Use GtkSourceView for editor instead of GtkTextView

[modest] / src / widgets / modest-gtkhtml-msg-view.c

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 7637dc9..4d40ed3 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -53,6 +53,7 @@
 #include <widgets/modest-gtkhtml-msg-view.h>
 #include <widgets/modest-isearch-view.h>
 #include <widgets/modest-ui-constants.h>
+#include <modest-icon-names.h>
 
 /* FIXNE: we should have no maemo-deps in widgets/ */
 #ifndef MODEST_TOOLKIT_GTK
@@ -244,7 +245,11 @@ struct _ModestGtkhtmlMsgViewPrivate {
        GtkWidget   *headers_box;
        GtkWidget   *html_scroll;
        GtkWidget   *attachments_box;
-       GtkWidget   *view_images_button;
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget   *priority_box;
+       GtkWidget   *priority_icon;
+#endif
 
        /* internal adjustments for set_scroll_adjustments */
        GtkAdjustment *hadj;
@@ -1142,7 +1147,20 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
 
        if (priv->mail_header_view)
                gtk_box_pack_start (GTK_BOX(priv->headers_box), priv->mail_header_view, FALSE, FALSE, 0);
-       
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       priv->priority_icon = gtk_image_new ();
+       gtk_misc_set_alignment (GTK_MISC (priv->priority_icon), 0.0, 0.5);
+       if (priv->priority_icon) {
+               priv->priority_box = (GtkWidget *)
+                       modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view),
+                                                                  _("mcen_me_editor_message_priority"),
+                                                                  priv->priority_icon,
+                                                                  FALSE, FALSE);
+                                                                  
+               gtk_widget_hide_all (priv->priority_box);
+       }
+#endif
        if (priv->attachments_view) {
 #ifndef MODEST_TOOLKIT_HILDON2
                gchar *att_label = g_strconcat (_("mcen_me_viewer_attachments"), ":", NULL);
@@ -1491,7 +1509,8 @@ has_blocked_external_images (ModestGtkhtmlMsgView *self)
 {
        ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
 
-       return modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view));
+       return (modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)) &&
+               !modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)));
 }
 
 static gboolean
@@ -1648,9 +1667,9 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg)
        ModestGtkhtmlMsgViewPrivate *priv;
        TnyHeader *header;
        GtkAdjustment *html_vadj;
-       
+
        g_return_if_fail (self);
-       
+
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
        modest_mail_header_view_set_loading (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), FALSE);
        gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
@@ -1669,12 +1688,15 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg)
                        g_object_ref   (G_OBJECT(msg));
                priv->msg = msg;
        }
-       
+
        if (!msg) {
                tny_header_view_clear (TNY_HEADER_VIEW (priv->mail_header_view));
                modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), NULL);
                gtk_widget_hide_all (priv->mail_header_view);
                gtk_widget_hide_all (priv->attachments_box);
+#ifdef MODEST_TOOKIT_HILDON2
+               gtk_widget_hide_all (priv->priority_box);
+#endif
                gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
                tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
                gtk_widget_queue_resize (GTK_WIDGET(self));
@@ -1721,17 +1743,19 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg)
                tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
        }
 
-       if (modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)) &&
-           !modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view))) {
-               gtk_widget_show (priv->view_images_button);
-       } else {
-               gtk_widget_hide (priv->view_images_button);
-       }
+       /* Refresh priority */
+       set_priority (self, tny_header_get_flags (header));
 
        gtk_widget_show (priv->body_view);
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_widget_set_no_show_all (priv->priority_box, TRUE);
+#endif
        gtk_widget_set_no_show_all (priv->attachments_box, TRUE);
        gtk_widget_show_all (priv->mail_header_view);
        gtk_widget_set_no_show_all (priv->attachments_box, FALSE);
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_widget_set_no_show_all (priv->priority_box, FALSE);
+#endif
        gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
        gtk_widget_queue_resize (GTK_WIDGET(self));
        gtk_widget_queue_draw (GTK_WIDGET(self));
@@ -1783,6 +1807,9 @@ set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
        modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), NULL);
        gtk_widget_show_all (priv->mail_header_view);
        gtk_widget_hide_all (priv->attachments_box);
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_widget_hide_all (priv->priority_box);
+#endif
        gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
        tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
        gtk_widget_queue_resize (GTK_WIDGET(self));
@@ -1858,6 +1885,27 @@ set_priority (ModestGtkhtmlMsgView *self, TnyHeaderFlags flags)
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
 
        modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       gboolean show_priority = FALSE;
+       TnyHeaderFlags priority_flags;
+
+       priority_flags = flags & TNY_HEADER_FLAG_PRIORITY_MASK;
+       if (priority_flags == TNY_HEADER_FLAG_HIGH_PRIORITY) {
+               show_priority = TRUE;
+               gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), MODEST_HEADER_ICON_HIGH, GTK_ICON_SIZE_MENU);
+       } else if (priority_flags == TNY_HEADER_FLAG_LOW_PRIORITY) {
+               show_priority = TRUE;
+               gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), MODEST_HEADER_ICON_LOW, GTK_ICON_SIZE_MENU);
+       }
+
+       if (show_priority && MODEST_IS_COMPACT_MAIL_HEADER_VIEW (priv->mail_header_view)) {
+               gtk_widget_show_all  (priv->priority_box);
+       } else {
+               gtk_widget_hide_all (priv->priority_box);
+       }
+#endif
+
 }
 
 /* INCREMENTAL SEARCH IMPLEMENTATION */