X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwidgets%2Fmodest-header-view-render.c;h=6ab9e3bbd1d8de666572fd36f310e0f3b531893a;hb=32aa324fb6312e9a86f9b244f63178fa1807043d;hp=b1c1daa88bc94a8d55cd9c988b636fbf6b1c8d15;hpb=c3c7de8afda2eb9cdb514fb517c6f188c8054e06;p=modest diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c index b1c1daa..6ab9e3b 100644 --- a/src/widgets/modest-header-view-render.c +++ b/src/widgets/modest-header-view-render.c @@ -34,75 +34,7 @@ #include #include #include - -#if 0 -static gchar * -_pango_replace_string (const gchar *string, - const gchar *in, - const gchar *out) -{ - gchar **tmp = NULL; - gchar *new_string = NULL; - gchar *tmp_string = NULL; - guint i = 0; - - /* Split data */ - if (string == NULL) return g_strdup(""); - tmp = g_strsplit(string, in, 0); - if (tmp[0] == NULL) return g_strdup(string); - - /* Replace and concat data*/ - new_string = g_strdup(tmp[0]); - for (i = 1; tmp[i] != NULL; i++) { - tmp_string = g_strconcat (new_string, out, tmp[i], NULL); - g_free(new_string); - new_string = g_strdup(tmp_string); - g_free(tmp_string); - } - - /* Free */ - g_strfreev(tmp); - - return new_string; -} - -static gchar * -_pango_parse_string (const gchar *string) -{ - gchar *parsed_string = NULL; - gchar *tmp = NULL; - - if (string == NULL) return g_strdup(""); - parsed_string = g_strdup(string); - - /* Check for '&' special character */ - tmp = g_strdup(parsed_string); - g_free(parsed_string); - parsed_string = _pango_replace_string (tmp, "&", "&"); - g_free(tmp); - - /* Check for '<' special character */ - tmp = g_strdup(parsed_string); - g_free(parsed_string); - parsed_string = _pango_replace_string (tmp, "<", "<"); - g_free(tmp); - - /* Check for '>' special character */ - tmp = g_strdup(parsed_string); - g_free(parsed_string); - parsed_string = _pango_replace_string (tmp, ">", ">"); - g_free(tmp); - - /* Check for ''' special character */ - tmp = g_strdup(parsed_string); - g_free(parsed_string); - parsed_string = _pango_replace_string (tmp, "'", "'"); - g_free(tmp); - - return parsed_string; -} - -#endif +#include static GdkPixbuf* get_pixbuf_for_flag (TnyHeaderFlags flag) @@ -112,6 +44,8 @@ get_pixbuf_for_flag (TnyHeaderFlags flag) static GdkPixbuf *seen_pixbuf = NULL; static GdkPixbuf *unread_pixbuf = NULL; static GdkPixbuf *attachments_pixbuf = NULL; + static GdkPixbuf *high_pixbuf = NULL; + static GdkPixbuf *low_pixbuf = NULL; switch (flag) { case TNY_HEADER_FLAG_DELETED: @@ -126,6 +60,14 @@ get_pixbuf_for_flag (TnyHeaderFlags flag) if (G_UNLIKELY(!attachments_pixbuf)) attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH); return attachments_pixbuf; + case TNY_HEADER_FLAG_HIGH_PRIORITY: + if (G_UNLIKELY(!high_pixbuf)) + high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY); + return high_pixbuf; + case TNY_HEADER_FLAG_LOW_PRIORITY: + if (G_UNLIKELY(!low_pixbuf)) + low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY); + return low_pixbuf; default: if (G_UNLIKELY(!unread_pixbuf)) unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD); @@ -133,52 +75,6 @@ get_pixbuf_for_flag (TnyHeaderFlags flag) } } -static GdkPixbuf* -get_pixbuf_for_compact_flag (TnyHeaderFlags flags) -{ - /* optimization */ - static GdkPixbuf *high_attachments_pixbuf = NULL; - static GdkPixbuf *normal_attachments_pixbuf = NULL; - static GdkPixbuf *low_attachments_pixbuf = NULL; - static GdkPixbuf *high_pixbuf = NULL; - static GdkPixbuf *low_pixbuf = NULL; - TnyHeaderFlags prior; - - prior = flags & TNY_HEADER_FLAG_HIGH_PRIORITY; - switch (prior) { - case TNY_HEADER_FLAG_HIGH_PRIORITY: - if (flags & TNY_HEADER_FLAG_ATTACHMENTS) { - if (G_UNLIKELY(!high_attachments_pixbuf)) - high_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY); - return high_attachments_pixbuf; - } else { - if (G_UNLIKELY(!high_pixbuf)) - high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY); - return high_pixbuf; - } - break; - case TNY_HEADER_FLAG_LOW_PRIORITY: - if (flags & TNY_HEADER_FLAG_ATTACHMENTS) { - if (G_UNLIKELY(!low_attachments_pixbuf)) - low_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY); - return low_attachments_pixbuf; - } else { - if (G_UNLIKELY(!low_pixbuf)) - low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY); - return low_pixbuf; - } - break; - default: - if (flags & TNY_HEADER_FLAG_ATTACHMENTS) { - if (G_UNLIKELY(!normal_attachments_pixbuf)) - normal_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY); - return normal_attachments_pixbuf; - } - } - - return NULL; -} - static void set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags) { @@ -225,22 +121,6 @@ _modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer } void -_modest_header_view_compact_flag_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) -{ - TnyHeaderFlags flags; - GdkPixbuf* pixbuf = NULL; - - gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, - &flags, -1); - - pixbuf = get_pixbuf_for_compact_flag (flags); - if (pixbuf != NULL) - g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL); - -} - -void _modest_header_view_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { @@ -280,35 +160,6 @@ _modest_header_view_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer } void -_modest_header_view_compact_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, - gpointer user_data) -{ - TnyHeaderFlags flags; - guint date, date_col; - gchar *display_date = NULL, *tmp_date = NULL; - gboolean received = GPOINTER_TO_INT(user_data); - - if (received) - date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN; - else - date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN; - - gtk_tree_model_get (tree_model, iter, - TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, - date_col, &date, - -1); - - tmp_date = modest_text_utils_get_display_date (date); - display_date = g_strdup_printf ("\n%s", tmp_date); - g_object_set (G_OBJECT(renderer), "markup", display_date, NULL); - - set_common_flags (renderer, flags); - g_free (tmp_date); - g_free (display_date); -} - -void _modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender) { @@ -342,12 +193,22 @@ void _modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { - GObject *rendobj; TnyHeaderFlags flags; - gchar *address, *subject, *header, *display_address; - gchar *parsed_address, *parsed_subject; + gchar *address, *subject, *header; time_t date; gboolean is_incoming; + GtkCellRenderer *recipient_cell, *date_cell, *subject_cell, + *attach_cell, *priority_cell, + *recipient_box, *subject_box; + gchar *display_date = NULL, *tmp_date = NULL; + + recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer")); + subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer")); + priority_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "priority-renderer")); + subject_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "subject-renderer")); + attach_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "attach-renderer")); + recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer")); + date_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer")); is_incoming = GPOINTER_TO_INT(user_data); /* GPOINTER_TO_BOOLEAN is not available * in older versions of glib...*/ @@ -366,30 +227,40 @@ _modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCe TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date, -1); - - rendobj = G_OBJECT(renderer); - /* deal with empty subjects */ - if (!subject) - subject = g_strdup (_("mail_va_no_subject")); - - /* Escape special characteres to allow pango makup`*/ - display_address = modest_text_utils_get_display_address (address); - parsed_address = modest_text_utils_convert_to_pango (display_address); - //_pango_parse_string (display_address); - parsed_subject = modest_text_utils_convert_to_pango (subject); - //_pango_parse_string (subject); + /* flags */ + if (flags & TNY_HEADER_FLAG_ATTACHMENTS) + g_object_set (G_OBJECT (attach_cell), "pixbuf", + get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS), + NULL); + else + g_object_set (G_OBJECT (attach_cell), "pixbuf", + get_pixbuf_for_flag (0), NULL); + if (flags & TNY_HEADER_FLAG_PRIORITY) + g_object_set (G_OBJECT (priority_cell), "pixbuf", + get_pixbuf_for_flag (flags & TNY_HEADER_FLAG_PRIORITY), + NULL); + else + g_object_set (G_OBJECT (priority_cell), "pixbuf", + get_pixbuf_for_flag (0), NULL); + header = g_markup_printf_escaped ("%s", (subject && strlen (subject)) ? subject : _("mail_va_no_subject")); + g_free (subject); + g_object_set (G_OBJECT (subject_cell), "markup", header, NULL); + set_common_flags (subject_cell, flags); - header = g_strdup_printf ("%s\n%s", - parsed_subject, - parsed_address); + header = g_markup_printf_escaped ("%s", modest_text_utils_get_display_address (address)); g_free (address); - g_free (subject); - g_free(parsed_subject); - g_free(parsed_address); + g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL); - g_object_set (rendobj, "markup", header, NULL); - set_common_flags (renderer, flags); + g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL); + set_common_flags (recipient_cell, flags); + + tmp_date = modest_text_utils_get_display_date (date); + display_date = g_strdup_printf ("%s", tmp_date); + g_object_set (G_OBJECT (date_cell), "markup", display_date, NULL); + g_free (tmp_date); + g_free (display_date); + set_common_flags (date_cell, flags); g_free (header); } @@ -419,19 +290,18 @@ _modest_header_view_size_cell_data (GtkTreeViewColumn *column, GtkCellRenderer void _modest_header_view_status_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, - gpointer user_data) + GtkTreeModel *tree_model, GtkTreeIter *iter, + gpointer user_data) { TnyHeaderFlags flags; - guint status; + //guint status; gchar *status_str; gtk_tree_model_get (tree_model, iter, - TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, - TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, + // TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status, -1); -/* size_str = modest_text_utils_get_display_size (size); */ status_str = g_strdup(_("mcen_li_outbox_waiting")); g_object_set (G_OBJECT(renderer), "text", status_str, NULL);