Launch account setup dialog when clicking on Edit account in Folders window

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

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index 995eeb9..0882876 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -232,7 +232,7 @@ modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
 {
        g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
 
-       g_warning ("%s not implemented", __FUNCTION__);
+       g_debug ("%s not implemented", __FUNCTION__);
 }
 
 void
@@ -256,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 
@@ -393,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),
@@ -485,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
@@ -501,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);
 }