#include <glib/gi18n.h>
#include <tny-list.h>
#include <tny-simple-list.h>
+#include <tny-vfs-stream.h>
#include <modest-tny-msg.h>
#include <modest-text-utils.h>
#include <widgets/modest-msg-view.h>
-#include <widgets/modest-mail-header-view.h>
+#include <widgets/modest-compact-mail-header-view.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-gtk.h>
+#endif
#include <widgets/modest-attachments-view.h>
#include <modest-marshal.h>
#include <widgets/modest-gtkhtml-mime-part-view.h>
#include <widgets/modest-gtkhtml-msg-view.h>
#include <widgets/modest-isearch-view.h>
-
+#include <widgets/modest-ui-constants.h>
+#include <modest-icon-names.h>
+#include <tny-camel-bs-mime-part.h>
+#include <modest-runtime.h>
/* '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);
/* 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);
/* body view signals */
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*/
static void disconnect_hadjustment (ModestGtkhtmlMsgView *obj);
static gboolean idle_readjust_scroll (ModestGtkhtmlMsgView *obj);
+/* vertical panning implementation */
+#ifdef MAEMO_CHANGES
+static gboolean motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ 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);
/* 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);
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);
static GtkShadowType modest_gtkhtml_msg_view_get_shadow_type (ModestMsgView *self);
static TnyHeaderFlags modest_gtkhtml_msg_view_get_priority (ModestMsgView *self);
static void modest_gtkhtml_msg_view_set_priority (ModestMsgView *self, TnyHeaderFlags flags);
-static GList *modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView *self);
-static GList *modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self);
+static TnyList *modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView *self);
+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);
static GtkShadowType modest_gtkhtml_msg_view_get_shadow_type_default (ModestMsgView *self);
static TnyHeaderFlags modest_gtkhtml_msg_view_get_priority_default (ModestMsgView *self);
static void modest_gtkhtml_msg_view_set_priority_default (ModestMsgView *self, TnyHeaderFlags flags);
-static GList *modest_gtkhtml_msg_view_get_selected_attachments_default (ModestMsgView *self);
-static GList *modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self);
+static TnyList *modest_gtkhtml_msg_view_get_selected_attachments_default (ModestMsgView *self);
+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);
static GtkShadowType get_shadow_type (ModestGtkhtmlMsgView *self);
static TnyHeaderFlags get_priority (ModestGtkhtmlMsgView *self);
static void set_priority (ModestGtkhtmlMsgView *self, TnyHeaderFlags flags);
-static GList *get_selected_attachments (ModestGtkhtmlMsgView *self);
-static GList *get_attachments (ModestGtkhtmlMsgView *self);
+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);
+static void set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg);
/* list properties */
enum {
GtkWidget *html_scroll;
GtkWidget *attachments_box;
+#ifdef MODEST_TOOLKIT_HILDON2
+ GtkWidget *priority_box;
+ GtkWidget *priority_icon;
+#endif
+ GtkWidget *calendar_box;
+ GtkWidget *calendar_icon;
+ GtkWidget *calendar_actions_box;
+ GtkWidget *calendar_actions_container;
+
/* internal adjustments for set_scroll_adjustments */
GtkAdjustment *hadj;
GtkAdjustment *vadj;
GdkWindow *headers_window;
GdkWindow *html_window;
+ /* id handler for dragged scroll */
+ guint idle_motion_id;
+
+ /* idle changes count */
+ gint idle_changes_count;
+ guint idle_readjust_scroll_id;
+ guint idle_resize_children_id;
+
/* zoom */
gdouble current_zoom;
/* link click management */
gchar *last_url;
+
+ gboolean has_blocked_bs_images;
};
#define MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
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 */
"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);
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;
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;
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));
{
GtkAllocation view_allocation;
GtkAdjustment *hadj = get_hadjustment (self);
+ gint full_width = 0;
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
get_view_allocation (self, &view_allocation);
hadj->page_size = view_allocation.width;
hadj->lower = 0;
hadj->upper = view_allocation.width;
+ /* Get the real width of the embedded html */
+ if (priv->html_scroll && GTK_WIDGET_VISIBLE(priv->html_scroll)) {
+ GtkAdjustment *html_hadj;
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ full_width += html_hadj->upper;
+ }
+
+ hadj->upper = MAX (view_allocation.width, full_width);
+
reclamp_adjustment (hadj, value_changed);
}
-static void
+static void
set_vadjustment_values (ModestGtkhtmlMsgView *self,
gboolean *value_changed)
{
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
allocation->height != widget->allocation.height))
gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+ if (priv->idle_readjust_scroll_id == 0 && priv->idle_changes_count < 5 && widget->allocation.width != allocation->width) {
+ g_object_ref (self);
+ priv->idle_readjust_scroll_id = g_idle_add ((GSourceFunc) idle_readjust_scroll, self);
+ priv->idle_changes_count ++;
+ }
+
widget->allocation = *allocation;
set_hadjustment_values (self, &hadj_value_changed);
set_vadjustment_values (self, &vadj_value_changed);
html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
html_allocation.x = 0;
- html_allocation.y = headers_allocation.height;
+ html_allocation.y = MAX (0, headers_allocation.height - priv->vadj->value);
html_allocation.width = view_allocation.width;
- html_allocation.height = MAX ((gint) html_vadj->upper, (gint)(priv->vadj->upper - headers_allocation.height));
+ if (html_vadj->upper < allocation->height) {
+ html_allocation.height = MAX (html_vadj->upper, allocation->height - headers_allocation.height);
+ } else {
+ html_allocation.height = allocation->height;
+ }
+ /* html_allocation.height = MAX ((gint) html_vadj->upper, (gint)(priv->vadj->upper - headers_allocation.height)); */
if (GTK_WIDGET_REALIZED (widget)) {
gdk_window_move_resize (widget->window,
headers_allocation.height);
gdk_window_move_resize (priv->html_window,
(gint) (- priv->hadj->value),
- (gint) (html_allocation.y - priv->vadj->value),
+ (gint) html_allocation.y,
(gint) priv->hadj->upper,
html_allocation.height);
}
html_allocation.x = 0;
html_allocation.y = 0;
html_allocation.width = (gint) priv->hadj->upper;
- html_allocation.height = (gint) priv->vadj->upper - headers_allocation.height;
gtk_widget_size_allocate (priv->html_scroll, &html_allocation);
+ if (html_vadj->page_size != html_allocation.height) {
+ html_vadj->page_size = html_allocation.height;
+ gtk_adjustment_changed (html_vadj);
+ }
}
gtk_adjustment_changed (priv->hadj);
gtk_adjustment_changed (priv->vadj);
if (priv->html_scroll && GTK_WIDGET_VISIBLE (priv->html_scroll)) {
gint old_x, old_y;
gint new_x, new_y;
+ gint new_internal_vvalue;
gdk_window_get_position (priv->html_window, &old_x, &old_y);
new_x = -hadj->value;
- new_y = headers_offset - vadj->value;
+
+ new_internal_vvalue = MAX (0, vadj->value - headers_offset);
+ gtk_adjustment_set_value (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll)),
+ new_internal_vvalue);
+
+ new_y = MAX (0, headers_offset - vadj->value);
if (new_x != old_x || new_y != old_y) {
gdk_window_move (priv->html_window, new_x, new_y);
}
}
+static gboolean
+resize_children_idle (GtkContainer *cont)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (cont);
+ if (GTK_WIDGET_DRAWABLE (cont)) {
+ gtk_container_resize_children (cont);
+ }
+ priv->idle_resize_children_id = 0;
+
+ return FALSE;
+}
+
static void
html_adjustment_changed (GtkAdjustment *adj,
gpointer userdata)
g_signal_stop_emission_by_name (G_OBJECT (adj), "changed");
priv->html_scroll->requisition.height = html_vadj->upper;
- if (html_vadj->upper == priv->html_scroll->allocation.height)
+ if ((priv->vadj != NULL && (html_vadj->upper == (priv->vadj->upper - GTK_WIDGET (priv->headers_box)->allocation.height)))
+ && html_vadj->page_size == priv->html_scroll->allocation.height)
return;
- priv->html_scroll->allocation.height = html_vadj->upper;
set_vadjustment_values (self, &vadj_changed);
- new_height = MAX ((gint) html_vadj->upper, (gint) (priv->vadj->upper - priv->headers_box->allocation.height));
+ if (html_vadj->upper < GTK_WIDGET (self)->allocation.height) {
+ new_height = MAX (html_vadj->upper,
+ GTK_WIDGET (self)->allocation.height - GTK_WIDGET(priv->headers_box)->allocation.height);
+ } else {
+ new_height = GTK_WIDGET (self)->allocation.height;
+ }
gtk_adjustment_changed (priv->vadj);
if (GTK_WIDGET_DRAWABLE (priv->html_scroll)) {
gdk_window_resize (priv->html_window, (gint) priv->hadj->upper, (gint) new_height);
gdk_window_process_updates (priv->view_window, TRUE);
- gtk_container_resize_children (GTK_CONTAINER (self));
+ if (priv->idle_resize_children_id == 0)
+ priv->idle_resize_children_id = gdk_threads_add_idle ((GSourceFunc) resize_children_idle, self);
}
}
gboolean
idle_readjust_scroll (ModestGtkhtmlMsgView *self)
{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
/* We're out the main lock */
gdk_threads_enter ();
if (GTK_WIDGET_DRAWABLE (self)) {
- ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
GtkAdjustment *html_vadj;
+ GtkAdjustment *html_hadj;
+
html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
- html_vadj->page_size = html_vadj->upper;
- gtk_adjustment_changed (html_vadj);
- gtk_widget_queue_resize (GTK_WIDGET (self));
- gtk_widget_queue_draw (GTK_WIDGET (self));
+ html_vadj->upper = 0;
+ html_vadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+ gtk_widget_queue_draw (GTK_WIDGET (priv->body_view));
/* Just another hack for making readjust really work. This forces an update
* of the scroll, and then, make the scroll really update properly the
* the size and not corrupt scrollable area */
gtk_adjustment_set_value (priv->vadj, 1.0);
gtk_adjustment_set_value (priv->vadj, 0.0);
+
}
+ priv->idle_readjust_scroll_id = 0;
g_object_unref (G_OBJECT (self));
+
gdk_threads_leave ();
return FALSE;
{
ModestGtkhtmlMsgViewPrivate *priv;
GtkAdjustment *html_vadj;
+#ifndef MODEST_TOOLKIT_HILDON2
GtkWidget *separator;
+#endif
GTK_WIDGET_UNSET_FLAGS (obj, GTK_NO_WINDOW);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (obj), TRUE);
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(obj);
+ priv->has_blocked_bs_images = FALSE;
+
+ priv->idle_changes_count = 0;
+ priv->idle_readjust_scroll_id = 0;
+ priv->idle_resize_children_id = 0;
priv->current_zoom = 1.0;
priv->hadj = NULL;
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");
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->mail_header_view = GTK_WIDGET (modest_compact_mail_header_view_new ());
gtk_widget_set_no_show_all (priv->mail_header_view, 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);
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_CALLBACK (html_adjustment_changed), obj);
gtk_widget_push_composite_child ();
- priv->headers_box = gtk_vbox_new (0, FALSE);
+ priv->headers_box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
gtk_widget_set_composite_name (priv->headers_box, "headers");
gtk_widget_pop_composite_child ();
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
+ priv->calendar_actions_box = NULL;
+ priv->calendar_icon = gtk_image_new ();
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->calendar_icon), MODEST_HEADER_ICON_CALENDAR, GTK_ICON_SIZE_MENU);
+ gtk_misc_set_alignment (GTK_MISC (priv->calendar_icon), 0.0, 0.5);
+ if (priv->calendar_icon) {
+ priv->calendar_box = (GtkWidget *)
+ modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view),
+ _("mail_fi_invitation"),
+ priv->calendar_icon,
+ FALSE, FALSE);
+
+ gtk_widget_hide_all (priv->calendar_box);
+ }
+
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),
g_free (att_label);
}
+ priv->calendar_actions_container = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->headers_box), priv->calendar_actions_container, FALSE, FALSE, 0);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
+
+#ifndef MODEST_TOOLKIT_HILDON2
separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX(priv->headers_box), separator, FALSE, FALSE, 0);
+#endif
gtk_widget_set_parent (priv->headers_box, GTK_WIDGET (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
}
g_object_unref (G_OBJECT(priv->msg));
priv->msg = NULL;
}
+
+ if (priv->idle_resize_children_id > 0) {
+ g_source_remove (priv->idle_resize_children_id);
+ priv->idle_resize_children_id = 0;
+ }
+
+ if (priv->idle_readjust_scroll_id > 0) {
+ g_source_remove (priv->idle_readjust_scroll_id);
+ priv->idle_readjust_scroll_id = 0;
+ }
+
+ 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 */
/* INTERNAL METHODS */
+#ifdef MAEMO_CHANGES
+static gboolean
+motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ gpointer userdata)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+
+ /* Use panning information in gtkhtml widget to support also vertical panning */
+
+ if (GTK_HTML (widget)->panning) {
+ gint y, dy;
+ gdouble value;
+
+ gdk_window_get_pointer (GTK_LAYOUT (widget)->bin_window, NULL, &y, NULL);
+ dy = y - GTK_HTML (widget)->lasty;
+ value = priv->vadj->value - (gdouble) dy;
+
+ if (value < priv->vadj->lower)
+ value = priv->vadj->lower;
+ else if (value > priv->vadj->upper - priv->vadj->page_size)
+ 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)
{
if (!hadj)
hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0));
disconnect_hadjustment (self);
- g_object_ref (G_OBJECT (hadj));
- gtk_object_sink (GTK_OBJECT (hadj));
+ g_object_ref_sink (G_OBJECT (hadj));
priv->hadj = hadj;
set_hadjustment_values (self, &value_changed);
if (!vadj)
vadj = (GtkAdjustment *) gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0);
disconnect_vadjustment (self);
- g_object_ref (G_OBJECT (vadj));
- gtk_object_sink (GTK_OBJECT (vadj));
+ g_object_ref_sink (G_OBJECT (vadj));
priv->vadj = vadj;
set_vadjustment_values (self, &value_changed);
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
}
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)
{
g_signal_emit_by_name (G_OBJECT(self), "attachment_clicked", mime_part);
}
+static void
+request_fetch_images (ModestGtkhtmlMsgView *self)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
+ TnyMimePart *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);
+ priv->has_blocked_bs_images = FALSE;
+ 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)) ||
+ (priv->has_blocked_bs_images)) &&
+ !modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)));
+}
+
static gboolean
on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *self)
{
gboolean result;
g_return_val_if_fail (self, FALSE);
-
+
g_signal_emit_by_name (G_OBJECT(self), "activate-link", uri, &result);
return result;
return result;
}
+static void
+on_limit_error (GtkWidget *widget, ModestGtkhtmlMsgView *msg_view)
+{
+ g_signal_emit_by_name (G_OBJECT (msg_view), "limit-error");
+}
+
+static gboolean
+part_cids_equal (const gchar *part_cid1,
+ const gchar *part_cid2)
+{
+ if (g_strcmp0 (part_cid1, part_cid2) == 0)
+ return TRUE;
+ if (part_cid2 && part_cid2[0] == '<') {
+ const gchar *end;
+ end = g_strrstr_len (part_cid2, -1, ">");
+
+ if (end && strncmp (part_cid2 + 1, part_cid1, end - part_cid2 - 1) == 0)
+ return TRUE;
+ }
+ return FALSE;
+}
static TnyMimePart *
find_cid_image (TnyMsg *msg, const gchar *cid)
part = TNY_MIME_PART(tny_iterator_get_current(iter));
part_cid = tny_mime_part_get_content_id (part);
- if (part_cid && strcmp (cid, part_cid) == 0)
+ /* if there is no content id, try the content location;
+ * this is what Outlook seems to use when it converts
+ * it's internal richtext to html
+ */
+ if (!part_cid)
+ part_cid = tny_mime_part_get_content_location (part);
+
+ if (part_cids_equal (cid, part_cid))
break;
if (tny_mime_part_content_type_is (part, "multipart/related")) {
while (!tny_iterator_is_done (related_iter)) {
related_part = TNY_MIME_PART (tny_iterator_get_current (related_iter));
part_cid = tny_mime_part_get_content_id (related_part);
- if (part_cid && strcmp (cid, part_cid) == 0) {
+
+ if (part_cids_equal (cid, part_cid))
break;
- }
+
g_object_unref (related_part);
related_part = NULL;
tny_iterator_next (related_iter);
return part;
}
+static void
+fetch_url_decode_to_stream_cb (TnyMimePart *self, gboolean cancelled, TnyStream *stream, GError *err, gpointer user_data)
+{
+ tny_stream_close (stream);
+}
static gboolean
on_fetch_url (GtkWidget *widget, const gchar *uri,
TnyStream *stream, ModestGtkhtmlMsgView *self)
{
ModestGtkhtmlMsgViewPrivate *priv;
+ const gchar* my_uri;
+ TnyMimePart *part = NULL;
+
+
+
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- gboolean result = FALSE;
+
+ /*
+ * we search for either something starting with cid:, or something
+ * with no prefix at all; this latter case occurs when sending mails
+ * with MS Outlook in rich-text mode, and 'attach-as-object
+ */
+ if (g_str_has_prefix (uri, "cid:"))
+ my_uri = uri + 4; /* +4 ==> skip "cid:" */
+ else
+ my_uri = uri;
- if (g_str_has_prefix (uri, "cid:")) {
- /* +4 ==> skip "cid:" */
- TnyMimePart *part = find_cid_image (priv->msg, uri + 4);
- if (!part) {
- g_printerr ("modest: '%s' not found\n", uri + 4);
- result = FALSE;
+ /* now try to find the embedded image */
+ part = find_cid_image (priv->msg, my_uri);
+
+ if (!part) {
+ if (g_str_has_prefix (uri, "http:")) {
+ if (modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view))) {
+ gboolean result = FALSE;
+ g_signal_emit_by_name (self, "fetch-image", uri, stream, &result);
+ return result;
+ } else {
+ /* we return immediately to get a "image not found" icon */
+ tny_stream_close (stream);
+ return TRUE;
+ }
} else {
- tny_mime_part_decode_to_stream ((TnyMimePart*)part,
- stream);
- g_object_unref (G_OBJECT(part));
- result = TRUE;
+ return FALSE;
+ }
+ } else if (TNY_IS_CAMEL_BS_MIME_PART (part) &&
+ !tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (part))){
+ if (!modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)) ||
+ !tny_device_is_online (modest_runtime_get_device ())) {
+ priv->has_blocked_bs_images = TRUE;
+ tny_stream_close (stream);
+ return TRUE;
}
- } else {
- return TRUE;
}
- return result;
+ tny_mime_part_decode_to_stream_async ((TnyMimePart*)part, stream, fetch_url_decode_to_stream_cb, NULL, NULL);
+ g_object_unref (G_OBJECT(part));
+ return TRUE;
}
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;
-
+ GtkAdjustment *html_vadj, *html_hadj;
+
g_return_if_fail (self);
-
+
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+ priv->has_blocked_bs_images = FALSE;
+ 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);
if (msg != priv->msg) {
if (priv->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_hide_all (priv->calendar_box);
+ gtk_widget_hide_all (priv->calendar_actions_container);
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
+
+ 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");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ priv->idle_changes_count = 0;
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+
gtk_widget_queue_resize (GTK_WIDGET(self));
gtk_widget_queue_draw (GTK_WIDGET(self));
return;
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);
-
- body = modest_tny_msg_find_body_part (msg, TRUE);
+ 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));
+
+ 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
+ } else {
tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
+ }
+
+ /* Refresh priority */
+ set_priority (self, tny_header_get_flags (header));
+ set_calendar (self, header, msg);
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->calendar_box, TRUE);
+ gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
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->calendar_box, FALSE);
+ gtk_widget_set_no_show_all (priv->calendar_actions_container, FALSE);
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
+
+ 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");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ priv->idle_changes_count = 0;
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+
gtk_widget_queue_resize (GTK_WIDGET(self));
gtk_widget_queue_draw (GTK_WIDGET(self));
if (priv->vadj != NULL)
priv->vadj->value = 0.0;
- html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
-
g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
/* This is a hack to force reallocation of scroll after drawing all the stuff. This
* makes the html view get the proper and expected size and prevent being able to scroll
* the buffer when it shouldn't be scrollable */
- g_object_ref (self);
- g_timeout_add (250, (GSourceFunc) idle_readjust_scroll, self);
+ if (priv->idle_readjust_scroll_id == 0) {
+ g_object_ref (self);
+ priv->idle_readjust_scroll_id = g_idle_add ((GSourceFunc) idle_readjust_scroll, self);
+ }
+}
+
+static void
+set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
+{
+ ModestGtkhtmlMsgViewPrivate *priv;
+ GtkAdjustment *html_vadj, *html_hadj;
+
+ g_return_if_fail (self);
+
+ if (header == NULL) {
+ set_message (self, NULL, NULL);
+ return;
+ }
+
+ priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+ priv->has_blocked_bs_images = FALSE;
+ 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");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ priv->idle_changes_count = 0;
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+
+ 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_hide_all (priv->calendar_box);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
+ tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
+ priv->idle_changes_count = 0;
+ gtk_widget_queue_resize (GTK_WIDGET(self));
+ gtk_widget_queue_draw (GTK_WIDGET(self));
}
set_zoom (ModestGtkhtmlMsgView *self, gdouble zoom)
{
ModestGtkhtmlMsgViewPrivate *priv;
+ GtkAdjustment *html_vadj, *html_hadj;
g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
modest_zoomable_set_zoom (MODEST_ZOOMABLE(priv->body_view), zoom);
+ 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");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ priv->idle_changes_count = 0;
gtk_widget_queue_resize (priv->body_view);
}
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 */
return result;
}
-static GList *
+static TnyList *
get_selected_attachments (ModestGtkhtmlMsgView *self)
{
ModestGtkhtmlMsgViewPrivate *priv;
}
-static GList *
+static TnyList *
get_attachments (ModestGtkhtmlMsgView *self)
{
ModestGtkhtmlMsgViewPrivate *priv;
}
+/* 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
{
TnyMsgViewIface *klass = (TnyMsgViewIface *)g;
- klass->get_msg_func = modest_msg_view_get_msg;
- klass->set_msg_func = modest_msg_view_set_msg;
- klass->set_unavailable_func = modest_msg_view_set_unavailable;
- klass->clear_func = modest_msg_view_clear;
- klass->create_mime_part_view_for_func = modest_msg_view_create_mime_part_view_for;
- klass->create_new_inline_viewer_func = modest_msg_view_create_new_inline_viewer;
+ klass->get_msg = modest_msg_view_get_msg;
+ klass->set_msg = modest_msg_view_set_msg;
+ klass->set_unavailable = modest_msg_view_set_unavailable;
+ klass->clear = modest_msg_view_clear;
+ klass->create_mime_part_view_for = modest_msg_view_create_mime_part_view_for;
+ klass->create_new_inline_viewer = modest_msg_view_create_new_inline_viewer;
return;
}
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*
{
TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
- klass->get_part_func = modest_msg_view_mp_get_part;
- klass->set_part_func = modest_msg_view_mp_set_part;
- klass->clear_func = modest_msg_view_mp_clear;
+ klass->get_part = modest_msg_view_mp_get_part;
+ klass->set_part = modest_msg_view_mp_set_part;
+ klass->clear = modest_msg_view_mp_clear;
return;
}
{
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
{
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;
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)
{
return get_priority (MODEST_GTKHTML_MSG_VIEW (self));
}
-static GList*
+static TnyList*
modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView *self)
{
return MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->get_selected_attachments_func (self);
}
-static GList*
+static TnyList*
modest_gtkhtml_msg_view_get_selected_attachments_default (ModestMsgView *self)
{
return get_selected_attachments (MODEST_GTKHTML_MSG_VIEW (self));
}
-static GList*
+static TnyList*
modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self)
{
return MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->get_attachments_func (self);
}
-static GList*
+static TnyList*
modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self)
{
return get_attachments (MODEST_GTKHTML_MSG_VIEW (self));
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));
+}
+
+static void
+set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg)
+{
+ ModestGtkhtmlMsgViewPrivate *priv;
+ TnyMimePart *calendar_part;
+
+ g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
+ priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
+
+ if (priv->calendar_actions_box) {
+ gtk_widget_destroy (priv->calendar_actions_box);
+ priv->calendar_actions_box = NULL;
+ }
+
+ calendar_part = modest_tny_msg_find_calendar (TNY_MSG (msg));
+
+ if (calendar_part) {
+ gboolean retval = FALSE;
+ priv->calendar_actions_box = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->calendar_actions_container), priv->calendar_actions_box, FALSE, FALSE, 0);
+ g_signal_emit_by_name (G_OBJECT (self), "handle-calendar", calendar_part, priv->calendar_actions_box, &retval);
+ if (retval) {
+ gtk_widget_show_all (priv->calendar_actions_container);
+ gtk_widget_show (priv->calendar_actions_box);
+ } else {
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ gtk_widget_hide (priv->calendar_actions_box);
+ }
+ gtk_widget_show_all (priv->calendar_box);
+ g_object_unref (calendar_part);
+ } else {
+ gtk_widget_hide_all (priv->calendar_box);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ gtk_widget_hide (priv->calendar_actions_box);
+ }
+
+
+}
projects / modest / blobdiff