#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)
{
static void
set_cell_text (GtkCellRenderer *renderer,
const gchar *text,
- TnyHeaderFlags flags,
- RenderCellStyle style)
+ TnyHeaderFlags flags)
{
PangoWeight weight;
gboolean strikethrough;
"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));
}
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
}
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);
}
/*
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);
+ set_cell_text (recipient_cell, (address && address[0] != '\0')?address:_("mail_va_no_to"), flags);
g_free (address);
if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
}
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);
}
GdkEventExpose *event,
gpointer user_data);
+static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static void update_style (ModestHeaderView *self);
+
typedef enum {
HEADER_VIEW_NON_EMPTY,
HEADER_VIEW_EMPTY,
gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */
ModestDatetimeFormatter *datetime_formatter;
+
+ GtkCellRenderer *renderer_address;
+ GtkCellRenderer *renderer_date_status;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
renderer_recpt_box = modest_hbox_cell_renderer_new ();
renderer_subject_box = modest_hbox_cell_renderer_new ();
renderer_recpt = gtk_cell_renderer_text_new ();
+ priv->renderer_address = renderer_recpt;
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);
compact_column, NULL);
}
+ update_style (self);
+ g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
+
return TRUE;
}
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
}
}
+
+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;
+ 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 (self)->style, "SecondaryTextColor", &style_color)) {
+ gdk_color_parse ("grey", &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);
+ 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", &style_color,
+ "foreground-set", TRUE,
+ "attributes", attr_list,
+ NULL);
+ g_object_set (G_OBJECT (priv->renderer_date_status),
+ "foreground-gdk", &style_color,
+ "foreground-set", TRUE,
+ "attributes", attr_list,
+ NULL);
+ pango_attr_list_unref (attr_list);
+}
+