* Added dimming rules support for accounts window

   * Fix email icon name

pmo-drop-split-view-r6908

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index 1b61c57..4166204 100644 (file)
--- a/src/hildon2/modest-accounts-window.c
+++ b/src/hildon2/modest-accounts-window.c
@@ -42,6 +42,9 @@
 #include <modest-icon-names.h>
 #include <modest-defs.h>
 #include <modest-folder-window.h>
+#include <modest-ui-dimming-rules.h>
+#include <modest-ui-dimming-manager.h>
+#include <modest-window-priv.h>
 
 
 /* 'private'/'protected' functions */
@@ -60,16 +63,23 @@ static void on_account_activated (GtkTreeView *treeview,
 static void add_to_menu (ModestAccountsWindow *self,
                         HildonAppMenu *menu,
                         gchar *label,
-                        GCallback callback);
-static void setup_menu (ModestAccountsWindow *self);
+                        GCallback callback,
+                        ModestDimmingRulesGroup *group,
+                        GCallback dimming_callback);
+static void setup_menu (ModestAccountsWindow *self,
+                       ModestDimmingRulesGroup *group);
 
 static void modest_accounts_window_show_toolbar (ModestWindow *self,
                                                 gboolean show_toolbar);
+static gboolean modest_accounts_window_toggle_menu (HildonWindow *window,
+                                                   guint button,
+                                                   guint32 time);
 
 typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate;
 struct _ModestAccountsWindowPrivate {
 
        GtkWidget *account_view;
+       GtkWidget *app_menu;
 
        /* signals */
        GSList *sighandlers;
@@ -116,12 +126,15 @@ modest_accounts_window_class_init (ModestAccountsWindowClass *klass)
        GObjectClass *gobject_class;
        gobject_class = (GObjectClass*) klass;
        ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
+       HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_accounts_window_finalize;
 
        g_type_class_add_private (gobject_class, sizeof(ModestAccountsWindowPrivate));
        
+       hildon_window_class->toggle_menu = modest_accounts_window_toggle_menu;
+
        modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->show_toolbar_func = modest_accounts_window_show_toolbar;
@@ -210,13 +223,23 @@ modest_accounts_window_new (void)
        HildonProgram *app;
        GdkPixbuf *window_icon;
        GtkWidget *pannable;
+       ModestWindowPrivate *parent_priv = NULL;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
        
        self  = MODEST_ACCOUNTS_WINDOW(g_object_new(MODEST_TYPE_ACCOUNTS_WINDOW, NULL));
        priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
+       menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
+
        pannable = hildon_pannable_area_new ();
        priv->account_view  = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ()));
 
-       setup_menu (self);
+       setup_menu (self, menu_rules_group);
+
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       g_object_unref (menu_rules_group);
 
        gtk_container_add (GTK_CONTAINER (pannable), priv->account_view);
        gtk_container_add (GTK_CONTAINER (self), pannable);
@@ -295,13 +318,20 @@ modest_accounts_window_get_account_view (ModestAccountsWindow *self)
 static void add_to_menu (ModestAccountsWindow *self,
                         HildonAppMenu *menu,
                         gchar *label,
-                        GCallback callback)
+                        GCallback callback,
+                        ModestDimmingRulesGroup *group,
+                        GCallback dimming_callback)
 {
        GtkWidget *button;
 
        button = gtk_button_new_with_label (label);
        g_signal_connect_after (G_OBJECT (button), "clicked",
                                callback, (gpointer) self);
+       if (dimming_callback)
+               modest_dimming_rules_group_add_widget_rule (group,
+                                                           button,
+                                                           dimming_callback,
+                                                           MODEST_WINDOW (self));
        hildon_app_menu_append (menu, GTK_BUTTON (button));
 }
 
@@ -312,37 +342,61 @@ on_new_account (GtkAction *action,
        modest_ui_actions_run_account_setup_wizard (window);
 }
 
-static void setup_menu (ModestAccountsWindow *self)
+static void setup_menu (ModestAccountsWindow *self, ModestDimmingRulesGroup *group)
 {
        ModestAccountsWindowPrivate *priv = NULL;
-       GtkWidget *app_menu;
 
        g_return_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self));
 
        priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
 
-       app_menu = hildon_app_menu_new ();
+       priv->app_menu = hildon_app_menu_new ();
 
        /* Settings menu buttons */
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new account"),
-                    G_CALLBACK (on_new_account));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: edit accounts"),
-                    G_CALLBACK (modest_ui_actions_on_accounts));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_options"),
-                    G_CALLBACK (modest_ui_actions_on_settings));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_globalsmtpservers"),
-                    G_CALLBACK (modest_ui_actions_on_smtp_servers));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"),
-                    G_CALLBACK (modest_ui_actions_on_new_msg));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"),
-                    G_CALLBACK (modest_ui_actions_on_send_receive));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_outbox_cancelsend"),
-                    G_CALLBACK (modest_ui_actions_cancel_send));
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: new account"),
+                    G_CALLBACK (on_new_account),
+                    group, NULL);
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: edit accounts"),
+                    G_CALLBACK (modest_ui_actions_on_accounts),
+                    group, NULL);
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_options"),
+                    G_CALLBACK (modest_ui_actions_on_settings),
+                    group, NULL);
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_globalsmtpservers"),
+                    G_CALLBACK (modest_ui_actions_on_smtp_servers),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_viewer_newemail"),
+                    G_CALLBACK (modest_ui_actions_on_new_msg),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_new_msg));
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_sendandreceive"),
+                    G_CALLBACK (modest_ui_actions_on_send_receive),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_outbox_cancelsend"),
+                    G_CALLBACK (modest_ui_actions_cancel_send),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
        
        hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
-                                              HILDON_APP_MENU (app_menu));
+                                              HILDON_APP_MENU (priv->app_menu));
+}
+
+static gboolean 
+modest_accounts_window_toggle_menu (HildonWindow *window,
+                                   guint button,
+                                   guint32 time)
+{
+       ModestAccountsWindowPrivate *priv = NULL;
+
+       priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (window);
+
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+
+       gtk_widget_queue_resize (priv->app_menu);
+
+       return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time);
 }
 
+
+
 static void
 on_account_activated (GtkTreeView *account_view,
                      GtkTreePath *path,

diff --git a/src/hildon2/modest-icon-names.h b/src/hildon2/modest-icon-names.h
index 83d56f4..f916929 100644 (file)
--- a/src/hildon2/modest-icon-names.h
+++ b/src/hildon2/modest-icon-names.h
@@ -36,7 +36,7 @@
 
 /* icons */
 
-#define MODEST_APP_ICON                                "general_mail"
+#define MODEST_APP_ICON                                "general_email"
 #define MODEST_APP_MSG_VIEW_ICON               "email_message_viewer"
 #define MODEST_APP_MSG_EDIT_ICON               "email_message_editor"
 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 79cc383..24b9497 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1883,6 +1883,8 @@ modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_da
        
        modest_account_mgr_free_account_names (account_names);
 
+       /* TODO: should dim if send receive is in progress */
+
        return dimmed;
 }