* Add new header settings parameter (sort) to select

[modest] / src / widgets / modest-header-view.c

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index bb1ea4a..ff745ba 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -73,6 +73,7 @@ struct _ModestHeaderViewPrivate {
 
        TnyFolderMonitor     *monitor;
        GMutex               *monitor_lock;
+       gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
 };
 
 #define MODEST_HEADER_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -216,7 +217,7 @@ remove_all_columns (ModestHeaderView *obj)
 }
 
 gboolean
-modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
+modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type)
 {
        GtkTreeModel *sortable;
        GtkTreeViewColumn *column=NULL;
@@ -331,23 +332,38 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                        break;
                        
                case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
-                       column = get_new_column (_("Received"), renderer_compact_date, FALSE,
+                       column = get_new_column (_("Received"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
                                                 TRUE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
                                                 GINT_TO_POINTER(TRUE));
-                       gtk_tree_view_column_set_fixed_width (column, 130);
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:                                             
-                       column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
+               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:  
+                       column = get_new_column (_("Sent"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                                 TRUE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
                                                 GINT_TO_POINTER(FALSE));
+                       break;
+                       
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
+                       column = get_new_column (_("Received"), renderer_compact_date, FALSE,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
+                                                GINT_TO_POINTER(TRUE));
                        gtk_tree_view_column_set_fixed_width (column, 130);
                        break;
                        
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:                                             
+                       column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
+                                                GINT_TO_POINTER(FALSE));
+                       gtk_tree_view_column_set_fixed_width (column, 130);
+                       break;
                case MODEST_HEADER_VIEW_COLUMN_SIZE:
                        column = get_new_column (_("Size"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
@@ -367,7 +383,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                        g_return_val_if_reached(FALSE);
                }
 
-               if (sortable)
+               if (sortable) 
                        gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
                                                         col, (GtkTreeIterCompareFunc)cmp_rows,
                                                         column, NULL);
@@ -381,7 +397,8 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                   self);
                gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);              
        }       
-
+       
+       
        return TRUE;
 }
 
@@ -389,6 +406,7 @@ static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
+       guint i, j;
 
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
@@ -396,7 +414,9 @@ modest_header_view_init (ModestHeaderView *obj)
 
        priv->monitor        = NULL;
        priv->monitor_lock   = g_mutex_new ();
-
+       for (j=0; j < 2; j++)
+               for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) 
+                       priv->sort_colid[j][i] = -1;
 
        setup_drag_and_drop (GTK_TREE_VIEW (obj));
 }
@@ -791,6 +811,30 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
 }
 
 void
+modest_header_view_set_sort_column_id (ModestHeaderView *self, guint sort_colid, TnyFolderType type)
+{
+       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
+
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       priv->sort_colid[style][type] = sort_colid;
+}
+
+gint
+modest_header_view_get_sort_column_id (ModestHeaderView *self, TnyFolderType type)
+{
+       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
+
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       return priv->sort_colid[style][type];
+}
+
+void
 modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
 {
        ModestHeaderViewPrivate *priv;
@@ -935,9 +979,10 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint t1, t2;
        gint val1, val2;
        gchar *s1, *s2;
-       gint cmp;
-       
+       gint cmp;       
        static int counter = 0;
+
+       g_return_val_if_fail (G_IS_OBJECT(user_data), 0);
        col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
        
        if (!(++counter % 100)) {
@@ -951,6 +996,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
                /* first one, we decide based on the time */
        case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
        case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
 
                gtk_tree_model_get (tree_model, iter1,
@@ -962,6 +1008,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                return t1 - t2;
 
        case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
        case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
                gtk_tree_model_get (tree_model, iter1,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
@@ -1142,8 +1189,8 @@ on_focus_in (GtkWidget     *self,
 {
        GtkTreeSelection *selection;
        GtkTreeModel *model;
-       GList *selected;
-       GtkTreePath *start_path, *end_path, *selected_path;
+       GList *selected = NULL;
+       GtkTreePath *selected_path = NULL;
 
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (!model)
@@ -1169,6 +1216,9 @@ on_focus_in (GtkWidget     *self,
        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)) {
@@ -1185,6 +1235,7 @@ on_focus_in (GtkWidget     *self,
                                                      0.0);
                }
        }
+       #endif /* GTK_CHECK_VERSION */
 
        /* Frees */     
        g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);