Modified webpage: now tinymail repository is in gitorious.
[modest] / src / widgets / modest-compact-mail-header-view.c
index 8f1a03e..c899c6a 100644 (file)
 
 #include <string.h>
 #include <gtk/gtk.h>
+#include <modest-defs.h>
 #include <modest-text-utils.h>
 #include <modest-compact-mail-header-view.h>
 #include <modest-tny-folder.h>
 #include <modest-ui-constants.h>
+#include <modest-icon-names.h>
+#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;
@@ -47,23 +51,27 @@ typedef struct _ModestCompactMailHeaderViewPriv ModestCompactMailHeaderViewPriv;
 struct _ModestCompactMailHeaderViewPriv
 {
        GtkWidget    *headers_vbox;
-       GtkWidget    *subject_box;
+       GtkWidget    *event_box;
 
        GtkWidget    *fromto_label;
        GtkWidget    *fromto_contents;
-       GtkWidget    *priority_icon;
-       GtkWidget    *details_label;
+       GtkWidget    *time_label;
        GtkWidget    *date_label;
-       GtkWidget    *subject_label;
+       GtkWidget    *brand_label;
+       GtkWidget    *brand_image;
 
-       GtkSizeGroup *labels_size_group;
+       GSList       *custom_labels;
 
        gboolean     is_outgoing;
        gboolean     is_draft;
-       gchar        *first_address;
        
        TnyHeader    *header;
        TnyHeaderFlags priority_flags;
+
+       gboolean     is_loading;
+
+       time_t       date_to_show;
+       ModestDatetimeFormatter *datetime_formatter;
 };
 
 #define MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE(o) \
@@ -89,6 +97,12 @@ static TnyHeaderFlags modest_compact_mail_header_view_get_priority_default (Mode
 static void modest_compact_mail_header_view_set_priority (ModestMailHeaderView *self, TnyHeaderFlags flags);
 static void modest_compact_mail_header_view_set_priority_default (ModestMailHeaderView *headers_view,
                                                                   TnyHeaderFlags flags);
+static gboolean modest_compact_mail_header_view_get_loading (ModestMailHeaderView *headers_view);
+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,
@@ -102,23 +116,40 @@ static const GtkWidget *modest_compact_mail_header_view_add_custom_header_defaul
 
 /* internal */
 static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
-static void on_details_button_clicked  (GtkButton *button, gpointer userdata);
-static void on_fromto_button_clicked  (GtkButton *button, gpointer userdata);
 static void update_style (ModestCompactMailHeaderView *self);
-static void set_date_time (ModestCompactMailHeaderView *compact_mail_header, time_t date);
+static void set_date_time (ModestCompactMailHeaderView *compact_mail_header);
 static void fill_address (ModestCompactMailHeaderView *self);
 
 static void
-set_date_time (ModestCompactMailHeaderView *compact_mail_header, time_t date)
+set_date_time (ModestCompactMailHeaderView *compact_mail_header)
 {
-       const guint BUF_SIZE = 64; 
-       gchar date_buf [BUF_SIZE];
-
        ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (compact_mail_header);
 
-       modest_text_utils_strftime (date_buf, BUF_SIZE, "%x %X", date);
-
-       gtk_label_set_text (GTK_LABEL (priv->date_label), date_buf);
+       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);
+       }
 
 }
 
@@ -184,7 +215,6 @@ modest_compact_mail_header_view_set_header_default (TnyHeaderView *self, TnyHead
        if (header && G_IS_OBJECT (header))
        {
                gchar *subject;
-               time_t date_to_show;
 
                g_object_ref (G_OBJECT (header)); 
                priv->header = header;
@@ -193,17 +223,12 @@ modest_compact_mail_header_view_set_header_default (TnyHeaderView *self, TnyHead
 
                subject = tny_header_dup_subject (header);
 
-               if (subject && (subject[0] != '\0'))
-                       gtk_label_set_text (GTK_LABEL (priv->subject_label), subject);
-               else
-                       gtk_label_set_text (GTK_LABEL (priv->subject_label), _("mail_va_no_subject"));
-
                if (priv->is_outgoing && priv->is_draft) {
-                       date_to_show = tny_header_get_date_sent (header);
+                       priv->date_to_show = tny_header_get_date_sent (header);
                } else {
-                       date_to_show = tny_header_get_date_received (header);
+                       priv->date_to_show = tny_header_get_date_received (header);
                }
-               set_date_time (MODEST_COMPACT_MAIL_HEADER_VIEW (self), date_to_show);
+               set_date_time (MODEST_COMPACT_MAIL_HEADER_VIEW (self));
 
                fill_address (MODEST_COMPACT_MAIL_HEADER_VIEW (self));
 
@@ -269,10 +294,10 @@ modest_compact_mail_header_view_add_custom_header_default (ModestMailHeaderView
        hbox = gtk_hbox_new (FALSE, 12);
        label_field = gtk_label_new (NULL);
        gtk_label_set_text (GTK_LABEL (label_field), label);
+       priv->custom_labels = g_slist_prepend (priv->custom_labels, (gpointer) label_field);
        gtk_misc_set_alignment (GTK_MISC (label_field), 1.0, 0.0);
        gtk_box_pack_start (GTK_BOX (hbox), label_field, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (hbox), custom_widget, TRUE, TRUE, 0);
-       gtk_size_group_add_widget (priv->labels_size_group, label_field);
 
        if (start)
                gtk_box_pack_start (GTK_BOX (priv->headers_vbox), hbox, FALSE, FALSE, 0);
@@ -299,46 +324,42 @@ modest_compact_mail_header_view_new ()
 }
 
 static void
+datetime_format_changed (ModestDatetimeFormatter *formatter,
+                        ModestCompactMailHeaderView *self)
+{
+       set_date_time (self);
+}
+
+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 *first_hbox, *second_hbox, *vbox, *main_vbox;
-       GtkWidget *details_button, *fromto_button;
-       PangoAttrList *attr_list;
+       GtkWidget *from_date_hbox, *vbox, *main_vbox;
+       GtkWidget *main_align;
+       GtkWidget *headers_date_hbox;
+       GtkWidget *date_brand_vbox, *brand_hbox;
 
        priv->header = NULL;
-       priv->first_address = NULL;
+       priv->custom_labels = NULL;
 
        main_vbox = gtk_vbox_new (FALSE, 0);
        vbox = gtk_vbox_new (FALSE, 0);
-       first_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
-
-       priv->subject_box = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
 
        /* We set here the style for widgets using standard text color. For
         * widgets with secondary text color, we set them in update_style,
         * as we want to track the style changes and update the color properly */
 
-       priv->subject_label = gtk_label_new (NULL);
-       gtk_misc_set_alignment (GTK_MISC (priv->subject_label), 0.0, 1.0);
-       gtk_label_set_ellipsize (GTK_LABEL (priv->subject_label), PANGO_ELLIPSIZE_END);
-       attr_list = pango_attr_list_new ();
-       pango_attr_list_insert (attr_list, pango_attr_scale_new (PANGO_SCALE_LARGE));
-       gtk_label_set_attributes (GTK_LABEL (priv->subject_label), attr_list);
-       pango_attr_list_unref (attr_list);
-
-       details_button = gtk_button_new ();
-       priv->details_label = gtk_label_new (_("mcen_ti_message_properties"));
-       gtk_misc_set_alignment (GTK_MISC (priv->details_label), 1.0, 0.5);
-       gtk_container_add (GTK_CONTAINER (details_button), priv->details_label);
-       gtk_button_set_relief (GTK_BUTTON (details_button), GTK_RELIEF_NONE);
-
-       gtk_box_pack_end (GTK_BOX (priv->subject_box), priv->subject_label, TRUE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX (first_hbox), priv->subject_box, TRUE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX (first_hbox), details_button, FALSE, FALSE, 0);
-
-       second_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
+       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);
@@ -346,51 +367,75 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer
        priv->fromto_contents = gtk_label_new (NULL);
        gtk_misc_set_alignment (GTK_MISC (priv->fromto_contents), 0.0, 1.0);
        gtk_label_set_ellipsize (GTK_LABEL (priv->fromto_contents), PANGO_ELLIPSIZE_END);
-       attr_list = pango_attr_list_new ();
-       pango_attr_list_insert (attr_list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
-       gtk_label_set_attributes (GTK_LABEL (priv->fromto_contents), attr_list);
-       pango_attr_list_unref (attr_list);
-       fromto_button = gtk_button_new ();
-       gtk_button_set_relief (GTK_BUTTON (fromto_button), GTK_RELIEF_NONE);
-       gtk_container_add (GTK_CONTAINER (fromto_button), priv->fromto_contents);
 
        priv->date_label = gtk_label_new (NULL);
-       gtk_misc_set_alignment (GTK_MISC (priv->date_label), 1.0, 1.0);
-       gtk_misc_set_padding (GTK_MISC (priv->date_label), MODEST_MARGIN_DEFAULT, 0);
+       gtk_label_set_justify (GTK_LABEL (priv->date_label), GTK_JUSTIFY_RIGHT);
+       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);
 
-       gtk_box_pack_start (GTK_BOX (second_hbox), priv->fromto_label, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (second_hbox), fromto_button, TRUE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX (second_hbox), priv->date_label, FALSE, FALSE, 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);
 
-       gtk_box_pack_start (GTK_BOX (vbox), first_hbox, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (vbox), second_hbox, FALSE, FALSE, 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->labels_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-       gtk_size_group_add_widget (priv->labels_size_group, priv->fromto_label);
-       
-       update_style (self);
+       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);
 
-       g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
+       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->time_label, FALSE, FALSE, 0);
 
-       g_signal_connect (G_OBJECT (details_button), "clicked", G_CALLBACK (on_details_button_clicked), instance);
-       g_signal_connect (G_OBJECT (fromto_button), "clicked", G_CALLBACK (on_fromto_button_clicked), instance);
+       gtk_box_pack_start (GTK_BOX (vbox), from_date_hbox, FALSE, FALSE, 0);
 
-       gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+       priv->datetime_formatter = modest_datetime_formatter_new ();
+       g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", 
+                         G_CALLBACK (datetime_format_changed), (gpointer) self);
 
        priv->headers_vbox = gtk_vbox_new (FALSE, 0);
        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 (self), main_vbox, TRUE, TRUE, 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, 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_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);
 
-       gtk_container_set_border_width (GTK_CONTAINER (self), MODEST_MARGIN_DOUBLE);
+       update_style (self);
+
+       g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
 
-       gtk_widget_show_all (main_vbox);
+       gtk_widget_show_all (priv->event_box);
 
        priv->is_outgoing = FALSE;
        priv->is_draft = FALSE;
+       priv->is_loading = FALSE;
 
        return;
 }
@@ -401,6 +446,21 @@ modest_compact_mail_header_view_finalize (GObject *object)
        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;
+       }
+
+       if (priv->custom_labels) {
+               g_slist_free (priv->custom_labels);
+               priv->custom_labels = NULL;
+       }
+
        if (G_LIKELY (priv->header))
                g_object_unref (G_OBJECT (priv->header));
        priv->header = NULL;
@@ -410,8 +470,6 @@ modest_compact_mail_header_view_finalize (GObject *object)
 
        priv->headers_vbox = NULL;
 
-       g_object_unref (priv->labels_size_group);
-
        (*parent_class->finalize) (object);
 
        return;
@@ -435,6 +493,9 @@ modest_mail_header_view_init (gpointer g, gpointer iface_data)
 
        klass->get_priority = modest_compact_mail_header_view_get_priority;
        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;
@@ -452,6 +513,9 @@ modest_compact_mail_header_view_class_init (ModestCompactMailHeaderViewClass *kl
        klass->clear_func = modest_compact_mail_header_view_clear_default;
        klass->set_priority_func = modest_compact_mail_header_view_set_priority_default;
        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;
 
@@ -542,21 +606,71 @@ modest_compact_mail_header_view_set_priority_default (ModestMailHeaderView *head
        priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
 
        priv->priority_flags = flags & TNY_HEADER_FLAG_PRIORITY_MASK ;
+}
 
-       if (priv->priority_flags == TNY_HEADER_FLAG_NORMAL_PRIORITY) {
-               if (priv->priority_icon != NULL) {
-                       gtk_widget_destroy (priv->priority_icon);
-                       priv->priority_icon = NULL;
-               }
-       } else if (priv->priority_flags == TNY_HEADER_FLAG_HIGH_PRIORITY) {
-               priv->priority_icon = gtk_image_new_from_icon_name ("qgn_list_messaging_high", GTK_ICON_SIZE_MENU);
-               gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0);
-               gtk_widget_show (priv->priority_icon);
-       } else if (priv->priority_flags == TNY_HEADER_FLAG_LOW_PRIORITY) {
-               priv->priority_icon = gtk_image_new_from_icon_name ("qgn_list_messaging_low", GTK_ICON_SIZE_MENU);
-               gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0);
-               gtk_widget_show (priv->priority_icon);
+static gboolean
+modest_compact_mail_header_view_get_loading (ModestMailHeaderView *headers_view)
+{
+       return MODEST_COMPACT_MAIL_HEADER_VIEW_GET_CLASS (headers_view)->get_loading_func (headers_view);
+}
+
+static gboolean
+modest_compact_mail_header_view_get_loading_default (ModestMailHeaderView *headers_view)
+{
+       ModestCompactMailHeaderViewPriv *priv;
+
+       g_return_val_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (headers_view), FALSE);
+       priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
+
+       return priv->is_loading;
+}
+
+static void
+modest_compact_mail_header_view_set_loading (ModestMailHeaderView *headers_view, gboolean is_loading)
+{
+       MODEST_COMPACT_MAIL_HEADER_VIEW_GET_CLASS (headers_view)->set_loading_func (headers_view, is_loading);
+}
+
+static void
+modest_compact_mail_header_view_set_loading_default (ModestMailHeaderView *headers_view, gboolean is_loading)
+{
+       ModestCompactMailHeaderViewPriv *priv;
+
+       g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (headers_view));
+       priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
+
+       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 
@@ -577,17 +691,22 @@ update_style (ModestCompactMailHeaderView *self)
        GdkColor style_color;
        PangoColor color;
        PangoAttrList *attr_list;
-       GSList *custom_widgets;
+       GSList *node;
 
        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 {
-               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;
+                       color.blue = 0xc0c0;
+               }
        }
 
        /* style of from:/to: label */
@@ -596,30 +715,28 @@ update_style (ModestCompactMailHeaderView *self)
        gtk_label_set_attributes (GTK_LABEL (priv->fromto_label), attr_list);
        pango_attr_list_unref (attr_list);
 
-       /* style of details label in details button */
-       attr_list = pango_attr_list_new ();
-       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));
-       pango_attr_list_insert (attr_list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
-       gtk_label_set_attributes (GTK_LABEL (priv->details_label), attr_list);
-       pango_attr_list_unref (attr_list);
-
        /* style of date time label */
        attr_list = pango_attr_list_new ();
        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 */
        attr_list = pango_attr_list_new ();
        pango_attr_list_insert (attr_list, pango_attr_foreground_new (color.red, color.green, color.blue));
-       custom_widgets = gtk_size_group_get_widgets (priv->labels_size_group);
-       while (custom_widgets) {                
-               gtk_label_set_attributes (GTK_LABEL (custom_widgets->data), attr_list);
-               custom_widgets = g_slist_next (custom_widgets);
+       for (node = priv->custom_labels; node != NULL; node = g_slist_next (node)) {
+               gtk_label_set_attributes (GTK_LABEL (node->data), attr_list);
        }
        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
@@ -628,8 +745,7 @@ fill_address (ModestCompactMailHeaderView *self)
        ModestCompactMailHeaderViewPriv *priv;
        gchar *recipients;
        const gchar *label;
-       GSList *recipient_list;
-       
+
        g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
        priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
 
@@ -641,48 +757,18 @@ fill_address (ModestCompactMailHeaderView *self)
                recipients = tny_header_dup_from (TNY_HEADER (priv->header));
        }
 
-       g_free (priv->first_address);
-       recipient_list = modest_text_utils_split_addresses_list (recipients);
-       if (recipient_list == NULL) {
-               priv->first_address = NULL;
-       } else {
-               gchar *first_recipient;
-
-               first_recipient = (gchar *) recipient_list->data;
-               priv->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);
-       if (recipients)
-               gtk_label_set_text (GTK_LABEL (priv->fromto_contents), priv->first_address);
 
-       g_free (recipients);
-}
-
-static void 
-on_fromto_button_clicked (GtkButton *button,
-                         gpointer userdata)
-{
-       ModestCompactMailHeaderViewPriv *priv;
-       ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *) userdata;
-
-       g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
-       priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
+       /* Set recipients */
+       if (recipients) {
+               gchar *addresses;
 
-       if (priv->first_address) {
-               g_signal_emit_by_name (G_OBJECT (self), "recpt-activated", priv->first_address);
+               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);
        }
 }
 
-static void 
-on_details_button_clicked (GtkButton *button,
-                          gpointer userdata)
-{
-       ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *) userdata;
-
-       g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
-
-       g_signal_emit_by_name (G_OBJECT (self), "show-details");
-}