* Change headers list tree view rows layout (flags, header, date).

* Use pango markup to set width and size font settings.
* Add a new compact flag column to show priority/attachment data.
* Enable multiple selection on headers list tree view.
* Change header settings in runtime configuration.
* Add 5 new icons to show all combinations of priority/attachment values.

pmo-trunk-r1577

diff --git a/src/gnome/modest-icon-names.h b/src/gnome/modest-icon-names.h
index 64e38e6..ea71d94 100644 (file)
--- a/src/gnome/modest-icon-names.h
+++ b/src/gnome/modest-icon-names.h
@@ -48,6 +48,13 @@
 #define MODEST_HEADER_ICON_DELETED             PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png"
 #define MODEST_HEADER_ICON_ATTACH              PIXMAP_PREFIX "qgn_list_gene_attacpap.png"
 
+#define MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY PIXMAP_PREFIX "qgn_list_gene_high_attacpap.png"
+#define MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY  PIXMAP_PREFIX "qgn_list_gene_low_attacpap.png"
+#define MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY PIXMAP_PREFIX "qgn_list_gene_norm_attacpap.png"
+
+#define MODEST_HEADER_ICON_HIGH_PRIORITY        PIXMAP_PREFIX "qgn_list_messaging_high_noatt.png"
+#define MODEST_HEADER_ICON_LOW_PRIORITY         PIXMAP_PREFIX "qgn_list_messaging_low_noatt.png"
+
 #define MODEST_FOLDER_ICON_OPEN                        PIXMAP_PREFIX "qgn_list_gene_fldr_opn.png"
 #define MODEST_FOLDER_ICON_CLOSED              PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png"
 

diff --git a/src/gnome/pixmaps/qgn_list_gene_high_attacpap.png b/src/gnome/pixmaps/qgn_list_gene_high_attacpap.png
new file mode 100644 (file)
index 0000000..9008ead
Binary files /dev/null and b/src/gnome/pixmaps/qgn_list_gene_high_attacpap.png differ

diff --git a/src/gnome/pixmaps/qgn_list_gene_low_attacpap.png b/src/gnome/pixmaps/qgn_list_gene_low_attacpap.png
new file mode 100644 (file)
index 0000000..0ef31f9
Binary files /dev/null and b/src/gnome/pixmaps/qgn_list_gene_low_attacpap.png differ

diff --git a/src/gnome/pixmaps/qgn_list_gene_norm_attacpap.png b/src/gnome/pixmaps/qgn_list_gene_norm_attacpap.png
new file mode 100644 (file)
index 0000000..cfddd64
Binary files /dev/null and b/src/gnome/pixmaps/qgn_list_gene_norm_attacpap.png differ

diff --git a/src/gnome/pixmaps/qgn_list_messaging_high_noatt.png b/src/gnome/pixmaps/qgn_list_messaging_high_noatt.png
new file mode 100644 (file)
index 0000000..2e7b564
Binary files /dev/null and b/src/gnome/pixmaps/qgn_list_messaging_high_noatt.png differ

diff --git a/src/gnome/pixmaps/qgn_list_messaging_low_noatt.png b/src/gnome/pixmaps/qgn_list_messaging_low_noatt.png
new file mode 100644 (file)
index 0000000..ebbbd38
Binary files /dev/null and b/src/gnome/pixmaps/qgn_list_messaging_low_noatt.png differ

diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h
index c871da5..f98205e 100644 (file)
--- a/src/maemo/modest-icon-names.h
+++ b/src/maemo/modest-icon-names.h
@@ -49,6 +49,13 @@
 #define MODEST_HEADER_ICON_DELETED             "qgn_list_messagin_mail_deleted"
 #define MODEST_HEADER_ICON_ATTACH              "qgn_list_gene_attacpap"
 
+#define MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY "qgn_list_gene_high_attacpap"
+#define MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY  "qgn_list_gene_low_attacpap"
+#define MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY "qgn_list_gene_norm_attacpap"
+
+#define MODEST_HEADER_ICON_HIGH_PRIORITY        "qgn_list_messaging_high_noatt"
+#define MODEST_HEADER_ICON_LOW_PRIORITY         "qgn_list_messaging_low_noatt"
+
 #define MODEST_FOLDER_ICON_OPEN                        "qgn_list_gene_fldr_opn"
 #define MODEST_FOLDER_ICON_CLOSED              "qgn_list_gene_fldr_cls"
 

diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 06ac537..5b28b1a 100644 (file)
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -75,24 +75,32 @@ static const FolderCols INBOX_COLUMNS_DETAILS[] = {
        {MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE, 60},
        {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
 };
+
 static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
-       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
-       {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 200}
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 180},
+       {MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE, 60}
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
-        {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
-        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
-        {MODEST_HEADER_VIEW_COLUMN_TO,    80},
-        {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80},
-        {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 80},
-        {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
+       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
+       {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
+       {MODEST_HEADER_VIEW_COLUMN_TO,    80},
+       {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80},
+       {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 80},
+       {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
 };
+
 static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
-        {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
-        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
-        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,200},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
+       {MODEST_HEADER_VIEW_COLUMN_STATUS, 60}
+};
+
+static const FolderCols SENT_COLUMNS_TWOLINES[] = {
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
+       {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 60}
 };
 
 #ifdef MODEST_PLATFORM_MAEMO
@@ -380,7 +388,6 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
             folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {          
                
                switch (folder_type) {
-               case TNY_FOLDER_TYPE_OUTBOX:
                case TNY_FOLDER_TYPE_SENT:
                case TNY_FOLDER_TYPE_DRAFTS:
                save_header_settings (conf, folder_type,
@@ -390,6 +397,13 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
                                      overwrite);
                save_header_settings (conf, folder_type,
                                      MODEST_HEADER_VIEW_STYLE_TWOLINES,
+                                     SENT_COLUMNS_TWOLINES,
+                                     G_N_ELEMENTS(SENT_COLUMNS_TWOLINES),
+                                     overwrite);
+               break;
+               case TNY_FOLDER_TYPE_OUTBOX:
+               save_header_settings (conf, folder_type,
+                                     MODEST_HEADER_VIEW_STYLE_TWOLINES,
                                      OUTBOX_COLUMNS_TWOLINES,
                                      G_N_ELEMENTS(OUTBOX_COLUMNS_TWOLINES),
                                      overwrite);

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 3ea4a8b..acf643c 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -34,6 +34,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include <modest-runtime.h>
+#include <modest-tny-folder.h>
 #include <modest-tny-msg.h>
 #include <modest-tny-account.h>
 #include <modest-address-book.h>
@@ -189,7 +190,7 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 
        if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                gtk_widget_destroy (GTK_WIDGET(win));
-       }
+       } 
 }
 
 

diff --git a/src/widgets/modest-header-view-priv.h b/src/widgets/modest-header-view-priv.h
index 7859fa0..5c1bc1e 100644 (file)
--- a/src/widgets/modest-header-view-priv.h
+++ b/src/widgets/modest-header-view-priv.h
@@ -46,12 +46,17 @@ void _modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRe
                                            GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data);
 void _modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
                                           GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data);
+void _modest_header_view_compact_flag_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+                                                GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data);
 void _modest_header_view_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                                            GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data);
 void _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                                          GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data);
 void _modest_header_view_size_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                                          GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data);
+void _modest_header_view_status_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
+                                           GtkTreeModel *tree_model,  GtkTreeIter *iter,
+                                           gpointer user_data);
 void _modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                                                     GtkTreeModel *tree_model,  GtkTreeIter *iter,  gboolean is_sender);
 void _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index cdb94ae..d1b22bb 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -40,10 +40,10 @@ static GdkPixbuf*
 get_pixbuf_for_flag (TnyHeaderFlags flag)
 {
        /* optimization */
-       static GdkPixbuf *deleted_pixbuf       = NULL;
-       static GdkPixbuf *seen_pixbuf          = NULL;
-       static GdkPixbuf *unread_pixbuf        = NULL;
-       static GdkPixbuf *attachments_pixbuf   = NULL;
+       static GdkPixbuf *deleted_pixbuf          = NULL;
+       static GdkPixbuf *seen_pixbuf             = NULL;
+       static GdkPixbuf *unread_pixbuf           = NULL;
+       static GdkPixbuf *attachments_pixbuf      = NULL;
        
        switch (flag) {
        case TNY_HEADER_FLAG_DELETED:
@@ -65,6 +65,48 @@ get_pixbuf_for_flag (TnyHeaderFlags flag)
        }
 }
 
+static GdkPixbuf*
+get_pixbuf_for_compact_flag (TnyHeaderFlags flag)
+{
+       /* optimization */
+       static GdkPixbuf *high_attachments_pixbuf   = NULL;
+       static GdkPixbuf *normal_attachments_pixbuf = NULL;
+       static GdkPixbuf *low_attachments_pixbuf    = NULL;
+       static GdkPixbuf *high_pixbuf               = NULL;
+       static GdkPixbuf *low_pixbuf                = NULL;
+       
+       if (flag & TNY_HEADER_FLAG_ATTACHMENTS) {
+               if (flag & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+                       if (G_UNLIKELY(!high_attachments_pixbuf))
+                               high_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY);
+                       return high_attachments_pixbuf;
+               }
+               else if (flag & TNY_HEADER_FLAG_LOW_PRIORITY) {
+                       if (G_UNLIKELY(!low_attachments_pixbuf))
+                               low_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY);
+                       return low_attachments_pixbuf;
+               }
+               else {
+                       if (G_UNLIKELY(!normal_attachments_pixbuf))
+                               normal_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY);
+                       return normal_attachments_pixbuf;
+               }
+       }
+       else if (flag & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+               if (G_UNLIKELY(!high_pixbuf))
+                       high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
+               return high_pixbuf;
+       }
+       else if (flag & TNY_HEADER_FLAG_LOW_PRIORITY) {
+               if (G_UNLIKELY(!low_pixbuf))
+                       low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
+               return low_pixbuf;
+       }
+
+       
+       return NULL;
+}
+
 static void
 set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags)
 {
@@ -111,6 +153,42 @@ _modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer
 }
 
 void
+_modest_header_view_compact_flag_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+                                           GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+{
+       TnyHeaderFlags flags;
+
+       gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                           &flags, -1);
+
+       flags = TNY_HEADER_FLAG_ATTACHMENTS;
+       if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
+               if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),
+                                     NULL);
+               else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),                                    
+                                     NULL);
+               else  
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),    
+                                     NULL);
+       }
+       else {
+               if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),
+                                     NULL);
+               else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),
+                                     NULL);
+       }
+}
+
+void
 _modest_header_view_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                  GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
@@ -129,7 +207,7 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
 {
        TnyHeaderFlags flags;
        guint date, date_col;
-       gchar *display_date;
+       gchar *display_date = NULL, *tmp_date = NULL;
        gboolean received = GPOINTER_TO_INT(user_data);
 
        if (received)
@@ -142,12 +220,12 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
                            date_col, &date,
                            -1);
 
-       display_date = modest_text_utils_get_display_date (date);
-       g_object_set (G_OBJECT(renderer),
-                     "text",    display_date,
-                     NULL);
+       tmp_date = modest_text_utils_get_display_date (date);
+       display_date = g_strdup_printf ("\n<small>%s</small>", tmp_date);
+       g_object_set (G_OBJECT(renderer), "markup", display_date, NULL);        
 
        set_common_flags (renderer, flags);
+       g_free (tmp_date);
        g_free (display_date);
 }
 
@@ -188,7 +266,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 {
        GObject *rendobj;
        TnyHeaderFlags flags;
-       gchar *address, *subject, *header, *display_date;
+       gchar *address, *subject, *header;
        time_t date;
        gboolean is_incoming;
 
@@ -211,16 +289,19 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                                    -1);
        
        rendobj = G_OBJECT(renderer);
-       display_date = modest_text_utils_get_display_date (date);
-       header = g_strdup_printf ("%s %s\n%s",
-                                 modest_text_utils_get_display_address (address),
-                                 display_date, subject);
+       if (flags & TNY_HEADER_FLAG_SEEN)
+               header = g_strdup_printf ("<b>%s</b>\n<small>%s</small>",
+                                         subject,
+                                         modest_text_utils_get_display_address (address));
+       else
+               header = g_strdup_printf ("<i>%s</i>\n<small>%s</small>",
+                                         subject,
+                                         modest_text_utils_get_display_address (address));
        g_free (address);
        g_free (subject);
-       g_free (display_date);
        
-       g_object_set (G_OBJECT(renderer), "text", header, NULL);        
-       set_common_flags (renderer, flags);
+       g_object_set (G_OBJECT(renderer), "markup", header, NULL);      
+/*     set_common_flags (renderer, flags); */
        
        g_free (header);
 }
@@ -247,3 +328,26 @@ _modest_header_view_size_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
 
        g_free (size_str);
  }
+
+void
+_modest_header_view_status_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
+                                    GtkTreeModel *tree_model,  GtkTreeIter *iter,
+                                    gpointer user_data)
+{
+        TnyHeaderFlags flags;
+       guint status;
+       gchar *status_str;
+       
+       gtk_tree_model_get (tree_model, iter,
+                          TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+                          TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
+                           -1);
+       
+/*     size_str = modest_text_utils_get_display_size (size); */
+       status_str = g_strdup(_("Wating ..."));
+       
+       g_object_set (G_OBJECT(renderer), "text", status_str, NULL);
+       set_common_flags (renderer, flags);
+
+       g_free (status_str);
+ }

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 401c784..b241bb6 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -46,19 +46,21 @@ static void modest_header_view_class_init  (ModestHeaderViewClass *klass);
 static void modest_header_view_init        (ModestHeaderView *obj);
 static void modest_header_view_finalize    (GObject *obj);
 
-static gboolean     on_header_clicked      (GtkWidget *widget, 
+static gboolean      on_header_clicked      (GtkWidget *widget, 
                                            GdkEventButton *event, 
                                            gpointer user_data);
 
-static gint         cmp_rows               (GtkTreeModel *tree_model, 
-                                           GtkTreeIter *iter1, 
-                                           GtkTreeIter *iter2,
-                                           gpointer user_data);
+static gint          cmp_rows               (GtkTreeModel *tree_model, 
+                                            GtkTreeIter *iter1, 
+                                            GtkTreeIter *iter2,
+                                            gpointer user_data);
 
-static void         on_selection_changed   (GtkTreeSelection *sel, 
-                                           gpointer user_data);
+static void          on_selection_changed   (GtkTreeSelection *sel, 
+                                            gpointer user_data);
+
+static void          setup_drag_and_drop    (GtkTreeView *self);
 
-static void         setup_drag_and_drop    (GtkTreeView *self);
+static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
 
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
@@ -215,8 +217,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
 {
        GtkTreeModel *sortable;
        GtkTreeViewColumn *column=NULL;
+       GtkTreeSelection *selection = NULL;
        GtkCellRenderer *renderer_msgtype,*renderer_header,
-               *renderer_attach;
+               *renderer_attach,  *renderer_comptact_flag, 
+               *renderer_compact_date;
        ModestHeaderViewPrivate *priv;
        const GList *cursor;
        
@@ -226,9 +230,17 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
        renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
        renderer_header  = gtk_cell_renderer_text_new ();
+       renderer_comptact_flag  = gtk_cell_renderer_pixbuf_new ();
+       renderer_compact_date  = gtk_cell_renderer_text_new ();
+
+       g_object_set(G_OBJECT(renderer_compact_date),
+                    "xalign", 1.0,
+                    NULL);
        
        remove_all_columns (self);
 
+       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
        sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
 
        /* Add new columns */
@@ -278,6 +290,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
+                       column = get_new_column (_("F"), renderer_comptact_flag, FALSE,
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_flag_cell_data,
+                                                NULL);
+                       gtk_tree_view_column_set_fixed_width (column, 45);
+                       break;
+
                case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
                        column = get_new_column (_("Header"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
@@ -304,15 +325,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                        break;
                        
                case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
-                       column = get_new_column (_("Received"), renderer_header, TRUE,
+                       column = get_new_column (_("Received"), renderer_compact_date, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
                                                 TRUE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
                                                 GINT_TO_POINTER(TRUE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
-                       column = get_new_column (_("Sent"), renderer_header, TRUE,
+               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:                                             
+                       column = get_new_column (_("Sent"), renderer_compact_date, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                                 TRUE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
@@ -326,6 +347,13 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 (GtkTreeCellDataFunc)_modest_header_view_size_cell_data,
                                                 NULL); 
                        break;
+               case MODEST_HEADER_VIEW_COLUMN_STATUS:
+                       column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
+                                                NULL); 
+                       break;
 
                default:
                        g_return_val_if_reached(FALSE);
@@ -510,14 +538,22 @@ modest_header_view_select_next (ModestHeaderView *self)
        GtkTreeSelection *sel;
        GtkTreeIter iter;
        GtkTreeModel *model;
+       GtkTreePath *path;
 
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-       if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
+               
+               /* Move path down and selects new one  */
                if (gtk_tree_model_iter_next (model, &iter)) {
                        gtk_tree_selection_select_iter (sel, &iter);
                        scroll_to_selected (self, &iter, FALSE);        
                }
+               gtk_tree_path_free(path);
        }
+       
 }
 
 void 
@@ -529,8 +565,10 @@ modest_header_view_select_prev (ModestHeaderView *self)
        GtkTreePath *path;
 
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-       if (gtk_tree_selection_get_selected (sel, &model, &iter)) {             
-               path = gtk_tree_model_get_path (model, &iter);
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
 
                /* Move path up */
                if (gtk_tree_path_prev (path)) {
@@ -795,13 +833,12 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
 static gboolean
 on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
+       ModestHeaderView *self = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreePath *path = NULL;
        GtkTreeIter iter;
-       GtkTreeSelection *sel;
-       GtkTreeModel *model;
+       GtkTreeModel *model = NULL;
        TnyHeader *header;
-
        /* ignore everything but doubleclick */
        if (event->type != GDK_2BUTTON_PRESS)
                return FALSE;
@@ -809,12 +846,10 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
        self = MODEST_HEADER_VIEW (widget);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
        
-       sel   = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
-               return FALSE; /* msg was _un_selected */
-
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
+               return FALSE;
+                       
        /* get the first selected item */
        gtk_tree_model_get (model, &iter,
                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
@@ -826,6 +861,7 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 
        /* Free */
        g_object_unref (G_OBJECT (header));
+       gtk_tree_path_free(path);
 
        return TRUE;
 }
@@ -836,6 +872,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
        GtkTreeModel *model;
        TnyHeader *header;
+       GtkTreePath *path = NULL;       
        GtkTreeIter iter;
        ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
@@ -845,8 +882,9 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        
        self = MODEST_HEADER_VIEW (user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
+
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
                return; /* msg was _un_selected */
 
        gtk_tree_model_get (model, &iter,
@@ -859,6 +897,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       0, header);
 
        g_object_unref (G_OBJECT (header));
+       gtk_tree_path_free(path);
 }
 
 
@@ -1009,14 +1048,12 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
                  GtkSelectionData *selection_data, 
                  guint info,  guint time, gpointer data)
 {
-       GtkTreeSelection *selection;
        GtkTreeModel *model;
        GtkTreeIter iter;
        GtkTreePath *source_row;
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       gtk_tree_selection_get_selected (selection, &model, &iter);
-       source_row = gtk_tree_model_get_path (model, &iter);
+       
+       source_row = get_selected_row (GTK_TREE_VIEW(widget), &model);
+       if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
 
        switch (info) {
        case MODEST_HEADER_ROW:
@@ -1058,3 +1095,27 @@ setup_drag_and_drop (GtkTreeView *self)
        g_signal_connect(G_OBJECT (self), "drag_data_get",
                         G_CALLBACK(drag_data_get_cb), NULL);
 }
+
+static GtkTreePath *
+get_selected_row (GtkTreeView *self, GtkTreeModel **model) 
+{
+       GtkTreePath *path = NULL;
+       GtkTreeSelection *sel = NULL;   
+       GList *rows = NULL;
+
+       sel   = gtk_tree_view_get_selection(self);
+       rows = gtk_tree_selection_get_selected_rows (sel, model);
+       
+       if ((rows == NULL) || (g_list_length(rows) != 1))
+               goto frees;
+
+       path = gtk_tree_path_copy(g_list_nth_data (rows, 0));
+       
+
+       /* Free */
+ frees:
+       g_list_foreach(rows,(GFunc) gtk_tree_path_free, NULL);
+       g_list_free(rows);
+
+       return path;
+}

diff --git a/src/widgets/modest-header-view.h b/src/widgets/modest-header-view.h
index ad086b0..5ecaa50 100644 (file)
--- a/src/widgets/modest-header-view.h
+++ b/src/widgets/modest-header-view.h
@@ -65,10 +65,12 @@ typedef enum _ModestHeaderViewColumn {
        MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
        MODEST_HEADER_VIEW_COLUMN_ATTACH,
        MODEST_HEADER_VIEW_COLUMN_SIZE,
+       MODEST_HEADER_VIEW_COLUMN_STATUS,
        /*
         * these two are for compact display on small devices,
         * with two line display with all relevant headers
         */
+       MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG,       /* priority and attachments */
        MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN,  /* incoming mail */
        MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT, /* outgoing mail */