Remove send button in toolbar of editor

pmo-trunk-r9133

diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml
index aa01e8c..ed2334e 100644 (file)
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml
@@ -82,12 +82,11 @@
     <toolitem action="ActionsBold"/>
     <toolitem action="ActionsItalics"/>
     <placeholder name="FontColor" />
-    <separator/>
-    <toolitem action="ToolbarSend"/>
   </toolbar>
 
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
   <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
   <accelerator name="AccelSend" action="SendShortcut"/>
+  <accelerator name="AccelSend2" action="SendShortcut2"/>
 
 </ui>

diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h
index e7a1dc4..bcee8da 100644 (file)
--- a/src/widgets/modest-msg-edit-window-ui.h
+++ b/src/widgets/modest-msg-edit-window-ui.h
@@ -98,15 +98,18 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = {
        { "ZoomPlus", NULL, N_("Zoom +"), "F7", NULL, G_CALLBACK (modest_ui_actions_on_zoom_plus) },
        { "ZoomMinus", NULL, N_("Zoom -"), "F8", NULL, G_CALLBACK (modest_ui_actions_on_zoom_minus) },
        { "SendShortcut", NULL, N_("Send email"), "<CTRL>KP_Enter", NULL, G_CALLBACK (modest_ui_actions_on_send) },
+#ifdef MODEST_TOOLKIT_HILDON2
+       { "SendShortcut2", NULL, N_("Send email"), "<CTRL>Return", NULL, G_CALLBACK (modest_ui_actions_on_send) },
+#endif
        { "ToggleFullscreen", NULL, N_("Toggle fullscreen"), "F6", NULL, G_CALLBACK (modest_ui_actions_on_change_fullscreen) },
        { "CloseWindowShortcut", NULL, NULL, "Escape", NULL, NULL },
 
        /* TOOLBAR ACTIONS */
-       { "ToolbarSend", MODEST_TOOLBAR_ICON_MAIL_SEND, MODEST_TOOLBAR_ICON_MAIL_SEND,  "<Control>Return", NULL,  G_CALLBACK (modest_ui_actions_on_send) },
-
 #ifdef MODEST_TOOLKIT_HILDON2
        /* Find in page. This is a normal menu option in Hildon2, and a checkbox in the others */
        { "FindInMessage", NULL, N_("mcen_me_viewer_find"), "<CTRL>F", NULL, G_CALLBACK (modest_ui_actions_on_toggle_find_in_page)},
+       { "ToolbarSend", MODEST_TOOLBAR_ICON_MAIL_SEND, MODEST_TOOLBAR_ICON_MAIL_SEND,  "<Control>Return", NULL,  G_CALLBACK (modest_ui_actions_on_send) },
+
 #endif
 };