Implement branding from account protocol service in edit window

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index f85ac90..091ea31 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -187,6 +187,8 @@ static void font_face_clicked (GtkToolButton *button,
 static void update_signature (ModestMsgEditWindow *self,
                              const gchar *old_account, 
                              const gchar *new_account);
 static void update_signature (ModestMsgEditWindow *self,
                              const gchar *old_account, 
                              const gchar *new_account);

+static void update_branding (ModestMsgEditWindow *self,
+                            const gchar *new_account);

 static GtkWidget *_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group,
                                           const gchar *label, GtkWidget *control);
 static void max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref);
 static GtkWidget *_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group,
                                           const gchar *label, GtkWidget *control);
 static void max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref);

@@ -325,6 +327,9 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *bcc_button;
 
        GtkWidget   *max_chars_banner;
        GtkWidget   *bcc_button;
 
        GtkWidget   *max_chars_banner;

+
+       GtkWidget   *brand_icon;
+       GtkWidget   *brand_label;

 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \

@@ -810,6 +815,7 @@ init_window (ModestMsgEditWindow *obj)
        GtkWidget *from_send_hbox;
        GtkWidget *send_icon;
        GtkWidget *attachments_label;
        GtkWidget *from_send_hbox;
        GtkWidget *send_icon;
        GtkWidget *attachments_label;

+       GtkWidget *branding_box;

 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);

@@ -932,16 +938,28 @@ init_window (ModestMsgEditWindow *obj)
        g_object_unref (title_size_group);
        g_object_unref (value_size_group);
 
        g_object_unref (title_size_group);
        g_object_unref (value_size_group);
 

+       priv->brand_icon = gtk_image_new ();
+       priv->brand_label = gtk_label_new (NULL);
+       gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 0.0, 0.5);
+       gtk_widget_set_no_show_all (priv->brand_icon, TRUE);
+       gtk_widget_set_no_show_all (priv->brand_label, TRUE);
+

        from_send_hbox = gtk_hbox_new (FALSE, 0);
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->from_field, TRUE, TRUE, 0);
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0);
 
        from_send_hbox = gtk_hbox_new (FALSE, 0);
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->from_field, TRUE, TRUE, 0);
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0);
 

+       branding_box = gtk_hbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+       gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_icon, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_label, TRUE, TRUE, 0);
+
+

        gtk_box_pack_start (GTK_BOX (priv->header_box), from_send_hbox, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->cc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), subject_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), from_send_hbox, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->cc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), subject_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0);

+       gtk_box_pack_start (GTK_BOX (priv->header_box), branding_box, FALSE, FALSE, 0);

        gtk_widget_set_no_show_all (priv->attachments_caption, TRUE);
 
        init_wp_text_view_style ();
        gtk_widget_set_no_show_all (priv->attachments_caption, TRUE);
 
        init_wp_text_view_style ();

@@ -1607,6 +1625,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar
        modest_selector_picker_set_pair_list (MODEST_SELECTOR_PICKER (priv->from_field), priv->from_field_protos);
        modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name);
        priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
        modest_selector_picker_set_pair_list (MODEST_SELECTOR_PICKER (priv->from_field), priv->from_field_protos);
        modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name);
        priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));

+       update_branding (MODEST_MSG_EDIT_WINDOW (obj), priv->last_from_account);

        if (mailbox && modest_pair_list_find_by_first_as_string (priv->from_field_protos, mailbox)) {
                modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) mailbox);
                priv->original_mailbox = g_strdup (mailbox);
        if (mailbox && modest_pair_list_find_by_first_as_string (priv->from_field_protos, mailbox)) {
                modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) mailbox);
                priv->original_mailbox = g_strdup (mailbox);

@@ -3985,6 +4004,34 @@ static void update_signature (ModestMsgEditWindow *self,
        gtk_text_buffer_end_user_action (priv->text_buffer);
 }
 
        gtk_text_buffer_end_user_action (priv->text_buffer);
 }
 

+static void update_branding (ModestMsgEditWindow *self,
+                            const gchar *new_account)
+{
+       ModestMsgEditWindowPrivate *priv;
+       ModestAccountMgr *mgr;
+       const GdkPixbuf *new_icon = NULL;
+       gchar *new_label = NULL;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       mgr = modest_runtime_get_account_mgr ();
+
+       modest_account_mgr_get_branding_from_recipient (mgr, new_account, &new_label, &new_icon, MODEST_ICON_SIZE_SMALL);
+       if (new_icon) {
+               gtk_image_set_from_pixbuf (GTK_IMAGE (priv->brand_icon), (GdkPixbuf *) new_icon);
+               gtk_widget_show (priv->brand_icon);
+       } else {
+               gtk_widget_hide (priv->brand_icon);
+       }
+       if (new_label) {
+               gtk_label_set_text (GTK_LABEL (priv->brand_label), new_label);
+               gtk_widget_show (priv->brand_label);
+               g_free (new_label);
+       } else {
+               gtk_widget_hide (priv->brand_label);
+       }
+}
+

 static void
 from_field_changed (HildonPickerButton *button,
                    ModestMsgEditWindow *self)
 static void
 from_field_changed (HildonPickerButton *button,
                    ModestMsgEditWindow *self)

@@ -3999,6 +4046,7 @@ from_field_changed (HildonPickerButton *button,
        new_account = priv->last_from_account;
 
        update_signature (self, old_account, new_account);
        new_account = priv->last_from_account;
 
        update_signature (self, old_account, new_account);

+       update_branding (self, new_account);

 
 }
 
 
 }
 

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index c06661c..9a96912 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -1251,3 +1251,33 @@ modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *mgr,
        return result;
 }
 
        return result;
 }
 

+void
+modest_account_mgr_get_branding_from_recipient (ModestAccountMgr *mgr, 
+                                               const gchar *current_recipient, 
+                                               gchar **service_name,
+                                               const GdkPixbuf **service_icon,
+                                               guint64 icon_size)
+{
+       gchar *mailbox = NULL;
+       gchar *account_name;
+       ModestProtocol *protocol = NULL;
+
+       *service_name = NULL;
+       *service_icon = NULL;
+
+       account_name = modest_utils_get_account_name_from_recipient (current_recipient, &mailbox);
+       if (modest_account_mgr_account_is_multimailbox (mgr, account_name, &protocol)) {
+               if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+                       gchar *name;
+                       const GdkPixbuf *icon;
+                       name = modest_account_protocol_get_service_name (MODEST_ACCOUNT_PROTOCOL (protocol),
+                                                                        account_name, mailbox);
+                       icon = modest_account_protocol_get_service_icon (MODEST_ACCOUNT_PROTOCOL (protocol),
+                                                                        account_name, mailbox, icon_size);
+                       *service_name = name;
+                       *service_icon = icon;
+               }
+       }
+
+}
+

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 9e584e9..f10d873 100644 (file)
--- a/src/modest-account-mgr-helpers.h
+++ b/src/modest-account-mgr-helpers.h
@@ -128,6 +128,13 @@ gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* na
 
 gchar *modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *self, const gchar *recipient,
                                                        gboolean *use_signature);
 
 gchar *modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *self, const gchar *recipient,
                                                        gboolean *use_signature);

+
+void modest_account_mgr_get_branding_from_recipient (ModestAccountMgr *mgr, 
+                                                    const gchar *current_recipient, 
+                                                    gchar **service_name,
+                                                    const GdkPixbuf **service_icon,
+                                                    guint64 icon_size);
+

 gboolean modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr,
                                                     const gchar *account_name, 
                                                     ModestProtocol **mmb_protocol);
 gboolean modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr,
                                                     const gchar *account_name, 
                                                     ModestProtocol **mmb_protocol);

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index 309e9e4..76aff6e 100644 (file)
--- a/src/modest-account-protocol.c
+++ b/src/modest-account-protocol.c
@@ -109,7 +109,8 @@ static gchar *modest_account_protocol_get_service_name_default (ModestAccountPro
 
 static const GdkPixbuf *modest_account_protocol_get_service_icon_default (ModestAccountProtocol *self,
                                                                          const gchar *account_id,
 
 static const GdkPixbuf *modest_account_protocol_get_service_icon_default (ModestAccountProtocol *self,
                                                                          const gchar *account_id,

-                                                                         const gchar *mailbox);
+                                                                         const gchar *mailbox,
+                                                                         guint icon_size);

 
 /* globals */
 static GObjectClass *parent_class = NULL;
 
 /* globals */
 static GObjectClass *parent_class = NULL;

@@ -739,15 +740,17 @@ modest_account_protocol_get_service_name_default (ModestAccountProtocol *self,
 const GdkPixbuf *
 modest_account_protocol_get_service_icon (ModestAccountProtocol *self,
                                          const gchar *account_id,
 const GdkPixbuf *
 modest_account_protocol_get_service_icon (ModestAccountProtocol *self,
                                          const gchar *account_id,

-                                         const gchar *mailbox)
+                                         const gchar *mailbox,
+                                         guint icon_size)

 {
 {

-       return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->get_service_icon (self, account_id, mailbox);
+       return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->get_service_icon (self, account_id, mailbox, icon_size);

 }
 
 static const GdkPixbuf *
 modest_account_protocol_get_service_icon_default (ModestAccountProtocol *self,
                                                  const gchar *account_id,
 }
 
 static const GdkPixbuf *
 modest_account_protocol_get_service_icon_default (ModestAccountProtocol *self,
                                                  const gchar *account_id,

-                                                 const gchar *mailbox)
+                                                 const gchar *mailbox,
+                                                 guint icon_size)

 {
        g_return_val_if_fail (MODEST_ACCOUNT_PROTOCOL (self), NULL);
 
 {
        g_return_val_if_fail (MODEST_ACCOUNT_PROTOCOL (self), NULL);
 

diff --git a/src/modest-account-protocol.h b/src/modest-account-protocol.h
index 28a70eb..da39cdb 100644 (file)
--- a/src/modest-account-protocol.h
+++ b/src/modest-account-protocol.h
@@ -86,7 +86,7 @@ struct _ModestAccountProtocolClass {
        const GdkPixbuf * (*get_icon) (ModestAccountProtocol *self, ModestAccountProtocolIconType icon_type, 
                                       GObject *object, guint icon_size);
        gchar * (*get_service_name) (ModestAccountProtocol *self, const gchar *account_id, const gchar *mailbox);
        const GdkPixbuf * (*get_icon) (ModestAccountProtocol *self, ModestAccountProtocolIconType icon_type, 
                                       GObject *object, guint icon_size);
        gchar * (*get_service_name) (ModestAccountProtocol *self, const gchar *account_id, const gchar *mailbox);

-       const GdkPixbuf * (*get_service_icon) (ModestAccountProtocol *self, const gchar *account_id, const gchar *mailbox);
+       const GdkPixbuf * (*get_service_icon) (ModestAccountProtocol *self, const gchar *account_id, const gchar *mailbox, guint icon_size);

 
        /* Padding for future expansions */
        void (*_reserved3) (void);
 
        /* Padding for future expansions */
        void (*_reserved3) (void);

@@ -431,7 +431,8 @@ gchar *modest_account_protocol_get_service_name (ModestAccountProtocol *self,
  */
 const GdkPixbuf *modest_account_protocol_get_service_icon (ModestAccountProtocol *self,
                                                           const gchar *account_id,
  */
 const GdkPixbuf *modest_account_protocol_get_service_icon (ModestAccountProtocol *self,
                                                           const gchar *account_id,

-                                                          const gchar *mailbox);
+                                                          const gchar *mailbox,
+                                                          guint icon_size);

 
 
 G_END_DECLS
 
 
 G_END_DECLS