#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>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <widgets/modest-compact-mail-header-view.h>
+#include <hildon/hildon-gtk.h>
+#else
+#include <widgets/modest-expander-mail-header-view.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>
+
+/* FIXNE: we should have no maemo-deps in widgets/ */
+#ifndef MODEST_TOOLKIT_GTK
+#include "maemo/modest-hildon-includes.h"
+#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);
/* 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);
#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 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 GtkAdjustment *modest_gtkhtml_msg_view_get_vadjustment_default (ModestMsgView *self);
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);
/* 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 gboolean is_empty (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);
GtkWidget *headers_box;
GtkWidget *html_scroll;
GtkWidget *attachments_box;
+ GtkWidget *view_images_button;
/* internal adjustments for set_scroll_adjustments */
GtkAdjustment *hadj;
GdkWindow *headers_window;
GdkWindow *html_window;
+ /* id handler for dragged scroll */
+ guint idle_motion_id;
+
/* zoom */
gdouble current_zoom;
/* link click management */
gchar *last_url;
-
- TnyHeaderFlags priority_flags;
};
#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;
gboolean
idle_readjust_scroll (ModestGtkhtmlMsgView *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;
gtk_adjustment_set_value (priv->vadj, 0.0);
}
g_object_unref (G_OBJECT (self));
+
+ gdk_threads_leave ();
+
return FALSE;
}
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(obj);
priv->current_zoom = 1.0;
- priv->priority_flags = 0;
priv->hadj = NULL;
priv->vadj = 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));
+#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
+ priv->view_images_button = gtk_button_new_with_label (_("mail_bd_external_images"));
+#ifdef MODEST_TOOLKIT_HILDON2
+ hildon_gtk_widget_set_theme_size (priv->view_images_button,
+ HILDON_SIZE_HALFSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT);
+#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);
G_CALLBACK(on_fetch_url), obj);
g_signal_connect (G_OBJECT(priv->body_view), "link_hover",
G_CALLBACK(on_link_hover), 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",
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);
+ if (priv->view_images_button) {
+ GtkWidget *hbuttonbox;
+
+ hbuttonbox = gtk_hbutton_box_new ();
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), priv->view_images_button);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_START);
+ gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, TRUE, TRUE, 0);
+#else
+ gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, FALSE, FALSE, 0);
+#endif
+ gtk_widget_hide (priv->view_images_button);
+ }
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),
#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_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)
{
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
+on_view_images_clicked (GtkButton * button, gpointer 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);
+
+
+}
+
static gboolean
on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *self)
{
part = TNY_MIME_PART(tny_iterator_get_current(iter));
part_cid = tny_mime_part_get_content_id (part);
+ /* 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_cid && strcmp (cid, part_cid) == 0)
break;
TnyStream *stream, ModestGtkhtmlMsgView *self)
{
ModestGtkhtmlMsgViewPrivate *priv;
+ const gchar* my_uri;
+ TnyMimePart *part = NULL;
+
+
+
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- gboolean result = FALSE;
+
+ 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
+ * 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 {
- return TRUE;
}
- return result;
+ tny_mime_part_decode_to_stream ((TnyMimePart*)part, stream, NULL);
+ tny_stream_close (stream);
+ g_object_unref (G_OBJECT(part));
+ return TRUE;
}
static void
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
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 (msg != priv->msg) {
if (priv->msg)
modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW(priv->attachments_view),
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 (body) {
tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), body);
+ g_object_unref (body);
if(modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view))) {
gtk_widget_show_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);
+ }
+
gtk_widget_show (priv->body_view);
gtk_widget_set_no_show_all (priv->attachments_box, TRUE);
gtk_widget_show_all (priv->mail_header_view);
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
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);
+ return;
+ }
+
+ priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+ 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);
+ 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)
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- return priv->priority_flags;
+ return modest_mail_header_view_get_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view));
}
static void
g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
-
modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
}
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);
+}
+
/* 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;
}
{
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;
}
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);
}
-