From 49b1c4b5e7e28b54afd6c84b3c3b4f38c0cea2e4 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Fri, 9 Mar 2007 12:39:22 +0000 Subject: [PATCH] * src/gnome/modest-main-window.c * Now the msg preview is embedded in a scroll. * src/gnome/modest-msg-view-window.c * Now the msg view is embedded in a scroll. * src/widgets/modest-mail-header-view.c * Set wrapping mode to label values, in order to make subject appear completely. * src/widgets/modest-recpt.view.c * Changed the way recpt view is set to the first line, as the previous method wasn't working in the new msg view. * src/widgets/modest-msg-view.c * Added event handling for attachment_activated signal, using the new ModestAttachmentsView widget. * New size requisition/allocation system that tries to get the correct size to be embedded. It fails a lot in Gnome. Need a review from a gtk allocation mage. * Removed old attachments management code. pmo-trunk-r895 --- src/gnome/modest-main-window.c | 8 +- src/gnome/modest-msg-view-window.c | 8 +- src/widgets/modest-mail-header-view.c | 1 + src/widgets/modest-msg-view.c | 207 ++++++++++++++++++++++++++------- src/widgets/modest-msg-view.h | 4 +- src/widgets/modest-recpt-view.c | 3 +- 6 files changed, 184 insertions(+), 47 deletions(-) diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c index 346de74..3043a3d 100644 --- a/src/gnome/modest-main-window.c +++ b/src/gnome/modest-main-window.c @@ -464,6 +464,7 @@ modest_main_window_new (void) GtkWidget *main_vbox; GtkWidget *status_hbox; GtkWidget *header_win, *folder_win; + GtkWidget *preview_scroll; GtkActionGroup *action_group; GError *error = NULL; @@ -512,10 +513,15 @@ modest_main_window_new (void) priv->folder_paned = gtk_vpaned_new (); priv->msg_paned = gtk_vpaned_new (); priv->main_paned = gtk_hpaned_new (); + preview_scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (preview_scroll), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win); gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->msg_paned); gtk_paned_add1 (GTK_PANED(priv->msg_paned), header_win); - gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview)); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (preview_scroll), + GTK_WIDGET(priv->msg_preview)); + gtk_paned_add2 (GTK_PANED(priv->msg_paned), preview_scroll); /* status bar / progress */ status_hbox = gtk_hbox_new (FALSE, 0); diff --git a/src/gnome/modest-msg-view-window.c b/src/gnome/modest-msg-view-window.c index 32af224..5c97b1a 100644 --- a/src/gnome/modest-msg-view-window.c +++ b/src/gnome/modest-msg-view-window.c @@ -165,6 +165,7 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg) GtkWidget *main_vbox; ModestMsgViewWindowPrivate *priv; ModestWindowPrivate *parent_priv; + GtkScrolledWindow *scrolled_window; priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); @@ -174,7 +175,12 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg) gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_view, TRUE, TRUE, 6); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), + priv->msg_view); + gtk_box_pack_start (GTK_BOX(main_vbox), scrolled_window, TRUE, TRUE, 6); gtk_widget_show_all (GTK_WIDGET(main_vbox)); gtk_container_add (GTK_CONTAINER(obj), main_vbox); diff --git a/src/widgets/modest-mail-header-view.c b/src/widgets/modest-mail-header-view.c index 143165c..5d2c6d3 100644 --- a/src/widgets/modest-mail-header-view.c +++ b/src/widgets/modest-mail-header-view.c @@ -85,6 +85,7 @@ add_header (ModestMailHeaderView *widget, const gchar *field, const gchar *value label_value = gtk_label_new (NULL); gtk_label_set_text (GTK_LABEL (label_value), value); gtk_label_set_selectable (GTK_LABEL (label_value), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (label_value), TRUE); gtk_misc_set_alignment (GTK_MISC (label_value), 0.0, 0.0); gtk_box_pack_start (GTK_BOX (hbox), label_field, FALSE, FALSE, 0); diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c index ea0bd23..2cb53e8 100644 --- a/src/widgets/modest-msg-view.c +++ b/src/widgets/modest-msg-view.c @@ -44,6 +44,7 @@ #include "modest-tny-stream-gtkhtml.h" #include #include +#include /* 'private'/'protected' functions */ @@ -51,13 +52,20 @@ static void modest_msg_view_class_init (ModestMsgViewClass *klass); static void modest_msg_view_init (ModestMsgView *obj); static void modest_msg_view_finalize (GObject *obj); +/* headers signals */ static void on_recpt_activated (ModestMailHeaderView *header_view, const gchar *address, ModestMsgView *msg_view); +static void on_attachment_activated (ModestAttachmentsView * att_view, gint index, gpointer); + +/* GtkHtml signals */ static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view); static gboolean on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, ModestMsgView *msg_view); static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view); -#define ATT_PREFIX "att:" +/* size allocation handlers */ +static void size_request (GtkWidget *widget, GtkRequisition *req, gpointer userdata); +static void size_allocate (GtkWidget *widget, GtkAllocation *alloc, gpointer userdata); +static void html_adjustment_changed (GtkAdjustment *adj, ModestMsgView * view); /* list my signals */ enum { @@ -70,12 +78,18 @@ enum { typedef struct _ModestMsgViewPrivate ModestMsgViewPrivate; struct _ModestMsgViewPrivate { + GtkWidget *table; GtkWidget *gtkhtml; GtkWidget *mail_header_view; GtkWidget *attachments_view; TnyMsg *msg; + GtkWidget *headers_box; + GtkWidget *html_scroll; + + guint full_width, full_height, html_height; + gulong sig1, sig2, sig3; }; #define MODEST_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -104,7 +118,7 @@ modest_msg_view_get_type (void) (GInstanceInitFunc) modest_msg_view_init, NULL }; - my_type = g_type_register_static (GTK_TYPE_VBOX, + my_type = g_type_register_static (GTK_TYPE_VIEWPORT, "ModestMsgView", &my_info, 0); } @@ -115,14 +129,15 @@ static void modest_msg_view_class_init (ModestMsgViewClass *klass) { GObjectClass *gobject_class; + GtkWidgetClass *widget_class; gobject_class = (GObjectClass*) klass; + widget_class = (GtkWidgetClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_msg_view_finalize; g_type_class_add_private (gobject_class, sizeof(ModestMsgViewPrivate)); - signals[LINK_CLICKED_SIGNAL] = g_signal_new ("link_clicked", G_TYPE_FROM_CLASS (gobject_class), @@ -160,6 +175,99 @@ modest_msg_view_class_init (ModestMsgViewClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING); } +/* THIS IS A HACK: we modify the size requisition and allocation system to negociate the + * size of the GtkHtml so that it gets the correct height, and reports it to this widget + * to propagate the new allocation. It should make it work when it's included in a scrolled + * window with a viewport */ + +static void +size_request (GtkWidget *widget, + GtkRequisition *req, + gpointer userdata) +{ + ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (widget); + GtkRequisition req_headers; + + g_message ("SIZE REQUEST START w %d h %d", req->width, req->height); + + /* tries to allocate as much as possible of the current allocation for headers box */ + + req_headers.height = priv->full_height; + req_headers.width = req->width; + req->height = priv->full_height; + + g_message ("SIZE REQUEST HEADER START w %d h %d", req_headers.width, req_headers.height); + gtk_widget_size_request (priv->headers_box, &req_headers); + g_message ("SIZE REQUEST HEADER END w %d h %d", req_headers.width, req_headers.height); + g_message ("SIZE REQUEST END w %d h %d", req->width, req->height); +} + +static void +size_allocate (GtkWidget *widget, + GtkAllocation *alloc, + gpointer userdata) +{ + ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (widget); + GtkAllocation headers_alloc; + GtkAllocation html_alloc; + GtkAdjustment *hadj, *vadj; + + g_message ("SIZE_ALLOCATE START w %d h %d", alloc->width, alloc->height); + + priv->full_width = alloc->width; + priv->full_height = alloc->height; + + hadj = gtk_viewport_get_hadjustment (GTK_VIEWPORT (widget)); + vadj = gtk_viewport_get_vadjustment (GTK_VIEWPORT (widget)); + + /* allocates all the visible with for the header. The height is + taken from the last requisition of the widget, supposing it's + been calculated depending on this width */ + headers_alloc.x = alloc->x; + headers_alloc.y = alloc->y; + headers_alloc.width = alloc->width; + headers_alloc.height = priv->headers_box->requisition.height; + if (priv->html_height != priv->gtkhtml->requisition.height) + gtk_widget_size_allocate (priv->headers_box, &headers_alloc); + + /* allocates the gtk html space trying to negociate that it takes + * the available space, and as much height as it needs. To do this, + * it takes the internal adjustment upper value (see html_adjustment_changed) + */ + html_alloc.x = alloc->x; + html_alloc.y = alloc->y + headers_alloc.height; + html_alloc.width = alloc->width; + html_alloc.height = MAX(alloc->height, priv->html_height); + gtk_widget_size_allocate (priv->gtkhtml, &html_alloc); + + /* Corrects the allocation of the full widget to include the final + * gtkhtml height */ + priv->full_height = headers_alloc.height + priv->html_height; + alloc->height = priv->full_height; + + g_message ("SIZE_ALLOCATE END w %d h %d", alloc->width, alloc->height); + +} + + +static void +html_adjustment_changed (GtkAdjustment *adj, + ModestMsgView * view) +{ + ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (view); + + g_message ("ADJUSTMENT CHANGED START upper %f html_height %d", adj->upper, priv->html_height); + + /* correct the html height calculation depending on the range exposed + * by the html vertical adjustment + */ + if (((gint) adj->upper) != priv->gtkhtml->allocation.height) { + priv->html_height = (gint) adj->upper; + } + gtk_widget_queue_resize (GTK_WIDGET(view)); +} + + static void modest_msg_view_init (ModestMsgView *obj) { @@ -167,6 +275,19 @@ modest_msg_view_init (ModestMsgView *obj) priv = MODEST_MSG_VIEW_GET_PRIVATE(obj); + + priv->full_width = 0; + priv->full_height = 0; + priv->html_height = G_MAXINT; + + priv->table = gtk_table_new (2, 2, FALSE); + + gtk_table_set_row_spacings (GTK_TABLE (priv->table), 0); + gtk_table_set_col_spacings (GTK_TABLE (priv->table), 0); + + priv->html_scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->html_scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER); + priv->msg = NULL; priv->gtkhtml = gtk_html_new(); @@ -181,16 +302,19 @@ modest_msg_view_init (ModestMsgView *obj) priv->attachments_view = GTK_WIDGET(modest_attachments_view_new (NULL)); gtk_widget_set_no_show_all (priv->attachments_view, TRUE); - + priv->sig1 = g_signal_connect (G_OBJECT(priv->gtkhtml), "link_clicked", G_CALLBACK(on_link_clicked), obj); priv->sig2 = g_signal_connect (G_OBJECT(priv->gtkhtml), "url_requested", G_CALLBACK(on_url_requested), obj); priv->sig3 = g_signal_connect (G_OBJECT(priv->gtkhtml), "on_url", G_CALLBACK(on_link_hover), obj); - + g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated", G_CALLBACK (on_recpt_activated), obj); + + g_signal_connect (G_OBJECT (priv->attachments_view), "activate", + G_CALLBACK (on_attachment_activated), obj); } @@ -210,44 +334,45 @@ modest_msg_view_finalize (GObject *obj) priv->gtkhtml = NULL; priv->attachments_view = NULL; - + G_OBJECT_CLASS(parent_class)->finalize (obj); } - GtkWidget* modest_msg_view_new (TnyMsg *msg) { GObject *obj; ModestMsgView* self; ModestMsgViewPrivate *priv; - GtkWidget *scrolled_window; obj = G_OBJECT(g_object_new(MODEST_TYPE_MSG_VIEW, NULL)); self = MODEST_MSG_VIEW(obj); priv = MODEST_MSG_VIEW_GET_PRIVATE (self); - gtk_box_set_spacing (GTK_BOX (self), 0); - gtk_box_set_homogeneous (GTK_BOX (self), FALSE); + priv->headers_box = gtk_vbox_new (0, FALSE); if (priv->mail_header_view) - gtk_box_pack_start (GTK_BOX(self), priv->mail_header_view, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(priv->headers_box), priv->mail_header_view, FALSE, FALSE, 0); if (priv->attachments_view) - gtk_box_pack_start (GTK_BOX(self), priv->attachments_view, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(priv->headers_box), priv->attachments_view, FALSE, FALSE, 0); + + gtk_table_attach (GTK_TABLE (priv->table), priv->headers_box, 0, 1, 0, 1, GTK_EXPAND, 0, 0, 0); + gtk_table_attach (GTK_TABLE (priv->table), gtk_label_new (""), 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK, 0, 0); if (priv->gtkhtml) { - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_window), - GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (scrolled_window), priv->gtkhtml); - gtk_box_pack_start (GTK_BOX(self), scrolled_window, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (priv->html_scroll), priv->gtkhtml); + gtk_table_attach (GTK_TABLE(priv->table), priv->html_scroll, 0, 2, 1, 2, GTK_EXPAND, GTK_EXPAND, 0, 0); } + gtk_container_add (GTK_CONTAINER (self), priv->table); + modest_msg_view_set_message (self, msg); + + g_signal_connect (G_OBJECT (self), "size-request", G_CALLBACK (size_request), NULL); + g_signal_connect (G_OBJECT (self), "size-allocate", G_CALLBACK (size_allocate), NULL); + g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(priv->html_scroll))), + "changed", G_CALLBACK (html_adjustment_changed), self); return GTK_WIDGET(self); } @@ -260,29 +385,26 @@ on_recpt_activated (ModestMailHeaderView *header_view, g_signal_emit (G_OBJECT (view), signals[RECPT_ACTIVATED_SIGNAL], 0, address); } -static gboolean -on_link_clicked (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view) +static void +on_attachment_activated (ModestAttachmentsView * att_view, gint index, gpointer msg_view) { - int index; - g_return_val_if_fail (msg_view, FALSE); - /* is it an attachment? */ - if (g_str_has_prefix(uri, ATT_PREFIX)) { - - index = atoi (uri + strlen(ATT_PREFIX)); - - if (index == 0) { - /* index is 1-based, so 0 indicates an error */ - g_printerr ("modest: invalid attachment id: %s\n", uri); - return FALSE; - } - - g_signal_emit (G_OBJECT(msg_view), signals[ATTACHMENT_CLICKED_SIGNAL], - 0, index); - return FALSE; + if (index == 0) { + /* index is 1-based, so 0 indicates an error */ + g_printerr ("modest: invalid attachment index: %d\n", index); + return; } + g_signal_emit (G_OBJECT(msg_view), signals[ATTACHMENT_CLICKED_SIGNAL], + 0, index); +} + +static gboolean +on_link_clicked (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view) +{ + g_return_val_if_fail (msg_view, FALSE); + g_signal_emit (G_OBJECT(msg_view), signals[LINK_CLICKED_SIGNAL], 0, uri); @@ -290,13 +412,9 @@ on_link_clicked (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view) } - static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view) { - if (uri && g_str_has_prefix (uri, ATT_PREFIX)) - return FALSE; - g_signal_emit (G_OBJECT(msg_view), signals[LINK_HOVER_SIGNAL], 0, uri); @@ -502,9 +620,13 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg) set_text_message (self, body, msg); } else set_empty_message (self); + + gtk_widget_queue_resize (GTK_WIDGET (self)); + gtk_widget_show (priv->gtkhtml); gtk_widget_show_all (priv->mail_header_view); gtk_widget_set_no_show_all (priv->mail_header_view, TRUE); + } @@ -515,3 +637,4 @@ modest_msg_view_get_message (ModestMsgView *self) return MODEST_MSG_VIEW_GET_PRIVATE(self)->msg; } + diff --git a/src/widgets/modest-msg-view.h b/src/widgets/modest-msg-view.h index e348762..7689da3 100644 --- a/src/widgets/modest-msg-view.h +++ b/src/widgets/modest-msg-view.h @@ -50,11 +50,11 @@ typedef struct _ModestMsgView ModestMsgView; typedef struct _ModestMsgViewClass ModestMsgViewClass; struct _ModestMsgView { - GtkVBox parent; + GtkViewport parent; }; struct _ModestMsgViewClass { - GtkVBoxClass parent_class; + GtkViewportClass parent_class; void (*link_hover) (ModestMsgView *msgview, const gchar* link, gpointer user_data); diff --git a/src/widgets/modest-recpt-view.c b/src/widgets/modest-recpt-view.c index 0f1a3fc..7e0f246 100644 --- a/src/widgets/modest-recpt-view.c +++ b/src/widgets/modest-recpt-view.c @@ -201,8 +201,9 @@ text_view_size_request (GtkWidget *widget, } gtk_text_buffer_get_start_iter (buffer, &iter); + gtk_text_buffer_place_cursor (buffer, &iter); - gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (text_view), &iter, 0.0, TRUE, 0.0, 0.0); + gtk_text_view_place_cursor_onscreen (GTK_TEXT_VIEW (text_view)); adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); if (adj != NULL) { -- 1.7.9.5