2007-06-10 Johannes Schmid <johannes.schmid@openismus.com>
[modest] / src / maemo / modest-main-window.c
index b5c212f..43b8a84 100644 (file)
@@ -31,6 +31,7 @@
 #include <gtk/gtktreeviewcolumn.h>
 #include <tny-account-store-view.h>
 #include <tny-simple-list.h>
+#include <tny-maemo-conic-device.h>
 #include "modest-hildon-includes.h"
 #include "modest-defs.h"
 #include <string.h>
@@ -44,6 +45,7 @@
 #include "modest-widget-memory.h"
 #include "modest-window-priv.h"
 #include "modest-main-window-ui.h"
+#include "modest-main-window-ui-dimming.h"
 #include "modest-account-mgr.h"
 #include "modest-tny-account.h"
 #include "modest-conf.h"
@@ -54,6 +56,7 @@
 #include "modest-icon-names.h"
 #include "modest-progress-bar-widget.h"
 #include "modest-text-utils.h"
+#include "modest-ui-dimming-manager.h"
 #include "maemo/modest-osso-state-saving.h"
 
 #ifdef MODEST_HILDON_VERSION_0
 
 #define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions"
 
+#define XALIGN 0.5
+#define YALIGN 0.5
+#define XSPACE 1
+#define YSPACE 0
+
 /* 'private'/'protected' functions */
 static void modest_main_window_class_init    (ModestMainWindowClass *klass);
 static void modest_main_window_init          (ModestMainWindow *obj);
@@ -106,11 +114,18 @@ static void set_toolbar_mode                  (ModestMainWindow *self,
 
 static gboolean set_toolbar_transfer_mode     (ModestMainWindow *self); 
 
-static void on_show_account_action_activated  (GtkAction *action,
-                                              gpointer user_data);
+static void on_show_account_action_activated      (GtkAction *action,
+                                                  gpointer user_data);
+
+static void on_refresh_account_action_activated   (GtkAction *action,
+                                                  gpointer user_data);
+
+static void on_send_receive_csm_activated         (GtkMenuItem *item,
+                                                  gpointer user_data);
+
+
+static GtkWidget * create_empty_view (void);
 
-static void on_send_receive_csm_activated     (GtkMenuItem *item,
-                                              gpointer user_data);
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -125,6 +140,7 @@ struct _ModestMainWindowPrivate {
        GtkWidget *main_paned;
        GtkWidget *main_vbox;
        GtkWidget *contents_widget;
+       GtkWidget *empty_view;
 
        /* Progress observers */
        GtkWidget        *progress_bar;
@@ -147,6 +163,9 @@ struct _ModestMainWindowPrivate {
        /* Optimized view enabled */
        gboolean optimized_view;
 
+       /* Optimized view enabled */
+       gboolean send_receive_in_progress;
+
        ModestHeaderView *header_view;
        ModestFolderView *folder_view;
 
@@ -175,6 +194,7 @@ static GtkWindowClass *parent_class = NULL;
 
 
 /* Private actions */
+/* This is the context sensitive menu: */
 static const GtkActionEntry modest_folder_view_action_entries [] = {
 
        /* Folder View CSM actions */
@@ -182,10 +202,24 @@ static const GtkActionEntry modest_folder_view_action_entries [] = {
        { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) },
        { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, NULL },
        { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
-       { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, NULL },
-       { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, NULL },
+       { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_search_messages) },
+       { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) },
 };
 
+static const GtkActionEntry modest_header_view_action_entries [] = {
+
+       /* Header View CSM actions */
+       { "HeaderViewCSMOpen",          NULL,  N_("mcen_me_inbox_open"),        NULL,       NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
+       { "HeaderViewCSMReply",         NULL,  N_("mcen_me_inbox_reply"),       NULL,      NULL, G_CALLBACK (modest_ui_actions_on_reply) },
+       { "HeaderViewCSMReplyAll",      NULL,  N_("mcen_me_inbox_replytoall"),  NULL,      NULL, G_CALLBACK (modest_ui_actions_on_reply_all) },
+       { "HeaderViewCSMForward",       NULL,  N_("mcen_me_inbox_forward"),     NULL,      NULL, G_CALLBACK (modest_ui_actions_on_forward) },
+       { "HeaderViewCSMCut",           NULL,  N_("mcen_me_inbox_cut"),         "<CTRL>X", NULL, G_CALLBACK (modest_ui_actions_on_cut) },
+       { "HeaderViewCSMCopy",          NULL,  N_("mcen_me_inbox_copy"),        "<CTRL>C", NULL, G_CALLBACK (modest_ui_actions_on_copy) },
+       { "HeaderViewCSMPaste",         NULL,  N_("mcen_me_inbox_paste"),       "<CTRL>V", NULL, G_CALLBACK (modest_ui_actions_on_paste) },
+       { "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete) },
+       { "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, NULL },
+       { "HeaderViewCSMHelp",          NULL,  N_("mcen_me_inbox_help"),        NULL,      NULL, G_CALLBACK (modest_ui_actions_on_help) },
+};
 
 static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = {
        { "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "<CTRL>t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), FALSE },
@@ -248,6 +282,7 @@ modest_main_window_init (ModestMainWindow *obj)
        priv->contents_widget  = NULL;
        priv->accounts_popup  = NULL;
        priv->details_widget  = NULL;
+       priv->empty_view  = NULL;
 
        priv->progress_widgets  = NULL;
        priv->progress_bar = NULL;
@@ -259,6 +294,7 @@ modest_main_window_init (ModestMainWindow *obj)
        priv->merge_ids = NULL;
 
        priv->optimized_view  = FALSE;
+       priv->send_receive_in_progress  = FALSE;
        priv->progress_bar_timeout = 0;
 }
 
@@ -307,7 +343,6 @@ modest_main_window_get_child_widget (ModestMainWindow *self,
 }
 
 
-
 static void
 restore_settings (ModestMainWindow *self)
 {
@@ -317,13 +352,19 @@ restore_settings (ModestMainWindow *self)
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 
        conf = modest_runtime_get_conf ();
-       
-       modest_widget_memory_restore (conf, G_OBJECT(self), 
+
+       modest_widget_memory_restore (conf, G_OBJECT(self),
                                      MODEST_CONF_MAIN_WINDOW_KEY);
-       modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
-                                     MODEST_CONF_MAIN_PANED_KEY);
        modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
                                      MODEST_CONF_HEADER_VIEW_KEY);
+       modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view),
+                                     MODEST_CONF_FOLDER_VIEW_KEY);
+       modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
+                                     MODEST_CONF_MAIN_PANED_KEY);
+
+       /* We need to force a redraw here in order to get the right
+          position of the horizontal paned separator */
+       gtk_widget_show (GTK_WIDGET (self));
 }
 
 
@@ -343,6 +384,8 @@ save_state (ModestWindow *window)
                                   MODEST_CONF_MAIN_PANED_KEY);
        modest_widget_memory_save (conf, G_OBJECT(priv->header_view), 
                                   MODEST_CONF_HEADER_VIEW_KEY);
+       modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), 
+                                  MODEST_CONF_FOLDER_VIEW_KEY);
 }
 
 static void
@@ -366,17 +409,78 @@ on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
 
 
 static void
-on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self)
+on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self)
 {
        /* When going online, do the equivalent of pressing the send/receive button, 
         * as per the specification:
         * (without the check for >0 accounts, though that is not specified): */
-       if (online) {
-               modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
+
+       TnyDevice *device = tny_account_store_get_device (store);
+       
+       /* Check that we are really online.
+        * This signal should not be emitted when we are not connected, 
+        * but it seems to happen sometimes: */
+        if (!tny_device_is_online (device))
+               return;
+               
+       const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
+       printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id);
+       
+       /* Stop the existing send queues: */
+       modest_runtime_remove_all_send_queues ();
+       
+       /* Create the send queues again, using the appropriate transport accounts 
+        * for this new connection.
+        * This could be the first time that they are created if this is the first 
+        * connection. */
+       /* TODO: Does this really destroy the TnySendQueues and their threads
+        * We do not want 2 TnySendQueues to exist with the same underlying 
+        * outbox directory. */
+       GSList *account_names = modest_account_mgr_account_names (
+               modest_runtime_get_account_mgr(), 
+               TRUE /* enabled accounts only */);
+       GSList *iter = account_names;
+       while (iter) {
+               const gchar *account_name = (const gchar*)(iter->data);
+                       if (account_name) {
+                       TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (
+                               modest_tny_account_store_get_transport_account_for_open_connection
+                                                (modest_runtime_get_account_store(), account_name));
+                       if (account) {
+                               printf ("debug: %s:\n  Transport account for %s: %s\n", __FUNCTION__, account_name, 
+                                       tny_account_get_id(TNY_ACCOUNT(account)));
+                               modest_runtime_get_send_queue (account);
+                       }
+               }
+               
+               iter = g_slist_next (iter);
        }
+       
+       g_slist_free (account_names);
+       
+       
+       modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
+}
+
+static void
+_folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
+{
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules");  
 }
 
+static void
+_header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
+{
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
 
+       /* Update visibility */
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules");  
+}
 
 static void
 connect_signals (ModestMainWindow *self)
@@ -396,9 +500,12 @@ connect_signals (ModestMainWindow *self)
        g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed",
                          G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
 
+       /* Folder view CSM */
        menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM");
        gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
-
+       g_signal_connect (G_OBJECT(priv->folder_view), "tap-and-hold",
+                         G_CALLBACK(_folder_view_csm_menu_activated),
+                         self);
        /* header view */
 /*     g_signal_connect (G_OBJECT(priv->header_view), "status_update", */
 /*                       G_CALLBACK(modest_ui_actions_on_header_status_update), self); */
@@ -411,6 +518,13 @@ connect_signals (ModestMainWindow *self)
        g_signal_connect (G_OBJECT(priv->header_view), "key-press-event",
                          G_CALLBACK(on_inner_widgets_key_pressed), self);
 
+       /* Header view CSM */
+       menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM");
+       gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0);
+       g_signal_connect (G_OBJECT(priv->header_view), "tap-and-hold",
+                         G_CALLBACK(_header_view_csm_menu_activated),
+                         self);
+       
        /* window */
        g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
        g_signal_connect (G_OBJECT (self), "window-state-event",
@@ -441,17 +555,19 @@ connect_signals (ModestMainWindow *self)
                          G_CALLBACK (modest_ui_actions_on_password_requested), self);
                          
        /* Device */
-       g_signal_connect (G_OBJECT(modest_runtime_get_device()), "connection_changed",
-                         G_CALLBACK(on_connection_changed), self);
+       g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), "connecting-finished",
+                         G_CALLBACK(on_account_store_connecting_finished), self);
 }
 
+#if 0
 /** Idle handler, to send/receive at startup .*/
 gboolean
 sync_accounts_cb (ModestMainWindow *win)
 {
-       modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (win));
+       modest_ui_actions_on_send_receive (NULL, MODEST_WINDOW (win));
        return FALSE; /* Do not call this idle handler again. */
 }
+#endif
 
 static void on_hildon_program_is_topmost_notify(GObject *self,
        GParamSpec *propert_param, gpointer user_data)
@@ -496,25 +612,32 @@ static void on_hildon_program_is_topmost_notify(GObject *self,
 ModestWindow*
 modest_main_window_new (void)
 {
-       ModestMainWindow *self; 
-       ModestMainWindowPrivate *priv;
-       ModestWindowPrivate *parent_priv;
-       GtkWidget *folder_win;
-       GtkActionGroup *action_group;
+       ModestMainWindow *self = NULL;  
+       ModestMainWindowPrivate *priv = NULL;
+       ModestWindowPrivate *parent_priv = NULL;
+       GtkWidget *folder_win = NULL;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+       GtkActionGroup *action_group = NULL;
        GError *error = NULL;
-       TnyFolderStoreQuery *query;
-       GdkPixbuf *window_icon;
-       ModestConf *conf;
-       GtkAction *action;
+       TnyFolderStoreQuery *query = NULL;
+       GdkPixbuf *window_icon = NULL; 
+       ModestConf *conf = NULL;
+       GtkAction *action = NULL;
 
        self  = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 
        parent_priv->ui_manager = gtk_ui_manager_new();
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
+
        action_group = gtk_action_group_new ("ModestMainWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
+
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
                                      modest_action_entries,
@@ -526,6 +649,11 @@ modest_main_window_new (void)
                                      G_N_ELEMENTS (modest_folder_view_action_entries),
                                      self);
 
+       gtk_action_group_add_actions (action_group,
+                                     modest_header_view_action_entries,
+                                     G_N_ELEMENTS (modest_header_view_action_entries),
+                                     self);
+
        gtk_action_group_add_toggle_actions (action_group,
                                             modest_toggle_action_entries,
                                             G_N_ELEMENTS (modest_toggle_action_entries),
@@ -548,6 +676,22 @@ modest_main_window_new (void)
                error = NULL;
        }
 
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_main_window_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_main_window_menu_dimming_entries),
+                                             self);
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_main_window_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_main_window_toolbar_dimming_entries),
+                                             self);
+
+       /* Insert dimming rules group for this window */
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
+       
        /* Add accelerators */
        gtk_window_add_accel_group (GTK_WINDOW (self), 
                                    gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
@@ -585,7 +729,10 @@ modest_main_window_new (void)
        if (!priv->header_view)
                g_printerr ("modest: cannot instantiate header view\n");
        modest_header_view_set_style (priv->header_view, MODEST_HEADER_VIEW_STYLE_TWOLINES);
-       
+
+       /* Empty view */ 
+       priv->empty_view = create_empty_view ();
+                
        /* Create scrolled windows */
        folder_win = gtk_scrolled_window_new (NULL, NULL);
        priv->contents_widget = gtk_scrolled_window_new (NULL, NULL);
@@ -601,9 +748,8 @@ modest_main_window_new (void)
 
        /* paned */
        priv->main_paned = gtk_hpaned_new ();
-       gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
-       gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->contents_widget);
-       gtk_widget_show (GTK_WIDGET(priv->header_view));
+       gtk_paned_pack1 (GTK_PANED(priv->main_paned), folder_win, TRUE, TRUE);
+       gtk_paned_pack2 (GTK_PANED(priv->main_paned), priv->contents_widget, TRUE, TRUE);
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view));
 
        /* putting it all together... */
@@ -611,7 +757,6 @@ modest_main_window_new (void)
        gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
 
        gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
-       restore_settings (MODEST_MAIN_WINDOW(self));
 
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_ICON);
@@ -624,8 +769,14 @@ modest_main_window_new (void)
        tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
                                                  TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
 
-       /* do send & receive when we are idle */
-       g_idle_add ((GSourceFunc)sync_accounts_cb, self);
+       /* Do send & receive when we are idle */
+       /* TODO: Enable this again. I have commented it out because, 
+        * at least in scratchbox, this can cause us to start a second 
+        * update (in response to a connection change) when we are already 
+        * doing an update (started here, at startup). Tinymail doesn't like that.
+        * murrayc.
+        */
+       /* g_idle_add ((GSourceFunc)sync_accounts_cb, self); */
        
        HildonProgram *app = hildon_program_get_instance ();
        hildon_program_add_window (app, HILDON_WINDOW (self));
@@ -647,6 +798,9 @@ modest_main_window_new (void)
         * hibernation:  */
        modest_osso_load_state();
 
+       /* Restore window & widget settings */
+       restore_settings (MODEST_MAIN_WINDOW(self));
+
        return MODEST_WINDOW(self);
 }
 
@@ -694,7 +848,6 @@ modest_main_window_set_style (ModestMainWindow *self,
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView");
 
        priv->style = style;
-
        switch (style) {
        case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
                /* Remove main paned */
@@ -913,7 +1066,8 @@ on_account_update (TnyAccountStore *account_store,
           menu_detach because it does not work well with
           tap_and_hold */
        if (priv->accounts_popup)
-               gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), (GtkCallback) gtk_widget_destroy, NULL);
+               gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), 
+                                      (GtkCallback) gtk_widget_destroy, NULL);
 
        /* Delete old entries in the View menu. Do not free groups, it
           belongs to Gtk+ */
@@ -961,7 +1115,6 @@ on_account_update (TnyAccountStore *account_store,
        default_account = modest_account_mgr_get_default_account (mgr);
        action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
        for (i = 0; i < num_accounts; i++) {
-               GtkAction *new_action = NULL;
                gchar *display_name = NULL;
                
                ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
@@ -981,17 +1134,22 @@ on_account_update (TnyAccountStore *account_store,
                   action name must be the account name, this way we
                   could know in the handlers the account to show */
                if(account_data->account_name) {
-                       new_action = gtk_action_new (account_data->account_name, display_name, NULL, NULL);
-                       gtk_action_group_add_action (action_group, new_action);
+                       gchar* item_name, *refresh_action_name;
+                       guint8 merge_id;
+                       GtkAction *view_account_action, *refresh_account_action;
+
+                       view_account_action = gtk_action_new (account_data->account_name,
+                                                             display_name, NULL, NULL);
+                       gtk_action_group_add_action (action_group, view_account_action);
 
                        /* Add ui from account data. We allow 2^9-1 account
                           changes in a single execution because we're
                           downcasting the guint to a guint8 in order to use a
                           GByteArray, it should be enough */
-                       gchar* item_name = g_strconcat (account_data->account_name, "Menu", NULL);
-                       guint8 merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+                       item_name = g_strconcat (account_data->account_name, "Menu", NULL);
+                       merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
                        priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
-                       gtk_ui_manager_add_ui (parent_priv->ui_manager, 
+                       gtk_ui_manager_add_ui (parent_priv->ui_manager,
                                               merge_id,
                                               "/MenuBar/ViewMenu/ViewMenuAdditions",
                                               item_name,
@@ -1000,13 +1158,38 @@ on_account_update (TnyAccountStore *account_store,
                                               FALSE);
        
                        /* Connect the action signal "activate" */
-                       g_signal_connect (G_OBJECT (new_action), 
-                                         "activate", 
-                                         G_CALLBACK (on_show_account_action_activated), 
+                       g_signal_connect (G_OBJECT (view_account_action),
+                                         "activate",
+                                         G_CALLBACK (on_show_account_action_activated),
                                          self);
 
-                       /* Create item and add it to the send&receive CSM */
-                       /* TODO: Why is this sometimes NULL? murrayc */
+                       /* Create the items for the Tools->Send&Receive submenu */
+                       refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
+                       refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name, 
+                                                                display_name, NULL, NULL);
+                       gtk_action_group_add_action (action_group, refresh_account_action);
+
+                       merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+                       priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
+                       gtk_ui_manager_add_ui (parent_priv->ui_manager, 
+                                              merge_id,
+                                              "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions",
+                                              item_name,
+                                              refresh_action_name,
+                                              GTK_UI_MANAGER_MENUITEM,
+                                              FALSE);
+                       g_free (refresh_action_name);
+
+                       g_signal_connect_data (G_OBJECT (refresh_account_action), 
+                                              "activate", 
+                                              G_CALLBACK (on_refresh_account_action_activated), 
+                                              g_strdup (account_data->account_name),
+                                              (GClosureNotify) g_free,
+                                              0);
+
+                       /* Create item and add it to the send&receive
+                          CSM. If there is only one account then
+                          it'll be no menu */
                        if (priv->accounts_popup) {
                                item = gtk_menu_item_new_with_label (display_name);
                                gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
@@ -1017,7 +1200,6 @@ on_account_update (TnyAccountStore *account_store,
                                                       (GClosureNotify) g_free,
                                                       0);
                        }
-                       
                        g_free (item_name);
                }
 
@@ -1083,6 +1265,20 @@ set_alignment (GtkWidget *widget,
 }
 
 static GtkWidget *
+create_empty_view (void)
+{
+       GtkLabel *label = NULL;
+       GtkWidget *align = NULL;
+
+       align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE);
+       label = GTK_LABEL(gtk_label_new (_("mcen_ia_nomessages")));
+       gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);      
+       gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET(label));
+
+       return GTK_WIDGET(align);
+}
+
+static GtkWidget *
 create_details_widget (TnyAccount *account)
 {
        GtkWidget *vbox;
@@ -1090,61 +1286,70 @@ create_details_widget (TnyAccount *account)
 
        vbox = gtk_vbox_new (FALSE, 0);
 
-       /* Account description */
-       if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
-               gchar *device_name;
-
+       /* Account description: */
+       
+       if (modest_tny_account_is_virtual_local_folders (account)) {
+               /* Local folders: */
+       
                /* Get device name */
-               device_name = modest_conf_get_string (modest_runtime_get_conf(),
+               gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(),
                                                      MODEST_CONF_DEVICE_NAME, NULL);
    
-               label = g_strdup_printf ("%s: %s",
-                                        _("mcen_fi_localroot_description"),
+               label = g_strdup_printf (_("mcen_fi_localroot_description"),
                                         device_name);
                gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
                g_free (device_name);
                g_free (label);
-       } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) {
-               /* TODO: MMC ? */
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0);
        } else {
-               GString *proto;
-
-               /* Put proto in uppercase */
-               proto = g_string_new (tny_account_get_proto (account));
-               proto = g_string_ascii_up (proto);
-
-               label = g_strdup_printf ("%s %s: %s", 
-                                        proto->str,
-                                        _("mcen_fi_remoteroot_account"),
-                                        tny_account_get_name (account));
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
-               g_string_free (proto, TRUE);
-               g_free (label);
+               if(!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) {
+                       gtk_box_pack_start (GTK_BOX (vbox), 
+                               gtk_label_new (tny_account_get_name (account)), 
+                               FALSE, FALSE, 0);
+               } else {
+                       /* Other accounts, such as IMAP and POP: */
+                       
+                       GString *proto;
+                       gchar *tmp;
+       
+                       /* Put proto in uppercase */
+                       proto = g_string_new (tny_account_get_proto (account));
+                       proto = g_string_ascii_up (proto);
+                       
+                       /* note: mcen_fi_localroot_description is something like "%s account"
+                        * however, we should display "%s account: %s"... therefore, ugly tmp */
+                       tmp   = g_strdup_printf (_("mcen_fi_remoteroot_account"),proto->str);
+                       label = g_strdup_printf ("%s: %s", tmp,tny_account_get_name (account));
+                       g_free (tmp);
+
+                       gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
+                       g_string_free (proto, TRUE);
+                       g_free (label);
+               }
        }
 
        /* Message count */
+       TnyFolderStore *folder_store = TNY_FOLDER_STORE (account);
        label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_messages"), 
-                                modest_tny_account_get_message_count (account));
+                                modest_tny_folder_store_get_message_count (folder_store));
        gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
        g_free (label);
 
        /* Folder count */
        label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_folders"), 
-                                modest_tny_account_get_folder_count (account));
+                                modest_tny_folder_store_get_folder_count (folder_store));
        gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
        g_free (label);
 
        /* Size / Date */
-       if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+       if (modest_tny_account_is_virtual_local_folders (account)) {
                /* FIXME: format size */
                label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_size"), 
-                                        modest_tny_account_get_local_size (account));
+                                        modest_tny_folder_store_get_local_size (folder_store));
                gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0);
                g_free (label);
-       } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) {
-               gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0);
-       } else {
+       } else if (TNY_IS_ACCOUNT(folder_store)) {
+               TnyAccount *account = TNY_ACCOUNT(folder_store);
+               
                time_t last_updated;
                gchar *last_updated_string;
                /* Get last updated from configuration */
@@ -1170,12 +1375,43 @@ create_details_widget (TnyAccount *account)
 }
 
 void 
+modest_main_window_notify_send_receive_initied (ModestMainWindow *self)
+{
+       GtkAction *action = NULL;
+       GtkWidget *widget = NULL;
+
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+
+        action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");        
+       gtk_action_set_sensitive (action, FALSE);
+        action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu");      
+       gtk_action_set_sensitive (action, FALSE);
+        widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions");      
+       gtk_widget_set_sensitive (widget, FALSE);
+} 
+
+void 
+modest_main_window_notify_send_receive_completed (ModestMainWindow *self)
+{
+       GtkAction *action = NULL;
+       GtkWidget *widget = NULL;
+
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+
+        action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");        
+       gtk_action_set_sensitive (action, TRUE);
+        action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu");      
+       gtk_action_set_sensitive (action, TRUE);
+        widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions");      
+       gtk_widget_set_sensitive (widget, TRUE);
+} 
+
+
+void 
 modest_main_window_set_contents_style (ModestMainWindow *self, 
                                       ModestMainWindowContentsStyle style)
 {
        ModestMainWindowPrivate *priv;
-       GtkWidget *content;
-       TnyAccount *account;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
 
@@ -1185,15 +1421,22 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
           set if there are details, because it could happen when we're
           selecting different accounts consecutively */
        if ((priv->contents_style == style) &&
-           (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS))
+           (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS))
                return;
 
        /* Remove previous child. Delete it if it was an account
           details widget */
-       content = gtk_bin_get_child (GTK_BIN (priv->contents_widget));
-       if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS)
-               g_object_ref (content);
-       gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content);
+       GtkWidget *content = gtk_bin_get_child (GTK_BIN (priv->contents_widget));
+       if (content) {
+               if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
+                       g_object_ref (content);
+               else if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) {
+                       g_object_ref (priv->empty_view);
+                       gtk_container_remove (GTK_CONTAINER (content), priv->empty_view);
+               }
+               
+               gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content);
+       }
 
        priv->contents_style = style;
 
@@ -1202,12 +1445,21 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view));
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS:
+       {
                /* TODO: show here account details */
-               account = TNY_ACCOUNT (modest_folder_view_get_selected (priv->folder_view));
-               priv->details_widget = create_details_widget (account);
+               TnyFolderStore *selected_folderstore = 
+                       modest_folder_view_get_selected (priv->folder_view);
+               if (TNY_IS_ACCOUNT (selected_folderstore)) {    
+                       priv->details_widget = create_details_widget (
+                               TNY_ACCOUNT (selected_folderstore));
 
-               wrap_in_scrolled_window (priv->contents_widget, 
+                       wrap_in_scrolled_window (priv->contents_widget, 
                                         priv->details_widget);
+               }
+               break;
+       }
+       case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
+               wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view));
                break;
        default:
                g_return_if_reached ();
@@ -1392,19 +1644,20 @@ on_queue_changed (ModestMailOperationQueue *queue,
                  ModestMainWindow *self)
 {
        ModestMainWindowPrivate *priv;
-       ModestMailOperationId op_id;
+       ModestMailOperationTypeOperation op_type;
        ModestToolBarModes mode;
        GSList *tmp;
        gboolean mode_changed = FALSE;
+/*     ModestMailOperationStatus status; */
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
               
        /* Get toolbar mode from operation id*/
-       op_id = modest_mail_operation_get_id (mail_op);
-       switch (op_id) {
-       case MODEST_MAIL_OPERATION_ID_SEND:
-       case MODEST_MAIL_OPERATION_ID_RECEIVE:
+       op_type = modest_mail_operation_get_type_operation (mail_op);
+       switch (op_type) {
+       case MODEST_MAIL_OPERATION_TYPE_SEND:
+       case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
                mode = TOOLBAR_MODE_TRANSFER;
                if (priv->current_toolbar_mode == TOOLBAR_MODE_NORMAL)
                        mode_changed = TRUE;
@@ -1430,6 +1683,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
                }
                break;
        case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED:
+               /* Change toolbar mode */
                if (mode == TOOLBAR_MODE_TRANSFER) {                    
                        while (tmp) {
                                modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
@@ -1443,8 +1697,10 @@ on_queue_changed (ModestMailOperationQueue *queue,
                                
                        }
                }
+
                break;
        }       
+
 }
 
 static void 
@@ -1477,17 +1733,29 @@ on_show_account_action_activated  (GtkAction *action,
 }
 
 static void
-on_send_receive_csm_activated (GtkMenuItem *item,
-                              gpointer user_data)
+refresh_account (const gchar *account_name)
 {
        ModestWindow *win;
 
        win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
 
-       /* If user_data == NULL, we must update all (CSM option All) */
-       if (!user_data) {
+       /* If account_name == NULL, we must update all (option All) */
+       if (!account_name)
                modest_ui_actions_do_send_receive_all (win);
-       } else {
-               modest_ui_actions_do_send_receive ((const gchar *)user_data, win);
-       }
+       else
+               modest_ui_actions_do_send_receive (account_name, win);
+}
+
+static void 
+on_refresh_account_action_activated  (GtkAction *action,
+                                     gpointer user_data)
+{
+       refresh_account ((const gchar*) user_data);
+}
+
+static void
+on_send_receive_csm_activated (GtkMenuItem *item,
+                              gpointer user_data)
+{
+       refresh_account ((const gchar*) user_data);
 }