X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-msg-edit-window-ui.h;h=bcee8da9dfbbd63588dea5f8e982fd63b4fa02b6;hb=00843109d0342129e01ba4b4848ad89eea5fe3e7;hp=4aa98958c4f652cd95b42cfd3e41e99cebaba447;hpb=1963e4754f8f1cc2b058bd363e700a8faa8f1f62;p=modest

diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h
index 4aa9895..bcee8da 100644
--- a/src/widgets/modest-msg-edit-window-ui.h
+++ b/src/widgets/modest-msg-edit-window-ui.h
@@ -58,8 +58,8 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = {
 	{ "ActionsNewMessage", NULL, N_("mcen_me_new_message"), "<CTRL>N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) },
 #else
 	{ "ActionsNewMessage", NULL, N_("mcen_me_viewer_newemail"), "<CTRL>N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) },
-#endif
 	{ "ActionsSaveToDrafts", NULL, N_("mcen_me_editor_save_as_draft"), "<CTRL>S", NULL, G_CALLBACK (modest_ui_actions_on_save_to_drafts) },
+#endif
 #ifdef MODEST_TOOLKIT_HILDON2
 	{ "ActionsDelete", NULL, N_("mcen_me_delete_messages"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) },
 #else
@@ -97,15 +97,19 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = {
 	/* KEY ACCELERATOR ACTIONS */
 	{ "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_STOCK_MAIL_SEND, N_("qgn_toolb_messagin_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
 };