Fixes NB#123142, a long tap in headers view does not open the CSM
[modest] / src / hildon2 / modest-header-window.c
index cacffcf..44b4d23 100644 (file)
@@ -31,6 +31,7 @@
 #include <modest-osso-state-saving.h>
 #include <libosso.h>
 #include <hildon/hildon-pannable-area.h>
+#include <hildon/hildon-helper.h>
 #include <modest-window-mgr.h>
 #include <modest-window-priv.h>
 #include <modest-signal-mgr.h>
@@ -51,6 +52,7 @@
 #include <hildon/hildon-banner.h>
 #include <modest-ui-dimming-rules.h>
 #include <modest-tny-folder.h>
+#include <tny-simple-list.h>
 
 typedef enum {
        CONTENTS_STATE_NONE = 0,
@@ -70,6 +72,7 @@ struct _ModestHeaderWindowPrivate {
        GtkWidget *empty_view;
        GtkWidget *contents_view;
        GtkWidget *top_vbox;
+       GtkWidget *new_message_button;
 
        /* state bar */
        ContentsState contents_state;
@@ -93,6 +96,11 @@ struct _ModestHeaderWindowPrivate {
 
        /* sort button */
        GtkWidget *sort_button;
+
+       /* CSM menu */
+       GtkWidget *csm_menu;
+       gdouble x_coord;
+       gdouble y_coord;
 };
 #define MODEST_HEADER_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                          MODEST_TYPE_HEADER_WINDOW, \
@@ -107,13 +115,13 @@ static void connect_signals (ModestHeaderWindow *self);
 static void modest_header_window_disconnect_signals (ModestWindow *self);
 
 static void setup_menu (ModestHeaderWindow *self);
-static GtkWidget *create_empty_view (void);
+static GtkWidget *create_empty_view (ModestWindow *self);
 static GtkWidget *create_header_view (ModestWindow *progress_window,
                                      TnyFolder *folder);
 
 static void update_view (ModestHeaderWindow *self,
                         TnyFolderChange *change);
-static void set_contents_state (ModestHeaderWindow *window, 
+static void set_contents_state (ModestHeaderWindow *window,
                                ContentsState state);
 
 static void on_msg_count_changed (ModestHeaderView *header_view,
@@ -157,15 +165,19 @@ static void update_progress_hint (ModestHeaderWindow *self);
 static void on_sort_column_changed (GtkTreeSortable *treesortable,
                                    gpointer         user_data);
 static void update_sort_button (ModestHeaderWindow *self);
-
+static void on_horizontal_movement (HildonPannableArea *hildonpannable,
+                                   gint                direction,
+                                   gdouble             initial_x,
+                                   gdouble             initial_y,
+                                   gpointer            user_data);
 
 /* globals */
 static GtkWindowClass *parent_class = NULL;
 
 #define EMPTYVIEW_XALIGN 0.5
-#define EMPTYVIEW_YALIGN 0.0
+#define EMPTYVIEW_YALIGN 0.5
 #define EMPTYVIEW_XSPACE 1.0
-#define EMPTYVIEW_YSPACE 0.0
+#define EMPTYVIEW_YSPACE 1.0
 
 
 
@@ -220,7 +232,7 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
 
        priv->sighandlers = NULL;
-       
+
        priv->header_view = NULL;
        priv->empty_view = NULL;
        priv->top_vbox = NULL;
@@ -234,7 +246,10 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv->queue_change_handler = 0;
        priv->current_store_account = NULL;
        priv->sort_button = NULL;
-       
+       priv->new_message_button = NULL;
+       priv->x_coord = 0;
+       priv->y_coord = 0;
+
        modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
                                            GTK_WINDOW(obj),
                                            "applications_email_headerview");
@@ -247,9 +262,12 @@ modest_header_window_finalize (GObject *obj)
 
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
 
+       tny_folder_sync_async (TNY_FOLDER (priv->folder),
+                              FALSE, NULL, NULL, NULL);
+
+       g_object_unref (priv->folder);
        g_object_unref (priv->header_view);
        g_object_unref (priv->empty_view);
-       g_object_unref (priv->folder);
 
        if (priv->current_store_account) {
                g_free (priv->current_store_account);
@@ -274,8 +292,8 @@ modest_header_window_finalize (GObject *obj)
 
 static void
 modest_header_window_disconnect_signals (ModestWindow *self)
-{      
-       ModestHeaderWindowPrivate *priv;        
+{
+       ModestHeaderWindowPrivate *priv;
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
 
        if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), 
@@ -319,9 +337,8 @@ connect_signals (ModestHeaderWindow *self)
                                           G_CALLBACK (on_expose_event),
                                           self);
 
-       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
-                                     (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (
-                                                                     GTK_TREE_VIEW (priv->header_view)))));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)));
+
        priv->sighandlers = 
                modest_signal_mgr_connect (priv->sighandlers,
                                           G_OBJECT (sortable),
@@ -344,47 +361,260 @@ connect_signals (ModestHeaderWindow *self)
                                           self);
 
        /* Mail Operation Queue */
-       priv->queue_change_handler =
-               g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
-                                 "queue-changed",
-                                 G_CALLBACK (on_queue_changed),
-                                 self);
        priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
                                                       G_OBJECT (modest_runtime_get_window_mgr ()),
                                                       "progress-list-changed",
                                                       G_CALLBACK (on_progress_list_changed), self);
+       priv->sighandlers =
+               modest_signal_mgr_connect (priv->sighandlers,
+                                          G_OBJECT (priv->new_message_button),
+                                          "clicked",
+                                          G_CALLBACK (modest_ui_actions_on_new_msg), self);
+
+       /* Delete using horizontal gesture */
+       /* DISABLED because it's unreliabile */
+       if (FALSE) {
+               priv->sighandlers =
+                       modest_signal_mgr_connect (priv->sighandlers,
+                                                  (GObject *) priv->contents_view,
+                                                  "horizontal-movement",
+                                                  G_CALLBACK (on_horizontal_movement),
+                                                  self);
+       }
+}
+
+static void
+folder_refreshed_cb (ModestMailOperation *mail_op,
+                    TnyFolder *folder,
+                    gpointer user_data)
+{
+       /* Update the view (folder could be empty) */
+       update_view (MODEST_HEADER_WINDOW (user_data), NULL);
+}
+
+static gboolean
+tap_and_hold_query_cb (GtkWidget *header_view,
+                      GdkEvent *event,
+                      gpointer user_data)
+{
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
+
+       self = (ModestHeaderWindow *) user_data;
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       if (event->type == GDK_BUTTON_PRESS) {
+               TnyHeader *header;
+
+               priv->x_coord = ((GdkEventButton*)event)->x;
+               priv->y_coord = ((GdkEventButton*)event)->y;
+
+               /* Enable/Disable mark as (un)read */
+               header = modest_header_view_get_header_at_pos ((ModestHeaderView *) header_view,
+                                                              priv->x_coord, priv->y_coord);
+               if (header) {
+                       GList *children;
+                       GtkWidget *mark_read_item, *mark_unread_item;
+
+                       /* Show "mark as read" or "mark as unread" */
+                       children = gtk_container_get_children (GTK_CONTAINER (priv->csm_menu));
+                       mark_read_item = (GtkWidget *) g_list_nth_data (children, 1);
+                       mark_unread_item = (GtkWidget *) g_list_nth_data (children, 2);
+
+                       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN) {
+                               gtk_widget_show (mark_unread_item);
+                               gtk_widget_hide (mark_read_item);
+                       } else {
+                               gtk_widget_show (mark_read_item);
+                               gtk_widget_hide (mark_unread_item);
+                       }
+                       g_object_unref (header);
+               }
+       }
+
+       return FALSE;
+}
+
+static void
+delete_header (GtkWindow *parent,
+              TnyHeader *header)
+{
+       gint response;
+       gchar *subject, *msg;
+
+       subject = tny_header_dup_subject (header);
+       if (!subject)
+               subject = g_strdup (_("mail_va_no_subject"));
+
+       msg = g_strdup_printf (ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 1),
+                              subject);
+       g_free (subject);
+
+       /* Confirmation dialog */
+       response = modest_platform_run_confirmation_dialog (parent, msg);
+       g_free (msg);
+
+       if (response == GTK_RESPONSE_OK) {
+               ModestMailOperation *mail_op;
+               TnyList *header_list;
+
+               header_list = tny_simple_list_new ();
+               tny_list_append (header_list, (GObject *) header);
+               mail_op = modest_mail_operation_new ((GObject *) parent);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                mail_op);
+               modest_mail_operation_remove_msgs (mail_op, header_list, FALSE);
+               g_object_unref (mail_op);
+               g_object_unref (header_list);
+       }
+}
+
+
+static void
+on_delete_csm_activated (GtkMenuItem *item,
+                        gpointer user_data)
+{
+       TnyHeader *header;
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
+
+       self = (ModestHeaderWindow *) user_data;
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+                                                      priv->x_coord, priv->y_coord);
+       if (header) {
+               delete_header ((GtkWindow *) self, header);
+               g_object_unref (header);
+       }
+}
+
+static void
+on_mark_read_csm_activated (GtkMenuItem *item,
+                           gpointer user_data)
+{
+       TnyHeader *header;
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
+
+       self = (ModestHeaderWindow *) user_data;
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+                                                      priv->x_coord, priv->y_coord);
+
+       if (header) {
+               tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+               g_object_unref (header);
+       }
+}
+
+static void
+on_mark_unread_csm_activated (GtkMenuItem *item,
+                             gpointer user_data)
+{
+       TnyHeader *header;
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
+
+       self = (ModestHeaderWindow *) user_data;
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+                                                      priv->x_coord, priv->y_coord);
+
+       if (header) {
+               tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN);
+               g_object_unref (header);
+       }
 }
 
 static GtkWidget *
 create_header_view (ModestWindow *self, TnyFolder *folder)
 {
        GtkWidget *header_view;
+       GtkWidget *delete_item, *mark_read_item, *mark_unread_item;
+       ModestHeaderWindowPrivate *priv;
 
        header_view  = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
-       modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, 
-                                      TRUE, self, NULL, NULL);
-       modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), 
+       modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder,
+                                      TRUE, self, folder_refreshed_cb, self);
+       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);
 
+       /* Create CSM menu */
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       priv->csm_menu = gtk_menu_new ();
+       delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
+       mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));
+       mark_unread_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_unread"));
+       gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item);
+       gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_read_item);
+       gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_unread_item);
+       gtk_widget_show_all (priv->csm_menu);
+
+       /* Connect signals */
+       g_signal_connect ((GObject *) header_view, "tap-and-hold-query",
+                         G_CALLBACK (tap_and_hold_query_cb), self);
+       g_signal_connect ((GObject *) delete_item, "activate",
+                         G_CALLBACK (on_delete_csm_activated), self);
+       g_signal_connect ((GObject *) mark_read_item, "activate",
+                         G_CALLBACK (on_mark_read_csm_activated), self);
+       g_signal_connect ((GObject *) mark_unread_item, "activate",
+                         G_CALLBACK (on_mark_unread_csm_activated), self);
+
+       /* Add tap&hold handling */
+       gtk_widget_tap_and_hold_setup (header_view, priv->csm_menu, NULL, 0);
+
        return header_view;
 }
 
 static GtkWidget *
-create_empty_view (void)
+create_empty_view (ModestWindow *self)
 {
+       GtkWidget *viewport = NULL;
        GtkWidget *label = NULL;
        GtkWidget *align = NULL;
+       GtkWidget *vbox = NULL;
+       GtkWidget *button = NULL;
+       GdkPixbuf *new_message_pixbuf;
+
+       vbox = gtk_vbox_new (0, FALSE);
 
        align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE);
        label = gtk_label_new (_("mcen_ia_nomessages"));
+       hildon_helper_set_logical_font (label, "LargeSystemFont");
+       gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
        gtk_widget_show (label);
        gtk_widget_show (align);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);  
        gtk_container_add (GTK_CONTAINER (align), label);
+       gtk_box_pack_end (GTK_BOX (vbox), align, TRUE, TRUE, 0);
 
-       return align;
+       button = hildon_button_new (MODEST_EDITABLE_SIZE, 
+                                   HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+
+       hildon_button_set_title (HILDON_BUTTON (button), _("mcen_ti_new_message"));
+       new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
+       hildon_button_set_image (HILDON_BUTTON (button), 
+                                gtk_image_new_from_pixbuf (new_message_pixbuf));
+       g_object_unref (new_message_pixbuf);
+       gtk_widget_show_all (button);
+       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+       gtk_widget_show (vbox);
+
+       g_signal_connect (button,
+                         "clicked",
+                         G_CALLBACK (modest_ui_actions_on_new_msg), self);
+
+       viewport = gtk_viewport_new ((GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0), 
+                                    (GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0));
+       gtk_container_add (GTK_CONTAINER (viewport), vbox);
+
+       return viewport;
 }
 
 static void
@@ -400,7 +630,7 @@ on_vertical_movement (HildonPannableArea *area,
 
 
 ModestWindow *
-modest_header_window_new (TnyFolder *folder, const gchar *account_name)
+modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gchar *mailbox)
 {
        ModestHeaderWindow *self = NULL;        
        ModestHeaderWindowPrivate *priv = NULL;
@@ -409,6 +639,10 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
        ModestAccountMgr *mgr;
        ModestAccountSettings *settings = NULL;
        ModestServerAccountSettings *store_settings = NULL;
+       GtkWidget *action_area_box;
+       GdkPixbuf *new_message_pixbuf;
+       GtkWidget *alignment;
+       gchar *account_display_name = NULL;
        
        self  = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
@@ -416,20 +650,55 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
        priv->folder = g_object_ref (folder);
 
        priv->contents_view = hildon_pannable_area_new ();
+       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
+                                  0, 0,
+                                  HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
+
+       /* We need to do this here to properly listen for mail
+          operations because create_header_view launches a mail
+          operation */
+       priv->queue_change_handler =
+               g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+                                 "queue-changed",
+                                 G_CALLBACK (on_queue_changed),
+                                 self);
 
        priv->header_view  = create_header_view (MODEST_WINDOW (self), folder);
-       priv->empty_view = create_empty_view ();
-       g_object_ref (priv->header_view);
-       g_object_ref (priv->empty_view);
+       priv->empty_view = create_empty_view (MODEST_WINDOW (self));
+
+       /* Transform the floating reference in a "hard" reference. We
+          need to do this because the widgets could be added/removed
+          to containers many times so we always need to keep a
+          reference. It could happen also that some widget is never
+          added to any container */
+       g_object_ref_sink (priv->header_view);
+       g_object_ref_sink (priv->empty_view);
+
        g_signal_connect (G_OBJECT (self), "edit-mode-changed",
                          G_CALLBACK (edit_mode_changed), (gpointer) self);
+
+       action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->header_view));
+       priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+
+       hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
+       new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
+       hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf));
+       g_object_unref (new_message_pixbuf);
+
+       gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
+       gtk_widget_show_all (priv->new_message_button);
+       hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), TRUE);
+       
        setup_menu (self);
 
         priv->top_vbox = gtk_vbox_new (FALSE, 0);
-       gtk_box_pack_end (GTK_BOX (priv->top_vbox), priv->contents_view, TRUE, TRUE, 0);
+       gtk_container_add (GTK_CONTAINER (alignment), priv->contents_view);
+       gtk_box_pack_end (GTK_BOX (priv->top_vbox), alignment, TRUE, TRUE, 0);
 
        gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
 
+       gtk_widget_show (alignment);
        gtk_widget_show (priv->contents_view);
        gtk_widget_show (priv->top_vbox);
 
@@ -446,7 +715,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
 
        app = hildon_program_get_instance ();
        hildon_program_add_window (app, HILDON_WINDOW (self));
-       
+
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG);
        if (window_icon) {
@@ -454,15 +723,6 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
                g_object_unref (window_icon);
        }
 
-       /* Set window title */
-       if (TNY_IS_FOLDER (folder)) {
-               gchar *folder_name;
-
-               folder_name = modest_tny_folder_get_display_name (folder);
-               gtk_window_set_title (GTK_WINDOW (self), folder_name);
-               g_free (folder_name);
-       }
-
        /* Dont't restore settings here, 
         * because it requires a gtk_widget_show(), 
         * and we don't want to do that until later,
@@ -481,10 +741,13 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
 
+
        modest_window_set_active_account (MODEST_WINDOW (self), account_name);
+       modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox);
        mgr = modest_runtime_get_account_mgr ();
        settings = modest_account_mgr_load_account_settings (mgr, account_name);
        if (settings) {
+               account_display_name = g_strdup (modest_account_settings_get_display_name (settings));
                store_settings = modest_account_settings_get_store_settings (settings);
                if (store_settings) {
                        priv->current_store_account = 
@@ -493,6 +756,27 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
                }
                g_object_unref (settings);
        }
+       /* Set window title */
+       if (TNY_IS_FOLDER (folder)) {
+               gchar *folder_name;
+
+               if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) {
+                       const gchar *box_name;
+                       box_name = mailbox;
+                       if (box_name == NULL || box_name[0] == '\0') {
+                               box_name = account_display_name;
+                       }
+                       folder_name = g_strconcat (_("mcen_me_folder_inbox"), " - ", box_name, NULL);
+               } else {
+                       folder_name = modest_tny_folder_get_display_name (folder);
+               }
+               
+               gtk_window_set_title (GTK_WINDOW (self), folder_name);
+               g_free (folder_name);
+       }
+       g_free (account_display_name);
+
+
        update_progress_hint (self);
        update_sort_button (self);
 
@@ -518,6 +802,9 @@ static void setup_menu (ModestHeaderWindow *self)
        g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
 
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
        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_move_to));
@@ -532,11 +819,11 @@ static void setup_menu (ModestHeaderWindow *self)
        hildon_button_set_title (HILDON_BUTTON (priv->sort_button), _("mcen_me_sort"));
        g_signal_connect (G_OBJECT (priv->sort_button), "clicked",
                          G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self);
+       hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER);
+       hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
+       hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
        modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button),
                                                  modest_ui_dimming_rules_on_sort);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
@@ -623,7 +910,6 @@ set_contents_state (ModestHeaderWindow *self,
                break;
        }
        priv->contents_state = state;
-       
 }
 
 static void
@@ -631,9 +917,9 @@ on_msg_count_changed (ModestHeaderView *header_view,
                      TnyFolder *folder,
                      TnyFolderChange *change,
                      ModestHeaderWindow *header_window)
-{      
+{
        g_return_if_fail (MODEST_IS_HEADER_WINDOW (header_window));
-       
+
        update_view (MODEST_HEADER_WINDOW (header_window), change);
 }
 
@@ -784,31 +1070,43 @@ has_active_operations (ModestHeaderWindow *self)
 
        queue = modest_runtime_get_mail_operation_queue ();
        operations = modest_mail_operation_queue_get_by_source (queue, G_OBJECT (self));
+
        for (node = operations; node != NULL; node = g_slist_next (node)) {
                if (!modest_mail_operation_is_finished (MODEST_MAIL_OPERATION (node->data))) {
                        has_active = TRUE;
                        break;
                }
        }
-       g_slist_free (operations);
+
+       if (operations) {
+               g_slist_foreach (operations, (GFunc) g_object_unref, NULL);
+               g_slist_free (operations);
+       }
+
        return has_active;
 }
 
 static void
 update_progress_hint (ModestHeaderWindow *self)
 {
-       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       ModestHeaderWindowPrivate *priv;
+
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
        priv->progress_hint = FALSE;
 
        if (has_active_operations (self)) {
                priv->progress_hint = TRUE;
+       } else {
+               priv->progress_hint = FALSE;
        }
 
        if (!priv->progress_hint && priv->current_store_account) {
-               priv->progress_hint = modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (),
-                                                                                          priv->current_store_account);
+               priv->progress_hint = 
+                       modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (),
+                                                                            priv->current_store_account);
        }
-       
+
        modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 
        if (GTK_WIDGET_VISIBLE (self)) {
@@ -816,7 +1114,7 @@ update_progress_hint (ModestHeaderWindow *self)
        }
 }
 
-gboolean 
+gboolean
 modest_header_window_toolbar_on_transfer_mode     (ModestHeaderWindow *self)
 {
        ModestHeaderWindowPrivate *priv= NULL; 
@@ -860,21 +1158,13 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
                            gpointer user_data)
 {
        ModestHeaderWindow *self;
-       ModestMailOperationTypeOperation op_type;
-       GSList *operations = NULL;
-       ModestMailOperationQueue *queue;
 
        self = MODEST_HEADER_WINDOW (user_data);
-       op_type = modest_mail_operation_get_type_operation (mail_op);
-
-       queue = modest_runtime_get_mail_operation_queue ();
-       operations = modest_mail_operation_queue_get_by_source (queue, user_data);
 
        /* Don't disable the progress hint if there are more pending
           operations from this window */
        update_progress_hint (self);
 
-       g_slist_free (operations);
        modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 }
 
@@ -954,12 +1244,22 @@ edit_mode_changed (ModestHeaderWindow *header_window,
                break;
        }
 
-       if (enabled)
+       hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), !enabled);
+       if (enabled) {
                modest_header_view_set_filter (MODEST_HEADER_VIEW (priv->header_view), 
                                               filter);
-       else
+       } else {
+               GtkTreeSelection *sel;
+
+               /* Unselect all. This will prevent us from keeping a
+                  reference to a TnyObject that we don't want to
+                  have */
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->header_view));
+               gtk_tree_selection_unselect_all (sel);
+
                modest_header_view_unset_filter (MODEST_HEADER_VIEW (priv->header_view), 
                                                 filter);
+       }
 }
 
 static void 
@@ -979,9 +1279,7 @@ update_sort_button (ModestHeaderWindow *self)
        const gchar *value = NULL;
 
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
-       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
-                                     (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (
-                                                                     GTK_TREE_VIEW (priv->header_view)))));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)));
 
        if (!gtk_tree_sortable_get_sort_column_id (sortable,
                                                   &current_sort_colid, &current_sort_type)) {
@@ -1035,3 +1333,38 @@ update_sort_button (ModestHeaderWindow *self)
 
        hildon_button_set_value (HILDON_BUTTON (priv->sort_button), value?value:"");
 }
+
+static void
+on_horizontal_movement (HildonPannableArea *hildonpannable,
+                       gint                direction,
+                       gdouble             initial_x,
+                       gdouble             initial_y,
+                       gpointer            user_data)
+{
+       ModestHeaderWindowPrivate *priv;
+       gint dest_x, dest_y;
+       TnyHeader *header;
+
+       /* Ignore right to left movement */
+       if (direction == HILDON_MOVEMENT_LEFT)
+               return;
+
+       /* Get the header to delete */
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (user_data);
+
+       /* Get tree view coordinates */
+       if (!gtk_widget_translate_coordinates ((GtkWidget *) hildonpannable,
+                                              priv->header_view,
+                                              initial_x,
+                                              initial_y,
+                                              &dest_x,
+                                              &dest_y))
+           return;
+
+       header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+                                                      dest_x, dest_y);
+       if (header) {
+               delete_header ((GtkWindow *) user_data, header);
+               g_object_unref (header);
+       }
+}