X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=cb9b1e980d249ceaf35297e872721f2649fb2751;hb=b267362311d6c82f71987833ad14ddfaedc21390;hp=0ad815fb6f0e2cf9c2baa56a89492a6fd33d957a;hpb=2616bf234fba8b57ec165ab7027155008e63ba92;p=modest diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 0ad815f..cb9b1e9 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -73,6 +74,11 @@ struct _ModestHeaderViewPrivate { TnyFolderMonitor *monitor; GMutex *monitor_lock; + + gint sort_colid[2][TNY_FOLDER_TYPE_NUM]; + gint sort_type[2][TNY_FOLDER_TYPE_NUM]; + + }; #define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -206,7 +212,7 @@ static void remove_all_columns (ModestHeaderView *obj) { GList *columns, *cursor; - + columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj)); for (cursor = columns; cursor; cursor = cursor->next) @@ -216,7 +222,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; @@ -236,6 +242,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) renderer_comptact_flag = gtk_cell_renderer_pixbuf_new (); renderer_compact_date = gtk_cell_renderer_text_new (); + g_object_set(G_OBJECT(renderer_header), + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); g_object_set(G_OBJECT(renderer_compact_date), "xalign", 1.0, NULL); @@ -328,21 +337,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, TRUE, + 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)); break; - case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: - column = get_new_column (_("Sent"), renderer_compact_date, TRUE, + 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, @@ -362,11 +388,13 @@ 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, + col, + (GtkTreeIterCompareFunc) cmp_rows, column, NULL); - + } + /* we keep the column id around */ g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN, GINT_TO_POINTER(col)); @@ -375,7 +403,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR, self); gtk_tree_view_append_column (GTK_TREE_VIEW(self), column); - } + } return TRUE; } @@ -384,6 +412,7 @@ static void modest_header_view_init (ModestHeaderView *obj) { ModestHeaderViewPrivate *priv; + guint i, j; priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); @@ -392,6 +421,13 @@ modest_header_view_init (ModestHeaderView *obj) priv->monitor = NULL; priv->monitor_lock = g_mutex_new (); + /* Sort parameters */ + for (j=0; j < 2; j++) { + for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) { + priv->sort_colid[j][i] = -1; + priv->sort_type[j][i] = GTK_SORT_DESCENDING; + } + } setup_drag_and_drop (GTK_TREE_VIEW (obj)); } @@ -417,7 +453,7 @@ modest_header_view_finalize (GObject *obj) g_object_unref (G_OBJECT (priv->folder)); priv->folder = NULL; } - + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -596,6 +632,7 @@ modest_header_view_get_columns (ModestHeaderView *self) return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); } + gboolean modest_header_view_is_empty (ModestHeaderView *self) { @@ -665,65 +702,12 @@ modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model) /* Set new model */ gtk_tree_view_set_model (header_view, model); - - modest_runtime_verify_object_death (old_model, ""); - modest_runtime_verify_object_death (old_model_sort, ""); } else gtk_tree_view_set_model (header_view, model); return; } -static void -on_progress_changed (ModestMailOperation *mail_op, - ModestHeaderView *self) -{ - GtkTreeModel *sortable; - ModestHeaderViewPrivate *priv; - GList *cols, *cursor; - TnyList *headers; - - if (!modest_mail_operation_is_finished (mail_op)) - return; - - if (modest_mail_operation_get_error (mail_op)) - return; - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - - headers = TNY_LIST (tny_gtk_header_list_model_new ()); - - tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - priv->folder, TRUE); - - sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); - g_object_unref (G_OBJECT (headers)); - - /* install our special sorting functions */ - cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); - while (cursor) { - gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data), - MODEST_HEADER_VIEW_COLUMN)); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), - col_id, - (GtkTreeIterCompareFunc) cmp_rows, - cursor->data, NULL); - cursor = g_list_next(cursor); - } - g_list_free (cols); - - /* Set new model */ - modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); - g_object_unref (G_OBJECT (sortable)); - - /* Add a folder observer */ - g_mutex_lock (priv->monitor_lock); - priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (priv->folder)); - tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); - tny_folder_monitor_start (priv->monitor); - g_mutex_unlock (priv->monitor_lock); -} - TnyFolder* modest_header_view_get_folder (ModestHeaderView *self) { @@ -739,10 +723,13 @@ modest_header_view_get_folder (ModestHeaderView *self) static void modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) { + TnyFolderType type; TnyList *headers; ModestHeaderViewPrivate *priv; GList *cols, *cursor; GtkTreeModel *sortable; + guint sort_colid; + GtkSortType sort_type; priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -777,20 +764,103 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) cursor->data, NULL); cursor = g_list_next(cursor); } - g_list_free (cols); + /* Restore sort column id */ + if (cols) { + type = modest_tny_folder_guess_folder_type (folder); + sort_colid = modest_header_view_get_sort_column_id (self, type); + sort_type = modest_header_view_get_sort_type (self, type); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + sort_colid, + sort_type); + } /* Set new model */ modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); g_object_unref (G_OBJECT (sortable)); + + /* Free */ + g_list_free (cols); +} + +void +modest_header_view_sort_by_column_id (ModestHeaderView *self, + guint sort_colid, + GtkSortType sort_type) +{ + ModestHeaderViewPrivate *priv = NULL; + GtkTreeModel *sortable = NULL; + TnyFolderType type; + + /* Get model and private data */ + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + + /* Sort tree model */ + type = modest_tny_folder_guess_folder_type (priv->folder); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + sort_colid, + sort_type); + /* Store new sort parameters */ + modest_header_view_set_sort_params (self, sort_colid, sort_type, type); + + /* Save GConf parameters */ +/* modest_widget_memory_save (modest_runtime_get_conf(), */ +/* G_OBJECT(self), "header-view"); */ + +} + +void +modest_header_view_set_sort_params (ModestHeaderView *self, + guint sort_colid, + GtkSortType sort_type, + 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; + priv->sort_type[style][type] = sort_type; +} + +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]; +} + +GtkSortType +modest_header_view_get_sort_type (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_type[style][type]; } void modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) { ModestHeaderViewPrivate *priv; + ModestWindow *win = NULL; priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + win = MODEST_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET(self))); + g_return_if_fail (MODEST_IS_WINDOW (win)); if (priv->folder) { g_object_unref (priv->folder); @@ -800,6 +870,7 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) if (folder) { ModestMailOperation *mail_op; + /* Set folder in the model */ modest_header_view_set_folder_intern (self, folder); /* Pick my reference. Nothing to do with the mail operation */ @@ -809,14 +880,10 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL); /* Create the mail operation */ - mail_op = modest_mail_operation_new (); + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, G_OBJECT(win)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - /* Register a mail operation observer */ - g_signal_connect (mail_op, "progress-changed", - G_CALLBACK (on_progress_changed), self); - /* Refresh the folder asynchronously */ modest_mail_operation_refresh_folder (mail_op, folder); @@ -930,9 +997,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gint t1, t2; gint val1, val2; gchar *s1, *s2; - gint cmp; - + gint cmp; + gint sort_colid; static int counter = 0; + + g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0); col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN)); if (!(++counter % 100)) { @@ -942,10 +1011,27 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, signals[STATUS_UPDATE_SIGNAL], 0, _("Sorting..."), 0, 0); } - switch (col_id) { - - /* first one, we decide based on the time */ + switch (col_id) { case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN: + case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT: + sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(user_data)); + gtk_tree_model_get (tree_model, iter1, + sort_colid, &s1, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, + -1); + gtk_tree_model_get (tree_model, iter2, + sort_colid, &s2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + -1); + cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE); + g_free (s1); + g_free (s2); + + return cmp ? cmp : t1 - t2; + + break; + + case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE: case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: gtk_tree_model_get (tree_model, iter1, @@ -956,7 +1042,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, &t2,-1); 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, @@ -1043,6 +1129,28 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, return cmp ? cmp : t1 - t2; + case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG: + gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1); + gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1); + + int flag_sort = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT)); + switch (flag_sort) { + case TNY_HEADER_FLAG_ATTACHMENTS: + cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) - + (val2 & TNY_HEADER_FLAG_ATTACHMENTS); + break; + case TNY_HEADER_FLAG_PRIORITY: + cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - + (val2 & TNY_HEADER_FLAG_PRIORITY); + break; + default: + cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - + (val2 & TNY_HEADER_FLAG_PRIORITY); + } + + return cmp ? cmp : t1 - t2; default: return &iter1 - &iter2; /* oughhhh */ } @@ -1137,7 +1245,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) @@ -1160,14 +1269,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);