X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-msg-edit-window-ui.h;h=22e03728d9d19da3f6b1ae295c8104f3d8c660ab;hp=1003512bf55f0e89551e51c8a323edf0feef5b74;hb=de2d9a7e88e25c2b3128cdc69a27c334cb9635ea;hpb=38402a6550ee767271308f42ebfbfc81a1fa736b

diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h
index 1003512..22e0372 100644
--- a/src/widgets/modest-msg-edit-window-ui.h
+++ b/src/widgets/modest-msg-edit-window-ui.h
@@ -38,15 +38,13 @@
 G_BEGIN_DECLS
 
 static const GtkActionEntry modest_msg_edit_action_entries [] = {
-
 	/* Toplevel menus */
-	{ "Email", NULL, N_("mcen_me_inbox_email") },
+	{ "Email", NULL, N_("mcen_me_inbox_email") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_email_menu_activated) },
 	{ "View", NULL, N_("mcen_me_inbox_view") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_view_menu_activated)},
 	{ "Edit", NULL, N_("mcen_me_inbox_edit") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_edit_menu_activated)},
 	{ "Format", NULL, N_("mcen_me_editor_format") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_format_menu_activated)},
 	{ "Alignment", NULL, N_("mcen_me_editor_align") },
 	{ "Attachments", NULL, N_("mcen_me_viewer_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_attachment_menu_activated) },
-	{ "Zoom", NULL, N_("mcen_me_viewer_zoom") },
 	{ "MessagePriority", NULL, N_("mcen_me_editor_message_priority") },
 	{ "FileFormat", NULL, N_("mcen_me_editor_file_format") },
 	{ "Tools", NULL, N_("mcen_me_inbox_tools") },
@@ -54,10 +52,10 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = {
 	{ "Close", NULL, N_("mcen_me_inbox_close") },
 
 	/* ACTIONS */
-	{ "ActionsNewMessage", NULL, N_("mcen_me_viewer_newemail"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_msg) },
+	{ "ActionsNewMessage", NULL, N_("mcen_me_viewer_newemail"), "<CTRL>N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) },
 	{ "ActionsSaveToDrafts", NULL, N_("mcen_me_editor_save_as_draft"), "<CTRL>S", NULL, G_CALLBACK (modest_ui_actions_on_save_to_drafts) },
 	{ "ActionsDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) },
-	{ "ActionsSend", NULL, N_("mcen_me_editor_send"), "<CTRL>Return", NULL,  G_CALLBACK (modest_ui_actions_on_send) },
+	{ "ActionsSend", NULL, N_("mcen_me_editor_send"), "<CTRL>KP_Enter", NULL,  G_CALLBACK (modest_ui_actions_on_send) },
 /* 	{ "ActionsFontColor", GTK_STOCK_SELECT_COLOR, N_("Color"), NULL, N_("Change text color"), G_CALLBACK (modest_ui_actions_on_select_editor_color)}, */
 /* 	{ "BackgroundColor", GTK_STOCK_SELECT_COLOR, N_("Background color"), NULL, N_("Change background color"), G_CALLBACK (modest_ui_actions_on_select_editor_background_color)}, */
 	{ "InsertImage", NULL, N_("mcen_me_editor_attach_inlineimage"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_insert_image)},
@@ -78,10 +76,10 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = {
 	{ "SearchMessages", NULL, N_("mcen_me_inbox_search"), "<CTRL>E", NULL,  G_CALLBACK (modest_ui_actions_on_search_messages) },
 
 
-	/* KEY ACCELERATOR ACTIONS */
+	/* 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) },
- 	{ "ToggleFullscreen", NULL, N_("Toggle fullscreen"), "F6", NULL, G_CALLBACK (modest_ui_actions_on_change_fullscreen) },
+	{ "ToggleFullscreen", NULL, N_("Toggle fullscreen"), "F6", NULL, G_CALLBACK (modest_ui_actions_on_change_fullscreen) },
 	{ "CloseWindowShortcut", NULL, NULL, "Escape", NULL, G_CALLBACK (modest_ui_actions_on_close_window) },
 
 	/* TOOLBAR ACTIONS */
@@ -105,8 +103,8 @@ static const GtkToggleActionEntry modest_msg_edit_toggle_action_entries [] = {
 	{ "ActionsBulletedList", NULL, N_("mcen_me_editor_bullets"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_bullets), FALSE },
 
 	/* Toolbar buttons */
-	{ "ActionsBold", MODEST_TOOLBAR_ICON_BOLD, NULL, NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_bold), FALSE },
-	{ "ActionsItalics", MODEST_TOOLBAR_ICON_ITALIC, NULL, NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_italics), FALSE },
+	{ "ActionsBold", MODEST_TOOLBAR_ICON_BOLD, MODEST_TOOLBAR_ICON_BOLD, NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_bold), FALSE },
+	{ "ActionsItalics", MODEST_TOOLBAR_ICON_ITALIC, MODEST_TOOLBAR_ICON_ITALIC, NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_italics), FALSE },
 
 	/* Find in page */
 	{ "FindInMessage", NULL, N_("mcen_me_viewer_find"), "<CTRL>F", NULL, G_CALLBACK (modest_ui_actions_on_toggle_find_in_page), FALSE },
@@ -119,15 +117,6 @@ static const GtkRadioActionEntry modest_msg_edit_alignment_radio_action_entries
 	{ "AlignmentRight", NULL, N_("mcen_me_editor_align_right"), NULL, NULL, GTK_JUSTIFY_RIGHT },
 };
 
-static const GtkRadioActionEntry modest_msg_edit_zoom_action_entries [] = {
-	{ "Zoom50", NULL, N_("mcen_me_viewer_50"), NULL, NULL, 50 },
-	{ "Zoom80", NULL, N_("mcen_me_viewer_80"), NULL, NULL, 80 },
-	{ "Zoom100", NULL, N_("mcen_me_viewer_100"), NULL, NULL, 100 },
-	{ "Zoom120", NULL, N_("mcen_me_viewer_120"), NULL, NULL, 120 },
-	{ "Zoom150", NULL, N_("mcen_me_viewer_150"), NULL, NULL, 150 },
-	{ "Zoom200", NULL, N_("mcen_me_viewer_200"), NULL, NULL, 200 }
-};
-
 static const GtkRadioActionEntry modest_msg_edit_priority_action_entries [] = {
 	{ "MessagePriorityHigh", NULL, N_("mcen_me_editor_priority_high"), NULL, NULL, TNY_HEADER_FLAG_HIGH_PRIORITY },
 	{ "MessagePriorityNormal", NULL, N_("mcen_me_editor_priority_normal"), NULL, NULL, TNY_HEADER_FLAG_NORMAL_PRIORITY },