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

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 2d27d48..1e02185 100644
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -80,6 +80,10 @@ static void set_rename_edit_mode (GtkButton *button,
 static void modest_folder_window_pack_toolbar (ModestHildon2Window *self,
 					       GtkPackType pack_type,
 					       GtkWidget *toolbar);
+static void edit_mode_changed (ModestFolderWindow *folder_window,
+			       gint edit_mode_id,
+			       gboolean enabled,
+			       ModestFolderWindow *self);
 
 typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
 struct _ModestFolderWindowPrivate {
@@ -221,6 +225,10 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 	priv->folder_view  = modest_platform_create_folder_view (query);
 	modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view),
 					   MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
+	modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
+				       MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
+	g_signal_connect (G_OBJECT (self), "edit-mode-changed",
+			  G_CALLBACK (edit_mode_changed), (gpointer) self);
 
 	setup_menu (self);
 
@@ -264,18 +272,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"), 
+						  _HL("wdgt_bd_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,46 +354,35 @@ 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_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+	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"),
-					   APP_MENU_CALLBACK (modest_ui_actions_on_new_account),
-					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"),
-					   APP_MENU_CALLBACK (modest_ui_actions_on_accounts),
-					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"),
-					   APP_MENU_CALLBACK (modest_ui_actions_on_settings),
-					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"),
-					   APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
-	
 }
 
 static void
@@ -448,3 +451,38 @@ modest_folder_window_pack_toolbar (ModestHildon2Window *self,
 		gtk_box_pack_end (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0);
 	}
 }
+
+static void 
+edit_mode_changed (ModestFolderWindow *folder_window,
+		   gint edit_mode_id,
+		   gboolean enabled,
+		   ModestFolderWindow *self)
+{
+	ModestFolderWindowPrivate *priv;
+	ModestFolderViewFilter filter = MODEST_FOLDER_VIEW_FILTER_NONE;
+
+	g_return_if_fail (MODEST_IS_FOLDER_WINDOW (self));
+	priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+	switch (edit_mode_id) {
+	case EDIT_MODE_COMMAND_MOVE:
+		filter = MODEST_FOLDER_VIEW_FILTER_MOVEABLE;
+		break;
+	case EDIT_MODE_COMMAND_DELETE:
+		filter = MODEST_FOLDER_VIEW_FILTER_DELETABLE;
+		break;
+	case EDIT_MODE_COMMAND_RENAME:
+		filter = MODEST_FOLDER_VIEW_FILTER_RENAMEABLE;
+		break;
+	case MODEST_HILDON2_WINDOW_EDIT_MODE_NONE:
+		filter = MODEST_FOLDER_VIEW_FILTER_NONE;
+		break;
+	}
+
+	if (enabled)
+		modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
+					       filter);
+	else
+		modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
+						 filter);
+}