#include <modest-platform.h>
#include <string.h>
+typedef enum {
+ RENDER_CELL_STYLE_DEFAULT=0,
+ RENDER_CELL_STYLE_GREY
+} RenderCellStyle;
static const gchar *
get_status_string (ModestTnySendQueueStatus status)
switch (flag) {
case TNY_HEADER_FLAG_DELETED:
if (G_UNLIKELY(!deleted_pixbuf))
- deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED);
+ deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED,
+ MODEST_ICON_SIZE_SMALL);
return deleted_pixbuf;
case TNY_HEADER_FLAG_SEEN:
if (G_UNLIKELY(!seen_pixbuf))
- seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ);
+ seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ,
+ MODEST_ICON_SIZE_SMALL);
return seen_pixbuf;
case TNY_HEADER_FLAG_ATTACHMENTS:
if (G_UNLIKELY(!attachments_pixbuf))
- attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH);
+ attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH,
+ MODEST_ICON_SIZE_SMALL);
return attachments_pixbuf;
case TNY_HEADER_FLAG_HIGH_PRIORITY:
if (G_UNLIKELY(!high_pixbuf))
- high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH);
+ high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH,
+ MODEST_ICON_SIZE_SMALL);
return high_pixbuf;
case TNY_HEADER_FLAG_LOW_PRIORITY:
if (G_UNLIKELY(!low_pixbuf))
- low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW);
+ low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW,
+ MODEST_ICON_SIZE_SMALL);
return low_pixbuf;
case TNY_HEADER_FLAG_NORMAL_PRIORITY:
return NULL;
default:
if (G_UNLIKELY(!unread_pixbuf))
- unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD);
+ unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD,
+ MODEST_ICON_SIZE_SMALL);
return unread_pixbuf;
}
}
NULL);
}
-
-void
-_modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+static void
+set_cell_text (GtkCellRenderer *renderer,
+ const gchar *text,
+ TnyHeaderFlags flags,
+ RenderCellStyle style)
{
- TnyHeaderFlags flags;
-
- gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
- &flags, -1);
-
- if (flags & TNY_HEADER_FLAG_DELETED)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_flag (TNY_HEADER_FLAG_DELETED), NULL);
- else if (flags & TNY_HEADER_FLAG_SEEN)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_flag (TNY_HEADER_FLAG_SEEN), NULL);
- else
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_flag (0), NULL); /* ughh, FIXME */
+ PangoWeight weight;
+ gboolean strikethrough;
+
+ weight = (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL: PANGO_WEIGHT_ULTRABOLD;
+ strikethrough = (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE;
+ g_object_freeze_notify (G_OBJECT (renderer));
+ g_object_set (G_OBJECT (renderer),
+ "text", text,
+ "weight", (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL : PANGO_WEIGHT_ULTRABOLD,
+ "strikethrough", (flags &TNY_HEADER_FLAG_DELETED) ? TRUE : FALSE,
+ NULL);
+ switch (style) {
+ case RENDER_CELL_STYLE_GREY:
+ g_object_set (G_OBJECT (renderer),
+ "foreground", "#666666",
+ "scale", PANGO_SCALE_SMALL,
+ NULL);
+ break;
+ case RENDER_CELL_STYLE_DEFAULT:
+ break;
+ }
+ g_object_thaw_notify (G_OBJECT (renderer));
}
void
date_col, &date,
-1);
- g_object_set (G_OBJECT(renderer), "text", modest_text_utils_get_display_date (date),
- NULL);
-
- set_common_flags (renderer, flags);
+ set_cell_text (renderer, modest_text_utils_get_display_date (date),
+ flags, RENDER_CELL_STYLE_DEFAULT);
}
void
-1);
modest_text_utils_get_display_address (address); /* string is changed in-place */
- g_object_set (G_OBJECT(renderer),
- "text",
- address,
- NULL);
+ set_cell_text (renderer, address, flags, RENDER_CELL_STYLE_DEFAULT);
g_free (address);
-
- set_common_flags (renderer, flags);
}
/*
* this for both incoming and outgoing mail, depending on the the user_data
TnyHeaderFlags flags = 0;
gchar *address = NULL;
gchar *subject = NULL;
- gchar *header = NULL;
time_t date;
+
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+ GtkTreeCellDataHint hint;
+#endif
+#endif
GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*attach_cell, *priority_cell,
*recipient_box, *subject_box = NULL;
TnyHeader *msg_header = NULL;
- gchar *display_date = NULL, *tmp_date = NULL;
TnyHeaderFlags prio = 0;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column));
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
+
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+ hint = gtk_tree_view_column_get_cell_data_hint (GTK_TREE_VIEW_COLUMN (column));
+
+ if (hint != GTK_TREE_CELL_DATA_HINT_ALL)
+ return;
+#endif
+#endif
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"));
get_pixbuf_for_flag (prio),
NULL);
- if (subject && strlen (subject)) {
- gchar* escaped_subject = g_markup_escape_text (subject, -1);
- g_object_set (G_OBJECT (subject_cell), "markup",
- escaped_subject, NULL);
- g_free (escaped_subject);
- } else {
- g_object_set (G_OBJECT (subject_cell), "markup",
- _("mail_va_no_subject"), NULL);
- }
-
+ set_cell_text (subject_cell, (subject && subject[0] != 0)?subject:_("mail_va_no_subject"),
+ flags, RENDER_CELL_STYLE_DEFAULT);
g_free (subject);
- set_common_flags (subject_cell, flags);
/* FIXME: we hardcode the color to #666666; instead we should use SecondaryTextColour from the
* theme (gtkrc file) */
modest_text_utils_get_display_address (address); /* changed in-place */
- header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>",
- address);
+ set_cell_text (recipient_cell, address, flags, RENDER_CELL_STYLE_GREY);
g_free (address);
- g_object_set (G_OBJECT (recipient_cell),
- "markup", header,
- NULL);
- g_free (header);
- header = NULL;
- set_common_flags (recipient_cell, flags);
if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
}
status_str = get_status_string (status);
- display_date = g_strdup_printf("<span size='small' foreground='#666666'>%s</span>", status_str);
- g_object_set (G_OBJECT (date_or_status_cell),
- "markup", display_date,
- NULL);
- g_free (display_date);
- display_date = NULL;
+ set_cell_text (date_or_status_cell, status_str, flags, RENDER_CELL_STYLE_GREY);
} else {
- display_date = g_strdup_printf ("<span size='small' foreground='#666666'>%s</span>",
- date ? modest_text_utils_get_display_date (date) : "");
- g_object_set (G_OBJECT (date_or_status_cell),
- "markup", display_date,
- NULL);
- g_free (tmp_date);
- tmp_date = NULL;
- g_free (display_date);
- display_date = NULL;
+ set_cell_text (date_or_status_cell, date ? modest_text_utils_get_display_date (date) : "",
+ flags, RENDER_CELL_STYLE_GREY);
}
if (msg_header != NULL)
g_object_unref (msg_header);
-
- set_common_flags (date_or_status_cell, flags);
}
size_str = modest_text_utils_get_display_size (size);
- g_object_set (G_OBJECT(renderer), "text", size_str, NULL);
- set_common_flags (renderer, flags);
+ set_cell_text (renderer, size_str, flags, RENDER_CELL_STYLE_DEFAULT);
g_free (size_str);
}
else
status_str = g_strdup(_("mcen_li_outbox_waiting"));
- g_object_set (G_OBJECT(renderer), "text", status_str, NULL);
- set_common_flags (renderer, flags);
+ set_cell_text (renderer, status_str, flags, RENDER_CELL_STYLE_DEFAULT);
g_free (status_str);
}
projects / modest / blobdiff