X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachments-view.c;h=2e717eb659667112165289f44ae4c5de9323fddf;hb=69a37caf59bcd8e225d14865bd48c2492589a3ec;hp=d144c375becf0577a03d68a0cde36a8ad82e7959;hpb=9a9ecea6b1a504e538117aa5a7b573c32fe259ed;p=modest diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c index d144c37..2e717eb 100644 --- a/src/widgets/modest-attachments-view.c +++ b/src/widgets/modest-attachments-view.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, Nokia Corporation +/* Copyright (c) 2007, 2009, Nokia Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ static GObjectClass *parent_class = NULL; /* signals */ enum { ACTIVATE_SIGNAL, + DELETE_SIGNAL, LAST_SIGNAL }; @@ -57,6 +58,7 @@ struct _ModestAttachmentsViewPrivate GtkWidget *box; GList *selected; GtkWidget *rubber_start; + ModestAttachmentsViewStyle style; }; #define MODEST_ATTACHMENTS_VIEW_GET_PRIVATE(o) \ @@ -75,7 +77,6 @@ static void set_selected (ModestAttachmentsView *atts_view, ModestAttachmentView static void select_range (ModestAttachmentsView *atts_view, ModestAttachmentView *att1, ModestAttachmentView *att2); static void clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer userdata); -static void clipboard_clear (GtkClipboard *clipboard, gpointer userdata); static void own_clipboard (ModestAttachmentsView *atts_view); static guint signals[LAST_SIGNAL] = {0}; @@ -100,13 +101,15 @@ modest_attachments_view_new (TnyMsg *msg) return GTK_WIDGET (self); } + void modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, TnyMsg *msg) { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (attachments_view); TnyList *parts; TnyIterator *iter; - const gchar *msg_content_type = NULL; + gchar *msg_content_type = NULL; + TnyMimePart *part_to_check; if (msg == priv->msg) return; @@ -126,47 +129,80 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn return; } + msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (priv->msg)); + /* If the top mime part is a multipart/signed, we have to work with its first child (if available) + * as "message" for showing attachments */ + + part_to_check = NULL; + if ((msg_content_type != NULL) && !strcasecmp (msg_content_type, "multipart/signed")) { + TnyList *msg_children; + guint length; + + msg_children = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_parts (TNY_MIME_PART (priv->msg), msg_children); + + length = tny_list_get_length (msg_children); + if (length == 1 || length == 2) { + TnyIterator *iterator; + + iterator = tny_list_create_iterator (msg_children); + + part_to_check = TNY_MIME_PART (tny_iterator_get_current (iterator)); + + g_object_unref (iterator); + } + + g_object_unref (msg_children); + + } + + if (part_to_check == NULL) { + part_to_check = g_object_ref (priv->msg); + } else { + msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (part_to_check)); + } + + /* 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 = 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; - gchar *header_content_type_lower; gboolean application_multipart = FALSE; - header_content_type = modest_tny_mime_part_get_header_value (TNY_MIME_PART (priv->msg), "Content-Type"); - header_content_type = g_strstrip (header_content_type); - header_content_type_lower = (header_content_type ) ? - g_ascii_strdown (header_content_type, -1) : NULL; + + g_free (msg_content_type); + + header_content_type = modest_tny_mime_part_get_headers_content_type (TNY_MIME_PART (part_to_check)); - if ((header_content_type_lower != NULL) && - !strstr (header_content_type_lower, "application/")) { + if ((header_content_type != NULL) && + !strstr (header_content_type, "application/")) { application_multipart = TRUE; - g_free (header_content_type_lower); } g_free (header_content_type); if (application_multipart) { gtk_widget_queue_draw (GTK_WIDGET (attachments_view)); + g_object_unref (part_to_check); return; } } else { - gchar *lower; gboolean direct_attach; - lower = g_ascii_strdown (msg_content_type, -1); - direct_attach = (!g_str_has_prefix (lower, "message/rfc822") && - !g_str_has_prefix (lower, "multipart") && - !g_str_has_prefix (lower, "text/")); - g_free (lower); + direct_attach = (!g_str_has_prefix (msg_content_type, "message/rfc822") && + !g_str_has_prefix (msg_content_type, "multipart") && + !g_str_has_prefix (msg_content_type, "text/")); + + 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); while (!tny_iterator_is_done (iter)) { @@ -184,6 +220,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,8 +242,9 @@ 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)); } void @@ -242,22 +280,24 @@ 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); - gtk_widget_destroy (GTK_WIDGET (found_att_view)); if ((priv->selected == NULL) && (next_widget != NULL)) set_selected (MODEST_ATTACHMENTS_VIEW (atts_view), MODEST_ATTACHMENT_VIEW (next_widget)); } own_clipboard (atts_view); + } + gtk_widget_queue_resize (GTK_WIDGET (atts_view)); } void @@ -288,6 +328,7 @@ modest_attachments_view_remove_attachment_by_id (ModestAttachmentsView *atts_vie own_clipboard (atts_view); + gtk_widget_queue_resize (GTK_WIDGET (atts_view)); } static void @@ -299,6 +340,7 @@ modest_attachments_view_instance_init (GTypeInstance *instance, gpointer g_class priv->box = gtk_vbox_new (FALSE, 0); priv->rubber_start = NULL; priv->selected = NULL; + priv->style = MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE; gtk_container_add (GTK_CONTAINER (instance), priv->box); gtk_event_box_set_above_child (GTK_EVENT_BOX (instance), TRUE); @@ -355,6 +397,15 @@ modest_attachments_view_class_init (ModestAttachmentsViewClass *klass) g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); + signals[DELETE_SIGNAL] = + g_signal_new ("delete", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET(ModestAttachmentsViewClass, delete), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + return; } @@ -394,7 +445,8 @@ button_press_event (GtkWidget *widget, ModestAttachmentsView *atts_view) { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); - if (!GTK_WIDGET_HAS_FOCUS (widget)) + if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE && + !GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget); if (event->button == 1 && event->type == GDK_BUTTON_PRESS) { @@ -404,7 +456,10 @@ button_press_event (GtkWidget *widget, (gint) event->x_root, (gint) event->y_root); if (att_view != NULL) { - if (GTK_WIDGET_STATE (att_view) == GTK_STATE_SELECTED && (g_list_length (priv->selected) < 2)) { + 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); @@ -419,6 +474,7 @@ button_press_event (GtkWidget *widget, priv->rubber_start = att_view; gtk_grab_add (widget); } + g_object_unref (mime_part); } } } @@ -505,6 +561,7 @@ find_prev_or_next_not_purged (GList *list, gboolean prev, gboolean include_this) tmp = g_list_next (tmp); is_valid = FALSE; } + g_object_unref (mime_part); } while (!is_valid && tmp); return tmp; @@ -518,6 +575,11 @@ key_press_event (GtkWidget *widget, { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); + if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS) { + unselect_all (atts_view); + return FALSE; + } + /* If grabbed (for example rubber banding), escape leaves the rubberbanding mode */ if (gtk_grab_get_current () == widget) { if (event->keyval == GDK_Escape) { @@ -609,6 +671,11 @@ key_press_event (GtkWidget *widget, return TRUE; } + if (event->keyval == GDK_BackSpace) { + g_signal_emit (G_OBJECT (widget), signals[DELETE_SIGNAL], 0); + return TRUE; + } + /* Activates selected item */ if (g_list_length (priv->selected) == 1) { ModestAttachmentView *att_view = (ModestAttachmentView *) priv->selected->data; @@ -773,13 +840,6 @@ static void clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_ } } -static void clipboard_clear (GtkClipboard *clipboard, gpointer userdata) -{ - ModestAttachmentsView *atts_view = (ModestAttachmentsView *) userdata; - - unselect_all (atts_view); -} - TnyList * modest_attachments_view_get_selection (ModestAttachmentsView *atts_view) { @@ -834,6 +894,9 @@ modest_attachments_view_select_all (ModestAttachmentsView *atts_view) unselect_all (atts_view); + if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) + return; + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); g_list_free (priv->selected); priv->selected = NULL; @@ -847,6 +910,7 @@ modest_attachments_view_select_all (ModestAttachmentsView *atts_view) gtk_widget_set_state (GTK_WIDGET (node->data), GTK_STATE_SELECTED); priv->selected = g_list_append (priv->selected, node->data); } + g_object_unref (mime_part); } g_list_free (children); @@ -916,7 +980,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, clipboard_clear, G_OBJECT(atts_view)); + clipboard_get, NULL, G_OBJECT(atts_view)); } @@ -940,11 +1004,34 @@ focus (GtkWidget *widget, GtkDirectionType direction, ModestAttachmentsView *att if (!gtk_window_has_toplevel_focus (GTK_WINDOW (toplevel))) return FALSE; - children = gtk_container_get_children (GTK_CONTAINER (priv->box)); - if (children != NULL) { - set_selected (atts_view, MODEST_ATTACHMENT_VIEW (children->data)); + if (priv->style != MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS) { + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); + if (children != NULL) { + set_selected (atts_view, MODEST_ATTACHMENT_VIEW (children->data)); + } + g_list_free (children); } - g_list_free (children); return FALSE; } + +void +modest_attachments_view_set_style (ModestAttachmentsView *self, + ModestAttachmentsViewStyle style) +{ + ModestAttachmentsViewPrivate *priv; + + g_return_if_fail (MODEST_IS_ATTACHMENTS_VIEW (self)); + priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (self); + + if (priv->style != style) { + priv->style = style; + gtk_widget_queue_draw (GTK_WIDGET (self)); + if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE) { + GTK_WIDGET_SET_FLAGS (self, GTK_CAN_FOCUS); + } else { + GTK_WIDGET_UNSET_FLAGS (self, GTK_CAN_FOCUS); + } + + } +}