* Exchanged two dimming rules associations

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

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 39a9de1..26c51f8 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -130,6 +130,9 @@ static void set_moveto_edit_mode (GtkButton *button,
 static gboolean on_expose_event(GtkTreeView *header_view,
                                GdkEventExpose *event,
                                gpointer user_data);
+static gboolean on_map_event (GtkWidget *widget,
+                             GdkEvent *event,
+                             gpointer userdata);
 static void on_vertical_movement (HildonPannableArea *area,
                                  HildonMovementDirection direction,
                                  gdouble x, gdouble y, gpointer user_data);
@@ -144,6 +147,10 @@ static void modest_header_window_show_toolbar   (ModestWindow *window,
 static void modest_header_window_pack_toolbar (ModestHildon2Window *self,
                                               GtkPackType pack_type,
                                               GtkWidget *toolbar);
+static void edit_mode_changed (ModestHeaderWindow *header_window,
+                              gint edit_mode_id,
+                              gboolean enabled,
+                              ModestHeaderWindow *self);
 
 
 /* globals */
@@ -301,6 +308,13 @@ connect_signals (ModestHeaderWindow *self)
 
        priv->sighandlers =
                modest_signal_mgr_connect (priv->sighandlers,
+                                          G_OBJECT (self),
+                                          "map-event",
+                                          G_CALLBACK (on_map_event),
+                                          self);
+
+       priv->sighandlers =
+               modest_signal_mgr_connect (priv->sighandlers,
                                           G_OBJECT (priv->contents_view), 
                                           "vertical-movement", 
                                           G_CALLBACK (on_vertical_movement), 
@@ -315,13 +329,15 @@ connect_signals (ModestHeaderWindow *self)
 }
 
 static GtkWidget *
-create_header_view (ModestWindow *progress_window, TnyFolder *folder)
+create_header_view (ModestWindow *self, TnyFolder *folder)
 {
        GtkWidget *header_view;
 
        header_view  = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
        modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, 
-                                      TRUE, progress_window, NULL, NULL);
+                                      TRUE, self, NULL, NULL);
+       modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), 
+                                      MODEST_HEADER_VIEW_FILTER_NONE);
        modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(header_view),
                                      MODEST_CONF_HEADER_VIEW_KEY);
 
@@ -375,6 +391,8 @@ modest_header_window_new (TnyFolder *folder)
        priv->empty_view = create_empty_view ();
        g_object_ref (priv->header_view);
        g_object_ref (priv->empty_view);
+       g_signal_connect (G_OBJECT (self), "edit-mode-changed",
+                         G_CALLBACK (edit_mode_changed), (gpointer) self);
        setup_menu (self);
 
         priv->top_vbox = gtk_vbox_new (FALSE, 0);
@@ -428,7 +446,7 @@ modest_header_window_new (TnyFolder *folder)
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message));
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
-                                                 _("mcen_ti_edit_move"), _("mcen_me_move"),
+                                                 _("mcen_ti_edit_move"), _HL("wdgt_bd_move"),
                                                  GTK_TREE_VIEW (priv->header_view),
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
@@ -452,13 +470,13 @@ static void setup_menu (ModestHeaderWindow *self)
 {
        g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
 
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_moveto"), NULL,
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_messages"), NULL,
                                           APP_MENU_CALLBACK (set_moveto_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL,
                                           APP_MENU_CALLBACK (set_delete_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder details"), NULL,
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder_details"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_details),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_sort"), NULL,
@@ -682,6 +700,22 @@ on_expose_event(GtkTreeView *header_view,
        return FALSE;
 }
 
+static gboolean 
+on_map_event(GtkWidget *widget,
+            GdkEvent *event,
+            gpointer user_data)
+{
+       ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
+       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+
+       if (priv->progress_hint) {
+               hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+       }
+       return FALSE;
+}
+
 static gboolean
 set_toolbar_transfer_mode (ModestHeaderWindow *self)
 {
@@ -851,3 +885,35 @@ modest_header_window_pack_toolbar (ModestHildon2Window *self,
                gtk_box_pack_end (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0);
        }
 }
+
+static void 
+edit_mode_changed (ModestHeaderWindow *header_window,
+                  gint edit_mode_id,
+                  gboolean enabled,
+                  ModestHeaderWindow *self)
+{
+       ModestHeaderWindowPrivate *priv;
+       ModestHeaderViewFilter filter = MODEST_HEADER_VIEW_FILTER_NONE;
+
+       g_return_if_fail (MODEST_IS_HEADER_WINDOW (self));
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       switch (edit_mode_id) {
+       case EDIT_MODE_COMMAND_MOVE:
+               filter = MODEST_HEADER_VIEW_FILTER_MOVEABLE;
+               break;
+       case EDIT_MODE_COMMAND_DELETE:
+               filter = MODEST_HEADER_VIEW_FILTER_DELETABLE;
+               break;
+       case MODEST_HILDON2_WINDOW_EDIT_MODE_NONE:
+               filter = MODEST_HEADER_VIEW_FILTER_NONE;
+               break;
+       }
+
+       if (enabled)
+               modest_header_view_set_filter (MODEST_HEADER_VIEW (priv->header_view), 
+                                              filter);
+       else
+               modest_header_view_unset_filter (MODEST_HEADER_VIEW (priv->header_view), 
+                                                filter);
+}