Fixes NB#123141, viewer window menu is not as per UI specs

Replaced two options from the menu
Replaced two toolitems in the toolbar

diff --git a/src/hildon2/modest-icon-names.h b/src/hildon2/modest-icon-names.h
index 43995b8..c7fe3ef 100644 (file)
--- a/src/hildon2/modest-icon-names.h
+++ b/src/hildon2/modest-icon-names.h
@@ -82,7 +82,7 @@
 #define  MODEST_TOOLBAR_ICON_NEW_MAIL          "email_message_editor"
 #define  MODEST_TOOLBAR_ICON_SEND_RECEIVE      "general_refresh"
 #define  MODEST_TOOLBAR_ICON_REPLY             "email_message_reply"
 #define  MODEST_TOOLBAR_ICON_NEW_MAIL          "email_message_editor"
 #define  MODEST_TOOLBAR_ICON_SEND_RECEIVE      "general_refresh"
 #define  MODEST_TOOLBAR_ICON_REPLY             "email_message_reply"

-#define  MODEST_TOOLBAR_ICON_REPLY_ALL         ""
+#define  MODEST_TOOLBAR_ICON_REPLY_ALL         "email_message_reply_all"

 #define  MODEST_TOOLBAR_ICON_FORWARD           ""
 #define  MODEST_TOOLBAR_ICON_DELETE            "general_delete"
 #define  MODEST_TOOLBAR_ICON_FORMAT_BULLETS     ""
 #define  MODEST_TOOLBAR_ICON_FORWARD           ""
 #define  MODEST_TOOLBAR_ICON_DELETE            "general_delete"
 #define  MODEST_TOOLBAR_ICON_FORMAT_BULLETS     ""

@@ -95,6 +95,7 @@
 #define  MODEST_TOOLBAR_ICON_NEXT               "general_forward"
 #define  MODEST_TOOLBAR_ICON_PREV               "general_back"
 #define  MODEST_TOOLBAR_ICON_FIND               "general_search"
 #define  MODEST_TOOLBAR_ICON_NEXT               "general_forward"
 #define  MODEST_TOOLBAR_ICON_PREV               "general_back"
 #define  MODEST_TOOLBAR_ICON_FIND               "general_search"

+#define  MODEST_TOOLBAR_ICON_DOWNLOAD_IMAGES    "email_message_download_external_images"

 
 /* Stock icon names */
 #define  MODEST_STOCK_MAIL_SEND    "modest-stock-mail-send"
 
 /* Stock icon names */
 #define  MODEST_STOCK_MAIL_SEND    "modest-stock-mail-send"

diff --git a/src/hildon2/modest-main-window-ui.h b/src/hildon2/modest-main-window-ui.h
index dd55cbf..c9014e9 100644 (file)
--- a/src/hildon2/modest-main-window-ui.h
+++ b/src/hildon2/modest-main-window-ui.h
@@ -119,6 +119,7 @@ static const GtkActionEntry modest_action_entries [] = {
        { "ToolbarMessageNext",    MODEST_TOOLBAR_ICON_NEXT, N_("qgn_toolb_gene_forward"),      NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) },
        { "ToolbarMessageMoveTo",     MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER, N_("qgn_toolb_gene_movetofldr"),   NULL, NULL, G_CALLBACK(modest_ui_actions_on_move_to) },
        { "ToolbarCancel",       GTK_STOCK_STOP,   "",      NULL, NULL,  NULL },
        { "ToolbarMessageNext",    MODEST_TOOLBAR_ICON_NEXT, N_("qgn_toolb_gene_forward"),      NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) },
        { "ToolbarMessageMoveTo",     MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER, N_("qgn_toolb_gene_movetofldr"),   NULL, NULL, G_CALLBACK(modest_ui_actions_on_move_to) },
        { "ToolbarCancel",       GTK_STOCK_STOP,   "",      NULL, NULL,  NULL },

+       { "ToolbarDownloadExternalImages", MODEST_TOOLBAR_ICON_DOWNLOAD_IMAGES, N_("mail_bd_external_images"),      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_fetch_images) },

 };
 
 G_END_DECLS
 };
 
 G_END_DECLS

diff --git a/src/hildon2/modest-msg-view-window-ui-dimming.h b/src/hildon2/modest-msg-view-window-ui-dimming.h
index 45810ea..cf1984a 100644 (file)
--- a/src/hildon2/modest-msg-view-window-ui-dimming.h
+++ b/src/hildon2/modest-msg-view-window-ui-dimming.h
@@ -59,12 +59,11 @@ static const ModestDimmingEntry modest_msg_view_toolbar_dimming_entries [] = {
 
        /* Toolbar */
        { "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
 
        /* Toolbar */
        { "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },

-       { "/ToolBar/ToolbarMessageMoveTo", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
+       { "/ToolBar/ToolbarMessageReplyAll", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },

        { "/ToolBar/ToolbarDeleteMessage",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
        { "/ToolBar/ToolbarDeleteMessage",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },

-       { "/ToolBar/FindInMessage", G_CALLBACK(modest_ui_dimming_rules_on_find_in_msg) },
+       { "/ToolBar/ToolbarDownloadExternalImages", G_CALLBACK(modest_ui_dimming_rules_on_fetch_images) },

        { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
        { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) },
        { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
        { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) },

-       { "/ToolBar/ToolbarCancel", NULL },

 };
 
 G_END_DECLS
 };
 
 G_END_DECLS

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 0c8e6ce..7df00a6 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2324,7 +2324,7 @@ toolbar_resize (ModestMsgViewWindow *self)
                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);

-               widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo");
+               widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReplyAll");

                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);

@@ -2332,7 +2332,7 @@ toolbar_resize (ModestMsgViewWindow *self)
                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);

-               widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FindInMessage");
+               widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarDownloadExternalImages");

                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
                gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
                gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
                gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 6264465..fd53467 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -52,10 +52,10 @@
   </menubar>
 
   <toolbar name="ToolBar">
   </menubar>
 
   <toolbar name="ToolBar">

-    <toolitem action="ToolbarMessageReply"/> 
-    <toolitem action="ToolbarMessageMoveTo"/>
+    <toolitem action="ToolbarMessageReply"/>
+    <toolitem action="ToolbarMessageReplyAll"/>

     <toolitem action="ToolbarDeleteMessage"/>
     <toolitem action="ToolbarDeleteMessage"/>

-    <toolitem action="FindInMessage"/>
+    <toolitem action="ToolbarDownloadExternalImages"/>

     <toolitem action="ToolbarMessageBack" position="bot"/>
     <toolitem action="ToolbarMessageNext" position="bot"/>
   </toolbar>
     <toolitem action="ToolbarMessageBack" position="bot"/>
     <toolitem action="ToolbarMessageNext" position="bot"/>
   </toolbar>