X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=11aa375907e5ab7ecfde21a597e9e7efadb28c46;hp=2d27d48f455ac654a5d4f4a1b0e5263697eab4c9;hb=134ad44220cf5267676137a9bcc8ca4872acbba3;hpb=f4bbfe36b6a6fb2337fde2dc3a9d46d3915d24e8

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 2d27d48..11aa375 100644
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -264,18 +264,24 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 	 */
 
 	/* Register edit modes */
-	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
-						  _("mcen_ti_edit_folder_delete"), _HL("wdgt_bd_delete"),
+	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
+						  EDIT_MODE_COMMAND_DELETE,
+						  _("mcen_ti_edit_folder_delete"), 
+						  _HL("wdgt_bd_delete"),
 						  GTK_TREE_VIEW (priv->folder_view),
 						  GTK_SELECTION_SINGLE,
 						  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_folder));
-	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
-						  _("mcen_ti_edit_move_folder"), _("mcen_me_move"),
+	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
+						  EDIT_MODE_COMMAND_MOVE,
+						  _("mcen_ti_edit_move_folder"), 
+						  _("mcen_me_move"),
 						  GTK_TREE_VIEW (priv->folder_view),
 						  GTK_SELECTION_SINGLE,
 						  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));	
-	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_RENAME,
-						  _("mcen_ti_edit_rename_folde"), _HL("wdgt_bd_rename"),
+	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
+						  EDIT_MODE_COMMAND_RENAME,
+						  _("mcen_ti_edit_rename_folder"), 
+						  _HL("wdgt_bd_rename"),
 						  GTK_TREE_VIEW (priv->folder_view),
 						  GTK_SELECTION_SINGLE,
 						  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder));
@@ -340,43 +346,43 @@ static void setup_menu (ModestFolderWindow *self)
 	g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
 	/* folders actions */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_new_folder),
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_user_renamefolder"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL,
 					   APP_MENU_CALLBACK (set_rename_edit_mode),
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
 					   APP_MENU_CALLBACK (set_moveto_edit_mode),
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), NULL,
 					   APP_MENU_CALLBACK (set_delete_edit_mode),
 					   NULL);
 
 	/* new message */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Ctrl>n",
 					   APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
 					   NULL);
 
 	/* send receive actions should be only one visible always */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 
 	/* Settings menu buttons */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_accounts"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_new_account),
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_accounts),
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_settings),
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));