#include <modest-hbox-cell-renderer.h>
#include <modest-vbox-cell-renderer.h>
#include <modest-datetime-formatter.h>
+#include <modest-ui-constants.h>
static void modest_header_view_class_init (ModestHeaderViewClass *klass);
static void modest_header_view_init (ModestHeaderView *obj);
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);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set (G_OBJECT (renderer_compact_header), "xpad", MODEST_MARGIN_DOUBLE, NULL);
+#endif
g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
#ifndef MODEST_TOOLKIT_GTK
gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
NULL);
gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1);
g_object_set (G_OBJECT (renderer_recpt),
- "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
+ "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.1,
NULL);
gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1);
g_object_set(G_OBJECT(renderer_compact_date_or_status),
- "xalign", 1.0, "yalign", 0.0,
+ "xalign", 1.0, "yalign", 0.1,
NULL);
gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1);
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set (G_OBJECT (renderer_priority),
+ "yalign", 0.5,
+ "xalign", 0.0, NULL);
+ g_object_set (G_OBJECT (renderer_attach),
+ "yalign", 0.5,
+ "xalign", 0.0, NULL);
+#else
g_object_set (G_OBJECT (renderer_priority),
- "yalign", 1.0, NULL);
+ "yalign", 0.5, NULL);
g_object_set (G_OBJECT (renderer_attach),
"yalign", 0.0, NULL);
+#endif
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON1
gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26);
gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
+#elif MODEST_TOOLKIT_HILDON2
+ gtk_cell_renderer_set_fixed_size (renderer_attach, 24, 26);
+ gtk_cell_renderer_set_fixed_size (renderer_priority, 24, 26);
+ gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
#else
gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16);
gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16);
compact_column, NULL);
}
+ update_style (self);
+ g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
+
return TRUE;
}
folder_refreshed_cb (mail_op, folder, info);
}
/* Free */
- g_object_unref (mail_op);
+ if (mail_op)
+ g_object_unref (mail_op);
} else {
g_mutex_lock (priv->observers_lock);
goto frees;
}
+ if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) {
+ if (priv->is_outbox &&
+ modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
+ visible = FALSE;
+ goto frees;
+ }
+ }
+
+ if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) {
+ if (priv->is_outbox &&
+ modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
+ visible = FALSE;
+ goto frees;
+ }
+ }
+
/* If no data on clipboard, return always TRUE */
if (modest_email_clipboard_cleared(priv->clipboard)) {
visible = TRUE;
g_free(id);
}
- if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) {
- if (priv->is_outbox &&
- modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING)
- visible = FALSE;
- }
-
- if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) {
- if (priv->is_outbox &&
- modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING)
- visible = FALSE;
- }
-
frees:
old_status = priv->status;
priv->status = ((gboolean) priv->status) && !visible;
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);
+ if (style) {
+ 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);
+ } else {
+ g_object_set (G_OBJECT (priv->renderer_address),
+ "foreground-gdk", &style_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-set", TRUE,
+ "scale", PANGO_SCALE_SMALL,
+ "scale-set", TRUE,
+ NULL);
+ }
+}
+
projects / modest / blobdiff