*Fixes NB#98805, do not show account related options in folders view

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 11aa375..1e02185 100644 (file)
--- 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);
 
@@ -274,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)); 
@@ -360,32 +368,21 @@ 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
@@ -454,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);
+}