X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-gtkhtml-msg-view.c;h=514322dfd116a6eceb6a974e268aa3295b9c7e1d;hp=ef7ee446bbe626809ea3196af300e4d97d65cc15;hb=db0da32bb0fd3bbad561aa48f4b00b47d887d508;hpb=60f17de24072df911c0adcc926db453c6d2d4aff diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c index ef7ee44..514322d 100644 --- a/src/widgets/modest-gtkhtml-msg-view.c +++ b/src/widgets/modest-gtkhtml-msg-view.c @@ -41,22 +41,29 @@ #include #include #include -#include +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#include +#else +#include +#endif #include #include #include #include #include #include +#include /* FIXNE: we should have no maemo-deps in widgets/ */ -#ifdef MODEST_PLATFORM_MAEMO +#ifndef MODEST_TOOLKIT_GTK #include "maemo/modest-hildon-includes.h" -#endif /*MODEST_PLATFORM_MAEMO*/ +#endif /*!MODEST_TOOLKIT_GTK*/ /* 'private'/'protected' functions */ static void modest_gtkhtml_msg_view_class_init (ModestGtkhtmlMsgViewClass *klass); +static void tny_header_view_init (gpointer g, gpointer iface_data); static void tny_msg_view_init (gpointer g, gpointer iface_data); static void tny_mime_part_view_init (gpointer g, gpointer iface_data); static void modest_mime_part_view_init (gpointer g, gpointer iface_data); @@ -71,17 +78,19 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GPa /* headers signals */ static void on_recpt_activated (ModestMailHeaderView *header_view, const gchar *address, ModestGtkhtmlMsgView *msg_view); +static void on_show_details (ModestMailHeaderView *header_view, ModestGtkhtmlMsgView *msg_view); static void on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_part, gpointer userdata); -static void on_view_images_clicked (GtkButton * button, gpointer self); /* body view signals */ static gboolean on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *msg_view); static gboolean on_fetch_url (GtkWidget *widget, const gchar *uri, TnyStream *stream, ModestGtkhtmlMsgView *msg_view); static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *msg_view); +static void on_limit_error (GtkWidget *widget, ModestGtkhtmlMsgView *msg_view); #ifdef MAEMO_CHANGES static void on_tap_and_hold (GtkWidget *widget, gpointer userdata); +static gboolean on_tap_and_hold_query (GtkWidget *widget, GdkEvent *event, gpointer userdata); #endif /*MAEMO_CHANGES*/ @@ -108,6 +117,15 @@ static gboolean motion_notify_event (GtkWidget *widget, gpointer userdata); #endif +static gboolean +button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer userdata); +static gboolean +button_release_event (GtkWidget *widget, + GdkEventButton *event, + gpointer userdata); + /* GtkContainer methods */ static void forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer userdata); @@ -122,6 +140,11 @@ static TnyMimePart* modest_msg_view_mp_get_part_default (TnyMimePartView *self); /* ModestMimePartView implementation */ static gboolean modest_msg_view_mp_is_empty (ModestMimePartView *self); static gboolean modest_msg_view_mp_is_empty_default (ModestMimePartView *self); +/* TnyHeaderView implementation */ +static void modest_msg_view_set_header (TnyHeaderView *self, TnyHeader *header); +static void modest_msg_view_set_header_default (TnyHeaderView *self, TnyHeader *header); +static void modest_msg_view_clear_header (TnyHeaderView *self); +static void modest_msg_view_clear_header_default (TnyHeaderView *self); /* TnyMsgView implementation */ static TnyMsg *modest_msg_view_get_msg (TnyMsgView *self); static TnyMsg *modest_msg_view_get_msg_default (TnyMsgView *self); @@ -150,6 +173,7 @@ static gboolean modest_msg_view_search_default (ModestISearchView *self, const g static gboolean modest_msg_view_search_next (ModestISearchView *self); static gboolean modest_msg_view_search_next_default (ModestISearchView *self); /* ModestMsgView implementation */ +static void modest_gtkhtml_msg_view_set_msg_with_other_body (ModestMsgView *self, TnyMsg *msg, TnyMimePart *other_body); static GtkAdjustment *modest_gtkhtml_msg_view_get_vadjustment (ModestMsgView *self); static GtkAdjustment *modest_gtkhtml_msg_view_get_hadjustment (ModestMsgView *self); static void modest_gtkhtml_msg_view_set_vadjustment (ModestMsgView *self, GtkAdjustment *vadj); @@ -162,6 +186,10 @@ static TnyList *modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView static TnyList *modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self); static void modest_gtkhtml_msg_view_grab_focus (ModestMsgView *self); static void modest_gtkhtml_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment); +static void modest_gtkhtml_msg_view_request_fetch_images (ModestMsgView *view); +static void modest_gtkhtml_msg_view_set_branding (ModestMsgView *view, const gchar *brand_name, const GdkPixbuf *brand_icon); +static gboolean modest_gtkhtml_msg_view_has_blocked_external_images (ModestMsgView *view); +static void modest_gtkhtml_msg_view_set_msg_with_other_body_default (ModestMsgView *view, TnyMsg *msg, TnyMimePart *part); static GtkAdjustment *modest_gtkhtml_msg_view_get_vadjustment_default (ModestMsgView *self); static GtkAdjustment *modest_gtkhtml_msg_view_get_hadjustment_default (ModestMsgView *self); static void modest_gtkhtml_msg_view_set_vadjustment_default (ModestMsgView *self, GtkAdjustment *vadj); @@ -174,10 +202,14 @@ static TnyList *modest_gtkhtml_msg_view_get_selected_attachments_default (Modest static TnyList *modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self); static void modest_gtkhtml_msg_view_grab_focus_default (ModestMsgView *self); static void modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *view, TnyMimePart *attachment); +static gboolean modest_gtkhtml_msg_view_has_blocked_external_images_default (ModestMsgView *view); +static void modest_gtkhtml_msg_view_request_fetch_images_default (ModestMsgView *view); +static void modest_gtkhtml_msg_view_set_branding_default (ModestMsgView *view, const gchar *brand_name, const GdkPixbuf *brand_icon); /* internal api */ +static void set_header (ModestGtkhtmlMsgView *self, TnyHeader *header); static TnyMsg *get_message (ModestGtkhtmlMsgView *self); -static void set_message (ModestGtkhtmlMsgView *self, TnyMsg *tny_msg); +static void set_message (ModestGtkhtmlMsgView *self, TnyMsg *tny_msg, TnyMimePart *other_body); static gboolean is_empty (ModestGtkhtmlMsgView *self); static void set_zoom (ModestGtkhtmlMsgView *self, gdouble zoom); static gdouble get_zoom (ModestGtkhtmlMsgView *self); @@ -195,6 +227,9 @@ static TnyList *get_selected_attachments (ModestGtkhtmlMsgView *self); static TnyList *get_attachments (ModestGtkhtmlMsgView *self); static void grab_focus (ModestGtkhtmlMsgView *self); static void remove_attachment (ModestGtkhtmlMsgView *view, TnyMimePart *attachment); +static void request_fetch_images (ModestGtkhtmlMsgView *view); +static void set_branding (ModestGtkhtmlMsgView *view, const gchar *brand_name, const GdkPixbuf *brand_icon); +static gboolean has_blocked_external_images (ModestGtkhtmlMsgView *view); /* list properties */ enum { @@ -216,7 +251,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; @@ -228,6 +267,9 @@ struct _ModestGtkhtmlMsgViewPrivate { GdkWindow *headers_window; GdkWindow *html_window; + /* id handler for dragged scroll */ + guint idle_motion_id; + /* zoom */ gdouble current_zoom; @@ -273,6 +315,13 @@ modest_gtkhtml_msg_view_get_type (void) NULL /* interface_data */ }; + static const GInterfaceInfo tny_header_view_info = + { + (GInterfaceInitFunc) tny_header_view_init, /* interface_init */ + NULL, /* interface_finalize */ + NULL /* interface_data */ + }; + static const GInterfaceInfo modest_mime_part_view_info = { (GInterfaceInitFunc) modest_mime_part_view_init, /* interface_init */ @@ -305,6 +354,9 @@ modest_gtkhtml_msg_view_get_type (void) "ModestGtkhtmlMsgView", &my_info, 0); + g_type_add_interface_static (my_type, TNY_TYPE_HEADER_VIEW, + &tny_header_view_info); + g_type_add_interface_static (my_type, TNY_TYPE_MIME_PART_VIEW, &tny_mime_part_view_info); @@ -353,6 +405,8 @@ modest_gtkhtml_msg_view_class_init (ModestGtkhtmlMsgViewClass *klass) container_class->forall = forall; container_class->remove = container_remove; + klass->set_header_func = modest_msg_view_set_header_default; + klass->clear_header_func = modest_msg_view_clear_header_default; klass->set_scroll_adjustments = set_scroll_adjustments; klass->get_part_func = modest_msg_view_mp_get_part_default; klass->set_part_func = modest_msg_view_mp_set_part_default; @@ -369,6 +423,7 @@ modest_gtkhtml_msg_view_class_init (ModestGtkhtmlMsgViewClass *klass) klass->zoom_plus_func = modest_msg_view_zoom_plus_default; klass->search_func = modest_msg_view_search_default; klass->search_next_func = modest_msg_view_search_next_default; + klass->set_msg_with_other_body_func = modest_gtkhtml_msg_view_set_msg_with_other_body_default; klass->get_vadjustment_func = modest_gtkhtml_msg_view_get_vadjustment_default; klass->get_hadjustment_func = modest_gtkhtml_msg_view_get_hadjustment_default; klass->set_vadjustment_func = modest_gtkhtml_msg_view_set_vadjustment_default; @@ -381,6 +436,9 @@ modest_gtkhtml_msg_view_class_init (ModestGtkhtmlMsgViewClass *klass) klass->get_attachments_func = modest_gtkhtml_msg_view_get_attachments_default; klass->grab_focus_func = modest_gtkhtml_msg_view_grab_focus_default; klass->remove_attachment_func = modest_gtkhtml_msg_view_remove_attachment_default; + klass->request_fetch_images_func = modest_gtkhtml_msg_view_request_fetch_images_default; + klass->set_branding_func = modest_gtkhtml_msg_view_set_branding_default; + klass->has_blocked_external_images_func = modest_gtkhtml_msg_view_has_blocked_external_images_default; g_type_class_add_private (gobject_class, sizeof(ModestGtkhtmlMsgViewPrivate)); @@ -595,11 +653,13 @@ set_scroll_adjustments (ModestGtkhtmlMsgView *self, GtkAdjustment *hadj, GtkAdjustment *vadj) { - ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); set_hadjustment (self, hadj); set_vadjustment (self, vadj); +#ifndef MODEST_TOOLKIT_HILDON2 + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->body_view), vadj); +#endif } static void @@ -1034,6 +1094,8 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) priv->headers_window = NULL; priv->html_window = NULL; + priv->idle_motion_id = 0; + gtk_widget_push_composite_child (); priv->html_scroll = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_composite_name (priv->html_scroll, "contents"); @@ -1043,11 +1105,20 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) priv->msg = NULL; priv->body_view = GTK_WIDGET (g_object_new (MODEST_TYPE_GTKHTML_MIME_PART_VIEW, NULL)); - priv->mail_header_view = GTK_WIDGET(modest_mail_header_view_new (TRUE)); - priv->view_images_button = gtk_button_new_with_label (_("mail_bd_external_images")); +#ifdef MODEST_TOOLKIT_HILDON2 + priv->mail_header_view = GTK_WIDGET(modest_compact_mail_header_view_new ()); +#else + priv->mail_header_view = GTK_WIDGET(modest_expander_mail_header_view_new (TRUE)); +#endif gtk_widget_set_no_show_all (priv->mail_header_view, TRUE); - gtk_widget_set_no_show_all (priv->view_images_button, TRUE); priv->attachments_view = GTK_WIDGET(modest_attachments_view_new (NULL)); +#ifdef MODEST_TOOLKIT_HILDON2 + modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), + MODEST_ATTACHMENTS_VIEW_STYLE_LINKS); +#else + modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), + MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE); +#endif g_signal_connect (G_OBJECT(priv->body_view), "activate_link", G_CALLBACK(on_activate_link), obj); @@ -1055,20 +1126,25 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) G_CALLBACK(on_fetch_url), obj); g_signal_connect (G_OBJECT(priv->body_view), "link_hover", G_CALLBACK(on_link_hover), obj); + g_signal_connect (G_OBJECT(priv->body_view), "limit_error", + G_CALLBACK(on_limit_error), obj); #ifdef MAEMO_CHANGES g_signal_connect (G_OBJECT(priv->body_view), "motion-notify-event", G_CALLBACK (motion_notify_event), obj); #endif + g_signal_connect (G_OBJECT (priv->body_view), "button-press-event", + G_CALLBACK (button_press_event), obj); + g_signal_connect (G_OBJECT (priv->body_view), "button-release-event", + G_CALLBACK (button_release_event), obj); g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated", G_CALLBACK (on_recpt_activated), obj); + g_signal_connect (G_OBJECT (priv->mail_header_view), "show-details", + G_CALLBACK (on_show_details), obj); g_signal_connect (G_OBJECT (priv->attachments_view), "activate", G_CALLBACK (on_attachment_activated), obj); - g_signal_connect (G_OBJECT (priv->view_images_button), "clicked", - G_CALLBACK (on_view_images_clicked), obj); - html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW(priv->html_scroll)); g_signal_connect (G_OBJECT (html_vadj), "changed", @@ -1081,17 +1157,26 @@ 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); - if (priv->view_images_button) { - GtkWidget *hbuttonbox; - - hbuttonbox = gtk_hbutton_box_new (); - gtk_container_add (GTK_CONTAINER (hbuttonbox), priv->view_images_button); - gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, FALSE, FALSE, 0); - gtk_widget_hide (priv->view_images_button); + +#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); +#else + gchar *att_label = g_strconcat (_("mail_va_attachment"), ":", NULL); +#endif priv->attachments_box = (GtkWidget *) modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), @@ -1113,6 +1198,7 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) #ifdef MAEMO_CHANGES gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->body_view), NULL, NULL, 0); g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold", G_CALLBACK (on_tap_and_hold), obj); + g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold-query", G_CALLBACK (on_tap_and_hold_query), obj); #endif } @@ -1129,6 +1215,11 @@ modest_gtkhtml_msg_view_finalize (GObject *obj) g_object_unref (G_OBJECT(priv->msg)); priv->msg = NULL; } + + if (priv->idle_motion_id > 0) { + g_source_remove (priv->idle_motion_id); + priv->idle_motion_id = 0; + } /* we cannot disconnect sigs, because priv->body_view is * already dead */ @@ -1177,11 +1268,63 @@ motion_notify_event (GtkWidget *widget, value = priv->vadj->upper - priv->vadj->page_size; gtk_adjustment_set_value (priv->vadj, value); - } + } return FALSE; } #endif +static gboolean +idle_motion (gpointer userdata) +{ + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata); + if (GTK_HTML (priv->body_view)->in_selection_drag) { + gdouble offset; + GtkAdjustment *adj; + gint gdk_y; + gdk_window_get_pointer (gtk_widget_get_parent_window (priv->body_view), NULL, &gdk_y, NULL); + offset= (gdouble) (priv->headers_box->requisition.height + gdk_y); + adj = GTK_ADJUSTMENT (priv->vadj); + if (offset < adj->value + adj->step_increment) { + gtk_adjustment_set_value (adj, MAX (offset + adj->page_increment - adj->page_size, 0.0)); + } else if (offset > adj->value + adj->page_increment) { + gtk_adjustment_set_value (adj, MIN (offset - adj->page_increment, adj->upper - adj->page_size)); + } + gtk_widget_queue_resize (userdata); + } + return TRUE; +} + +static gboolean +button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer userdata) +{ + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata); + + if (priv->idle_motion_id == 0) { + priv->idle_motion_id = g_timeout_add (200, idle_motion, userdata); + } + return FALSE; +} + +static gboolean +button_release_event (GtkWidget *widget, + GdkEventButton *event, + gpointer userdata) +{ + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata); + + if (priv->idle_motion_id > 0) { + gint gdk_y; + g_source_remove (priv->idle_motion_id); + + priv->idle_motion_id = 0;; + gdk_window_get_pointer (gtk_widget_get_parent_window (priv->body_view), NULL, &gdk_y, NULL); + event->y = (gdouble) gdk_y; + } + return FALSE; +} + static GtkAdjustment * get_vadjustment (ModestGtkhtmlMsgView *self) { @@ -1317,6 +1460,18 @@ on_tap_and_hold (GtkWidget *widget, g_signal_emit_by_name (G_OBJECT (self), "link-contextual", priv->last_url); } + +static gboolean +on_tap_and_hold_query (GtkWidget *widget, + GdkEvent *event, + gpointer data) +{ + ModestGtkhtmlMsgView *self = (ModestGtkhtmlMsgView *) data; + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); + + /* Don't show the tap and hold animation if no url below */ + return (priv->last_url == NULL); +} #endif static void @@ -1328,6 +1483,13 @@ on_recpt_activated (ModestMailHeaderView *header_view, } static void +on_show_details (ModestMailHeaderView *header_view, + ModestGtkhtmlMsgView *self) +{ + g_signal_emit_by_name (G_OBJECT (self), "show-details"); +} + +static void on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_part, gpointer self) { @@ -1335,19 +1497,38 @@ on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_par } static void -on_view_images_clicked (GtkButton * button, gpointer self) +request_fetch_images (ModestGtkhtmlMsgView *self) { ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); TnyMimePart *part; - modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), TRUE); - gtk_widget_hide (priv->view_images_button); - part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->body_view)); - tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), part); - tny_msg_set_allow_external_images (TNY_MSG (priv->msg), TRUE); - g_object_unref (part); - + /* The message could have not been downloaded yet */ + if (priv->msg) { + modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), TRUE); + part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->body_view)); + if (part) { + tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), part); + g_object_unref (part); + } + tny_msg_set_allow_external_images (TNY_MSG (priv->msg), TRUE); + } +} +static void +set_branding (ModestGtkhtmlMsgView *self, const gchar *brand_name, const GdkPixbuf *brand_icon) +{ + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); + + modest_mail_header_view_set_branding (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), brand_name, brand_icon); +} + +static gboolean +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)) && + !modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view))); } static gboolean @@ -1355,7 +1536,7 @@ on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *sel { gboolean result; g_return_val_if_fail (self, FALSE); - + g_signal_emit_by_name (G_OBJECT(self), "activate-link", uri, &result); return result; @@ -1376,6 +1557,11 @@ on_link_hover (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *self) return result; } +static void +on_limit_error (GtkWidget *widget, ModestGtkhtmlMsgView *msg_view) +{ + g_signal_emit_by_name (G_OBJECT (msg_view), "limit-error"); +} static TnyMimePart * @@ -1462,8 +1648,6 @@ on_fetch_url (GtkWidget *widget, const gchar *uri, priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); - if (modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view))) - gtk_widget_show (priv->view_images_button); /* * we search for either something starting with cid:, or something * with no prefix at all; this latter case occurs when sending mails @@ -1500,16 +1684,17 @@ on_fetch_url (GtkWidget *widget, const gchar *uri, } static void -set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg) +set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg, TnyMimePart *other_body) { TnyMimePart *body; 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); modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE); @@ -1526,12 +1711,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)); @@ -1543,35 +1731,63 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg) tny_header_view_set_header (TNY_HEADER_VIEW (priv->mail_header_view), header); g_object_unref (header); - modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW(priv->attachments_view), - msg); + modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), + other_body?NULL:msg); modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), tny_msg_get_allow_external_images (msg)); - - body = modest_tny_msg_find_body_part (msg, TRUE); + + if (other_body) { + body = other_body; + g_object_ref (body); + } else { + body = modest_tny_msg_find_body_part (msg, TRUE); + } if (body) { - tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), body); + ModestAttachmentsView *widget; - if(modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view))) { + tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), body); + g_object_unref (body); + widget = MODEST_ATTACHMENTS_VIEW (priv->attachments_view); + + if (modest_attachments_view_has_attachments (widget)) { + GtkLabel *label; + GList *children = NULL; + gchar *text = NULL; + /* Ugly but... */ + children = gtk_container_get_children (GTK_CONTAINER (priv->attachments_box)); + label = GTK_LABEL (children->data); gtk_widget_show_all (priv->attachments_box); +#ifdef MODEST_TOOLKIT_HILDON2 + if (modest_attachments_view_get_num_attachments (widget) > 1) { + text = _("mail_va_attachments"); + } else { + text = _("mail_va_attachment"); + } +#else + text = _("mail_va_attachment"); +#endif + gtk_label_set_text (label, text); } else { gtk_widget_hide_all (priv->attachments_box); } - } else - 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); + tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view)); } + /* 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)); @@ -1590,6 +1806,48 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg) g_timeout_add (250, (GSourceFunc) idle_readjust_scroll, self); } +static void +set_header (ModestGtkhtmlMsgView *self, TnyHeader *header) +{ + ModestGtkhtmlMsgViewPrivate *priv; + GtkAdjustment *html_vadj; + + g_return_if_fail (self); + + if (header == NULL) { + set_message (self, NULL, NULL); + return; + } + + priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self); + modest_mail_header_view_set_loading (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), TRUE); + gtk_widget_set_no_show_all (priv->mail_header_view, FALSE); + modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE); + + html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll)); + html_vadj->upper = 0; + html_vadj->page_size = 0; + g_signal_emit_by_name (G_OBJECT (html_vadj), "changed"); + + + if (priv->msg) { + g_object_unref (G_OBJECT(priv->msg)); + } + priv->msg = NULL; + + tny_header_view_set_header (TNY_HEADER_VIEW (priv->mail_header_view), 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)); + gtk_widget_queue_draw (GTK_WIDGET(self)); +} + static TnyMsg* get_message (ModestGtkhtmlMsgView *self) @@ -1659,6 +1917,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 */ @@ -1781,6 +2060,45 @@ remove_attachment (ModestGtkhtmlMsgView *self, TnyMimePart *attachment) } +/* TNY HEADER VIEW IMPLEMENTATION */ + +static void +tny_header_view_init (gpointer g, gpointer iface_data) +{ + TnyHeaderViewIface *klass = (TnyHeaderViewIface *)g; + + klass->set_header = modest_msg_view_set_header; + klass->clear = modest_msg_view_clear_header; + + return; +} + +static void +modest_msg_view_set_header (TnyHeaderView *self, TnyHeader *header) +{ + MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->set_header_func (self, header); +} + + +static void +modest_msg_view_set_header_default (TnyHeaderView *self, TnyHeader *header) +{ + set_header (MODEST_GTKHTML_MSG_VIEW (self), header); +} + +static void +modest_msg_view_clear_header (TnyHeaderView *self) +{ + MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->clear_header_func (self); +} + + +static void +modest_msg_view_clear_header_default (TnyHeaderView *self) +{ + set_message (MODEST_GTKHTML_MSG_VIEW (self), NULL, NULL); +} + /* TNY MSG IMPLEMENTATION */ static void @@ -1848,7 +2166,7 @@ modest_msg_view_clear (TnyMsgView *self) static void modest_msg_view_clear_default (TnyMsgView *self) { - set_message (MODEST_GTKHTML_MSG_VIEW (self), NULL); + set_message (MODEST_GTKHTML_MSG_VIEW (self), NULL, NULL); } static TnyMimePartView* @@ -1918,7 +2236,7 @@ modest_msg_view_mp_set_part_default (TnyMimePartView *self, { g_return_if_fail ((part == NULL) || TNY_IS_MSG (part)); - set_message (MODEST_GTKHTML_MSG_VIEW (self), TNY_MSG (part)); + set_message (MODEST_GTKHTML_MSG_VIEW (self), TNY_MSG (part), NULL); } static void @@ -2057,6 +2375,7 @@ modest_msg_view_init (gpointer g, gpointer iface_data) { ModestMsgViewIface *klass = (ModestMsgViewIface *)g; + klass->set_msg_with_other_body_func = modest_gtkhtml_msg_view_set_msg_with_other_body; klass->get_vadjustment_func = modest_gtkhtml_msg_view_get_vadjustment; klass->get_hadjustment_func = modest_gtkhtml_msg_view_get_hadjustment; klass->set_vadjustment_func = modest_gtkhtml_msg_view_set_vadjustment; @@ -2069,10 +2388,25 @@ modest_msg_view_init (gpointer g, gpointer iface_data) klass->get_attachments_func = modest_gtkhtml_msg_view_get_attachments; klass->grab_focus_func = modest_gtkhtml_msg_view_grab_focus; klass->remove_attachment_func = modest_gtkhtml_msg_view_remove_attachment; + klass->request_fetch_images_func = modest_gtkhtml_msg_view_request_fetch_images; + klass->set_branding_func = modest_gtkhtml_msg_view_set_branding; + klass->has_blocked_external_images_func = modest_gtkhtml_msg_view_has_blocked_external_images; return; } +static void +modest_gtkhtml_msg_view_set_msg_with_other_body (ModestMsgView *self, TnyMsg *msg, TnyMimePart *other_body) +{ + MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->set_msg_with_other_body_func (self, msg, other_body); +} + +static void +modest_gtkhtml_msg_view_set_msg_with_other_body_default (ModestMsgView *self, TnyMsg *msg, TnyMimePart *other_body) +{ + set_message (MODEST_GTKHTML_MSG_VIEW (self), msg, other_body); +} + static GtkAdjustment* modest_gtkhtml_msg_view_get_vadjustment (ModestMsgView *self) { @@ -2216,3 +2550,39 @@ modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *self, TnyMimeP { remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment); } + +static void +modest_gtkhtml_msg_view_request_fetch_images (ModestMsgView *self) +{ + MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->request_fetch_images_func (self); +} + +static void +modest_gtkhtml_msg_view_request_fetch_images_default (ModestMsgView *self) +{ + request_fetch_images (MODEST_GTKHTML_MSG_VIEW (self)); +} + +static void +modest_gtkhtml_msg_view_set_branding (ModestMsgView *self, const gchar *brand_name, const GdkPixbuf *brand_icon) +{ + MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->set_branding_func (self, brand_name, brand_icon); +} + +static void +modest_gtkhtml_msg_view_set_branding_default (ModestMsgView *self, const gchar *brand_name, const GdkPixbuf *brand_icon) +{ + set_branding (MODEST_GTKHTML_MSG_VIEW (self), brand_name, brand_icon); +} + +static gboolean +modest_gtkhtml_msg_view_has_blocked_external_images (ModestMsgView *self) +{ + return MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->has_blocked_external_images_func (self); +} + +static gboolean +modest_gtkhtml_msg_view_has_blocked_external_images_default (ModestMsgView *self) +{ + return has_blocked_external_images (MODEST_GTKHTML_MSG_VIEW (self)); +}