Better progress hint feedback in header window (fixes NB#100599)
[modest] / src / hildon2 / modest-folder-window.c
index f446bd5..2120fca 100644 (file)
@@ -50,6 +50,7 @@
 #include <modest-ui-dimming-rules.h>
 #include <modest-ui-dimming-manager.h>
 #include <modest-window-priv.h>
+#include "modest-text-utils.h"
 
 typedef enum {
        EDIT_MODE_COMMAND_MOVE = 1,
@@ -79,6 +80,16 @@ 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);
+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 {
@@ -89,8 +100,8 @@ struct _ModestFolderWindowPrivate {
        /* signals */
        GSList *sighandlers;
 
-       /* Display state */
-       osso_display_state_t display_state;
+       gchar *current_store_account;
+       gboolean progress_hint;
 };
 #define MODEST_FOLDER_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                          MODEST_TYPE_FOLDER_WINDOW, \
@@ -150,7 +161,6 @@ modest_folder_window_init (ModestFolderWindow *obj)
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj);
 
        priv->sighandlers = NULL;
-       priv->display_state = OSSO_DISPLAY_ON;
        
        priv->folder_view = NULL;
 
@@ -159,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
@@ -168,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));  
@@ -197,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 */
@@ -207,19 +228,6 @@ connect_signals (ModestFolderWindow *self)
        
 }
 
-static void 
-osso_display_event_cb (osso_display_state_t state, 
-                      gpointer data)
-{
-       ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (data);
-
-       priv->display_state = state;
-
-       /* Stop blinking if the screen becomes on */
-       if (priv->display_state == OSSO_DISPLAY_ON)
-               modest_platform_remove_new_mail_notifications (TRUE);
-}
-
 ModestWindow *
 modest_folder_window_new (TnyFolderStoreQuery *query)
 {
@@ -236,6 +244,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);
 
@@ -272,12 +284,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                g_object_unref (window_icon);
        }
 
-       /* Listen for changes in the screen, we don't want to show a
-          led pattern when the display is on for example */
-       osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (),
-                                     osso_display_event_cb,
-                                     self); 
-
        /* Dont't restore settings here, 
         * because it requires a gtk_widget_show(), 
         * and we don't want to do that until later,
@@ -285,35 +291,34 @@ 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));
        
-       return MODEST_WINDOW(self);
-}
-
-gboolean
-modest_folder_window_screen_is_on (ModestFolderWindow *self)
-{
-       ModestFolderWindowPrivate *priv = NULL;
-
-       g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW(self), FALSE);
+       g_signal_connect (G_OBJECT (self), "map-event",
+                         G_CALLBACK (on_map_event),
+                         G_OBJECT (self));
+       update_progress_hint (self);
 
-       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
-       
-       return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
+       return MODEST_WINDOW(self);
 }
 
 ModestFolderView *
@@ -352,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), 
@@ -373,46 +382,36 @@ 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_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), _("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
@@ -434,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));
 }
 
@@ -481,3 +482,84 @@ 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);
+}
+
+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;
+}