X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-gtkhtml-msg-view.c;h=d8ebb46efc6ea8a90dcb03338a534bee1d03e9f1;hp=2fd7120e40d1190bac47497dea63e3b18c3a09b4;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=8ad05e09773c9b7b7e867f81120058b37a626ebf diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c index 2fd7120..d8ebb46 100644 --- a/src/widgets/modest-gtkhtml-msg-view.c +++ b/src/widgets/modest-gtkhtml-msg-view.c @@ -41,7 +41,12 @@ #include #include #include -#include +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#include +#else +#include +#endif #include #include #include @@ -50,9 +55,9 @@ #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 */ @@ -71,6 +76,7 @@ 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); @@ -82,6 +88,7 @@ static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestGtkhtm #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 +115,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); @@ -228,6 +244,9 @@ struct _ModestGtkhtmlMsgViewPrivate { GdkWindow *headers_window; GdkWindow *html_window; + /* id handler for dragged scroll */ + guint idle_motion_id; + /* zoom */ gdouble current_zoom; @@ -1034,6 +1053,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,8 +1064,16 @@ 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)); +#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)); @@ -1059,9 +1088,15 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) 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); @@ -1086,7 +1121,12 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) 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); } @@ -1113,6 +1153,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 +1170,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 +1223,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 +1415,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 +1438,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) {