#include <modest-datetime-formatter.h>
#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-gtk.h>
+#include <hildon/hildon-helper.h>
#endif
static GObjectClass *parent_class = NULL;
struct _ModestCompactMailHeaderViewPriv
{
GtkWidget *headers_vbox;
+ GtkWidget *event_box;
GtkWidget *fromto_label;
GtkWidget *fromto_contents;
+ GtkWidget *time_label;
GtkWidget *date_label;
+ GtkWidget *brand_label;
+ GtkWidget *brand_image;
GSList *custom_labels;
static gboolean modest_compact_mail_header_view_get_loading_default (ModestMailHeaderView *headers_view);
static void modest_compact_mail_header_view_set_loading (ModestMailHeaderView *headers_view, gboolean is_loading);
static void modest_compact_mail_header_view_set_loading_default (ModestMailHeaderView *headers_view, gboolean is_loading);
+static void modest_compact_mail_header_view_set_branding (ModestMailHeaderView *headers_view, const gchar *brand_name, const GdkPixbuf *brand_icon);
+static void modest_compact_mail_header_view_set_branding_default (ModestMailHeaderView *headers_view, const gchar *brand_name, const GdkPixbuf *brand_icon);
static const GtkWidget *modest_compact_mail_header_view_add_custom_header (ModestMailHeaderView *self,
const gchar *label,
GtkWidget *custom_widget,
static void
set_date_time (ModestCompactMailHeaderView *compact_mail_header)
{
- const guint BUF_SIZE = 64;
- const gchar *date_str;
- gchar date_buf[BUF_SIZE];
- GString *buffer = g_string_new ("");
-
ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (compact_mail_header);
- modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_week"), priv->date_to_show);
- buffer = g_string_append (buffer, date_buf);
- buffer = g_string_append_c (buffer, ' ');
- buffer = g_string_append_unichar (buffer, 0x2015);
- buffer = g_string_append_c (buffer, ' ');
- date_str = modest_datetime_formatter_format_time (priv->datetime_formatter, priv->date_to_show);
- buffer = g_string_append (buffer, date_str);
- buffer = g_string_append (buffer, "\n");
- modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_date_medium"), priv->date_to_show);
- buffer = g_string_append (buffer, date_buf);
-
- gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);
- g_string_free (buffer, TRUE);
+ if (priv->date_to_show == 0) {
+ gtk_label_set_text (GTK_LABEL (priv->time_label), "");
+ gtk_label_set_text (GTK_LABEL (priv->date_label), "");
+ } else {
+ const guint BUF_SIZE = 64;
+ const gchar *date_str;
+ gchar date_buf[BUF_SIZE];
+ GString *buffer = g_string_new ("");
+
+ modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_WEEK, priv->date_to_show);
+ buffer = g_string_append (buffer, date_buf);
+ buffer = g_string_append_c (buffer, ' ');
+ buffer = g_string_append_unichar (buffer, 0x2015);
+ buffer = g_string_append_c (buffer, ' ');
+ date_str = modest_datetime_formatter_format_time (priv->datetime_formatter, priv->date_to_show);
+ buffer = g_string_append (buffer, date_str);
+ gtk_label_set_text (GTK_LABEL (priv->time_label), buffer->str);
+ g_string_free (buffer, TRUE);
+ buffer = g_string_new ("");
+ modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_DATE_MEDIUM, priv->date_to_show);
+ buffer = g_string_append (buffer, date_buf);
+
+ gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);
+ g_string_free (buffer, TRUE);
+ }
}
}
static void
+unref_event_box (ModestCompactMailHeaderView *self,
+ GtkWidget *event_box)
+{
+ ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
+ priv->event_box = NULL;
+}
+
+static void
modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer g_class)
{
ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *)instance;
ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
GtkWidget *from_date_hbox, *vbox, *main_vbox;
GtkWidget *main_align;
+ GtkWidget *headers_date_hbox;
+ GtkWidget *date_brand_vbox, *brand_hbox;
priv->header = NULL;
priv->custom_labels = NULL;
* as we want to track the style changes and update the color properly */
from_date_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_DOUBLE);
+ headers_date_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_DOUBLE);
priv->fromto_label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (priv->fromto_label), 0.0, 1.0);
priv->date_label = gtk_label_new (NULL);
gtk_label_set_justify (GTK_LABEL (priv->date_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment (GTK_MISC (priv->date_label), 1.0, 1.0);
+ gtk_misc_set_alignment (GTK_MISC (priv->date_label), 1.0, 0.0);
gtk_misc_set_padding (GTK_MISC (priv->date_label), MODEST_MARGIN_DOUBLE, 0);
+ priv->time_label = gtk_label_new (NULL);
+ gtk_label_set_justify (GTK_LABEL (priv->time_label), GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment (GTK_MISC (priv->time_label), 1.0, 1.0);
+ gtk_misc_set_padding (GTK_MISC (priv->time_label), MODEST_MARGIN_DOUBLE, 0);
+
+ priv->brand_label = gtk_label_new (NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
+ hildon_helper_set_logical_font (priv->brand_label, "SmallSystemFont");
+#endif
+ gtk_label_set_justify (GTK_LABEL (priv->brand_label), GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 1.0, 0.5);
+ gtk_misc_set_padding (GTK_MISC (priv->brand_label), MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_set_no_show_all (priv->brand_label, TRUE);
+
+ priv->brand_image = gtk_image_new ();
+ gtk_misc_set_alignment (GTK_MISC (priv->brand_image), 0.5, 0.5);
+ gtk_widget_set_no_show_all (priv->brand_image, TRUE);
+
gtk_box_pack_start (GTK_BOX (from_date_hbox), priv->fromto_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (from_date_hbox), priv->fromto_contents, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (from_date_hbox), priv->date_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (from_date_hbox), priv->time_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), from_date_hbox, FALSE, FALSE, 0);
- update_style (self);
-
- g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
-
priv->datetime_formatter = modest_datetime_formatter_new ();
g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed",
G_CALLBACK (datetime_format_changed), (gpointer) self);
gtk_container_set_focus_chain (GTK_CONTAINER (priv->headers_vbox), NULL);
g_object_ref (priv->headers_vbox);
+ brand_hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (brand_hbox), priv->brand_image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (brand_hbox), priv->brand_label, TRUE, TRUE, 0);
+
+ date_brand_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (date_brand_vbox), priv->date_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (date_brand_vbox), brand_hbox, FALSE, FALSE, 0);
+
gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), priv->headers_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (headers_date_hbox), priv->headers_vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (headers_date_hbox), date_brand_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), headers_date_hbox, FALSE, FALSE, 0);
main_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
- gtk_alignment_set_padding (GTK_ALIGNMENT (main_align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (main_align), 0, MODEST_MARGIN_HALF, MODEST_MARGIN_DOUBLE, 0);
+ priv->event_box = gtk_event_box_new ();
+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->event_box), TRUE);
gtk_container_add (GTK_CONTAINER (main_align), main_vbox);
- gtk_box_pack_start (GTK_BOX (self), main_align, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (priv->event_box), main_align);
+ gtk_box_pack_start (GTK_BOX (self), priv->event_box, TRUE, TRUE, 0);
+ g_object_weak_ref (G_OBJECT (priv->event_box), (GWeakNotify) unref_event_box, (gpointer) self);
+
+ update_style (self);
- gtk_widget_show_all (main_align);
+ g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
+
+ gtk_widget_show_all (priv->event_box);
priv->is_outgoing = FALSE;
priv->is_draft = FALSE;
ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *)object;
ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
+ if (priv->event_box) {
+ g_object_weak_unref (G_OBJECT (priv->event_box), (GWeakNotify) unref_event_box, (gpointer) self);
+ priv->event_box = NULL;
+ }
+
if (priv->datetime_formatter) {
g_object_unref (priv->datetime_formatter);
priv->datetime_formatter = NULL;
klass->set_priority = modest_compact_mail_header_view_set_priority;
klass->get_loading = modest_compact_mail_header_view_get_loading;
klass->set_loading = modest_compact_mail_header_view_set_loading;
+ klass->set_branding = modest_compact_mail_header_view_set_branding;
klass->add_custom_header = modest_compact_mail_header_view_add_custom_header;
return;
klass->get_priority_func = modest_compact_mail_header_view_get_priority_default;
klass->set_loading_func = modest_compact_mail_header_view_set_loading_default;
klass->get_loading_func = modest_compact_mail_header_view_get_loading_default;
+ klass->set_branding_func = modest_compact_mail_header_view_set_branding_default;
klass->add_custom_header_func = modest_compact_mail_header_view_add_custom_header_default;
object_class->finalize = modest_compact_mail_header_view_finalize;
priv->is_loading = is_loading;
}
+static void
+modest_compact_mail_header_view_set_branding (ModestMailHeaderView *headers_view, const gchar *brand_name, const GdkPixbuf *brand_icon)
+{
+ MODEST_COMPACT_MAIL_HEADER_VIEW_GET_CLASS (headers_view)->set_branding_func (headers_view, brand_name, brand_icon);
+}
+
+static void
+modest_compact_mail_header_view_set_branding_default (ModestMailHeaderView *headers_view, const gchar *brand_name, const GdkPixbuf *brand_icon)
+{
+ ModestCompactMailHeaderViewPriv *priv;
+
+ g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (headers_view));
+ priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
+
+ if (brand_name) {
+ gtk_label_set_text (GTK_LABEL (priv->brand_label), brand_name);
+ gtk_widget_show (priv->brand_label);
+ } else {
+ gtk_widget_hide (priv->brand_label);
+ }
+
+ if (brand_icon) {
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->brand_image), (GdkPixbuf *) brand_icon);
+ gtk_widget_show (priv->brand_image);
+ } else {
+ gtk_widget_hide (priv->brand_image);
+ }
+
+
+}
+
static void
on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
{
g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
- if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+ if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
color.red = style_color.red;
color.green = style_color.green;
color.blue = style_color.blue;
} else {
- if (!pango_color_parse (&color, "grey")) {
+ if (!pango_color_parse (&color, MODEST_SECONDARY_COLOR)) {
g_warning ("Failed to parse color grey");
color.red = 0xc0c0;
color.green = 0xc0c0;
pango_attr_list_insert (attr_list, pango_attr_foreground_new (color.red, color.green, color.blue));
pango_attr_list_insert (attr_list, pango_attr_scale_new (PANGO_SCALE_SMALL));
gtk_label_set_attributes (GTK_LABEL (priv->date_label), attr_list);
+ gtk_label_set_attributes (GTK_LABEL (priv->time_label), attr_list);
pango_attr_list_unref (attr_list);
/* set style of custom headers */
}
pango_attr_list_unref (attr_list);
+#ifdef MODEST_COMPACT_HEADER_BG
+ GdkColor bg_color;
+
+ gdk_color_parse (MODEST_COMPACT_HEADER_BG, &bg_color);
+ gtk_widget_modify_bg (GTK_WIDGET (priv->event_box), GTK_STATE_NORMAL, &bg_color);
+#endif
}
static void
ModestCompactMailHeaderViewPriv *priv;
gchar *recipients;
const gchar *label;
- GSList *recipient_list;
- gchar *first_address;
-
+
g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
recipients = tny_header_dup_from (TNY_HEADER (priv->header));
}
- recipient_list = modest_text_utils_split_addresses_list (recipients);
- if (recipient_list == NULL) {
- first_address = NULL;
- } else {
- gchar *first_recipient;
-
- first_recipient = (gchar *) recipient_list->data;
- first_address = first_recipient?g_strdup (first_recipient):NULL;
- }
- g_slist_foreach (recipient_list, (GFunc) g_free, NULL);
- g_slist_free (recipient_list);
-
+ /* Set label */
gtk_label_set_text (GTK_LABEL (priv->fromto_label), label);
+
+ /* Set recipients */
if (recipients) {
- modest_text_utils_get_display_address (first_address);
- gtk_label_set_text (GTK_LABEL (priv->fromto_contents), first_address);
+ gchar *addresses;
+
+ addresses = modest_text_utils_get_display_addresses ((const gchar *) recipients);
+ gtk_label_set_text (GTK_LABEL (priv->fromto_contents),
+ (addresses) ? addresses : _("mail_va_no_to"));
+ g_free (addresses);
g_free (recipients);
- g_free (first_address);
}
-
}
projects / modest / blobdiff