* Added preliminar code to support send and receive from the toolbar menu

pmo-trunk-r1578

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index e3c120f..a0c6141 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -33,13 +33,15 @@
 #include <glib/gi18n.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include <tny-account-store-view.h>
-#include <modest-runtime.h>
-#include <string.h>
+#include <tny-simple-list.h>
 
-#include <widgets/modest-main-window.h>
-#include <widgets/modest-msg-edit-window.h>
-#include <widgets/modest-account-view-window.h>
+#include <string.h>
 
+#include "widgets/modest-main-window.h"
+#include "widgets/modest-msg-edit-window.h"
+#include "widgets/modest-account-view-window.h"
+#include "modest-runtime.h"
+#include "modest-account-mgr-helpers.h"
 #include "modest-platform.h"
 #include "modest-widget-memory.h"
 #include "modest-window-priv.h"
@@ -67,6 +69,10 @@ static void save_sizes (ModestMainWindow *self);
 static void modest_main_window_show_toolbar   (ModestWindow *window,
                                               gboolean show_toolbar);
 
+static void on_account_update                 (TnyAccountStore *account_store, 
+                                              gchar *account_name,
+                                              gpointer user_data);
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -337,6 +343,12 @@ connect_signals (ModestMainWindow *self)
                          G_CALLBACK(on_key_changed), self);
        
        g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+
+       /* Track account changes. We need to refresh the toolbar */
+       g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+                         "account_update",
+                         G_CALLBACK (on_account_update),
+                         self);
 }
 
 
@@ -599,9 +611,13 @@ modest_main_window_show_toolbar (ModestWindow *self,
                /* Set reply button tap and hold menu */
                reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
                                                          "/ToolBar/ToolbarMessageReply");
-               menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+               menu = gtk_ui_manager_get_widget (parent_priv->ui_manager,
                                                  "/ToolbarReplyContextMenu");
                gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
+
+               /* Set send & receive button tap and hold menu */
+               on_account_update (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+                                  NULL, self);
        }
 
 
@@ -610,3 +626,92 @@ modest_main_window_show_toolbar (ModestWindow *self,
        else
                gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
 }
+
+/*
+ * TODO: modify the menu dinamically. Add handlers to each item of the
+ * menu when created
+ */
+static void 
+on_account_update (TnyAccountStore *account_store, 
+                  gchar *accout_name,
+                  gpointer user_data)
+{
+       ModestMainWindow *self;
+       ModestWindowPrivate *parent_priv;
+       TnyList *account_list;
+       GtkWidget *popup = NULL, *item, *send_receive_button;
+       TnyIterator *iter;
+       ModestAccountMgr *mgr;
+       gchar *default_account;
+
+       self = MODEST_MAIN_WINDOW (user_data);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+       /* If there is no toolbar then exit */
+       if (!parent_priv->toolbar)
+               return;
+
+       /* Get accounts */
+       account_list = tny_simple_list_new ();
+       tny_account_store_get_accounts (account_store, 
+                                       account_list, 
+                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
+       /* If there is only one account do not show any menu */
+       if (tny_list_get_length (account_list) <= 1)
+               goto free;
+       
+       /* Get send receive button */
+       send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+                                                         "/ToolBar/ToolbarSendReceive");
+
+       /* Create the menu */
+       popup = gtk_menu_new ();
+       item = gtk_menu_item_new_with_label (_("FIXME All"));
+       gtk_menu_shell_append (GTK_MENU_SHELL (popup), GTK_WIDGET (item));
+       item = gtk_separator_menu_item_new ();
+       gtk_menu_shell_append (GTK_MENU_SHELL (popup), GTK_WIDGET (item));
+
+       iter = tny_list_create_iterator (account_list);
+       mgr = modest_runtime_get_account_mgr ();
+       default_account = modest_account_mgr_get_default_account (mgr);
+
+       do {
+               TnyAccount *acc;
+               const gchar *acc_name;
+
+               /* Create tool item */
+               acc = TNY_ACCOUNT (tny_iterator_get_current (iter));
+               acc_name = tny_account_get_name (acc);
+
+               if (!strcmp (default_account, acc_name)) {
+                       gchar *bold_name;
+                       bold_name = g_strdup_printf ("<b>%s</b>", acc_name);
+                       item = gtk_menu_item_new_with_label (bold_name);
+                       g_free (bold_name);
+               } else {
+                       item = gtk_menu_item_new_with_label (acc_name);
+               }
+               g_object_unref (acc);
+
+               /* Append item */
+               gtk_menu_shell_append (GTK_MENU_SHELL (popup), GTK_WIDGET (item));
+
+               /* Go to next */
+               tny_iterator_next (iter);
+
+       } while (!tny_iterator_is_done (iter));
+
+       g_object_unref (iter);
+
+       /* Mandatory in order to view the menu contents */
+       gtk_widget_show_all (popup);
+
+       /* Setup tap_and_hold */
+       gtk_widget_tap_and_hold_setup (send_receive_button, popup, NULL, 0);
+
+ free:
+
+       /* Free */
+       g_object_unref (account_list);
+}

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index acf643c..cb5cd85 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -892,27 +892,27 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 
        if (!selected) { /* the folder was unselected; save it's settings  */
                modest_widget_memory_save (conf, G_OBJECT (header_view), "header-view");
-               gtk_window_set_title (GTK_WINDOW(main_window), "Modest");
+               gtk_window_set_title (GTK_WINDOW(main_window), NULL);
                modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
        } else {  /* the folder was selected */
                if (folder) { /* folder may be NULL */
                        guint num, unread;
-                       gchar *title;
 
                        num    = tny_folder_get_all_count    (folder);
                        unread = tny_folder_get_unread_count (folder);
-                       
-                       title = g_strdup_printf ("Modest: %s",
-                                                tny_folder_get_name (folder));
-                       
-                       gtk_window_set_title (GTK_WINDOW(main_window), title);
-                       g_free (title);
+
+                       /* Change main window title */                  
+                       gtk_window_set_title (GTK_WINDOW(main_window), 
+                                             tny_folder_get_name (folder));
                        
                        txt = g_strdup_printf (_("%d %s, %d unread"),
                                               num, num==1 ? _("item") : _("items"), unread);           
                        //gtk_label_set_label (GTK_LABEL(folder_info_label), txt);
                        g_free (txt);
+               } else {
+                       gtk_window_set_title (GTK_WINDOW(main_window), NULL);
                }
+
                modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), folder);
                modest_widget_memory_restore (conf, G_OBJECT(header_view),
                                              "header-view");

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index bfce187..4e55fb6 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -583,7 +583,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
                            -1);
 
-       /* If the folder is the same or is a root folder do not notify */
+       /* If the folder is the same do not notify */
        if ((type == TNY_FOLDER_TYPE_ROOT) || (priv->cur_folder == folder)) {
                g_object_unref (folder);
                return;