Fixes NB#112513, show the proper account title when opening folders window from notif...

[modest] / src / hildon2 / modest-hildon2-window.c

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index 86507cb..bb9a376 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -30,6 +30,7 @@
 #include <hildon/hildon-banner.h>
 #include <modest-platform.h>
 #include <hildon/hildon-program.h>
+#include "modest-marshal.h"
 #include <modest-maemo-utils.h>
 #include <modest-defs.h>
 #include <modest-ui-dimming-rules.h>
@@ -37,6 +38,7 @@
 #include <modest-window-priv.h>
 #include <modest-hildon2-window.h>
 #include <modest-ui-actions.h>
+#include "modest-text-utils.h"
 #include <hildon/hildon-edit-toolbar.h>
 
 typedef struct _EditModeRegister {
@@ -92,9 +94,18 @@ struct _ModestHildon2WindowPrivate {
                                                                            MODEST_TYPE_HILDON2_WINDOW, \
                                                                            ModestHildon2WindowPrivate))
 
+/* list my signals */
+enum {
+       EDIT_MODE_CHANGED_SIGNAL,
+       LAST_SIGNAL
+};
+
 /* globals */
 static GtkWindowClass *parent_class = NULL;
 
+/* uncomment the following if you have defined any signals */
+static guint signals[LAST_SIGNAL] = {0};
+
 /************************************************************************/
 
 GType
@@ -133,6 +144,15 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_hildon2_window_finalize;
 
+       signals[EDIT_MODE_CHANGED_SIGNAL] =
+               g_signal_new ("edit-mode-changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestHildon2WindowClass, edit_mode_changed),
+                             NULL, NULL,
+                             modest_marshal_VOID__INT_BOOLEAN,
+                             G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_BOOLEAN);
+
        g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowPrivate));
        
        hildon_window_class->toggle_menu = modest_hildon2_window_toggle_menu;
@@ -176,7 +196,7 @@ modest_hildon2_window_instance_init (GTypeInstance *instance, gpointer g_class)
        priv->edit_mode = FALSE;
        priv->edit_toolbar = NULL;
        priv->current_edit_tree_view = NULL;
-       priv->edit_command = -1;
+       priv->edit_command = MODEST_HILDON2_WINDOW_EDIT_MODE_NONE;
        priv->edit_mode_registry = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                                          NULL, edit_mode_register_destroy);
 
@@ -201,9 +221,8 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
        g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW (window), FALSE);
 
-       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+       hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
        return FALSE;
-
 }
 
 static void 
@@ -237,12 +256,16 @@ modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
        g_return_if_fail (GTK_IS_BUTTON (button));
        priv = MODEST_HILDON2_WINDOW_GET_PRIVATE (self);
 
+       modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button),
+                                                          MODEST_UI_DIMMING_MODE_HIDE);
+
        if (dimming_callback)
                modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group,
                                                            GTK_WIDGET (button),
                                                            (GCallback) dimming_callback,
                                                            MODEST_WINDOW (self));
        hildon_app_menu_append (HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (button));
+       gtk_widget_show (GTK_WIDGET (button));
 }
 
 void 
@@ -374,7 +397,18 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self,
 
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->current_edit_tree_view));
        gtk_tree_selection_set_mode (selection, reg->mode);
-       gtk_tree_selection_unselect_all (selection);
+       if (reg->mode == GTK_SELECTION_SINGLE || reg->mode == GTK_SELECTION_BROWSE) {
+               GtkTreeModel *model;
+               GtkTreeIter iter;
+
+               model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->current_edit_tree_view));
+               if (gtk_tree_model_get_iter_first (model, &iter)) {
+                       gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (priv->current_edit_tree_view), 0, 0);
+                       gtk_tree_selection_select_iter (selection, &iter);
+               }
+       } else {
+               gtk_tree_selection_unselect_all (selection);
+       }
 
        priv->edit_toolbar = hildon_edit_toolbar_new ();
        hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
@@ -393,6 +427,8 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self,
        gtk_widget_queue_resize (priv->current_edit_tree_view);
        gtk_window_fullscreen (GTK_WINDOW (self));
 
+       g_signal_emit (G_OBJECT (self), signals[EDIT_MODE_CHANGED_SIGNAL], 0,
+                      priv->edit_command, priv->edit_mode);
 }
 
 void 
@@ -410,7 +446,6 @@ modest_hildon2_window_unset_edit_mode (ModestHildon2Window *self)
 
        if (priv->edit_mode) {
                priv->edit_mode = FALSE;
-               priv->edit_command = -1;
                if (priv->current_edit_tree_view) {
                        g_object_set (G_OBJECT (priv->current_edit_tree_view), 
                                      "hildon-ui-mode", HILDON_UI_MODE_NORMAL, 
@@ -419,6 +454,9 @@ modest_hildon2_window_unset_edit_mode (ModestHildon2Window *self)
                        priv->current_edit_tree_view = NULL;
                }
                gtk_window_unfullscreen (GTK_WINDOW (self));
+               g_signal_emit (G_OBJECT (self), signals[EDIT_MODE_CHANGED_SIGNAL], 0,
+                              priv->edit_command, priv->edit_mode);
+               priv->edit_command = MODEST_HILDON2_WINDOW_EDIT_MODE_NONE;
        }
 }
 
@@ -462,15 +500,16 @@ edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
        EditModeRegister *reg;
 
        g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-       
+
        reg = (EditModeRegister *) g_hash_table_lookup (priv->edit_mode_registry, 
                                                        GINT_TO_POINTER (priv->edit_command));
-       if (reg == NULL)
-               modest_hildon2_window_unset_edit_mode (self);
 
-       if ((reg->action == NULL) || reg->action (self))
+       if (reg) {
+               if ((reg->action == NULL) || reg->action (self))
+                       modest_hildon2_window_unset_edit_mode (self);
+       } else {
                modest_hildon2_window_unset_edit_mode (self);
-
+       }
 }
 
 static void
@@ -478,7 +517,7 @@ edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
                            ModestHildon2Window *self)
 {
        g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-       
+
        modest_hildon2_window_unset_edit_mode (self);
 }