X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=a57ee458df07f6905443cc61d4ad1edd769dcb23;hb=266a0648148571006f3e268731f552ed2cead771;hp=0980eda93f1f958095592410d96ac04ecda9037e;hpb=ab80c7abd28f6a1bf324abbe817f2c3d49153b5e;p=modest

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 0980eda..a57ee45 100644
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -82,6 +82,7 @@ static void modest_folder_window_pack_toolbar (ModestHildon2Window *self,
 					       GtkWidget *toolbar);
 static void edit_mode_changed (ModestFolderWindow *folder_window,
 			       gint edit_mode_id,
+			       gboolean enabled,
 			       ModestFolderWindow *self);
 
 typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
@@ -224,6 +225,8 @@ 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);
 
@@ -279,7 +282,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
 						  EDIT_MODE_COMMAND_MOVE,
 						  _("mcen_ti_edit_move_folder"), 
-						  _("mcen_me_move"),
+						  _HL("wdgt_bd_move"),
 						  GTK_TREE_VIEW (priv->folder_view),
 						  GTK_SELECTION_SINGLE,
 						  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));	
@@ -365,32 +368,22 @@ static void setup_menu (ModestFolderWindow *self)
 					   NULL);
 
 	/* new message */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Ctrl>n",
+	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"), NULL,
+	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_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_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"), NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_on_accounts),
-					   NULL);
-	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"), NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
-	
 }
 
 static void
@@ -412,6 +405,10 @@ on_folder_activated (ModestFolderView *folder_view,
 	if (!TNY_IS_FOLDER (folder))
 		return;
 
+	/* We cannot open noselect folders (fake ones) */
+	if (tny_folder_get_caps (folder) & TNY_FOLDER_CAPS_NOSELECT)
+		return;
+
 	headerwin = modest_header_window_new (folder);
 	modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
 					   MODEST_WINDOW (headerwin),
@@ -463,6 +460,7 @@ modest_folder_window_pack_toolbar (ModestHildon2Window *self,
 static void 
 edit_mode_changed (ModestFolderWindow *folder_window,
 		   gint edit_mode_id,
+		   gboolean enabled,
 		   ModestFolderWindow *self)
 {
 	ModestFolderWindowPrivate *priv;
@@ -486,5 +484,10 @@ edit_mode_changed (ModestFolderWindow *folder_window,
 		break;
 	}
 
-	modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), filter);
+	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);
 }