fixed mailbox issued

diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c
index 15c8d28..2186f4b 100755 (executable)
--- a/mailbox/src/email-mailbox-list.c
+++ b/mailbox/src/email-mailbox-list.c
@@ -613,31 +613,19 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
                        return (void *)icon;
                }
        } else if(!g_strcmp0(source, "elm.icon.4")) {
-               if (ld->followup_flag > EMAIL_FLAG_FLAGED) {
-                       ld->flag_ic = elm_icon_add(obj);
-                       switch(ld->followup_flag)
-                       {
-                       case EMAIL_FLAG_TASK_STATUS_CLEAR:
-                               elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag_clear.png", NULL);
-                               break;
-                       case EMAIL_FLAG_TASK_STATUS_ACTIVE:
-                               elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag.png", NULL);
-                               break;
-                       case EMAIL_FLAG_TASK_STATUS_COMPLETE:
-                               elm_image_file_set(ld->flag_ic, IMGDIR "/M02_icon_flag_complete.png", NULL);
-                               break;
-                       }
-                       evas_object_size_hint_min_set(ld->flag_ic, 38, 38);
-                       return ld->flag_ic;
-               }
+                               ld->important = elm_icon_add(obj);
+                               if(ld->imp_sel) {
+                                       elm_image_file_set(ld->important, IMGDIR "/M02_icon_favorite_test.png", NULL);
+                               } else {
+                                       elm_image_file_set(ld->important, IMGDIR "/M02_icon_favorite_test_off.png", NULL);
+                               }
+                               evas_object_size_hint_min_set(ld->important, 38, 38);
+                               return ld->important;
        } else if(!g_strcmp0(source, "elm.icon.4.touch")) {
                Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj));
                evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               if(ld->followup_flag > EMAIL_FLAG_FLAGED)
-                       evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_UP, _item_followup_flag_touched_cb, data);
-               else
-                       evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_UP, _important_status_changed_cb, data);
+               evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_UP, _important_status_changed_cb, data);
 
                evas_object_propagate_events_set(rect, EINA_FALSE);
                evas_object_color_set(rect, 0, 0 ,0, 0);
@@ -1149,7 +1137,7 @@ void mailbox_create_list_view(EmailMailboxUGD *mailbox_ugd)
        elm_object_style_set(gl, "handler");
        elm_scroller_policy_set(gl, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
        elm_genlist_block_count_set(gl, BLOCK_COUNT);
-       elm_genlist_homogeneous_set(gl, EINA_TRUE);
+       //elm_genlist_homogeneous_set(gl, EINA_TRUE); //This option should not be used because we add several kinds of list item(different height)
        elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); //compress mode should be used because of text block(should be check rotate sweep menu issue)
        elm_genlist_select_mode_set(gl, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
@@ -1231,7 +1219,7 @@ void email_maillist_select_info(EmailMailboxUGD *mailbox_ugd)
                                elm_object_signal_emit(mailbox_ugd->sub_layout[mailbox_ugd->previous_view], "hide_selection_info", "elm");
                        }
 
-                       snprintf(tmp, sizeof(tmp), "%s (%d)", N_("Selected"), cnt);
+                       snprintf(tmp, sizeof(tmp), "%s (%d)", dgettext("sys_string", "IDS_COM_POP_SELECTED"), cnt);
                        elm_object_part_text_set(mailbox_ugd->split_nocontent, "elm.text", tmp);
                }
                else {
@@ -2495,12 +2483,6 @@ void _edit_back_cb(void *data, Evas_Object *obj, void *event_info)
        /*clear checked status of mail item*/
        _clear_checked_status(mailbox_ugd);
 
-       if (mailbox_ugd->view_type == EMAIL_VIEW_EDIT && mailbox_ugd->isRotate == true)
-       {
-               _delete_controlbar(mailbox_ugd);
-               email_maillist_select_info(mailbox_ugd);
-       }
-
        mailbox_ugd->view_type = mailbox_ugd->previous_view;
 
        if (GET_MAILBOX_TYPE(mailbox_ugd->mailbox_id) == EMAIL_MAILBOX_TYPE_OUTBOX) {

diff --git a/mailbox/src/email-mailbox.c b/mailbox/src/email-mailbox.c
index 3cdb426..d7bfffc 100755 (executable)
--- a/mailbox/src/email-mailbox.c
+++ b/mailbox/src/email-mailbox.c
@@ -613,7 +613,10 @@ static void _mailbox_rotate_to_potrait(void *data, int angle)
        elm_win_rotation_with_resize_set(mailbox_ugd->win_main, angle);
 
        debug_log("show title. view_type:%d, previous_view:%d", mailbox_ugd->view_type, mailbox_ugd->previous_view);
-       elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title", mailbox_ugd->navi_title_ly);
+       if (mailbox_ugd->view_type == EMAIL_VIEW_EDIT)
+               elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->previous_view], "title", mailbox_ugd->navi_title_ly);
+       else
+               elm_object_item_part_content_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title", mailbox_ugd->navi_title_ly);
 
        if (elm_object_part_content_get(mailbox_ugd->panes, "right") == mailbox_ugd->split_ly) {
                elm_panes_content_left_size_set(mailbox_ugd->panes, 1.0);
@@ -1850,7 +1853,7 @@ void _create_email_no_content_view(EmailMailboxUGD *mailbox_ugd)
                list = edit_list;
                cnt = eina_list_count(list);
 
-               snprintf(tmp, sizeof(tmp), "%s (%d)", N_("Selected"), cnt);
+               snprintf(tmp, sizeof(tmp), "%s (%d)", dgettext("sys_string", "IDS_COM_POP_SELECTED"), cnt);
                elm_object_part_text_set(mailbox_ugd->split_nocontent, "elm.text", tmp);
        }
        else {
@@ -2281,10 +2284,14 @@ void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd)
 
                if (mailbox_ugd->isRotate == false) {
                        _create_controlbar(mailbox_ugd);
+               } else {
+                       _create_controlbar_for_split_view(mailbox_ugd);
                }
        } else {
                if (mailbox_ugd->isRotate == false) {
                        _create_controlbar(mailbox_ugd);
+               } else {
+                       _create_controlbar_for_split_view(mailbox_ugd);
                }
                elm_object_item_text_set(mailbox_ugd->navibar_item[mailbox_ugd->view_type], mailbox_ugd->folder_alias);
                elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->folder_alias);
@@ -2297,6 +2304,16 @@ void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd)
                        email_free_account(&account, 1);
                }
        }
+
+       if (mailbox_ugd->isRotate && evas_object_visible_get(mailbox_ugd->navi_title_ly)) {
+               debug_log("title is visible, hide title");
+               if (mailbox_ugd->view_type == EMAIL_VIEW_EDIT) {
+                       elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->previous_view], "title");
+               } else {
+                       elm_object_item_part_content_unset(mailbox_ugd->navibar_item[mailbox_ugd->view_type], "title");
+               }
+               evas_object_hide(mailbox_ugd->navi_title_ly);
+       }
 }
 
 static void _account_dim_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)

diff --git a/mailbox/theme/email-mailbox-theme.edc b/mailbox/theme/email-mailbox-theme.edc
index 5be3e95..4e32f8f 100755 (executable)
--- a/mailbox/theme/email-mailbox-theme.edc
+++ b/mailbox/theme/email-mailbox-theme.edc
@@ -183,6 +183,20 @@ collections
                                                target: "noc";
                                                transition: LINEAR 0.1;
                                }
+                               program {
+                                               name: "selection_info_show";
+                                               signal: "show_selection_info";
+                                               source: "elm";
+                                               action: STATE_SET "default" 0.0;
+                                               target: "selection_info";
+                               }
+                               program {
+                                               name: "selection_info_hide";
+                                               signal: "hide_selection_info";
+                                               source: "elm";
+                                               action: STATE_SET "hide" 0.0;
+                                               target: "selection_info";
+                               }
                }
        } //end group
 
@@ -455,6 +469,20 @@ collections
                                                target: "noc";
                                                transition: LINEAR 0.1;
                                }
+                               program {
+                                               name: "selection_info_show";
+                                               signal: "show_selection_info";
+                                               source: "elm";
+                                               action: STATE_SET "default" 0.0;
+                                               target: "selection_info";
+                               }
+                               program {
+                                               name: "selection_info_hide";
+                                               signal: "hide_selection_info";
+                                               source: "elm";
+                                               action: STATE_SET "hide" 0.0;
+                                               target: "selection_info";
+                               }                               
                }
        } //end group