* Add two new columns to show compact Sent/Received date. This change

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

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index fcda9d5..85d5f78 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -331,23 +331,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,
@@ -1142,7 +1157,8 @@ on_focus_in (GtkWidget     *self,
 {
        GtkTreeSelection *selection;
        GtkTreeModel *model;
-       GList *selected;
+       GList *selected = NULL;
+       GtkTreePath *selected_path = NULL;
 
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (!model)
@@ -1165,14 +1181,29 @@ on_focus_in (GtkWidget     *self,
 
        /* Need to get the all the rows because is selection multiple */
        selected = gtk_tree_selection_get_selected_rows (selection, &model);
-
-       /* Scroll to first path */
-       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self),
-                                     (GtkTreePath *) selected->data,
-                                     NULL,
-                                     TRUE,
-                                     0.5,
-                                     0.0);
+       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);
+               }
+       }
+       #endif /* GTK_CHECK_VERSION */
 
        /* Frees */     
        g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);