* src/maemo/modest-signature-editor-dialog.c

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 80abed1..81eb994 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -59,7 +59,7 @@
 #include "modest-tny-msg.h"
 #include "modest-mail-operation.h"
 #include "modest-icon-names.h"
-#include "modest-progress-bar-widget.h"
+#include "modest-progress-bar.h"
 #include "modest-text-utils.h"
 #include "modest-ui-dimming-manager.h"
 #include "maemo/modest-osso-state-saving.h"
@@ -176,6 +176,8 @@ static void on_updating_msg_list (ModestHeaderView *header_view,
 
 static gboolean restore_paned_timeout_handler (gpointer *data);
 
+static gboolean show_retrieving_banner (gpointer user_data);
+
 typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
 struct _ModestMainWindowPrivate {
        GtkWidget *msg_paned;
@@ -227,6 +229,10 @@ struct _ModestMainWindowPrivate {
        GtkWidget *updating_banner;
        guint updating_banner_timeout;
 
+       /* "Retrieving" banner for header view */
+       GtkWidget *retrieving_banner;
+       guint retrieving_banner_timeout;
+
        /* Display state */
        osso_display_state_t display_state;
 };
@@ -356,6 +362,8 @@ modest_main_window_init (ModestMainWindow *obj)
        priv->sighandlers = NULL;
        priv->updating_banner = NULL;
        priv->updating_banner_timeout = 0;
+       priv->retrieving_banner = NULL;
+       priv->retrieving_banner_timeout = 0;
        priv->display_state = OSSO_DISPLAY_ON;
        
        modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
@@ -394,6 +402,16 @@ modest_main_window_finalize (GObject *obj)
                priv->updating_banner = NULL;
        }
 
+       if (priv->retrieving_banner_timeout > 0) {
+               g_source_remove (priv->retrieving_banner_timeout);
+               priv->retrieving_banner_timeout = 0;
+       }
+
+       if (priv->retrieving_banner) {
+               gtk_widget_destroy (priv->retrieving_banner);
+               priv->retrieving_banner = NULL;
+       }
+
        if (priv->restore_paned_timeout > 0) {
                g_source_remove (priv->restore_paned_timeout);
                priv->restore_paned_timeout = 0;
@@ -1491,7 +1509,7 @@ modest_main_window_show_toolbar (ModestWindow *self,
                toolbar_resize (MODEST_MAIN_WINDOW (self));
                
                /* Add ProgressBar (Transfer toolbar) */ 
-               priv->progress_bar = modest_progress_bar_widget_new ();
+               priv->progress_bar = modest_progress_bar_new ();
                gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
                placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView");
                insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
@@ -1903,6 +1921,7 @@ on_msg_count_changed (ModestHeaderView *header_view,
                      TnyFolderChange *change,
                      ModestMainWindow *main_window)
 {
+       gboolean refilter = FALSE;
        gboolean folder_empty = FALSE;
        gboolean all_marked_as_deleted = FALSE;
        ModestMainWindowPrivate *priv;
@@ -1925,6 +1944,11 @@ on_msg_count_changed (ModestHeaderView *header_view,
                if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
                        modest_platform_push_email_notification ();
                }
+
+               if ((changed) & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)
+                       refilter = TRUE;
+       } else {
+               folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (folder))) == 0);
        }
 
        /* Check if all messages are marked to be deleted */
@@ -1940,6 +1964,9 @@ on_msg_count_changed (ModestHeaderView *header_view,
                modest_main_window_set_contents_style (main_window,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
        }
+
+       if (refilter)
+               modest_header_view_refilter (header_view);
 }
 
 
@@ -2273,6 +2300,15 @@ on_mail_operation_started (ModestMailOperation *mail_op,
                g_object_unref (account);
                if (!is_remote)
                        return;
+
+               /* Show information banner. Remove old timeout */
+               if (priv->retrieving_banner_timeout > 0) {
+                       g_source_remove (priv->retrieving_banner_timeout);
+                       priv->retrieving_banner_timeout = 0;
+               }
+               /* Create a new timeout */
+               priv->retrieving_banner_timeout = 
+                       g_timeout_add (2000, show_retrieving_banner, self);
        }
               
        /* Get toolbar mode from operation id*/
@@ -2295,6 +2331,10 @@ on_mail_operation_started (ModestMailOperation *mail_op,
                        tmp = g_slist_next (tmp);
                }
        }
+
+       /* Update the main menu as well, we need to explicitely do
+          this in order to enable/disable accelerators */
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 }
 
 static void 
@@ -2324,6 +2364,18 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
                g_object_unref (account);
                if (!is_remote)
                        return;
+
+               /* Remove old timeout */
+               if (priv->retrieving_banner_timeout > 0) {
+                       g_source_remove (priv->retrieving_banner_timeout);
+                       priv->retrieving_banner_timeout = 0;
+               }
+
+               /* Remove the banner if exists */
+               if (priv->retrieving_banner) {
+                       gtk_widget_destroy (priv->retrieving_banner);
+                       priv->retrieving_banner = NULL;
+               }
        }
 
        /* Get toolbar mode from operation id*/
@@ -2477,9 +2529,9 @@ refresh_account (const gchar *account_name)
        
        /* If account_name == NULL, we must update all (option All) */
        if (!account_name)
-               modest_ui_actions_do_send_receive_all (win, FALSE);
+               modest_ui_actions_do_send_receive_all (win, TRUE);
        else
-               modest_ui_actions_do_send_receive (account_name, FALSE, win);
+               modest_ui_actions_do_send_receive (account_name, TRUE, win);
        
 }
 
@@ -2701,3 +2753,25 @@ modest_main_window_screen_is_on (ModestMainWindow *self)
        
        return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
 }
+
+static gboolean
+show_retrieving_banner (gpointer user_data)
+{
+       ModestMainWindowPrivate *priv = NULL;
+
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data);
+
+       if (priv->retrieving_banner == NULL) {
+
+               /* We're outside the main lock */
+               gdk_threads_enter ();
+               priv->retrieving_banner = 
+                       modest_platform_animation_banner (GTK_WIDGET (user_data), NULL,
+                                                         _("mcen_ib_getting_items"));
+               gdk_threads_leave ();
+       }
+
+       /* Remove timeout */
+       priv->retrieving_banner_timeout = 0;
+       return FALSE;
+}