Build diablo build and fix second line font size and color in maemo and gnome
[modest] / src / widgets / modest-header-view.c
index ea189e2..dec1973 100644 (file)
@@ -32,6 +32,7 @@
 #include <tny-simple-list.h>
 #include <tny-folder-monitor.h>
 #include <tny-folder-change.h>
+#include <tny-error.h>
 #include <string.h>
 
 #include <modest-header-view.h>
@@ -40,7 +41,7 @@
 #include <modest-tny-folder.h>
 #include <modest-debug.h>
 #include <modest-main-window.h>
-
+#include <modest-ui-actions.h>
 #include <modest-marshal.h>
 #include <modest-text-utils.h>
 #include <modest-icon-names.h>
@@ -48,6 +49,8 @@
 #include "modest-platform.h"
 #include <modest-hbox-cell-renderer.h>
 #include <modest-vbox-cell-renderer.h>
+#include <modest-datetime-formatter.h>
+#include <modest-ui-constants.h>
 
 static void modest_header_view_class_init  (ModestHeaderViewClass *klass);
 static void modest_header_view_init        (ModestHeaderView *obj);
@@ -92,6 +95,7 @@ static void          disable_drag_and_drop  (GtkWidget *self);
 
 static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
 
+#ifndef MODEST_TOOLKIT_HILDON2
 static gboolean      on_focus_in            (GtkWidget     *sef,
                                             GdkEventFocus *event,
                                             gpointer       user_data);
@@ -99,6 +103,7 @@ static gboolean      on_focus_in            (GtkWidget     *sef,
 static gboolean      on_focus_out            (GtkWidget     *self,
                                              GdkEventFocus *event,
                                              gpointer       user_data);
+#endif
 
 static void          folder_monitor_update  (TnyFolderObserver *self, 
                                             TnyFolderChange *change);
@@ -109,15 +114,16 @@ static void          _clipboard_set_selected_data (ModestHeaderView *header_view
 
 static void          _clear_hidding_filter (ModestHeaderView *header_view);
 
-static void modest_header_view_notify_observers(
-               ModestHeaderView *header_view,
-               GtkTreeModel *model,
-               const gchar *tny_folder_id);
+static void          modest_header_view_notify_observers(ModestHeaderView *header_view,
+                                                        GtkTreeModel *model,
+                                                        const gchar *tny_folder_id);
+
+static gboolean      modest_header_view_on_expose_event (GtkTreeView *header_view,
+                                                        GdkEventExpose *event,
+                                                        gpointer user_data);
 
-static gboolean modest_header_view_on_expose_event(
-               GtkTreeView *header_view,
-               GdkEventExpose *event,
-               gpointer user_data);
+static void         on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static void         update_style (ModestHeaderView *self);
 
 typedef enum {
        HEADER_VIEW_NON_EMPTY,
@@ -129,6 +135,7 @@ typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
        TnyFolder            *folder;
        ModestHeaderViewStyle style;
+       gboolean is_outbox;
 
        TnyFolderMonitor     *monitor;
        GMutex               *observers_lock;
@@ -143,6 +150,8 @@ struct _ModestHeaderViewPrivate {
        /* Filter tree model */
        gchar **hidding_ids;
        guint   n_selected;
+       GtkTreeRowReference *autoselect_reference;
+       ModestHeaderViewFilter filter;
 
        gint    sort_colid[2][TNY_FOLDER_TYPE_NUM];
        gint    sort_type[2][TNY_FOLDER_TYPE_NUM];
@@ -154,6 +163,12 @@ struct _ModestHeaderViewPrivate {
 
        HeaderViewStatus status;
        guint status_timeout;
+       gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */
+
+       ModestDatetimeFormatter *datetime_formatter;
+
+       GtkCellRenderer *renderer_address;
+       GtkCellRenderer *renderer_date_status;
 };
 
 typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
@@ -249,8 +264,8 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestHeaderViewClass,header_activated),
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
+                             gtk_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
        
        
        signals[ITEM_NOT_FOUND_SIGNAL] = 
@@ -279,12 +294,17 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              NULL, NULL,
                              g_cclosure_marshal_VOID__BOOLEAN,
                              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_rc_parse_string ("class \"ModestHeaderView\" style \"fremantle-touchlist\"");
+       
+#endif
 }
 
 static void
 tny_folder_observer_init (TnyFolderObserverIface *klass)
 {
-       klass->update_func = folder_monitor_update;
+       klass->update = folder_monitor_update;
 }
 
 static GtkTreeViewColumn*
@@ -336,7 +356,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        GtkTreeModel *tree_filter, *sortable;
        GtkTreeViewColumn *column=NULL;
        GtkTreeSelection *selection = NULL;
-       GtkCellRenderer *renderer_msgtype,*renderer_header,
+       GtkCellRenderer *renderer_header,
                *renderer_attach, *renderer_compact_date_or_status;
        GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
                *renderer_subject, *renderer_subject_box, *renderer_recpt,
@@ -350,8 +370,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
 
-       /* FIXME: check whether these renderers need to be freed */
-       renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
+       priv->is_outbox = (type == TNY_FOLDER_TYPE_OUTBOX);
+
+       /* TODO: check whether these renderers need to be freed */
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
        renderer_priority  = gtk_cell_renderer_pixbuf_new ();
        renderer_header  = gtk_cell_renderer_text_new ();
@@ -360,8 +381,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        renderer_recpt_box = modest_hbox_cell_renderer_new ();
        renderer_subject_box = modest_hbox_cell_renderer_new ();
        renderer_recpt = gtk_cell_renderer_text_new ();
+       priv->renderer_address = renderer_recpt;
        renderer_subject = gtk_cell_renderer_text_new ();
        renderer_compact_date_or_status  = gtk_cell_renderer_text_new ();
+       priv->renderer_date_status = renderer_compact_date_or_status;
 
        modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE);
        g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box);
@@ -378,9 +401,14 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
        g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       g_object_set (G_OBJECT (renderer_compact_header), "xpad", MODEST_MARGIN_DOUBLE, NULL);
+#endif
        g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
+#ifndef MODEST_TOOLKIT_GTK
        gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
        gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32);
+#endif
        g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL);
        g_object_set(G_OBJECT(renderer_header),
                     "ellipsize", PANGO_ELLIPSIZE_END,
@@ -388,20 +416,42 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        g_object_set (G_OBJECT (renderer_subject),
                      "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
                      NULL);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1);
        g_object_set (G_OBJECT (renderer_recpt),
-                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
+                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.1,
                      NULL);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1);
        g_object_set(G_OBJECT(renderer_compact_date_or_status),
-                    "xalign", 1.0, "yalign", 0.0,
+                    "xalign", 1.0, "yalign", 0.1,
                     NULL);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1);
+#ifdef MODEST_TOOLKIT_HILDON2
        g_object_set (G_OBJECT (renderer_priority),
-                     "yalign", 1.0, NULL);
+                     "yalign", 0.5,
+                     "xalign", 0.0, NULL);
+       g_object_set (G_OBJECT (renderer_attach),
+                     "yalign", 0.5, 
+                     "xalign", 0.0, NULL);
+#else
+       g_object_set (G_OBJECT (renderer_priority),
+                     "yalign", 0.5, NULL);
        g_object_set (G_OBJECT (renderer_attach),
                      "yalign", 0.0, NULL);
+#endif
 
+#ifdef MODEST_TOOLKIT_HILDON1
        gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26);
        gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
        gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
+#elif MODEST_TOOLKIT_HILDON2
+       gtk_cell_renderer_set_fixed_size (renderer_attach, 24, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_priority, 24, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
+#else
+       gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16);
+       gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16);
+       /* gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); */
+#endif
        
        remove_all_columns (self);
 
@@ -422,15 +472,6 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                
                switch (col) {
                        
-               case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
-                       column = get_new_column (_("M"), renderer_msgtype, FALSE,
-                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_msgtype_cell_data,
-                                                NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 45);
-                       break;
-
                case MODEST_HEADER_VIEW_COLUMN_ATTACH:
                        column = get_new_column (_("A"), renderer_attach, FALSE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
@@ -542,11 +583,20 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 compact_column, NULL);
        }
 
+       update_style (self);
+       g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
 
        return TRUE;
 }
 
 static void
+datetime_format_changed (ModestDatetimeFormatter *formatter,
+                        ModestHeaderView *self)
+{
+       gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
@@ -555,12 +605,15 @@ modest_header_view_init (ModestHeaderView *obj)
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
        priv->folder  = NULL;
+       priv->is_outbox = FALSE;
 
        priv->monitor        = NULL;
        priv->observers_lock = g_mutex_new ();
+       priv->autoselect_reference = NULL;
 
        priv->status  = HEADER_VIEW_INIT;
        priv->status_timeout = 0;
+       priv->notify_status = TRUE;
 
        priv->observer_list_lock = g_mutex_new();
        priv->observer_list = NULL;
@@ -568,6 +621,7 @@ modest_header_view_init (ModestHeaderView *obj)
        priv->clipboard = modest_runtime_get_email_clipboard ();
        priv->hidding_ids = NULL;
        priv->n_selected = 0;
+       priv->filter = MODEST_HEADER_VIEW_FILTER_NONE;
        priv->selection_changed_handler = 0;
        priv->acc_removed_handler = 0;
 
@@ -579,6 +633,10 @@ modest_header_view_init (ModestHeaderView *obj)
                }                       
        }
 
+       priv->datetime_formatter = modest_datetime_formatter_new ();
+       g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", 
+                         G_CALLBACK (datetime_format_changed), (gpointer) obj);
+
        setup_drag_and_drop (GTK_WIDGET(obj));
 }
 
@@ -592,6 +650,11 @@ modest_header_view_dispose (GObject *obj)
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
+       if (priv->datetime_formatter) {
+               g_object_unref (priv->datetime_formatter);
+               priv->datetime_formatter = NULL;
+       }
+
        /* Free in the dispose to avoid unref cycles */
        if (priv->folder) {
                tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
@@ -641,6 +704,11 @@ modest_header_view_finalize (GObject *obj)
        /* Clear hidding array created by cut operation */
        _clear_hidding_filter (MODEST_HEADER_VIEW (obj));
 
+       if (priv->autoselect_reference != NULL) {
+               gtk_tree_row_reference_free (priv->autoselect_reference);
+               priv->autoselect_reference = NULL;
+       }
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -677,10 +745,12 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        g_signal_connect (self, "row-activated",
                          G_CALLBACK (on_header_row_activated), NULL);
 
+#ifndef MODEST_TOOLKIT_HILDON2
        g_signal_connect (self, "focus-in-event",
                          G_CALLBACK(on_focus_in), NULL);
        g_signal_connect (self, "focus-out-event",
                          G_CALLBACK(on_focus_out), NULL);
+#endif
 
        g_signal_connect (self, "button-press-event",
                          G_CALLBACK(on_button_press_event), NULL);
@@ -779,7 +849,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 static void
 scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
 {
-#ifdef MODEST_PLATFORM_GNOME 
+#ifdef MODEST_TOOLKIT_GTK 
 
        GtkTreePath *selected_path;
        GtkTreePath *start, *end;
@@ -804,7 +874,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
        gtk_tree_path_free (start);
        gtk_tree_path_free (end);
 
-#endif /* MODEST_PLATFORM_GNOME */
+#endif /* MODEST_TOOLKIT_GTK */
 }
 
 
@@ -927,46 +997,79 @@ modest_header_view_on_expose_event(GtkTreeView *header_view,
        GtkTreeSelection *sel;
        GtkTreeModel *model;
        GtkTreeIter tree_iter;
+       ModestHeaderViewPrivate *priv;
 
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
        model = gtk_tree_view_get_model(header_view);
 
        if (!model)
                return FALSE;
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       return FALSE;
+#endif
        sel = gtk_tree_view_get_selection(header_view);
-       if(!gtk_tree_selection_count_selected_rows(sel))
+       if(!gtk_tree_selection_count_selected_rows(sel)) {
                if (gtk_tree_model_get_iter_first(model, &tree_iter)) {
+                       GtkTreePath *tree_iter_path;
                        /* Prevent the widget from getting the focus
                           when selecting the first item */
+                       tree_iter_path = gtk_tree_model_get_path (model, &tree_iter);
                        g_object_set(header_view, "can-focus", FALSE, NULL);
                        gtk_tree_selection_select_iter(sel, &tree_iter);
+                       gtk_tree_view_set_cursor (header_view, tree_iter_path, NULL, FALSE);
                        g_object_set(header_view, "can-focus", TRUE, NULL);
+                       if (priv->autoselect_reference) {
+                               gtk_tree_row_reference_free (priv->autoselect_reference);
+                       }
+                       priv->autoselect_reference = gtk_tree_row_reference_new (model, tree_iter_path);
+                       gtk_tree_path_free (tree_iter_path);
+               }
+       } else {
+               if (priv->autoselect_reference != NULL) {
+                       gboolean moved_selection = FALSE;
+                       GtkTreePath * last_path;
+                       if (gtk_tree_selection_count_selected_rows (sel) != 1) {
+                               moved_selection = TRUE;
+                       } else {
+                               GList *rows;
+
+                               rows = gtk_tree_selection_get_selected_rows (sel, NULL);
+                               last_path = gtk_tree_row_reference_get_path (priv->autoselect_reference);
+                               if (gtk_tree_path_compare (last_path, (GtkTreePath *) rows->data) != 0)
+                                       moved_selection = TRUE;
+                               g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+                               g_list_free (rows);
+                               gtk_tree_path_free (last_path);
+                       }
+                       if (moved_selection) {
+                               gtk_tree_row_reference_free (priv->autoselect_reference);
+                               priv->autoselect_reference = NULL;
+                       } else {
+
+                               if (gtk_tree_model_get_iter_first (model, &tree_iter)) {
+                                       GtkTreePath *current_path;
+                                       current_path = gtk_tree_model_get_path (model, &tree_iter);
+                                       last_path = gtk_tree_row_reference_get_path (priv->autoselect_reference);
+                                       if (gtk_tree_path_compare (current_path, last_path) != 0) {
+                                               g_object_set(header_view, "can-focus", FALSE, NULL);
+                                               gtk_tree_selection_unselect_all (sel);
+                                               gtk_tree_selection_select_iter(sel, &tree_iter);
+                                               gtk_tree_view_set_cursor (header_view, current_path, NULL, FALSE);
+                                               g_object_set(header_view, "can-focus", TRUE, NULL);
+                                               gtk_tree_row_reference_free (priv->autoselect_reference);
+                                               priv->autoselect_reference = gtk_tree_row_reference_new (model, current_path);
+                                       }
+                                       gtk_tree_path_free (current_path);
+                                       gtk_tree_path_free (last_path);
+                               }
+                       }
                }
+       }
 
        return FALSE;
 }
 
-/* 
- * This function sets a sortable model in the header view. It's just
- * used for developing purposes, because it only does a
- * gtk_tree_view_set_model
- */
-static void
-modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model)
-{
-/*     GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */
-/*     if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { */
-/*             GtkTreeModel *old_model; */
-/*             ModestHeaderViewPrivate *priv; */
-/*             priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); */
-/*             old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort)); */
-
-/*             /\* Set new model *\/ */
-/*             gtk_tree_view_set_model (header_view, model); */
-/*     } else */
-       gtk_tree_view_set_model (header_view, model);
-}
-
 TnyFolder*
 modest_header_view_get_folder (ModestHeaderView *self)
 {
@@ -983,22 +1086,22 @@ modest_header_view_get_folder (ModestHeaderView *self)
 }
 
 static void
-modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+set_folder_intern_get_headers_async_cb (TnyFolder *folder, 
+                                       gboolean cancelled, 
+                                       TnyList *headers, 
+                                       GError *err, 
+                                       gpointer user_data)
 {
-       TnyFolderType type;
-       TnyList *headers;
+       ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
-       GList *cols, *cursor;
-       GtkTreeModel *filter_model, *sortable; 
-       guint sort_colid;
-       GtkSortType sort_type;
 
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data));
 
-       headers = TNY_LIST (tny_gtk_header_list_model_new ());
+       self = MODEST_HEADER_VIEW (user_data);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
-                                             folder, FALSE, NULL, NULL, NULL);
+       if (cancelled || err)
+               return;
 
        /* Add IDLE observer (monitor) and another folder observer for
           new messages (self) */
@@ -1011,6 +1114,39 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
        tny_folder_monitor_start (priv->monitor);
        g_mutex_unlock (priv->observers_lock);
+}
+
+static void
+modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+{
+       TnyFolderType type;
+       TnyList *headers;
+       ModestHeaderViewPrivate *priv;
+       GList *cols, *cursor;
+       GtkTreeModel *filter_model, *sortable; 
+       guint sort_colid;
+       GtkSortType sort_type;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       headers = TNY_LIST (tny_gtk_header_list_model_new ());
+
+       /* Start the monitor in the callback of the
+          tny_gtk_header_list_model_set_folder call. It's crucial to
+          do it there and not just after the call because we want the
+          monitor to observe only the headers returned by the
+          tny_folder_get_headers_async call that it's inside the
+          tny_gtk_header_list_model_set_folder call. This way the
+          monitor infrastructure could successfully cope with
+          duplicates. For example if a tny_folder_add_msg_async is
+          happening while tny_gtk_header_list_model_set_folder is
+          invoked, then the first call could add a header that will
+          be added again by tny_gtk_header_list_model_set_folder, so
+          we'd end up with duplicate headers. sergio */
+       tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
+                                             folder, FALSE, 
+                                             set_folder_intern_get_headers_async_cb, 
+                                             NULL, self);
 
        sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
        g_object_unref (G_OBJECT (headers));
@@ -1051,12 +1187,10 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        }
 
        /* Set new model */
-       modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model);
+       gtk_tree_view_set_model (GTK_TREE_VIEW (self), filter_model);
        modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model),
                        tny_folder_get_id(folder));
        g_object_unref (G_OBJECT (filter_model));
-/*     modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); */
-/*     g_object_unref (G_OBJECT (sortable)); */
 
        /* Free */
        g_list_free (cols);
@@ -1179,35 +1313,56 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
        g_signal_emit (G_OBJECT (info->header_view), 
                       signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL);
 
+       /* Allow filtering notifications from now on if the current
+          folder is still the same (if not then the user has selected
+          another one to refresh, we should wait until that refresh
+          finishes) */
+       if (priv->folder == folder)
+               priv->notify_status = TRUE;
+
        /* Frees */
        g_object_unref (info->header_view);
        g_free (info);
 }
 
+static void
+refresh_folder_error_handler (ModestMailOperation *mail_op, 
+                             gpointer user_data)
+{
+       const GError *error = modest_mail_operation_get_error (mail_op);
+
+       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
+           error->code == TNY_IO_ERROR_WRITE ||
+           error->code == TNY_IO_ERROR_READ) {
+               ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
+               /* If the mail op has been cancelled then it's not an error: don't show any message */
+               if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+                       modest_platform_information_banner (NULL, NULL,
+                                                           dgettext("ke-recv",
+                                                                    "cerm_device_memory_full"));
+               }
+       }
+}
+
 void
 modest_header_view_set_folder (ModestHeaderView *self, 
                               TnyFolder *folder,
+                              gboolean refresh,
+                              ModestWindow *progress_window,
                               RefreshAsyncUserCallback callback,
                               gpointer user_data)
 {
        ModestHeaderViewPrivate *priv;
-       SetFolderHelper *info;
-       ModestWindow *main_win;
        
        g_return_if_fail (self);
 
        priv =     MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-                                                     FALSE); /* don't create */
-       if (!main_win) {
-               g_warning ("%s: BUG: no main window", __FUNCTION__);
-               return;
-       }
-                                                     
        if (priv->folder) {
-               if (priv->status_timeout)
+               if (priv->status_timeout) {
                        g_source_remove (priv->status_timeout);
+                       priv->status_timeout = 0;
+               }
 
                g_mutex_lock (priv->observers_lock);
                tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self));
@@ -1217,8 +1372,9 @@ modest_header_view_set_folder (ModestHeaderView *self,
        }
 
        if (folder) {
-               ModestMailOperation *mail_op = NULL;
                GtkTreeSelection *selection;
+               SetFolderHelper *info;
+               ModestMailOperation *mail_op = NULL;
 
                /* Set folder in the model */
                modest_header_view_set_folder_intern (self, folder);
@@ -1226,6 +1382,9 @@ modest_header_view_set_folder (ModestHeaderView *self,
                /* Pick my reference. Nothing to do with the mail operation */
                priv->folder = g_object_ref (folder);
 
+               /* Do not notify about filterings until the refresh finishes */
+               priv->notify_status = FALSE;
+
                /* Clear the selection if exists */
                selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
                gtk_tree_selection_unselect_all(selection);
@@ -1236,24 +1395,31 @@ modest_header_view_set_folder (ModestHeaderView *self,
                               0, TRUE, NULL);
 
                /* create the helper */
-               info = g_malloc0 (sizeof(SetFolderHelper));
+               info = g_malloc0 (sizeof (SetFolderHelper));
                info->header_view = g_object_ref (self);
                info->cb = callback;
                info->user_data = user_data;
 
                /* Create the mail operation (source will be the parent widget) */
-               mail_op = modest_mail_operation_new (G_OBJECT(main_win));
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                                mail_op);
-
-               /* Refresh the folder asynchronously */
-               modest_mail_operation_refresh_folder (mail_op,
-                                                     folder,
-                                                     folder_refreshed_cb,
-                                                     info);
-
+               if (progress_window)
+                       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(progress_window),
+                                                                                refresh_folder_error_handler,
+                                                                                NULL, NULL);
+               if (refresh) {                  
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                        mail_op);
+                       
+                       /* Refresh the folder asynchronously */
+                       modest_mail_operation_refresh_folder (mail_op,
+                                                             folder,
+                                                             folder_refreshed_cb,
+                                                             info);
+               } else {
+                       folder_refreshed_cb (mail_op, folder, info);
+               }
                /* Free */
-               g_object_unref (mail_op);
+               if (mail_op)
+                       g_object_unref (mail_op);
        } else {
                g_mutex_lock (priv->observers_lock);
 
@@ -1262,7 +1428,13 @@ modest_header_view_set_folder (ModestHeaderView *self,
                        g_object_unref (G_OBJECT (priv->monitor));
                        priv->monitor = NULL;
                }
-               modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); 
+
+               if (priv->autoselect_reference) {
+                       gtk_tree_row_reference_free (priv->autoselect_reference);
+                       priv->autoselect_reference = NULL;
+               }
+
+               gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL); 
 
                modest_header_view_notify_observers(self, NULL, NULL);
 
@@ -1300,14 +1472,19 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
 
        /* Dont open DELETED messages */
        if (flags & TNY_HEADER_FLAG_DELETED) {
-               modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_already_deleted"));
+               GtkWidget *win;
+               gchar *msg;
+               win = gtk_widget_get_ancestor (GTK_WIDGET (treeview), GTK_TYPE_WINDOW);
+               msg = modest_ui_actions_get_msg_already_deleted_error_msg (MODEST_WINDOW (win));
+               modest_platform_information_banner (NULL, NULL, msg);
+               g_free (msg);
                goto frees;
        }
 
        /* Emit signal */
        g_signal_emit (G_OBJECT(self), 
                       signals[HEADER_ACTIVATED_SIGNAL], 
-                      0, header);
+                      0, header, path);
 
        /* Free */
  frees:
@@ -1552,6 +1729,9 @@ const GtkTargetEntry header_view_drag_types[] = {
 static void
 enable_drag_and_drop (GtkWidget *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        gtk_drag_source_set (self, GDK_BUTTON1_MASK,
                             header_view_drag_types,
                             G_N_ELEMENTS (header_view_drag_types),
@@ -1561,12 +1741,18 @@ enable_drag_and_drop (GtkWidget *self)
 static void
 disable_drag_and_drop (GtkWidget *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        gtk_drag_source_unset (self);
 }
 
 static void
 setup_drag_and_drop (GtkWidget *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        enable_drag_and_drop(self);
        g_signal_connect(G_OBJECT (self), "drag_data_get",
                         G_CALLBACK(drag_data_get_cb), NULL);
@@ -1602,6 +1788,7 @@ get_selected_row (GtkTreeView *self, GtkTreeModel **model)
        return path;
 }
 
+#ifndef MODEST_TOOLKIT_HILDON2
 /*
  * This function moves the tree view scroll to the current selected
  * row when the widget grabs the focus 
@@ -1640,33 +1827,6 @@ on_focus_in (GtkWidget     *self,
        if (selected == NULL) return FALSE;
        selected_path = (GtkTreePath *) selected->data;
 
-       /* Check if we need to scroll */
-       #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */
-       GtkTreePath *start_path = NULL;
-       GtkTreePath *end_path = NULL;
-       if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self),
-                                            &start_path,
-                                            &end_path)) {
-
-               if ((gtk_tree_path_compare (start_path, selected_path) != -1) ||
-                   (gtk_tree_path_compare (end_path, selected_path) != 1)) {
-
-                       /* Scroll to first path */
-                       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self),
-                                                     selected_path,
-                                                     NULL,
-                                                     TRUE,
-                                                     0.5,
-                                                     0.0);
-               }
-       }
-       if (start_path)
-               gtk_tree_path_free (start_path);
-       if (end_path)
-               gtk_tree_path_free (end_path);
-
-       #endif /* GTK_CHECK_VERSION */
-
        /* Frees */     
        g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
        g_list_free (selected);
@@ -1696,6 +1856,7 @@ on_focus_out (GtkWidget     *self,
        }
        return FALSE;
 }
+#endif
 
 static gboolean
 on_button_release_event(GtkWidget * self, GdkEventButton * event, gpointer userdata)
@@ -1709,24 +1870,50 @@ on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdat
 {
        GtkTreeSelection *selection = NULL;
        GtkTreePath *path = NULL;
-       gboolean already_selected = FALSE;
+       gboolean already_selected = FALSE, already_opened = FALSE;
+       ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
 
        if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) {
+               GtkTreeIter iter;
+               GtkTreeModel *model;
+
                selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
                already_selected = gtk_tree_selection_path_is_selected (selection, path);
+
+               /* Get header from model */
+               model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+               if (gtk_tree_model_get_iter (model, &iter, path)) {
+                       GValue value = {0,};
+                       TnyHeader *header;
+
+                       gtk_tree_model_get_value (model, &iter, 
+                                                 TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                                 &value);
+                       header = (TnyHeader *) g_value_get_object (&value);
+                       if (TNY_IS_HEADER (header)) {
+                               status = modest_tny_all_send_queues_get_msg_status (header);
+                               already_opened = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), 
+                                                                                          header, NULL);
+                       }
+                       g_value_unset (&value);
+               }
        }
 
-       /* Enable drag and drop onlly if the user clicks on a row that
+       /* Enable drag and drop only if the user clicks on a row that
           it's already selected. If not, let him select items using
-          the pointer */
-       if (!already_selected) {
+          the pointer. If the message is in an OUTBOX and in sending
+          status disable drag and drop as well */
+       if (!already_selected ||
+           status == MODEST_TNY_SEND_QUEUE_SENDING ||
+           already_opened)
                disable_drag_and_drop(self);
-       }
 
-       if (path != NULL) {
+       if (path != NULL)
                gtk_tree_path_free(path);
-       }
 
+       /* If it's already opened then do not let the button-press
+          event go on because it'll perform a message open because
+          we're clicking on to an already selected header */
        return FALSE;
 }
 
@@ -1814,7 +2001,7 @@ modest_header_view_clear (ModestHeaderView *self)
 {
        g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
        
-       modest_header_view_set_folder (self, NULL, NULL, NULL);
+       modest_header_view_set_folder (self, NULL, FALSE, NULL, NULL, NULL);
 }
 
 void 
@@ -1899,6 +2086,10 @@ static void
 notify_filter_change_destroy (gpointer data)
 {
        NotifyFilterInfo *info = (NotifyFilterInfo *) data;
+       ModestHeaderViewPrivate *priv;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (info->self);
+       priv->status_timeout = 0;
 
        g_object_unref (info->self);
        g_object_unref (info->folder);
@@ -1938,6 +2129,22 @@ filter_row (GtkTreeModel *model,
                goto frees;
        }
 
+       if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) {
+               if (priv->is_outbox &&
+                   modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
+                       visible = FALSE;
+                       goto frees;
+               }
+       }
+
+       if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) {
+               if (priv->is_outbox &&
+                   modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
+                       visible = FALSE;
+                       goto frees;
+               }
+       }
+
        /* If no data on clipboard, return always TRUE */
        if (modest_email_clipboard_cleared(priv->clipboard)) {
                visible = TRUE;
@@ -1952,7 +2159,7 @@ filter_row (GtkTreeModel *model,
        
        /* Check hiding */
        if (priv->hidding_ids != NULL) {
-               id = g_strdup(tny_header_get_message_id (header));
+               id = tny_header_dup_message_id (header);
                for (i=0; i < priv->n_selected && !found; i++)
                        if (priv->hidding_ids[i] != NULL && id != NULL)
                                found = (!strcmp (priv->hidding_ids[i], id));
@@ -1964,7 +2171,7 @@ filter_row (GtkTreeModel *model,
  frees:
        old_status = priv->status;
        priv->status = ((gboolean) priv->status) && !visible;
-       if (priv->status != old_status) {
+       if ((priv->notify_status) && (priv->status != old_status)) {
                NotifyFilterInfo *info;
 
                if (priv->status_timeout)
@@ -2038,7 +2245,7 @@ on_account_removed (TnyAccountStore *self,
                my_account = tny_folder_get_account (priv->folder);
                if (my_account == account)
                        modest_header_view_clear (MODEST_HEADER_VIEW (user_data));
-               g_object_unref (account);
+               g_object_unref (my_account);
        }
 }
 
@@ -2099,3 +2306,115 @@ modest_header_view_notify_observers(ModestHeaderView *header_view,
        g_mutex_unlock(priv->observer_list_lock);
 }
 
+const gchar *
+_modest_header_view_get_display_date (ModestHeaderView *self, time_t date)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       return modest_datetime_formatter_display_datetime (priv->datetime_formatter, date);
+}
+
+void 
+modest_header_view_set_filter (ModestHeaderView *self,
+                              ModestHeaderViewFilter filter)
+{
+       ModestHeaderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+
+       priv->filter |= filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+void 
+modest_header_view_unset_filter (ModestHeaderView *self,
+                                ModestHeaderViewFilter filter)
+{
+       ModestHeaderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+
+       priv->filter &= ~filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+static void 
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+       if (strcmp ("style", spec->name) == 0) {
+               update_style (MODEST_HEADER_VIEW (obj));
+               gtk_widget_queue_draw (GTK_WIDGET (obj));
+       } 
+}
+
+static void
+update_style (ModestHeaderView *self)
+{
+       ModestHeaderViewPrivate *priv;
+       GdkColor style_color;
+       PangoAttrList *attr_list;
+       GtkStyle *style;
+       PangoAttribute *attr;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+
+       /* Set color */
+
+       attr_list = pango_attr_list_new ();
+       if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+               gdk_color_parse ("grey", &style_color);
+       }
+       attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
+       pango_attr_list_insert (attr_list, attr);
+       
+       /* set font */
+       style = gtk_rc_get_style_by_paths (gtk_widget_get_settings
+                                          (GTK_WIDGET(self)),
+                                          "SmallSystemFont", NULL,
+                                          G_TYPE_NONE);
+       if (style) {
+               attr = pango_attr_font_desc_new (pango_font_description_copy
+                                                (style->font_desc));
+               pango_attr_list_insert (attr_list, attr);
+
+               g_object_set (G_OBJECT (priv->renderer_address),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "attributes", attr_list,
+                             NULL);
+               g_object_set (G_OBJECT (priv->renderer_date_status),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "attributes", attr_list,
+                             NULL);
+               pango_attr_list_unref (attr_list);
+       } else {
+               g_object_set (G_OBJECT (priv->renderer_address),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "scale", PANGO_SCALE_SMALL,
+                             "scale-set", TRUE,
+                             NULL);
+               g_object_set (G_OBJECT (priv->renderer_date_status),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "scale", PANGO_SCALE_SMALL,
+                             "scale-set", TRUE,
+                             NULL);
+       }
+}
+