X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=776d15ee95e2c6fdad1323553693c703a43868be;hp=4fc28a43f59182849ff1eccc68b412fd1ece9753;hb=839a44d74460225883a7f8e9f718c5cae4928ed9;hpb=d7a21489c70d2e49d36b8213e14b7a3e769903f1;ds=sidebyside diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 4fc28a4..776d15e 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -51,6 +51,7 @@ 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 void modest_header_view_dispose (GObject *obj); static void on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer userdata); @@ -60,6 +61,15 @@ static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter2, gpointer user_data); +static gint cmp_subject_rows (GtkTreeModel *tree_model, + GtkTreeIter *iter1, + GtkTreeIter *iter2, + gpointer user_data); + +static gboolean filter_row (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data); + static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data); @@ -76,7 +86,9 @@ static void folder_monitor_update (TnyFolderObserver *self, static void tny_folder_observer_init (TnyFolderObserverIface *klass); -static void _on_new_folder_assigned (const GObject *obj, TnyFolder *folder, gpointer user_data); +static void _clipboard_set_selected_data (ModestHeaderView *header_view, gboolean delete); + +static void _clear_hidding_filter (ModestHeaderView *header_view); typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate; @@ -87,6 +99,13 @@ struct _ModestHeaderViewPrivate { TnyFolderMonitor *monitor; GMutex *observers_lock; + /* not unref this object, its a singlenton */ + ModestEmailClipboard *clipboard; + + /* Filter tree model */ + gchar **hidding_ids; + guint n_selected; + gint sort_colid[2][TNY_FOLDER_TYPE_NUM]; gint sort_type[2][TNY_FOLDER_TYPE_NUM]; @@ -166,6 +185,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_header_view_finalize; + gobject_class->dispose = modest_header_view_dispose; g_type_class_add_private (gobject_class, sizeof(ModestHeaderViewPrivate)); @@ -259,7 +279,7 @@ remove_all_columns (ModestHeaderView *obj) gboolean modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type) { - GtkTreeModel *sortable; + GtkTreeModel *tree_filter, *sortable; GtkTreeViewColumn *column=NULL; GtkTreeSelection *selection = NULL; GtkCellRenderer *renderer_msgtype,*renderer_header, @@ -321,7 +341,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn 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)); +/* sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */ + tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter)); /* Add new columns */ for (cursor = columns; cursor; cursor = g_list_next(cursor)) { @@ -447,6 +469,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, (GtkTreeIterCompareFunc) cmp_rows, compact_column, NULL); + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable), + TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, + (GtkTreeIterCompareFunc) cmp_subject_rows, + compact_column, NULL); } @@ -466,6 +492,10 @@ modest_header_view_init (ModestHeaderView *obj) priv->monitor = NULL; priv->observers_lock = g_mutex_new (); + priv->clipboard = modest_runtime_get_email_clipboard (); + priv->hidding_ids = NULL; + priv->n_selected = 0; + /* Sort parameters */ for (j=0; j < 2; j++) { for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) { @@ -478,6 +508,24 @@ modest_header_view_init (ModestHeaderView *obj) } static void +modest_header_view_dispose (GObject *obj) +{ + ModestHeaderView *self; + ModestHeaderViewPrivate *priv; + + self = MODEST_HEADER_VIEW(obj); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + if (priv->folder) { + tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj)); + g_object_unref (G_OBJECT (priv->folder)); + priv->folder = NULL; + } + + G_OBJECT_CLASS(parent_class)->dispose (obj); +} + +static void modest_header_view_finalize (GObject *obj) { ModestHeaderView *self; @@ -494,11 +542,8 @@ modest_header_view_finalize (GObject *obj) g_mutex_unlock (priv->observers_lock); g_mutex_free (priv->observers_lock); - if (priv->folder) { - tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj)); - g_object_unref (G_OBJECT (priv->folder)); - priv->folder = NULL; - } + /* Clear hidding array created by cut operation */ + _clear_hidding_filter (MODEST_HEADER_VIEW (obj)); G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -520,7 +565,7 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); modest_header_view_set_style (self, style); - modest_header_view_set_folder (self, NULL); +/* modest_header_view_set_folder (self, NULL, NULL, NULL); */ gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj)); gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE); @@ -543,6 +588,37 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) } +guint +modest_header_view_count_selected_headers (ModestHeaderView *self) +{ + GtkTreeSelection *sel; + guint selected_rows; + + g_return_val_if_fail (self, 0); + + /* Get selection object and check selected rows count */ + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + selected_rows = gtk_tree_selection_count_selected_rows (sel); + + return selected_rows; +} + +gboolean +modest_header_view_has_selected_headers (ModestHeaderView *self) +{ + GtkTreeSelection *sel; + gboolean empty; + + g_return_val_if_fail (self, FALSE); + + /* Get selection object and check selected rows count */ + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + empty = gtk_tree_selection_count_selected_rows (sel) == 0; + + return !empty; +} + + TnyList * modest_header_view_get_selected_headers (ModestHeaderView *self) { @@ -737,21 +813,17 @@ modest_header_view_get_style (ModestHeaderView *self) 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); - - return; +/* 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* @@ -773,7 +845,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) TnyList *headers; ModestHeaderViewPrivate *priv; GList *cols, *cursor; - GtkTreeModel *sortable; + GtkTreeModel *filter_model, *sortable; guint sort_colid; GtkSortType sort_type; @@ -800,6 +872,14 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); g_object_unref (G_OBJECT (headers)); + /* Create a tree model filter to hide and show rows for cut operations */ + filter_model = gtk_tree_model_filter_new (sortable, NULL); + gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), + filter_row, + self, + NULL); + g_object_unref (G_OBJECT (sortable)); + /* install our special sorting functions */ cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); @@ -815,11 +895,17 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, (GtkTreeIterCompareFunc) cmp_rows, cols->data, NULL); + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), + TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, + (GtkTreeIterCompareFunc) cmp_subject_rows, + cols->data, NULL); } /* Set new model */ - modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); - g_object_unref (G_OBJECT (sortable)); + modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model); + 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); @@ -831,12 +917,14 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self, GtkSortType sort_type) { ModestHeaderViewPrivate *priv = NULL; - GtkTreeModel *sortable = NULL; + GtkTreeModel *tree_filter, *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)); + tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter)); +/* sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */ /* Sort tree model */ type = modest_tny_folder_guess_folder_type (priv->folder); @@ -895,10 +983,12 @@ modest_header_view_get_sort_type (ModestHeaderView *self, } void -modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) +modest_header_view_set_folder (ModestHeaderView *self, + TnyFolder *folder, + RefreshAsyncUserCallback callback, + gpointer user_data) { ModestHeaderViewPrivate *priv; - ModestMailOperation *mail_op = NULL; ModestWindowMgr *mgr = NULL; GObject *source = NULL; @@ -913,6 +1003,7 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) } if (folder) { + ModestMailOperation *mail_op = NULL; /* Get main window to use it as source of mail operation */ mgr = modest_runtime_get_window_mgr (); @@ -934,12 +1025,11 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) /* Refresh the folder asynchronously */ modest_mail_operation_refresh_folder (mail_op, folder, - _on_new_folder_assigned, - NULL); + callback, + user_data); /* Free */ g_object_unref (mail_op); - } else { g_mutex_lock (priv->observers_lock); @@ -1037,6 +1127,16 @@ _modest_header_view_change_selection (GtkTreeSelection *selection, on_selection_changed (selection, user_data); } +static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) +{ + p1 = p1 & TNY_HEADER_FLAG_PRIORITY; + p2 = p2 & TNY_HEADER_FLAG_PRIORITY; + if (p1 == 0) + p1 = TNY_HEADER_FLAG_LOW_PRIORITY + 1; + if (p2 == 0) + p2 = TNY_HEADER_FLAG_LOW_PRIORITY + 1; + return p1 - p2; +} static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, @@ -1051,14 +1151,8 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0); /* col_id = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (tree_model)); */ col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT)); + -/* if (!(++counter % 100)) { */ -/* GObject *header_view = g_object_get_data(G_OBJECT(user_data), */ -/* MODEST_HEADER_VIEW_PTR); */ -/* g_signal_emit (header_view, */ -/* signals[STATUS_UPDATE_SIGNAL], */ -/* 0, _("Sorting..."), 0, 0); */ -/* } */ switch (col_id) { case TNY_HEADER_FLAG_ATTACHMENTS: @@ -1080,10 +1174,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, /* This is for making priority values respect the intuitive sort relationship * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */ - if (val1 == 0) val1 = 2; - if (val2 == 0) val2 = 2; - - cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - (val2 & TNY_HEADER_FLAG_PRIORITY); + cmp = compare_priorities (val1, val2); return cmp ? cmp : t1 - t2; @@ -1092,6 +1183,30 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, } } +static gint +cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, + gpointer user_data) +{ + gint t1, t2; + gchar *val1, *val2; + gint cmp; +/* static int counter = 0; */ + + g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0); + + gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_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_SUBJECT_COLUMN, &val2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1); + + cmp = modest_text_utils_utf8_strcmp (val1 + modest_text_utils_get_subject_prefix_len(val1), + val2 + modest_text_utils_get_subject_prefix_len(val2), + TRUE); + g_free (val1); + g_free (val2); + return cmp; +} + /* Drag and drop stuff */ static void drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, @@ -1273,8 +1388,12 @@ idle_notify_headers_count_changed (gpointer data) priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self); g_mutex_lock (priv->observers_lock); + /* Emmit signal to evaluate how headers changes affects to the window view */ g_signal_emit (G_OBJECT(helper->self), signals[MSG_COUNT_CHANGED_SIGNAL], 0, folder, helper->change); + /* Added or removed headers, so data sotred on cliboard are invalid */ + modest_email_clipboard_clear (priv->clipboard); + g_mutex_unlock (priv->observers_lock); return FALSE; @@ -1309,29 +1428,126 @@ folder_monitor_update (TnyFolderObserver *self, } } +void +modest_header_view_clear (ModestHeaderView *self) +{ + modest_header_view_set_folder (self, NULL, NULL, NULL); +} + +void +modest_header_view_copy_selection (ModestHeaderView *header_view) +{ + /* Copy selection */ + _clipboard_set_selected_data (header_view, FALSE); +} + +void +modest_header_view_cut_selection (ModestHeaderView *header_view) +{ + ModestHeaderViewPrivate *priv = NULL; + GtkTreeModel *model = NULL; + const gchar **hidding = NULL; + guint i, n_selected; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); + + /* Copy selection */ + _clipboard_set_selected_data (header_view, TRUE); + + /* Get hidding ids */ + hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); + + /* Clear hidding array created by previous cut operation */ + _clear_hidding_filter (MODEST_HEADER_VIEW (header_view)); + + /* Copy hidding array */ + priv->n_selected = n_selected; + priv->hidding_ids = g_malloc0(sizeof(gchar *) * n_selected); + for (i=0; i < n_selected; i++) + priv->hidding_ids[i] = g_strdup(hidding[i]); + + /* Hide cut headers */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + if (GTK_IS_TREE_MODEL_FILTER (model)) + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); +} + + + static void -_on_new_folder_assigned (const GObject *obj, TnyFolder *folder, gpointer user_data) +_clipboard_set_selected_data (ModestHeaderView *header_view, + gboolean delete) { - ModestMainWindow *win = NULL; - gboolean folder_empty = FALSE; + ModestHeaderViewPrivate *priv = NULL; + TnyList *headers = NULL; - g_return_if_fail (TNY_IS_FOLDER (folder)); + g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); + + /* Set selected data on clipboard */ + g_return_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard)); + headers = modest_header_view_get_selected_headers (header_view); + modest_email_clipboard_set_data (priv->clipboard, priv->folder, headers, delete); - if (!MODEST_IS_MAIN_WINDOW (obj)) return; - win = MODEST_MAIN_WINDOW (obj); + /* Free */ + g_object_unref (headers); +} + + + +static gboolean +filter_row (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + ModestHeaderViewPrivate *priv = NULL; + TnyHeader *header = NULL; + guint i; + gchar *id = NULL; + gboolean found = FALSE; - /* Check if folder is empty and set headers view contents style */ - folder_empty = tny_folder_get_all_count (folder) == 0; - if (folder_empty) { - modest_main_window_set_contents_style (win, - MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); - } - else { - modest_main_window_set_contents_style (win, - MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); -/* modest_widget_memory_restore (conf, G_OBJECT(header_view), */ -/* MODEST_CONF_HEADER_VIEW_KEY); */ - } + g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data); + + /* If no data on clipboard, return always TRUE */ + if (modest_email_clipboard_cleared(priv->clipboard)) return TRUE; + + /* Get header from model */ + gtk_tree_model_get (model, iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, + -1); + + /* Get message id from header (ensure is a valid id) */ + if (!header) return FALSE; + id = g_strdup(tny_header_get_message_id (header)); + /* Check hiding */ + if (priv->hidding_ids != NULL) + for (i=0; i < priv->n_selected && !found; i++) + if (priv->hidding_ids[i] != NULL && id != NULL) + found = (!strcmp (priv->hidding_ids[i], id)); + + /* Free */ + g_object_unref (header); + g_free(id); + + return !found; +} + +static void +_clear_hidding_filter (ModestHeaderView *header_view) +{ + ModestHeaderViewPrivate *priv; + guint i; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); + + if (priv->hidding_ids != NULL) { + for (i=0; i < priv->n_selected; i++) + g_free (priv->hidding_ids[i]); + g_free(priv->hidding_ids); + } }