#include <tny-simple-list.h>
#include <modest-header-view.h>
#include <modest-header-view-priv.h>
+#include <modest-defs.h>
#include <modest-icon-names.h>
#include <modest-text-utils.h>
#include <modest-tny-account-store.h>
#include <modest-platform.h>
#include <string.h>
-typedef enum {
- RENDER_CELL_STYLE_DEFAULT=0,
- RENDER_CELL_STYLE_GREY
-} RenderCellStyle;
+#ifdef MODEST_TOOLKIT_HILDON2
+#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#else
+#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#endif
static const gchar *
get_status_string (ModestTnySendQueueStatus status)
case TNY_HEADER_FLAG_DELETED:
if (G_UNLIKELY(!deleted_pixbuf))
deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return deleted_pixbuf;
case TNY_HEADER_FLAG_SEEN:
if (G_UNLIKELY(!seen_pixbuf))
seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return seen_pixbuf;
case TNY_HEADER_FLAG_ATTACHMENTS:
if (G_UNLIKELY(!attachments_pixbuf))
attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return attachments_pixbuf;
case TNY_HEADER_FLAG_HIGH_PRIORITY:
if (G_UNLIKELY(!high_pixbuf))
high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return high_pixbuf;
case TNY_HEADER_FLAG_LOW_PRIORITY:
if (G_UNLIKELY(!low_pixbuf))
low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
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,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return unread_pixbuf;
}
}
static void
set_cell_text (GtkCellRenderer *renderer,
const gchar *text,
- TnyHeaderFlags flags,
- RenderCellStyle style)
+ TnyHeaderFlags flags)
{
- PangoWeight weight;
gboolean strikethrough;
+ gboolean bold_is_active_color;
+ GdkColor *color = NULL;
+ PangoWeight weight;
+
+ bold_is_active_color = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), BOLD_IS_ACTIVE_COLOR));
+ if (bold_is_active_color) {
+ color = g_object_get_data (G_OBJECT (renderer), ACTIVE_COLOR);
+ }
- weight = (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL: PANGO_WEIGHT_ULTRABOLD;
+#ifdef MODEST_TOOLKIT_HILDON2
+ weight = PANGO_WEIGHT_NORMAL;
+#else
+ weight = (bold_is_active_color || (flags & TNY_HEADER_FLAG_SEEN)) ? PANGO_WEIGHT_NORMAL: PANGO_WEIGHT_ULTRABOLD;
+#endif
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,
+ "weight", weight,
"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;
+ if (bold_is_active_color && color) {
+ if (flags & TNY_HEADER_FLAG_SEEN) {
+ g_object_set (G_OBJECT (renderer),
+ "foreground-set", FALSE,
+ NULL);
+ } else {
+ g_object_set (G_OBJECT (renderer),
+ "foreground-gdk", color,
+ "foreground-set", TRUE,
+ NULL);
+ }
}
g_object_thaw_notify (G_OBJECT (renderer));
}
header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
set_cell_text (renderer,
_modest_header_view_get_display_date (header_view, date),
- flags, RENDER_CELL_STYLE_DEFAULT);
+ flags);
#else
set_cell_text (renderer, modest_text_utils_get_display_date (date),
- flags, RENDER_CELL_STYLE_DEFAULT);
+ flags);
#endif
}
sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN;
else
sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
-
+
gtk_tree_model_get (tree_model, iter,
sender_receiver_col, &address,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-1);
-
+
modest_text_utils_get_display_address (address); /* string is changed in-place */
-
+
set_cell_text (renderer, (address && address[0] != '\0')?address:_("mail_va_no_to"),
- flags, RENDER_CELL_STYLE_DEFAULT);
+ flags);
g_free (address);
}
/*
_modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
- /* Note that GtkTreeModel is a GtkTreeModelFilter. */
-
- /* printf ("DEBUG: %s: tree_model gtype=%s\n", __FUNCTION__, G_OBJECT_TYPE_NAME (tree_model)); */
-
TnyHeaderFlags flags = 0;
- gchar *address = NULL;
+ gchar *recipients = NULL, *addresses;
gchar *subject = 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;
TnyHeaderFlags prio = 0;
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+ GtkTreeCellDataHint hint;
+#endif
+#endif
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column));
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
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"));
priority_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "priority-renderer"));
if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN)
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &address,
+ TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &recipients,
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,
TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &msg_header,
else
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
- TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &address,
+ TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &recipients,
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &msg_header,
NULL);
set_cell_text (subject_cell, (subject && subject[0] != 0)?subject:_("mail_va_no_subject"),
- flags, RENDER_CELL_STYLE_DEFAULT);
+ flags);
g_free (subject);
- /* 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 */
- set_cell_text (recipient_cell, (address && address[0] != '\0')?address:_("mail_va_no_to"), flags, RENDER_CELL_STYLE_GREY);
- g_free (address);
-
+ /* Show the list of senders/recipients */
+ addresses = modest_text_utils_get_display_addresses ((const gchar *) recipients);
+ set_cell_text (recipient_cell, (addresses) ? addresses : _("mail_va_no_to"), flags);
+ g_free (addresses);
+ g_free (recipients);
+
+ /* Show status (outbox folder) or sent date */
if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
const gchar *status_str = "";
tny_header_set_flag (msg_header, TNY_HEADER_FLAG_SUSPENDED);
}
}
-
+
status_str = get_status_string (status);
- set_cell_text (date_or_status_cell, status_str, flags, RENDER_CELL_STYLE_GREY);
+ set_cell_text (date_or_status_cell, status_str, flags);
} else {
#if GTK_CHECK_VERSION (2, 12, 0)
ModestHeaderView *header_view;
header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
set_cell_text (date_or_status_cell,
date ? _modest_header_view_get_display_date (header_view, date) : "",
- flags, RENDER_CELL_STYLE_GREY);
+ flags);
#else
set_cell_text (date_or_status_cell,
date ? modest_text_utils_get_display_date (date) : "",
- flags, RENDER_CELL_STYLE_GREY);
+ flags);
#endif
}
if (msg_header != NULL)
size_str = modest_text_utils_get_display_size (size);
- set_cell_text (renderer, size_str, flags, RENDER_CELL_STYLE_DEFAULT);
+ set_cell_text (renderer, size_str, flags);
g_free (size_str);
}
else
status_str = g_strdup(_("mcen_li_outbox_waiting"));
- set_cell_text (renderer, status_str, flags, RENDER_CELL_STYLE_DEFAULT);
+ set_cell_text (renderer, status_str, flags);
g_free (status_str);
}
projects / modest / blobdiff