X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=996cbae2a059fe5d167f4f7e02e4379f9f6c2f48;hp=5b4aedd34fbacb267d67bf5e4cd08c20eec6a526;hb=HEAD;hpb=59b14198e1f8d28945cd7966a66e17122907094e diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 5b4aedd..996cbae 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -50,6 +50,10 @@ #include #include #include +#include +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#endif static void modest_header_view_class_init (ModestHeaderViewClass *klass); static void modest_header_view_init (ModestHeaderView *obj); @@ -73,7 +77,7 @@ static gboolean filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data); -static void on_account_removed (TnyAccountStore *self, +static void on_account_removed (TnyAccountStore *self, TnyAccount *account, gpointer user_data); @@ -104,7 +108,7 @@ static gboolean on_focus_out (GtkWidget *self, gpointer user_data); #endif -static void folder_monitor_update (TnyFolderObserver *self, +static void folder_monitor_update (TnyFolderObserver *self, TnyFolderChange *change); static void tny_folder_observer_init (TnyFolderObserverIface *klass); @@ -121,6 +125,10 @@ static gboolean modest_header_view_on_expose_event (GtkTreeView *header_vie GdkEventExpose *event, gpointer user_data); +static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata); +static void update_style (ModestHeaderView *self); +static void modest_header_view_refilter_by_chunks (ModestHeaderView *self); + typedef enum { HEADER_VIEW_NON_EMPTY, HEADER_VIEW_EMPTY, @@ -148,6 +156,10 @@ struct _ModestHeaderViewPrivate { guint n_selected; GtkTreeRowReference *autoselect_reference; ModestHeaderViewFilter filter; +#ifdef MODEST_TOOLKIT_HILDON2 + GtkWidget *live_search; + guint live_search_timeout; +#endif gint sort_colid[2][TNY_FOLDER_TYPE_NUM]; gint sort_type[2][TNY_FOLDER_TYPE_NUM]; @@ -162,12 +174,29 @@ struct _ModestHeaderViewPrivate { gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */ ModestDatetimeFormatter *datetime_formatter; + + GtkCellRenderer *renderer_subject; + GtkCellRenderer *renderer_address; + GtkCellRenderer *renderer_date_status; + + GdkColor active_color; + GdkColor secondary_color; + + gchar *filter_string; + gchar **filter_string_splitted; + gboolean filter_date_range; + time_t date_range_start; + time_t date_range_end; + + guint refilter_handler_id; + GtkTreeModel *filtered_model; + GtkTreeIter refilter_iter; }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; struct _HeadersCountChangedHelper { ModestHeaderView *self; - TnyFolderChange *change; + TnyFolderChange *change; }; @@ -179,6 +208,12 @@ struct _HeadersCountChangedHelper { #define MODEST_HEADER_VIEW_PTR "modest-header-view" +#define _HEADER_VIEW_SUBJECT_FOLD "_subject_modest_header_view" +#define _HEADER_VIEW_FROM_FOLD "_from_modest_header_view" +#define _HEADER_VIEW_TO_FOLD "_to_modest_header_view" +#define _HEADER_VIEW_CC_FOLD "_cc_modest_header_view" +#define _HEADER_VIEW_BCC_FOLD "_bcc_modest_header_view" + enum { HEADER_SELECTED_SIGNAL, HEADER_ACTIVATED_SIGNAL, @@ -212,7 +247,7 @@ modest_header_view_get_type (void) NULL }; - static const GInterfaceInfo tny_folder_observer_info = + static const GInterfaceInfo tny_folder_observer_info = { (GInterfaceInitFunc) tny_folder_observer_init, /* interface_init */ NULL, /* interface_finalize */ @@ -239,10 +274,10 @@ 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)); - - signals[HEADER_SELECTED_SIGNAL] = + + signals[HEADER_SELECTED_SIGNAL] = g_signal_new ("header_selected", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -251,7 +286,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[HEADER_ACTIVATED_SIGNAL] = + signals[HEADER_ACTIVATED_SIGNAL] = g_signal_new ("header_activated", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -259,9 +294,9 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) NULL, NULL, gtk_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); - - - signals[ITEM_NOT_FOUND_SIGNAL] = + + + signals[ITEM_NOT_FOUND_SIGNAL] = g_signal_new ("item_not_found", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -290,7 +325,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) #ifdef MODEST_TOOLKIT_HILDON2 gtk_rc_parse_string ("class \"ModestHeaderView\" style \"fremantle-touchlist\""); - + #endif } @@ -311,9 +346,9 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer, gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_resizable (column, resizable); - if (resizable) + if (resizable) gtk_tree_view_column_set_expand (column, TRUE); - + if (show_as_text) gtk_tree_view_column_add_attribute (column, renderer, "text", sort_col_id); @@ -322,7 +357,7 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer, gtk_tree_view_column_set_sort_indicator (column, FALSE); gtk_tree_view_column_set_reorderable (column, TRUE); - + if (cell_data_func) gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func, user_data, NULL); @@ -334,25 +369,25 @@ 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) gtk_tree_view_remove_column (GTK_TREE_VIEW(obj), GTK_TREE_VIEW_COLUMN(cursor->data)); - g_list_free (columns); + g_list_free (columns); } gboolean modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type) { - GtkTreeModel *tree_filter, *sortable; + GtkTreeModel *sortable, *filter_model; GtkTreeViewColumn *column=NULL; GtkTreeSelection *selection = NULL; GtkCellRenderer *renderer_header, *renderer_attach, *renderer_compact_date_or_status; - GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, - *renderer_subject, *renderer_subject_box, *renderer_recpt, + GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, + *renderer_subject_box, *renderer_recpt, *renderer_priority; ModestHeaderViewPrivate *priv; GtkTreeViewColumn *compact_column = NULL; @@ -360,8 +395,8 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, FALSE); - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); priv->is_outbox = (type == TNY_FOLDER_TYPE_OUTBOX); @@ -374,8 +409,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn renderer_recpt_box = modest_hbox_cell_renderer_new (); renderer_subject_box = modest_hbox_cell_renderer_new (); renderer_recpt = gtk_cell_renderer_text_new (); - renderer_subject = gtk_cell_renderer_text_new (); + priv->renderer_address = renderer_recpt; + priv->renderer_subject = gtk_cell_renderer_text_new (); renderer_compact_date_or_status = gtk_cell_renderer_text_new (); + priv->renderer_date_status = renderer_compact_date_or_status; modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE); g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box); @@ -383,8 +420,8 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set_data (G_OBJECT (renderer_compact_header), "recpt-box-renderer", renderer_recpt_box); modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_priority, FALSE); g_object_set_data (G_OBJECT (renderer_subject_box), "priority-renderer", renderer_priority); - modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_subject, TRUE); - g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", renderer_subject); + modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), priv->renderer_subject, TRUE); + g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", priv->renderer_subject); modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_attach, FALSE); g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach); modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE); @@ -392,6 +429,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE); g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status); +#ifdef MODEST_TOOLKIT_HILDON2 + g_object_set (G_OBJECT (renderer_compact_header), "xpad", 0, NULL); +#endif g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL); #ifndef MODEST_TOOLKIT_GTK gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32); @@ -401,52 +441,68 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set(G_OBJECT(renderer_header), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - g_object_set (G_OBJECT (renderer_subject), + g_object_set (G_OBJECT (priv->renderer_subject), "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0, NULL); - gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (priv->renderer_subject), 1); g_object_set (G_OBJECT (renderer_recpt), - "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0, + "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.1, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1); g_object_set(G_OBJECT(renderer_compact_date_or_status), - "xalign", 1.0, "yalign", 0.0, + "xalign", 1.0, "yalign", 0.1, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1); +#ifdef MODEST_TOOLKIT_HILDON2 + g_object_set (G_OBJECT (renderer_priority), + "yalign", 0.5, + "xalign", 0.0, NULL); + g_object_set (G_OBJECT (renderer_attach), + "yalign", 0.5, + "xalign", 0.0, NULL); +#else g_object_set (G_OBJECT (renderer_priority), - "yalign", 1.0, NULL); + "yalign", 0.5, NULL); g_object_set (G_OBJECT (renderer_attach), "yalign", 0.0, NULL); +#endif -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON1 gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26); gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26); gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); +#elif MODEST_TOOLKIT_HILDON2 + gtk_cell_renderer_set_fixed_size (renderer_attach, 24 + MODEST_MARGIN_DEFAULT, 26); + gtk_cell_renderer_set_fixed_size (renderer_priority, 24 + MODEST_MARGIN_DEFAULT, 26); + gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); #else gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16); gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16); /* gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); */ #endif - + remove_all_columns (self); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); - 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 = NULL; + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (GTK_IS_TREE_MODEL_FILTER (filter_model)) { + sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + } /* Add new columns */ for (cursor = columns; cursor; cursor = g_list_next(cursor)) { ModestHeaderViewColumn col = (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data); - + if (0> col || col >= MODEST_HEADER_VIEW_COLUMN_NUM) { g_printerr ("modest: invalid column %d in column list\n", col); continue; } - + switch (col) { - + case MODEST_HEADER_VIEW_COLUMN_ATTACH: column = get_new_column (_("A"), renderer_attach, FALSE, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, @@ -456,7 +512,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn gtk_tree_view_column_set_fixed_width (column, 45); break; - + case MODEST_HEADER_VIEW_COLUMN_FROM: column = get_new_column (_("From"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, @@ -472,7 +528,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn (GtkTreeCellDataFunc)_modest_header_view_sender_receiver_cell_data, GINT_TO_POINTER(FALSE)); break; - + case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN: column = get_new_column (_("Header"), renderer_compact_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, @@ -493,7 +549,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn compact_column = column; break; - + case MODEST_HEADER_VIEW_COLUMN_SUBJECT: column = get_new_column (_("Subject"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, @@ -501,7 +557,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn (GtkTreeCellDataFunc)_modest_header_view_header_cell_data, NULL); break; - + case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: column = get_new_column (_("Received"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, @@ -509,28 +565,28 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn (GtkTreeCellDataFunc)_modest_header_view_date_cell_data, GINT_TO_POINTER(TRUE)); break; - - case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: + + 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_SIZE: column = get_new_column (_("Size"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, FALSE, (GtkTreeCellDataFunc)_modest_header_view_size_cell_data, - NULL); + NULL); break; case MODEST_HEADER_VIEW_COLUMN_STATUS: column = get_new_column (_("Status"), renderer_compact_date_or_status, TRUE, TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, FALSE, (GtkTreeCellDataFunc)_modest_header_view_status_cell_data, - NULL); + NULL); break; default: @@ -540,15 +596,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn /* we keep the column id around */ g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN, GINT_TO_POINTER(col)); - + /* we need this ptr when sorting the rows */ g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR, self); - gtk_tree_view_append_column (GTK_TREE_VIEW(self), column); - } + gtk_tree_view_append_column (GTK_TREE_VIEW(self), column); + } if (sortable) { - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable), TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, (GtkTreeIterCompareFunc) cmp_rows, compact_column, NULL); @@ -558,6 +614,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn compact_column, NULL); } + update_style (self); + g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self); + return TRUE; } @@ -574,7 +633,7 @@ modest_header_view_init (ModestHeaderView *obj) ModestHeaderViewPrivate *priv; guint i, j; - priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); priv->folder = NULL; priv->is_outbox = FALSE; @@ -594,19 +653,28 @@ modest_header_view_init (ModestHeaderView *obj) priv->hidding_ids = NULL; priv->n_selected = 0; priv->filter = MODEST_HEADER_VIEW_FILTER_NONE; +#ifdef MODEST_TOOLKIT_HILDON2 + priv->live_search = NULL; +#endif + priv->filter_string = NULL; + priv->filter_string_splitted = NULL; + priv->filter_date_range = FALSE; priv->selection_changed_handler = 0; priv->acc_removed_handler = 0; + priv->filtered_model = NULL; + priv->refilter_handler_id = 0; + /* 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; - } + } } priv->datetime_formatter = modest_datetime_formatter_new (); - g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", + g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", G_CALLBACK (datetime_format_changed), (gpointer) obj); setup_drag_and_drop (GTK_WIDGET(obj)); @@ -618,10 +686,23 @@ modest_header_view_dispose (GObject *obj) ModestHeaderView *self; ModestHeaderViewPrivate *priv; GtkTreeSelection *sel; - + self = MODEST_HEADER_VIEW(obj); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + if (priv->refilter_handler_id > 0) { + g_source_remove (priv->refilter_handler_id); + priv->refilter_handler_id = 0; + priv->filtered_model = NULL; + } + +#ifdef MODEST_TOOLKIT_HILDON2 + if (priv->live_search_timeout > 0) { + g_source_remove (priv->live_search_timeout); + priv->live_search_timeout = 0; + } +#endif + if (priv->datetime_formatter) { g_object_unref (priv->datetime_formatter); priv->datetime_formatter = NULL; @@ -650,13 +731,13 @@ modest_header_view_finalize (GObject *obj) { ModestHeaderView *self; ModestHeaderViewPrivate *priv; - + self = MODEST_HEADER_VIEW(obj); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - if (g_signal_handler_is_connected (modest_runtime_get_account_store (), + if (g_signal_handler_is_connected (modest_runtime_get_account_store (), priv->acc_removed_handler)) { - g_signal_handler_disconnect (modest_runtime_get_account_store (), + g_signal_handler_disconnect (modest_runtime_get_account_store (), priv->acc_removed_handler); } @@ -681,6 +762,14 @@ modest_header_view_finalize (GObject *obj) priv->autoselect_reference = NULL; } + if (priv->filter_string) { + g_free (priv->filter_string); + } + + if (priv->filter_string_splitted) { + g_strfreev (priv->filter_string_splitted); + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -692,28 +781,28 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) GtkTreeSelection *sel; ModestHeaderView *self; ModestHeaderViewPrivate *priv; - + g_return_val_if_fail (style >= 0 && style < MODEST_HEADER_VIEW_STYLE_NUM, NULL); - + obj = G_OBJECT(g_object_new(MODEST_TYPE_HEADER_VIEW, NULL)); self = MODEST_HEADER_VIEW(obj); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - + modest_header_view_set_style (self, style); gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj)); gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE); gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), TRUE); - + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj), TRUE); /* alternating row colors */ - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); priv->selection_changed_handler = g_signal_connect_after (sel, "changed", G_CALLBACK(on_selection_changed), self); - + g_signal_connect (self, "row-activated", G_CALLBACK (on_header_row_activated), NULL); @@ -728,7 +817,7 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) G_CALLBACK(on_button_press_event), NULL); g_signal_connect (self, "button-release-event", G_CALLBACK(on_button_release_event), NULL); - + priv->acc_removed_handler = g_signal_connect (modest_runtime_get_account_store (), "account_removed", G_CALLBACK (on_account_removed), @@ -749,11 +838,11 @@ modest_header_view_count_selected_headers (ModestHeaderView *self) guint selected_rows; g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(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; } @@ -762,22 +851,21 @@ modest_header_view_has_selected_headers (ModestHeaderView *self) { GtkTreeSelection *sel; gboolean empty; - + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(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 * +TnyList * modest_header_view_get_selected_headers (ModestHeaderView *self) { GtkTreeSelection *sel; - ModestHeaderViewPrivate *priv; TnyList *header_list = NULL; TnyHeader *header; GList *list, *tmp = NULL; @@ -785,8 +873,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) GtkTreeIter iter; g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + /* Get selected rows */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); @@ -797,7 +884,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) list = g_list_reverse (list); tmp = list; - while (tmp) { + while (tmp) { /* get header from selection */ gtk_tree_model_get_iter (tree_model, &iter, (GtkTreePath *) (tmp->data)); gtk_tree_model_get (tree_model, &iter, @@ -821,13 +908,13 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) static void scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) { -#ifdef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_GTK GtkTreePath *selected_path; GtkTreePath *start, *end; - + GtkTreeModel *model; - + model = gtk_tree_view_get_model (GTK_TREE_VIEW(self)); selected_path = gtk_tree_model_get_path (model, iter); @@ -850,7 +937,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) } -void +void modest_header_view_select_next (ModestHeaderView *self) { GtkTreeSelection *sel; @@ -865,18 +952,18 @@ modest_header_view_select_next (ModestHeaderView *self) 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); + scroll_to_selected (self, &iter, FALSE); } gtk_tree_path_free(path); } - + } -void +void modest_header_view_select_prev (ModestHeaderView *self) { GtkTreeSelection *sel; @@ -895,10 +982,10 @@ modest_header_view_select_prev (ModestHeaderView *self) /* Move path up */ if (gtk_tree_path_prev (path)) { gtk_tree_model_get_iter (model, &iter, path); - + /* Select the new one */ gtk_tree_selection_select_iter (sel, &iter); - scroll_to_selected (self, &iter, TRUE); + scroll_to_selected (self, &iter, TRUE); } gtk_tree_path_free (path); @@ -907,10 +994,10 @@ modest_header_view_select_prev (ModestHeaderView *self) GList* modest_header_view_get_columns (ModestHeaderView *self) -{ +{ g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); - - return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); + + return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); } @@ -922,15 +1009,15 @@ modest_header_view_set_style (ModestHeaderView *self, ModestHeaderViewPrivate *priv; gboolean show_col_headers = FALSE; ModestHeaderViewStyle old_style; - + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); g_return_val_if_fail (style >= 0 && MODEST_HEADER_VIEW_STYLE_NUM, FALSE); - + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->style == style) return TRUE; /* nothing to do */ - + switch (style) { case MODEST_HEADER_VIEW_STYLE_DETAILS: show_col_headers = TRUE; @@ -941,7 +1028,7 @@ modest_header_view_set_style (ModestHeaderView *self, g_return_val_if_reached (FALSE); } gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), show_col_headers); - gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), show_col_headers); + gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), show_col_headers); old_style = priv->style; priv->style = style; @@ -961,7 +1048,7 @@ modest_header_view_get_style (ModestHeaderView *self) /* This is used to automatically select the first header if the user * has not selected any header yet. */ -static gboolean +static gboolean modest_header_view_on_expose_event(GtkTreeView *header_view, GdkEventExpose *event, gpointer user_data) @@ -998,7 +1085,7 @@ modest_header_view_on_expose_event(GtkTreeView *header_view, gtk_tree_path_free (tree_iter_path); } } else { - if (priv->autoselect_reference != NULL) { + if (priv->autoselect_reference != NULL && gtk_tree_row_reference_valid (priv->autoselect_reference)) { gboolean moved_selection = FALSE; GtkTreePath * last_path; if (gtk_tree_selection_count_selected_rows (sel) != 1) { @@ -1058,10 +1145,10 @@ modest_header_view_get_folder (ModestHeaderView *self) } static void -set_folder_intern_get_headers_async_cb (TnyFolder *folder, - gboolean cancelled, - TnyList *headers, - GError *err, +set_folder_intern_get_headers_async_cb (TnyFolder *folder, + gboolean cancelled, + TnyList *headers, + GError *err, gpointer user_data) { ModestHeaderView *self; @@ -1089,19 +1176,22 @@ set_folder_intern_get_headers_async_cb (TnyFolder *folder, } static void -modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) +modest_header_view_set_folder_intern (ModestHeaderView *self, + TnyFolder *folder, + gboolean refresh) { TnyFolderType type; TnyList *headers; ModestHeaderViewPrivate *priv; GList *cols, *cursor; - GtkTreeModel *filter_model, *sortable; + GtkTreeModel *filter_model, *sortable; guint sort_colid; GtkSortType sort_type; priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); headers = TNY_LIST (tny_gtk_header_list_model_new ()); + tny_gtk_header_list_model_set_update_in_batches (TNY_GTK_HEADER_LIST_MODEL (headers), 300); /* Start the monitor in the callback of the tny_gtk_header_list_model_set_folder call. It's crucial to @@ -1116,23 +1206,22 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) be added again by tny_gtk_header_list_model_set_folder, so we'd end up with duplicate headers. sergio */ tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - folder, FALSE, - set_folder_intern_get_headers_async_cb, + folder, refresh, + set_folder_intern_get_headers_async_cb, NULL, self); - sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); - g_object_unref (G_OBJECT (headers)); - /* Init filter_row function to examine empty status */ priv->status = HEADER_VIEW_INIT; + /* Create sortable model */ + sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (headers)); + g_object_unref (headers); + /* Create a tree model filter to hide and show rows for cut operations */ - filter_model = gtk_tree_model_filter_new (sortable, NULL); + filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (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)); + filter_row, self, NULL); + g_object_unref (sortable); /* install our special sorting functions */ cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); @@ -1142,17 +1231,17 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) type = modest_tny_folder_guess_folder_type (folder); if (type == TNY_FOLDER_TYPE_INVALID) g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); - - 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 = 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); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable), TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, (GtkTreeIterCompareFunc) cmp_rows, cols->data, NULL); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable), TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, (GtkTreeIterCompareFunc) cmp_subject_rows, cols->data, NULL); @@ -1160,58 +1249,58 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) /* Set new model */ gtk_tree_view_set_model (GTK_TREE_VIEW (self), filter_model); - modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model), - tny_folder_get_id(folder)); - g_object_unref (G_OBJECT (filter_model)); + modest_header_view_notify_observers (self, sortable, tny_folder_get_id (folder)); + g_object_unref (filter_model); /* Free */ g_list_free (cols); } void -modest_header_view_sort_by_column_id (ModestHeaderView *self, +modest_header_view_sort_by_column_id (ModestHeaderView *self, guint sort_colid, GtkSortType sort_type) { ModestHeaderViewPrivate *priv = NULL; - GtkTreeModel *tree_filter, *sortable = NULL; + GtkTreeModel *sortable = NULL, *filter_model = NULL; TnyFolderType type; g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING); - + /* Get model and private data */ - priv = MODEST_HEADER_VIEW_GET_PRIVATE(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)); */ - + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (GTK_IS_TREE_MODEL_FILTER (filter_model)) { + sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + } + /* Sort tree model */ type = modest_tny_folder_guess_folder_type (priv->folder); if (type == TNY_FOLDER_TYPE_INVALID) g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); else { - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), - sort_colid, - sort_type); + 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); - } + } } void -modest_header_view_set_sort_params (ModestHeaderView *self, - guint sort_colid, +modest_header_view_set_sort_params (ModestHeaderView *self, + guint sort_colid, GtkSortType sort_type, TnyFolderType type) { ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; - + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING); g_return_if_fail (type != TNY_FOLDER_TYPE_INVALID); - + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1220,7 +1309,7 @@ modest_header_view_set_sort_params (ModestHeaderView *self, } gint -modest_header_view_get_sort_column_id (ModestHeaderView *self, +modest_header_view_get_sort_column_id (ModestHeaderView *self, TnyFolderType type) { ModestHeaderViewPrivate *priv; @@ -1228,7 +1317,7 @@ modest_header_view_get_sort_column_id (ModestHeaderView *self, g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0); g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, 0); - + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1236,15 +1325,15 @@ modest_header_view_get_sort_column_id (ModestHeaderView *self, } GtkSortType -modest_header_view_get_sort_type (ModestHeaderView *self, +modest_header_view_get_sort_type (ModestHeaderView *self, TnyFolderType type) { ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; - + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), GTK_SORT_DESCENDING); g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, GTK_SORT_DESCENDING); - + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1264,7 +1353,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestHeaderViewPrivate *priv; SetFolderHelper *info; - + info = (SetFolderHelper*) user_data; priv = MODEST_HEADER_VIEW_GET_PRIVATE(info->header_view); @@ -1282,7 +1371,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, g_mutex_unlock (priv->observers_lock); /* Notify the observers that the update is over */ - g_signal_emit (G_OBJECT (info->header_view), + g_signal_emit (G_OBJECT (info->header_view), signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL); /* Allow filtering notifications from now on if the current @@ -1298,7 +1387,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, } static void -refresh_folder_error_handler (ModestMailOperation *mail_op, +refresh_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { const GError *error = modest_mail_operation_get_error (mail_op); @@ -1309,15 +1398,15 @@ refresh_folder_error_handler (ModestMailOperation *mail_op, ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op); /* If the mail op has been cancelled then it's not an error: don't show any message */ if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) { - modest_platform_information_banner (NULL, NULL, - dgettext("ke-recv", - "cerm_device_memory_full")); + gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), ""); + modest_platform_information_banner (NULL, NULL, msg); + g_free (msg); } } } void -modest_header_view_set_folder (ModestHeaderView *self, +modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder, gboolean refresh, ModestWindow *progress_window, @@ -1325,7 +1414,7 @@ modest_header_view_set_folder (ModestHeaderView *self, gpointer user_data) { ModestHeaderViewPrivate *priv; - + g_return_if_fail (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1349,8 +1438,8 @@ modest_header_view_set_folder (ModestHeaderView *self, ModestMailOperation *mail_op = NULL; /* Set folder in the model */ - modest_header_view_set_folder_intern (self, folder); - + modest_header_view_set_folder_intern (self, folder, refresh); + /* Pick my reference. Nothing to do with the mail operation */ priv->folder = g_object_ref (folder); @@ -1363,7 +1452,7 @@ modest_header_view_set_folder (ModestHeaderView *self, g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL); /* Notify the observers that the update begins */ - g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], + g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], 0, TRUE, NULL); /* create the helper */ @@ -1377,10 +1466,10 @@ modest_header_view_set_folder (ModestHeaderView *self, mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(progress_window), refresh_folder_error_handler, NULL, NULL); - if (refresh) { + if (refresh) { modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - + /* Refresh the folder asynchronously */ modest_mail_operation_refresh_folder (mail_op, folder, @@ -1390,7 +1479,8 @@ modest_header_view_set_folder (ModestHeaderView *self, folder_refreshed_cb (mail_op, folder, info); } /* Free */ - g_object_unref (mail_op); + if (mail_op) + g_object_unref (mail_op); } else { g_mutex_lock (priv->observers_lock); @@ -1405,14 +1495,14 @@ modest_header_view_set_folder (ModestHeaderView *self, priv->autoselect_reference = NULL; } - gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL); + gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL); modest_header_view_notify_observers(self, NULL, NULL); g_mutex_unlock (priv->observers_lock); /* Notify the observers that the update is over */ - g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], + g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL); } } @@ -1422,23 +1512,21 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer userdata) { ModestHeaderView *self = NULL; - ModestHeaderViewPrivate *priv = NULL; GtkTreeIter iter; GtkTreeModel *model = NULL; TnyHeader *header = NULL; TnyHeaderFlags flags; self = MODEST_HEADER_VIEW (treeview); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - model = gtk_tree_view_get_model (treeview); - if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) + model = gtk_tree_view_get_model (treeview); + if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) goto frees; /* get the first selected item */ gtk_tree_model_get (model, &iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); /* Dont open DELETED messages */ @@ -1453,14 +1541,14 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, } /* Emit signal */ - g_signal_emit (G_OBJECT(self), - signals[HEADER_ACTIVATED_SIGNAL], + g_signal_emit (G_OBJECT(self), + signals[HEADER_ACTIVATED_SIGNAL], 0, header, path); /* Free */ frees: - if (header != NULL) - g_object_unref (G_OBJECT (header)); + if (header != NULL) + g_object_unref (G_OBJECT (header)); } @@ -1469,20 +1557,18 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) { GtkTreeModel *model; TnyHeader *header = NULL; - GtkTreePath *path = NULL; + GtkTreePath *path = NULL; GtkTreeIter iter; ModestHeaderView *self; - ModestHeaderViewPrivate *priv; GList *selected = NULL; - + g_return_if_fail (sel); g_return_if_fail (user_data); - + self = MODEST_HEADER_VIEW (user_data); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); selected = gtk_tree_selection_get_selected_rows (sel, &model); - if (selected != NULL) + if (selected != NULL) path = (GtkTreePath *) selected->data; if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) return; /* msg was _un_selected */ @@ -1492,8 +1578,8 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) &header, -1); /* Emit signal */ - g_signal_emit (G_OBJECT(self), - signals[HEADER_SELECTED_SIGNAL], + g_signal_emit (G_OBJECT(self), + signals[HEADER_SELECTED_SIGNAL], 0, header); g_object_unref (G_OBJECT (header)); @@ -1508,13 +1594,13 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) selection to reload a msg. For example if we have selected a header in offline mode, when Modest become online, we want to reload the message automatically without an user click over the header */ -void +void _modest_header_view_change_selection (GtkTreeSelection *selection, gpointer user_data) { g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); g_return_if_fail (user_data && MODEST_IS_HEADER_VIEW (user_data)); - + on_selection_changed (selection, user_data); } @@ -1549,13 +1635,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gint t1, t2; gint val1, val2; gint cmp; -/* static int counter = 0; */ 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)); - + switch (col_id) { case TNY_HEADER_FLAG_ATTACHMENTS: @@ -1568,7 +1652,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, (val2 & TNY_HEADER_FLAG_ATTACHMENTS); return cmp ? cmp : t1 - t2; - + case TNY_HEADER_FLAG_PRIORITY_MASK: { TnyHeader *header1 = NULL, *header2 = NULL; @@ -1577,11 +1661,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header2, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1); - /* This is for making priority values respect the intuitive sort relationship + /* This is for making priority values respect the intuitive sort relationship * as HIGH is 01, LOW is 10, and NORMAL is 00 */ if (header1 && header2) { - cmp = compare_priorities (tny_header_get_priority (header1), + cmp = compare_priorities (tny_header_get_priority (header1), tny_header_get_priority (header2)); g_object_unref (header1); g_object_unref (header2); @@ -1603,7 +1687,6 @@ cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *ite 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); @@ -1612,9 +1695,22 @@ cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *ite 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), + /* Do not use the prefixes for sorting. Consume all the blank + spaces for sorting */ + cmp = modest_text_utils_utf8_strcmp (g_strchug (val1 + modest_text_utils_get_subject_prefix_len(val1)), + g_strchug (val2 + modest_text_utils_get_subject_prefix_len(val2)), TRUE); + + /* If they're equal based on subject without prefix then just + sort them by length. This will show messages like this. + * Fw: + * Fw:Fw: + * Fw:Fw: + * Fw:Fw:Fw: + * */ + if (cmp == 0) + cmp = (g_utf8_strlen (val1, -1) >= g_utf8_strlen (val2, -1)) ? 1 : -1; + g_free (val1); g_free (val2); return cmp; @@ -1622,11 +1718,11 @@ cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *ite /* Drag and drop stuff */ static void -drag_data_get_cb (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, +drag_data_get_cb (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, gpointer data) { ModestHeaderView *self = NULL; @@ -1638,7 +1734,7 @@ drag_data_get_cb (GtkWidget *widget, /* Set the data. Do not use the current selection because it could be different than the selection at the beginning of the d&d */ - modest_dnd_selection_data_set_paths (selection_data, + modest_dnd_selection_data_set_paths (selection_data, priv->drag_begin_cached_selected_rows); } @@ -1654,8 +1750,8 @@ drag_data_get_cb (GtkWidget *widget, * */ static void -drag_begin_cb (GtkWidget *widget, - GdkDragContext *context, +drag_begin_cb (GtkWidget *widget, + GdkDragContext *context, gpointer data) { ModestHeaderView *self = NULL; @@ -1666,7 +1762,7 @@ drag_begin_cb (GtkWidget *widget, priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - priv->drag_begin_cached_selected_rows = + priv->drag_begin_cached_selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL); } @@ -1676,8 +1772,8 @@ drag_begin_cb (GtkWidget *widget, * success */ static void -drag_end_cb (GtkWidget *widget, - GdkDragContext *dc, +drag_end_cb (GtkWidget *widget, + GdkDragContext *dc, gpointer data) { ModestHeaderView *self = NULL; @@ -1736,20 +1832,20 @@ setup_drag_and_drop (GtkWidget *self) } static GtkTreePath * -get_selected_row (GtkTreeView *self, GtkTreeModel **model) +get_selected_row (GtkTreeView *self, GtkTreeModel **model) { GtkTreePath *path = NULL; - GtkTreeSelection *sel = 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: @@ -1762,9 +1858,9 @@ get_selected_row (GtkTreeView *self, GtkTreeModel **model) #ifndef MODEST_TOOLKIT_HILDON2 /* * This function moves the tree view scroll to the current selected - * row when the widget grabs the focus + * row when the widget grabs the focus */ -static gboolean +static gboolean on_focus_in (GtkWidget *self, GdkEventFocus *event, gpointer user_data) @@ -1798,14 +1894,14 @@ on_focus_in (GtkWidget *self, if (selected == NULL) return FALSE; selected_path = (GtkTreePath *) selected->data; - /* Frees */ + /* Frees */ g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL); g_list_free (selected); return FALSE; } -static gboolean +static gboolean on_focus_out (GtkWidget *self, GdkEventFocus *event, gpointer user_data) @@ -1857,13 +1953,13 @@ on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdat GValue value = {0,}; TnyHeader *header; - gtk_tree_model_get_value (model, &iter, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + gtk_tree_model_get_value (model, &iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value); header = (TnyHeader *) g_value_get_object (&value); if (TNY_IS_HEADER (header)) { status = modest_tny_all_send_queues_get_msg_status (header); - already_opened = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), + already_opened = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), header, NULL); } g_value_unset (&value); @@ -1889,7 +1985,7 @@ on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdat } static void -folder_monitor_update (TnyFolderObserver *self, +folder_monitor_update (TnyFolderObserver *self, TnyFolderChange *change) { ModestHeaderViewPrivate *priv = NULL; @@ -1897,7 +1993,7 @@ folder_monitor_update (TnyFolderObserver *self, TnyFolder *folder = NULL; changed = tny_folder_change_get_changed (change); - + /* Do not notify the observers if the folder of the header view has changed before this call to the observer happens */ @@ -1908,23 +2004,23 @@ folder_monitor_update (TnyFolderObserver *self, MODEST_DEBUG_BLOCK ( if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) - g_print ("ADDED %d/%d (r/t) \n", + g_print ("ADDED %d/%d (r/t) \n", tny_folder_change_get_new_unread_count (change), tny_folder_change_get_new_all_count (change)); if (changed & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) - g_print ("ALL COUNT %d\n", + g_print ("ALL COUNT %d\n", tny_folder_change_get_new_all_count (change)); if (changed & TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT) - g_print ("UNREAD COUNT %d\n", + g_print ("UNREAD COUNT %d\n", tny_folder_change_get_new_unread_count (change)); if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) - g_print ("EXPUNGED %d/%d (r/t) \n", + g_print ("EXPUNGED %d/%d (r/t) \n", tny_folder_change_get_new_unread_count (change), tny_folder_change_get_new_all_count (change)); if (changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME) g_print ("FOLDER RENAME\n"); if (changed & TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED) - g_print ("MSG RECEIVED %d/%d (r/t) \n", + g_print ("MSG RECEIVED %d/%d (r/t) \n", tny_folder_change_get_new_unread_count (change), tny_folder_change_get_new_all_count (change)); g_print ("---------------------------------------------------\n"); @@ -1938,16 +2034,16 @@ folder_monitor_update (TnyFolderObserver *self, /* Emit signal to evaluate how headers changes affects to the window view */ - g_signal_emit (G_OBJECT(self), - signals[MSG_COUNT_CHANGED_SIGNAL], + g_signal_emit (G_OBJECT(self), + signals[MSG_COUNT_CHANGED_SIGNAL], 0, folder, change); - + /* Added or removed headers, so data stored on cliboard are invalid */ if (modest_email_clipboard_check_source_folder (priv->clipboard, folder)) modest_email_clipboard_clear (priv->clipboard); - + g_mutex_unlock (priv->observers_lock); - } + } /* Free */ frees: @@ -1959,9 +2055,9 @@ gboolean modest_header_view_is_empty (ModestHeaderView *self) { ModestHeaderViewPrivate *priv; - + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), TRUE); - + priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self)); return priv->status == HEADER_VIEW_EMPTY; @@ -1971,20 +2067,20 @@ void modest_header_view_clear (ModestHeaderView *self) { g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); - + modest_header_view_set_folder (self, NULL, FALSE, NULL, NULL, NULL); } -void +void modest_header_view_copy_selection (ModestHeaderView *header_view) { g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); - + /* Copy selection */ _clipboard_set_selected_data (header_view, FALSE); } -void +void modest_header_view_cut_selection (ModestHeaderView *header_view) { ModestHeaderViewPrivate *priv = NULL; @@ -1992,30 +2088,30 @@ modest_header_view_cut_selection (ModestHeaderView *header_view) guint i, n_selected; g_return_if_fail (header_view && 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); - + 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]); + for (i=0; i < n_selected; i++) + priv->hidding_ids[i] = g_strdup(hidding[i]); /* Hide cut headers */ modest_header_view_refilter (header_view); } - + static void _clipboard_set_selected_data (ModestHeaderView *header_view, @@ -2026,7 +2122,7 @@ _clipboard_set_selected_data (ModestHeaderView *header_view, 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); @@ -2046,8 +2142,8 @@ notify_filter_change (gpointer data) { NotifyFilterInfo *info = (NotifyFilterInfo *) data; - g_signal_emit (info->self, - signals[MSG_COUNT_CHANGED_SIGNAL], + g_signal_emit (info->self, + signals[MSG_COUNT_CHANGED_SIGNAL], 0, info->folder, NULL); return FALSE; @@ -2068,6 +2164,104 @@ notify_filter_change_destroy (gpointer data) } static gboolean +current_folder_needs_filtering (ModestHeaderViewPrivate *priv) +{ + /* For the moment we only need to filter outbox */ + return priv->is_outbox; +} + +static gboolean +header_match_string (TnyHeader *header, gchar **words) +{ + gchar *subject_fold; + gchar *cc_fold; + gchar *bcc_fold; + gchar *to_fold; + gchar *from_fold; + + gchar **current_word; + gboolean found; + + subject_fold = g_object_get_data (G_OBJECT (header), _HEADER_VIEW_SUBJECT_FOLD); + if (subject_fold == NULL) { + gchar *subject; + subject = tny_header_dup_subject (header); + if (subject != NULL) { + subject_fold = subject?g_utf8_casefold (subject, -1):NULL; + g_object_set_data_full (G_OBJECT (header), _HEADER_VIEW_SUBJECT_FOLD, + subject_fold, (GDestroyNotify) g_free); + } + g_free (subject); + } + + from_fold = g_object_get_data (G_OBJECT (header), _HEADER_VIEW_FROM_FOLD); + if (from_fold == NULL) { + gchar *from; + from = tny_header_dup_from (header); + if (from != NULL) { + from_fold = from?g_utf8_casefold (from, -1):NULL; + g_object_set_data_full (G_OBJECT (header), _HEADER_VIEW_FROM_FOLD, + from_fold, (GDestroyNotify) g_free); + } + g_free (from); + } + + to_fold = g_object_get_data (G_OBJECT (header), _HEADER_VIEW_TO_FOLD); + if (to_fold == NULL) { + gchar *to; + to = tny_header_dup_to (header); + if (to != NULL) { + to_fold = to?g_utf8_casefold (to, -1):NULL; + g_object_set_data_full (G_OBJECT (header), _HEADER_VIEW_TO_FOLD, + to_fold, (GDestroyNotify) g_free); + } + g_free (to); + } + + cc_fold = g_object_get_data (G_OBJECT (header), _HEADER_VIEW_CC_FOLD); + if (cc_fold == NULL) { + gchar *cc; + cc = tny_header_dup_cc (header); + if (cc != NULL) { + cc_fold = cc?g_utf8_casefold (cc, -1):NULL; + g_object_set_data_full (G_OBJECT (header), _HEADER_VIEW_CC_FOLD, + cc_fold, (GDestroyNotify) g_free); + } + g_free (cc); + } + + bcc_fold = g_object_get_data (G_OBJECT (header), _HEADER_VIEW_BCC_FOLD); + if (bcc_fold == NULL) { + gchar *bcc; + bcc = tny_header_dup_bcc (header); + if (bcc != NULL) { + bcc_fold = bcc?g_utf8_casefold (bcc, -1):NULL; + g_object_set_data_full (G_OBJECT (header), _HEADER_VIEW_BCC_FOLD, + bcc_fold, (GDestroyNotify) g_free); + } + g_free (bcc); + } + + found = TRUE; + + for (current_word = words; *current_word != NULL; current_word++) { + + if ((subject_fold && g_strstr_len (subject_fold, -1, *current_word)) + || (cc_fold && g_strstr_len (cc_fold, -1, *current_word)) + || (bcc_fold && g_strstr_len (bcc_fold, -1, *current_word)) + || (to_fold && g_strstr_len (to_fold, -1, *current_word)) + || (from_fold && g_strstr_len (from_fold, -1, *current_word))) { + found = TRUE; + } else { + found = FALSE; + break; + } + } + + return found; +} + +static gboolean filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) @@ -2086,13 +2280,17 @@ filter_row (GtkTreeModel *model, priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data); /* Get header from model */ - gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &value); - flags = (TnyHeaderFlags) g_value_get_int (&value); - g_value_unset (&value); gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value); header = (TnyHeader *) g_value_get_object (&value); g_value_unset (&value); - + flags = tny_header_get_flags (header); + + /* Get message id from header (ensure is a valid id) */ + if (!header) { + visible = FALSE; + goto frees; + } + /* Hide deleted and mark as deleted heders */ if (flags & TNY_HEADER_FLAG_DELETED || flags & TNY_HEADER_FLAG_EXPUNGED) { @@ -2101,7 +2299,7 @@ filter_row (GtkTreeModel *model, } if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) { - if (priv->is_outbox && + if (current_folder_needs_filtering (priv) && modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) { visible = FALSE; goto frees; @@ -2109,32 +2307,40 @@ filter_row (GtkTreeModel *model, } if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) { - if (priv->is_outbox && + if (current_folder_needs_filtering (priv) && modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) { visible = FALSE; goto frees; } } + if (visible && priv->filter_string) { + if (!header_match_string (header, priv->filter_string_splitted)) { + visible = FALSE; + goto frees; + } + if (priv->filter_date_range) { + if ((tny_header_get_date_sent (TNY_HEADER (header)) < priv->date_range_start) || + ((priv->date_range_end != -1) && (tny_header_get_date_sent (TNY_HEADER (header)) > priv->date_range_end))) { + visible = FALSE; + goto frees; + } + } + } + /* If no data on clipboard, return always TRUE */ if (modest_email_clipboard_cleared(priv->clipboard)) { visible = TRUE; goto frees; - } - - /* Get message id from header (ensure is a valid id) */ - if (!header) { - visible = FALSE; - goto frees; } - + /* Check hiding */ if (priv->hidding_ids != NULL) { id = tny_header_dup_message_id (header); for (i=0; i < priv->n_selected && !found; i++) if (priv->hidding_ids[i] != NULL && id != NULL) found = (!strcmp (priv->hidding_ids[i], id)); - + visible = !found; g_free(id); } @@ -2143,62 +2349,65 @@ filter_row (GtkTreeModel *model, old_status = priv->status; priv->status = ((gboolean) priv->status) && !visible; if ((priv->notify_status) && (priv->status != old_status)) { - NotifyFilterInfo *info; - if (priv->status_timeout) g_source_remove (priv->status_timeout); - info = g_slice_new0 (NotifyFilterInfo); - info->self = g_object_ref (G_OBJECT (user_data)); - info->folder = tny_header_get_folder (header); - priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, - notify_filter_change, - info, - notify_filter_change_destroy); + if (header) { + NotifyFilterInfo *info; + + info = g_slice_new0 (NotifyFilterInfo); + info->self = g_object_ref (G_OBJECT (user_data)); + if (header) + info->folder = tny_header_get_folder (header); + priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, + notify_filter_change, + info, + notify_filter_change_destroy); + } } - + return visible; } static void -_clear_hidding_filter (ModestHeaderView *header_view) +_clear_hidding_filter (ModestHeaderView *header_view) { ModestHeaderViewPrivate *priv = NULL; guint i; - - g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + + 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++) + for (i=0; i < priv->n_selected; i++) g_free (priv->hidding_ids[i]); g_free(priv->hidding_ids); - } + } } -void +void modest_header_view_refilter (ModestHeaderView *header_view) { - GtkTreeModel *model = NULL; + GtkTreeModel *filter_model = NULL; ModestHeaderViewPrivate *priv = NULL; g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view)); priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); - + /* Hide cut headers */ - model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - if (GTK_IS_TREE_MODEL_FILTER (model)) { + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + if (GTK_IS_TREE_MODEL_FILTER (filter_model)) { priv->status = HEADER_VIEW_INIT; - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + modest_header_view_refilter_by_chunks (header_view); } } -/* +/* * Called when an account is removed. If I'm showing a folder of the * account that has been removed then clear the view */ static void -on_account_removed (TnyAccountStore *self, +on_account_removed (TnyAccountStore *self, TnyAccount *account, gpointer user_data) { @@ -2213,10 +2422,19 @@ on_account_removed (TnyAccountStore *self, if (priv->folder) { TnyAccount *my_account; - my_account = tny_folder_get_account (priv->folder); - if (my_account == account) - modest_header_view_clear (MODEST_HEADER_VIEW (user_data)); - g_object_unref (my_account); + if (TNY_IS_MERGE_FOLDER (priv->folder) && + tny_folder_get_folder_type (priv->folder) == TNY_FOLDER_TYPE_OUTBOX) { + ModestTnyAccountStore *acc_store = modest_runtime_get_account_store (); + my_account = modest_tny_account_store_get_local_folders_account (acc_store); + } else { + my_account = tny_folder_get_account (priv->folder); + } + + if (my_account) { + if (my_account == account) + modest_header_view_clear (MODEST_HEADER_VIEW (user_data)); + g_object_unref (my_account); + } } } @@ -2225,7 +2443,7 @@ modest_header_view_add_observer(ModestHeaderView *header_view, ModestHeaderViewObserver *observer) { ModestHeaderViewPrivate *priv; - + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer)); @@ -2236,7 +2454,7 @@ modest_header_view_add_observer(ModestHeaderView *header_view, g_mutex_unlock(priv->observer_list_lock); } -void +void modest_header_view_remove_observer(ModestHeaderView *header_view, ModestHeaderViewObserver *observer) { @@ -2252,7 +2470,7 @@ modest_header_view_remove_observer(ModestHeaderView *header_view, g_mutex_unlock(priv->observer_list_lock); } -static void +static void modest_header_view_notify_observers(ModestHeaderView *header_view, GtkTreeModel *model, const gchar *tny_folder_id) @@ -2263,7 +2481,7 @@ modest_header_view_notify_observers(ModestHeaderView *header_view, g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); - + priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); g_mutex_lock(priv->observer_list_lock); @@ -2281,43 +2499,422 @@ const gchar * _modest_header_view_get_display_date (ModestHeaderView *self, time_t date) { ModestHeaderViewPrivate *priv = NULL; - + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); return modest_datetime_formatter_display_datetime (priv->datetime_formatter, date); } -void +void modest_header_view_set_filter (ModestHeaderView *self, ModestHeaderViewFilter filter) { ModestHeaderViewPrivate *priv; - GtkTreeModel *filter_model; g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); priv->filter |= filter; - filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); - if (GTK_IS_TREE_MODEL_FILTER(filter_model)) { - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); - } + if (current_folder_needs_filtering (priv)) + modest_header_view_refilter (self); } -void +void modest_header_view_unset_filter (ModestHeaderView *self, ModestHeaderViewFilter filter) { ModestHeaderViewPrivate *priv; - GtkTreeModel *filter_model; g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); priv->filter &= ~filter; + if (current_folder_needs_filtering (priv)) + modest_header_view_refilter (self); +} + +static void +on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata) +{ + if (strcmp ("style", spec->name) == 0) { + update_style (MODEST_HEADER_VIEW (obj)); + gtk_widget_queue_draw (GTK_WIDGET (obj)); + } +} + +static void +update_style (ModestHeaderView *self) +{ + ModestHeaderViewPrivate *priv; + GdkColor style_color; + GdkColor style_active_color; + PangoAttrList *attr_list; + GtkStyle *style; + PangoAttribute *attr; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + /* Set color */ + + attr_list = pango_attr_list_new (); + if (!gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) { + gdk_color_parse (MODEST_SECONDARY_COLOR, &style_color); + } + priv->secondary_color = style_color; + attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue); + pango_attr_list_insert (attr_list, attr); + + /* set font */ + style = gtk_rc_get_style_by_paths (gtk_widget_get_settings + (GTK_WIDGET(self)), + "SmallSystemFont", NULL, + G_TYPE_NONE); + if (style) { + attr = pango_attr_font_desc_new (pango_font_description_copy + (style->font_desc)); + pango_attr_list_insert (attr_list, attr); + + g_object_set (G_OBJECT (priv->renderer_address), + "foreground-gdk", &(priv->secondary_color), + "foreground-set", TRUE, + "attributes", attr_list, + NULL); + g_object_set (G_OBJECT (priv->renderer_date_status), + "foreground-gdk", &(priv->secondary_color), + "foreground-set", TRUE, + "attributes", attr_list, + NULL); + pango_attr_list_unref (attr_list); + } else { + g_object_set (G_OBJECT (priv->renderer_address), + "foreground-gdk", &(priv->secondary_color), + "foreground-set", TRUE, + "scale", PANGO_SCALE_SMALL, + "scale-set", TRUE, + NULL); + g_object_set (G_OBJECT (priv->renderer_date_status), + "foreground-gdk", &(priv->secondary_color), + "foreground-set", TRUE, + "scale", PANGO_SCALE_SMALL, + "scale-set", TRUE, + NULL); + } + + if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "ActiveTextColor", &style_active_color)) { + priv->active_color = style_active_color; +#ifdef MODEST_TOOLKIT_HILDON2 + g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (TRUE)); + g_object_set_data (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, &(priv->active_color)); +#endif + } else { +#ifdef MODEST_TOOLKIT_HILDON2 + g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (FALSE)); +#endif + } +} + +TnyHeader * +modest_header_view_get_header_at_pos (ModestHeaderView *header_view, + gint initial_x, + gint initial_y) +{ + GtkTreePath *path; + GtkTreeModel *tree_model; + GtkTreeIter iter; + TnyHeader *header; + + /* Get tree path */ + if (!gtk_tree_view_get_dest_row_at_pos ((GtkTreeView *) header_view, + initial_x, + initial_y, + &path, + NULL)) + return NULL; + + /* Get model */ + tree_model = gtk_tree_view_get_model ((GtkTreeView *) header_view); + if (!gtk_tree_model_get_iter (tree_model, &iter, path)) + return NULL; + + /* Get header */ + gtk_tree_model_get (tree_model, &iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + + return header; +} + +static gboolean +parse_date_side (const gchar *string, time_t *date_side) +{ + gchar *today; + gchar *yesterday; + gchar *casefold; + GDate *date; + gboolean result = FALSE; + + if (string && string[0] == '\0') { + *date_side = 0; + return TRUE; + } + + casefold = g_utf8_casefold (string, -1); + today = g_utf8_casefold (dgettext ("gtk20", "Today"), -1); + yesterday = g_utf8_casefold (dgettext ("gtk20", "Yesterday"), -1); + date = g_date_new (); + + if (g_utf8_collate (casefold, today) == 0) { + *date_side = time (NULL); + result = TRUE; + goto frees; + } + + if (g_utf8_collate (casefold, yesterday) == 0) { + *date_side = time (NULL) - 24*60*60; + result = TRUE; + goto frees; + } + + g_date_set_parse (date, string); + if (g_date_valid (date)) { + struct tm tm = {0}; + g_date_to_struct_tm (date, &tm); + *date_side = mktime (&tm); + + result = TRUE; + goto frees; + } +frees: + g_free (today); + g_free (yesterday); + g_free (casefold); + g_date_free (date); + + return result; +} + +static gboolean +parse_date_range (const gchar *string, time_t *date_range_start, time_t *date_range_end) +{ + gchar ** parts; + gboolean valid; + + parts = g_strsplit (string, "..", 2); + valid = TRUE; + + if (g_strv_length (parts) != 2) { + valid = FALSE; + goto frees; + g_strfreev (parts); + return FALSE; + } + + if (!parse_date_side (parts[0], date_range_start)) { + valid = FALSE; + goto frees; + } + + if (parse_date_side (parts[1], date_range_end)) { + if (*date_range_end == 0) { + *date_range_end = (time_t) -1; + } else { + *date_range_end += (24*60*60 - 1); + } + } else { + valid = FALSE; + goto frees; + } + +frees: + g_strfreev (parts); + return valid; +} + +void +modest_header_view_set_filter_string (ModestHeaderView *self, + const gchar *filter_string) +{ + ModestHeaderViewPrivate *priv; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + if (priv->filter_string) + g_free (priv->filter_string); + + priv->filter_string = g_strdup (filter_string); + priv->filter_date_range = FALSE; + + if (priv->filter_string_splitted) { + g_strfreev (priv->filter_string_splitted); + priv->filter_string_splitted = NULL; + } + + if (priv->filter_string) { + gchar **split, **current, **current_target; + + split = g_strsplit (priv->filter_string, " ", 0); + + priv->filter_string_splitted = g_malloc0 (sizeof (gchar *)*(g_strv_length (split) + 1)); + current_target = priv->filter_string_splitted; + for (current = split; *current != 0; current ++) { + gboolean has_date_range = FALSE;; + if (g_strstr_len (*current, -1, "..") && strcmp(*current, "..")) { + time_t range_start, range_end; + /* It contains .. but it's not ".." so it may be a date range */ + if (parse_date_range (*current, &range_start, &range_end)) { + priv->filter_date_range = TRUE; + has_date_range = TRUE; + priv->date_range_start = range_start; + priv->date_range_end = range_end; + } + } + if (!has_date_range) { + *current_target = g_utf8_casefold (*current, -1); + current_target++; + } + } + *current_target = '\0'; + g_strfreev (split); + } + modest_header_view_refilter (MODEST_HEADER_VIEW (self)); +} + +#ifdef MODEST_TOOLKIT_HILDON2 +static gboolean +on_live_search_timeout (ModestHeaderView *self) +{ + const gchar *needle; + ModestHeaderViewPrivate *priv; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + needle = hildon_live_search_get_text ((HildonLiveSearch *) priv->live_search); + if (needle && needle[0] != '\0') { + modest_header_view_set_filter_string (MODEST_HEADER_VIEW (self), needle); + } else { + modest_header_view_set_filter_string (MODEST_HEADER_VIEW (self), NULL); + } + + priv->live_search_timeout = 0; + + return FALSE; +} + +static gboolean +on_live_search_refilter (HildonLiveSearch *livesearch, + ModestHeaderView *self) +{ + ModestHeaderViewPrivate *priv; + GtkTreeModel *model, *sortable, *filter; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + if (priv->live_search_timeout > 0) { + g_source_remove (priv->live_search_timeout); + priv->live_search_timeout = 0; + } + + model = NULL; + filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (GTK_IS_TREE_MODEL_FILTER (filter)) { + sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter)); + if (GTK_IS_TREE_MODEL_SORT (sortable)) { + model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sortable)); + } + } + + if (model && tny_list_get_length (TNY_LIST (model)) > 250) { + priv->live_search_timeout = g_timeout_add (1000, (GSourceFunc) on_live_search_timeout, self); + } else { + on_live_search_timeout (self); + } + + return TRUE; +} + +GtkWidget * +modest_header_view_setup_live_search (ModestHeaderView *self) +{ + ModestHeaderViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_HEADER_VIEW (self), NULL); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + priv->live_search = hildon_live_search_new (); + + g_signal_connect (G_OBJECT (priv->live_search), "refilter", G_CALLBACK (on_live_search_refilter), self); + + return priv->live_search; +} +#endif + +static gboolean +refilter_idle_handler (gpointer userdata) +{ + ModestHeaderView *self = MODEST_HEADER_VIEW (userdata); + ModestHeaderViewPrivate *priv; + GtkTreeModel *filter_model; + GtkTreeModel *filtered_model; + gint i; + gboolean has_more; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); - if (GTK_IS_TREE_MODEL_FILTER(filter_model)) { - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + filtered_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + + if (filtered_model != priv->filtered_model) { + priv->refilter_handler_id = 0; + priv->filtered_model = NULL; + return FALSE; + } + + if (!gtk_tree_model_sort_iter_is_valid (GTK_TREE_MODEL_SORT (filtered_model), &(priv->refilter_iter))) { + priv->refilter_handler_id = 0; + priv->filtered_model = NULL; + modest_header_view_refilter_by_chunks (self); + return FALSE; + } + + i = 0; + do { + GtkTreePath *path; + path = gtk_tree_model_get_path (priv->filtered_model, &(priv->refilter_iter)); + gtk_tree_model_row_changed (priv->filtered_model, path, &(priv->refilter_iter)); + gtk_tree_path_free (path); + i++; + + has_more = gtk_tree_model_iter_next (priv->filtered_model, &(priv->refilter_iter)); + } while (i < 100 && has_more); + + if (has_more) { + return TRUE; + } else { + priv->filtered_model = NULL; + priv->refilter_handler_id = 0; + return FALSE; + } +} + +static void +modest_header_view_refilter_by_chunks (ModestHeaderView *self) +{ + ModestHeaderViewPrivate *priv; + GtkTreeModel *filter_model; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + if (priv->refilter_handler_id > 0) { + g_source_remove (priv->refilter_handler_id); + priv->refilter_handler_id = 0; + } + + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + priv->filtered_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + + if (gtk_tree_model_get_iter_first (priv->filtered_model, &(priv->refilter_iter))) { + priv->refilter_handler_id = g_idle_add (refilter_idle_handler, self); } }