projects / modest / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Better progress hint feedback in header window (fixes NB#100599)
[modest] / src / hildon2 / modest-folder-window.c
diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 869b5ed..2120fca 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -82,7 +82,14 @@ 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);
+static void on_progress_list_changed (ModestWindowMgr *mgr,
+                                     ModestFolderWindow *self);
+static gboolean on_map_event (GtkWidget *widget,
+                             GdkEvent *event,
+                             gpointer userdata);
+static void update_progress_hint (ModestFolderWindow *self);
 
 typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
 struct _ModestFolderWindowPrivate {
@@ -93,6 +100,8 @@ struct _ModestFolderWindowPrivate {
        /* signals */
        GSList *sighandlers;
 
+       gchar *current_store_account;
+       gboolean progress_hint;
 };
 #define MODEST_FOLDER_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                          MODEST_TYPE_FOLDER_WINDOW, \
@@ -160,6 +169,8 @@ modest_folder_window_init (ModestFolderWindow *obj)
        modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
                                            GTK_WINDOW(obj),
                                            "applications_email_folderview");
+       priv->progress_hint = FALSE;
+       priv->current_store_account = NULL;
 }
 
 static void
@@ -169,6 +180,11 @@ modest_folder_window_finalize (GObject *obj)
 
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj);
 
+       if (priv->current_store_account) {
+               g_free (priv->current_store_account);
+               priv->current_store_account = NULL;
+       }
+
        /* Sanity check: shouldn't be needed, the window mgr should
           call this function before */
        modest_folder_window_disconnect_signals (MODEST_WINDOW (obj));  
@@ -198,6 +214,10 @@ connect_signals (ModestFolderWindow *self)
                                                       G_OBJECT (priv->folder_view), "folder-activated", 
                                                       G_CALLBACK (on_folder_activated), self);
 
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT (modest_runtime_get_window_mgr ()),
+                                                      "progress-list-changed",
+                                                      G_CALLBACK (on_progress_list_changed), self);
        /* TODO: connect folder view activate */
        
        /* window */
@@ -281,7 +301,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)); 
@@ -293,6 +313,11 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder));
        
+       g_signal_connect (G_OBJECT (self), "map-event",
+                         G_CALLBACK (on_map_event),
+                         G_OBJECT (self));
+       update_progress_hint (self);
+
        return MODEST_WINDOW(self);
 }
 
@@ -332,9 +357,13 @@ modest_folder_window_set_account (ModestFolderWindow *self,
        if (!store_settings)
                goto free_refs;
 
+       if (priv->current_store_account != NULL)
+               g_free (priv->current_store_account);
+       priv->current_store_account = g_strdup (modest_server_account_settings_get_account_name (store_settings));
+       
        modest_folder_view_set_account_id_of_visible_server_account 
                (MODEST_FOLDER_VIEW (priv->folder_view),
-                modest_server_account_settings_get_account_name (store_settings));
+                priv->current_store_account);
 
        modest_window_set_active_account (MODEST_WINDOW (self), account_name);
        gtk_window_set_title (GTK_WINDOW (self), 
@@ -361,10 +390,10 @@ static void setup_menu (ModestFolderWindow *self)
                                           NULL);
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
                                           APP_MENU_CALLBACK (set_moveto_edit_mode),
-                                          NULL);
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), NULL,
                                           APP_MENU_CALLBACK (set_delete_edit_mode),
-                                          NULL);
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
 
        /* new message */
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), 
@@ -379,24 +408,10 @@ static void setup_menu (ModestFolderWindow *self)
                                           NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
                                           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
@@ -418,13 +433,15 @@ on_folder_activated (ModestFolderView *folder_view,
        if (!TNY_IS_FOLDER (folder))
                return;
 
-       headerwin = modest_header_window_new (folder);
+       /* 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_get_active_account (MODEST_WINDOW (self)));
        modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
                                           MODEST_WINDOW (headerwin),
                                           MODEST_WINDOW (self));
 
-       modest_window_set_active_account (MODEST_WINDOW (headerwin), 
-                                         modest_window_get_active_account (MODEST_WINDOW (self)));
        gtk_widget_show (GTK_WIDGET (headerwin));
 }
 
@@ -469,6 +486,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;
@@ -492,5 +510,56 @@ 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);
+}
+
+static gboolean 
+on_map_event (GtkWidget *widget,
+             GdkEvent *event,
+             gpointer userdata)
+{
+       ModestFolderWindow *self = (ModestFolderWindow *) userdata;
+       ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+       if (priv->progress_hint) {
+               hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+       }
+
+       return FALSE;
+}
+
+static void
+update_progress_hint (ModestFolderWindow *self)
+{
+       ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+       if (!priv->current_store_account)
+               return;
+
+       priv->progress_hint = modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (),
+                                                                                  priv->current_store_account);
+       
+       if (GTK_WIDGET_VISIBLE (self)) {
+               hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0);
+       }
+}
+
+static void
+on_progress_list_changed (ModestWindowMgr *mgr,
+                         ModestFolderWindow *self)
+{
+       update_progress_hint (self);
+}
+
+gboolean
+modest_folder_window_transfer_mode_enabled (ModestFolderWindow *self)
+{
+       ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+       return priv->progress_hint;
 }
"modest" is a lean & mean e-mail program.