X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachments-view.c;h=e7d5a5c31ec08c45d986d55c76716e84fc02d6fb;hp=a3e6c3f9947f84595554e8bc179b375b84bc8173;hb=16c1a13ce46a9befd8fbe3d0fd63ce80c1a5cd97;hpb=0538c50385771c04188d7b20b73d9304e5947be6 diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c index a3e6c3f..e7d5a5c 100644 --- a/src/widgets/modest-attachments-view.c +++ b/src/widgets/modest-attachments-view.c @@ -40,6 +40,8 @@ #include #include #include +#include +#include static GObjectClass *parent_class = NULL; @@ -58,6 +60,8 @@ struct _ModestAttachmentsViewPrivate GtkWidget *box; GList *selected; GtkWidget *rubber_start; + GtkWidget *press_att_view; + GtkWidget *previous_selection; ModestAttachmentsViewStyle style; }; @@ -78,6 +82,8 @@ static void select_range (ModestAttachmentsView *atts_view, ModestAttachmentView static void clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer userdata); static void own_clipboard (ModestAttachmentsView *atts_view); +static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata); +static void update_style (ModestAttachmentsView *self); static guint signals[LAST_SIGNAL] = {0}; @@ -101,6 +107,27 @@ modest_attachments_view_new (TnyMsg *msg) return GTK_WIDGET (self); } +static void +add_digest_attachments (ModestAttachmentsView *attachments_view, TnyMimePart *part) +{ + TnyList *parts; + TnyIterator *iter; + + parts = TNY_LIST (tny_simple_list_new()); + tny_mime_part_get_parts (TNY_MIME_PART (part), parts); + + for (iter = tny_list_create_iterator(parts); + !tny_iterator_is_done (iter); + tny_iterator_next (iter)) { + TnyMimePart *cur_part = TNY_MIME_PART (tny_iterator_get_current (iter)); + modest_attachments_view_add_attachment (attachments_view, cur_part, TRUE, 0); + g_object_unref (cur_part); + } + g_object_unref (iter); + g_object_unref (parts); + +} + void modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, TnyMsg *msg) @@ -109,6 +136,9 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn TnyList *parts; TnyIterator *iter; gchar *msg_content_type = NULL; + TnyMimePart *part_to_check; + gboolean body_found; + gboolean is_alternate; if (msg == priv->msg) return; @@ -123,22 +153,24 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn priv->selected = NULL; gtk_container_foreach (GTK_CONTAINER (priv->box), (GtkCallback) gtk_widget_destroy, NULL); - - if (priv->msg == NULL) { + + if (priv->msg == NULL) return; - } + + part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg)); + msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (part_to_check)); + is_alternate = (msg_content_type != NULL) && !strcasecmp (msg_content_type, "multipart/alternative"); /* If the top mime part is a multipart/related, we don't show the attachments, as they're * embedded images in body */ - msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (priv->msg)); if ((msg_content_type != NULL) && !strcasecmp (msg_content_type, "multipart/related")) { gchar *header_content_type; gboolean application_multipart = FALSE; g_free (msg_content_type); - header_content_type = modest_tny_mime_part_get_headers_content_type (TNY_MIME_PART (priv->msg)); - + header_content_type = modest_tny_mime_part_get_headers_content_type (TNY_MIME_PART (part_to_check)); + if ((header_content_type != NULL) && !strstr (header_content_type, "application/")) { application_multipart = TRUE; @@ -147,6 +179,7 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn if (application_multipart) { gtk_widget_queue_draw (GTK_WIDGET (attachments_view)); + g_object_unref (part_to_check); return; } } else { @@ -159,24 +192,42 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn g_free (msg_content_type); if (direct_attach) { - modest_attachments_view_add_attachment (attachments_view, TNY_MIME_PART (msg), TRUE, 0); + modest_attachments_view_add_attachment (attachments_view, TNY_MIME_PART (part_to_check), TRUE, 0); gtk_widget_queue_draw (GTK_WIDGET (attachments_view)); + g_object_unref (part_to_check); return; } } parts = TNY_LIST (tny_simple_list_new ()); - tny_mime_part_get_parts (TNY_MIME_PART (priv->msg), parts); + tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts); iter = tny_list_create_iterator (parts); + body_found = FALSE; while (!tny_iterator_is_done (iter)) { TnyMimePart *part; + gchar *content_type; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (part && (modest_tny_mime_part_is_attachment_for_modest (part))) + if (part && (modest_tny_mime_part_is_attachment_for_modest (part))) { modest_attachments_view_add_attachment (attachments_view, part, TRUE, 0); + } else if (part && !is_alternate) { + content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); + g_strstrip (content_type); + + if (g_str_has_prefix (content_type, "multipart/digest")) { + add_digest_attachments (attachments_view, part); + } else if (body_found && g_str_has_prefix (content_type, "text/")) { + modest_attachments_view_add_attachment (attachments_view, part, TRUE, 0); + } else if (g_str_has_prefix (content_type, "multipart/") || + g_str_has_prefix (content_type, "text/")) { + body_found = TRUE; + } + } + + if (part) g_object_unref (part); @@ -184,7 +235,7 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn } g_object_unref (iter); g_object_unref (parts); - + g_object_unref (part_to_check); gtk_widget_queue_draw (GTK_WIDGET (attachments_view)); @@ -205,7 +256,7 @@ modest_attachments_view_add_attachment (ModestAttachmentsView *attachments_view, att_view = modest_attachment_view_new (part, detect_size); if (!detect_size) modest_attachment_view_set_size (MODEST_ATTACHMENT_VIEW (att_view), size); - gtk_box_pack_end (GTK_BOX (priv->box), att_view, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (priv->box), att_view, FALSE, FALSE, 0); gtk_widget_show_all (att_view); gtk_widget_queue_resize (GTK_WIDGET (attachments_view)); } @@ -243,14 +294,14 @@ modest_attachments_view_remove_attachment (ModestAttachmentsView *atts_view, Tny box_children = gtk_container_get_children (GTK_CONTAINER (priv->box)); node = g_list_find (box_children, found_att_view); - if (node->next) + if (node && node->next) next_widget = node->next->data; g_list_free (box_children); gtk_widget_destroy (GTK_WIDGET (found_att_view)); node = g_list_find (priv->selected, found_att_view); - if (node != NULL) { + if (node) { priv->selected = g_list_delete_link (priv->selected, node); if ((priv->selected == NULL) && (next_widget != NULL)) set_selected (MODEST_ATTACHMENTS_VIEW (atts_view), @@ -302,6 +353,7 @@ modest_attachments_view_instance_init (GTypeInstance *instance, gpointer g_class priv->msg = NULL; priv->box = gtk_vbox_new (FALSE, 0); priv->rubber_start = NULL; + priv->press_att_view = NULL; priv->selected = NULL; priv->style = MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE; @@ -317,6 +369,10 @@ modest_attachments_view_instance_init (GTypeInstance *instance, gpointer g_class GTK_WIDGET_SET_FLAGS (instance, GTK_CAN_FOCUS); + g_signal_connect (G_OBJECT (instance), "notify::style", G_CALLBACK (on_notify_style), (gpointer) instance); + + update_style (MODEST_ATTACHMENTS_VIEW (instance)); + return; } @@ -421,14 +477,16 @@ button_press_event (GtkWidget *widget, if (att_view != NULL) { if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS) { unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); - } else if ((priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) || - (GTK_WIDGET_STATE (att_view) == GTK_STATE_SELECTED && (g_list_length (priv->selected) < 2))) { - TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); - if (TNY_IS_MIME_PART (mime_part)) { - g_signal_emit (G_OBJECT (widget), signals[ACTIVATE_SIGNAL], 0, mime_part); - g_object_unref (mime_part); - } + } else if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) { + priv->press_att_view = att_view; + set_selected (MODEST_ATTACHMENTS_VIEW (widget), MODEST_ATTACHMENT_VIEW (att_view)); + gtk_grab_add (widget); } else { + if (g_list_length (priv->selected) == 1) { + priv->previous_selection = GTK_WIDGET (priv->selected->data); + } else { + priv->previous_selection = NULL; + } TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); /* Do not select purged attachments */ @@ -457,13 +515,32 @@ button_release_event (GtkWidget *widget, att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), (gint) event->x_root, (gint) event->y_root); - if (att_view != NULL) { + if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) { unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); - select_range (MODEST_ATTACHMENTS_VIEW (widget), - MODEST_ATTACHMENT_VIEW (priv->rubber_start), - MODEST_ATTACHMENT_VIEW (att_view)); + if (att_view == priv->press_att_view) { + TnyMimePart *mime_part; + mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); + g_signal_emit (G_OBJECT (widget), signals[ACTIVATE_SIGNAL], 0, mime_part); + g_object_unref (mime_part); + } + priv->press_att_view = NULL; + } else { + + if (priv->style != MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS && + priv->rubber_start == att_view && + priv->previous_selection == att_view) { + TnyMimePart *mime_part; + mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); + g_signal_emit (G_OBJECT (widget), signals[ACTIVATE_SIGNAL], 0, mime_part); + g_object_unref (mime_part); + } else if (att_view != NULL) { + unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); + select_range (MODEST_ATTACHMENTS_VIEW (widget), + MODEST_ATTACHMENT_VIEW (priv->rubber_start), + MODEST_ATTACHMENT_VIEW (att_view)); + } + priv->rubber_start = NULL; } - priv->rubber_start = NULL; gtk_grab_remove (widget); } return TRUE; @@ -480,13 +557,25 @@ motion_notify_event (GtkWidget *widget, att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), (gint) event->x_root, (gint) event->y_root); + if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) { + if (att_view == priv->press_att_view) { + if (priv->selected == NULL) + set_selected (MODEST_ATTACHMENTS_VIEW (widget), MODEST_ATTACHMENT_VIEW (att_view)); + } else { + if (priv->selected) { + unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); + } + } + } else { - if (att_view != NULL) { - unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); - select_range (MODEST_ATTACHMENTS_VIEW (widget), - MODEST_ATTACHMENT_VIEW (priv->rubber_start), - MODEST_ATTACHMENT_VIEW (att_view)); + if (att_view != NULL) { + unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); + select_range (MODEST_ATTACHMENTS_VIEW (widget), + MODEST_ATTACHMENT_VIEW (priv->rubber_start), + MODEST_ATTACHMENT_VIEW (att_view)); + } } + gdk_event_request_motions (event); } return TRUE; } @@ -927,7 +1016,6 @@ modest_attachments_view_get_sizes (ModestAttachmentsView *attachments_view, size = 32768; } *attachments_size += size; - } g_object_unref (part); } @@ -935,6 +1023,13 @@ modest_attachments_view_get_sizes (ModestAttachmentsView *attachments_view, } static void +dummy_clear_func (GtkClipboard *clipboard, + gpointer user_data_or_owner) +{ + /* Do nothing */ +} + +static void own_clipboard (ModestAttachmentsView *atts_view) { GtkTargetEntry targets[] = { @@ -943,8 +1038,7 @@ own_clipboard (ModestAttachmentsView *atts_view) gtk_clipboard_set_with_owner (gtk_widget_get_clipboard (GTK_WIDGET (atts_view), GDK_SELECTION_PRIMARY), targets, G_N_ELEMENTS (targets), - clipboard_get, NULL, G_OBJECT(atts_view)); - + clipboard_get, dummy_clear_func, G_OBJECT(atts_view)); } static gboolean @@ -998,3 +1092,50 @@ modest_attachments_view_set_style (ModestAttachmentsView *self, } } + +guint +modest_attachments_view_get_num_attachments (ModestAttachmentsView *atts_view) +{ + ModestAttachmentsViewPrivate *priv; + GList *children; + gint result; + + g_return_val_if_fail (MODEST_IS_ATTACHMENTS_VIEW (atts_view), 0); + priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); + + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); + result = g_list_length (children); + g_list_free (children); + + return result; +} + +static void +on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata) +{ + if (strcmp ("style", spec->name) == 0) { + update_style (MODEST_ATTACHMENTS_VIEW (obj)); + gtk_widget_queue_draw (GTK_WIDGET (obj)); + } +} + +/* This method updates the color (and other style settings) of widgets using secondary text color, + * tracking the gtk style */ +static void +update_style (ModestAttachmentsView *self) +{ +#ifdef MODEST_COMPACT_HEADER_BG + GdkColor bg_color; + GtkStyle *style; + GdkColor *current_bg; + + g_return_if_fail (MODEST_IS_ATTACHMENTS_VIEW (self)); + + gdk_color_parse (MODEST_COMPACT_HEADER_BG, &bg_color); + style = gtk_widget_get_style (GTK_WIDGET (self)); + current_bg = &(style->bg[GTK_STATE_NORMAL]); + if (current_bg->red != bg_color.red || current_bg->blue != bg_color.blue || current_bg->green != bg_color.green) + gtk_widget_modify_bg (GTK_WIDGET (self), GTK_STATE_NORMAL, &bg_color); +#endif +} +