X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=929025552300ff1563fbae6d38d9ca2e37da6d06;hb=4bd81ff5d465420ea507dfcd28a33715d498a9a4;hp=9753537e01005252cb9e8f87f3cd51c466d36241;hpb=e92e65e9ee319e8fee212bab3b3089e63d252647;p=modest diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 9753537..9290255 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 @@ -170,6 +170,15 @@ struct _ModestHeaderViewPrivate { 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; }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -622,6 +631,9 @@ modest_header_view_init (ModestHeaderView *obj) priv->hidding_ids = NULL; priv->n_selected = 0; priv->filter = MODEST_HEADER_VIEW_FILTER_NONE; + priv->filter_string = NULL; + priv->filter_string_splitted = NULL; + priv->filter_date_range = FALSE; priv->selection_changed_handler = 0; priv->acc_removed_handler = 0; @@ -709,6 +721,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); } @@ -1024,7 +1044,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) { @@ -1115,7 +1135,9 @@ 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; @@ -1142,7 +1164,7 @@ 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, + folder, refresh, set_folder_intern_get_headers_async_cb, NULL, self); @@ -1371,7 +1393,7 @@ 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); @@ -1620,7 +1642,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); @@ -1629,9 +1650,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; @@ -2085,6 +2119,72 @@ 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; + gchar *cc; + gchar *bcc; + gchar *to; + gchar *from; + gchar *subject_fold; + gchar *cc_fold; + gchar *bcc_fold; + gchar *to_fold; + gchar *from_fold; + + gchar **current_word; + gboolean found; + + subject = tny_header_dup_subject (header); + cc = tny_header_dup_cc (header); + bcc = tny_header_dup_bcc (header); + to = tny_header_dup_to (header); + from = tny_header_dup_from (header); + + subject_fold = g_utf8_casefold (subject, -1); + g_free (subject); + bcc_fold = g_utf8_casefold (bcc, -1); + g_free (bcc); + cc_fold = g_utf8_casefold (cc, -1); + g_free (cc); + to_fold = g_utf8_casefold (to, -1); + g_free (to); + from_fold = g_utf8_casefold (from, -1); + g_free (from); + + found = TRUE; + + for (current_word = words; *current_word != NULL; current_word++) { + + if ((subject && g_strstr_len (subject_fold, -1, *current_word)) + || (cc && g_strstr_len (cc_fold, -1, *current_word)) + || (bcc && g_strstr_len (bcc_fold, -1, *current_word)) + || (to && g_strstr_len (to_fold, -1, *current_word)) + || (from && g_strstr_len (from_fold, -1, *current_word))) { + found = TRUE; + } else { + found = FALSE; + break; + } + } + + g_free (subject_fold); + g_free (cc_fold); + g_free (bcc_fold); + g_free (to_fold); + g_free (from_fold); + + return found; +} + +static gboolean filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) @@ -2124,7 +2224,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; @@ -2132,13 +2232,27 @@ 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; @@ -2176,7 +2290,7 @@ filter_row (GtkTreeModel *model, notify_filter_change_destroy); } } - + return visible; } @@ -2199,17 +2313,20 @@ _clear_hidding_filter (ModestHeaderView *header_view) void modest_header_view_refilter (ModestHeaderView *header_view) { - GtkTreeModel *model = NULL; + GtkTreeModel *model, *sortable = 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)) { - priv->status = HEADER_VIEW_INIT; - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + if (GTK_IS_TREE_MODEL_SORT (sortable)) { + model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sortable)); + if (GTK_IS_TREE_MODEL_FILTER (model)) { + priv->status = HEADER_VIEW_INIT; + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + } } } @@ -2233,10 +2350,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); + } } } @@ -2311,17 +2437,14 @@ 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 @@ -2329,17 +2452,14 @@ 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; - 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); } static void @@ -2360,7 +2480,6 @@ update_style (ModestHeaderView *self) PangoAttrList *attr_list; GtkStyle *style; PangoAttribute *attr; - GdkColor *new_color; g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); @@ -2368,9 +2487,10 @@ update_style (ModestHeaderView *self) /* Set color */ attr_list = pango_attr_list_new (); - if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) { - gdk_color_parse ("grey", &style_color); + 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); @@ -2385,40 +2505,42 @@ update_style (ModestHeaderView *self) pango_attr_list_insert (attr_list, attr); g_object_set (G_OBJECT (priv->renderer_address), - "foreground-gdk", &style_color, + "foreground-gdk", &(priv->secondary_color), "foreground-set", TRUE, "attributes", attr_list, NULL); g_object_set (G_OBJECT (priv->renderer_date_status), - "foreground-gdk", &style_color, + "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", &style_color, + "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", &style_color, + "foreground-gdk", &(priv->secondary_color), "foreground-set", TRUE, "scale", PANGO_SCALE_SMALL, "scale-set", TRUE, NULL); } - if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) { - new_color = gdk_color_copy (&style_active_color); + 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 { - new_color = NULL; - } #ifdef MODEST_TOOLKIT_HILDON2 - g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (new_color != NULL)); - g_object_set_data_full (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, new_color, (GDestroyNotify) gdk_color_free); + g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (FALSE)); #endif + } } TnyHeader * @@ -2439,8 +2561,6 @@ modest_header_view_get_header_at_pos (ModestHeaderView *header_view, NULL)) return NULL; - g_debug ("located path: %s", gtk_tree_path_to_string (path)); - /* Get model */ tree_model = gtk_tree_view_get_model ((GtkTreeView *) header_view); if (!gtk_tree_model_get_iter (tree_model, &iter, path)) @@ -2453,3 +2573,139 @@ modest_header_view_get_header_at_pos (ModestHeaderView *header_view, 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)); +}