X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachments-view.c;h=a56ceba35061002bfdf2ab1b2a73f334370a73eb;hb=fb9097c61809c7c772ed584e424e169b7a43f2ae;hp=2ed99c79b17faeb1b044cb98a5ef15cd059e17ba;hpb=89c4087fa5155783ca4cf4a9cc724592caa5b880;p=modest diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c index 2ed99c7..a56ceba 100644 --- a/src/widgets/modest-attachments-view.c +++ b/src/widgets/modest-attachments-view.c @@ -29,8 +29,6 @@ #include -//#include - #include #include #include @@ -41,6 +39,7 @@ #include #include #include +#include static GObjectClass *parent_class = NULL; @@ -67,6 +66,8 @@ static gboolean button_press_event (GtkWidget *widget, GdkEventButton *event, Mo static gboolean motion_notify_event (GtkWidget *widget, GdkEventMotion *event, ModestAttachmentsView *atts_view); static gboolean button_release_event (GtkWidget *widget, GdkEventButton *event, ModestAttachmentsView *atts_view); static gboolean key_press_event (GtkWidget *widget, GdkEventKey *event, ModestAttachmentsView *atts_view); +static gboolean focus_out_event (GtkWidget *widget, GdkEventFocus *event, ModestAttachmentsView *atts_view); +static gboolean focus (GtkWidget *widget, GtkDirectionType direction, ModestAttachmentsView *atts_view); static GtkWidget *get_att_view_at_coords (ModestAttachmentsView *atts_view, gdouble x, gdouble y); static void unselect_all (ModestAttachmentsView *atts_view); @@ -105,10 +106,11 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (attachments_view); TnyList *parts; TnyIterator *iter; + const gchar *msg_content_type = NULL; if (msg == priv->msg) return; - if (priv->msg) + if (priv->msg) g_object_unref (priv->msg); if (msg) g_object_ref (G_OBJECT(msg)); @@ -124,6 +126,14 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn return; } + /* 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")) { + gtk_widget_queue_draw (GTK_WIDGET (attachments_view)); + return; + } + parts = TNY_LIST (tny_simple_list_new ()); tny_mime_part_get_parts (TNY_MIME_PART (priv->msg), parts); iter = tny_list_create_iterator (parts); @@ -132,12 +142,18 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) { + + if (part && (modest_tny_mime_part_is_attachment_for_modest (part))) modest_attachments_view_add_attachment (attachments_view, part); - } - g_object_unref (part); + + if (part) + g_object_unref (part); + tny_iterator_next (iter); } + g_object_unref (iter); + g_object_unref (parts); + gtk_widget_queue_draw (GTK_WIDGET (attachments_view)); @@ -186,7 +202,26 @@ modest_attachments_view_remove_attachment (ModestAttachmentsView *atts_view, Tny } if (found_att_view) { - gtk_widget_destroy (GTK_WIDGET (found_att_view)); + GList *node = NULL; + GtkWidget *next_widget = NULL; + GList *box_children = NULL; + + box_children = gtk_container_get_children (GTK_CONTAINER (priv->box)); + node = g_list_find (box_children, found_att_view); + if (node->next) + next_widget = node->next->data; + + g_list_free (box_children); + + node = g_list_find (priv->selected, found_att_view); + if (node != NULL) { + 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); } } @@ -209,12 +244,16 @@ modest_attachments_view_remove_attachment_by_id (ModestAttachmentsView *atts_vie const gchar *mime_part_id = NULL; mime_part_id = tny_mime_part_get_content_id (cur_mime_part); - if ((mime_part_id != NULL) && (strcmp (mime_part_id, att_id) == 0)) + if ((mime_part_id != NULL) && (strcmp (mime_part_id, att_id) == 0)) { gtk_widget_destroy (GTK_WIDGET (att_view)); + priv->selected = g_list_remove (priv->selected, att_view); + } g_object_unref (cur_mime_part); } + own_clipboard (atts_view); + } static void @@ -234,6 +273,8 @@ modest_attachments_view_instance_init (GTypeInstance *instance, gpointer g_class g_signal_connect (G_OBJECT (instance), "button-release-event", G_CALLBACK (button_release_event), instance); g_signal_connect (G_OBJECT (instance), "motion-notify-event", G_CALLBACK (motion_notify_event), instance); g_signal_connect (G_OBJECT (instance), "key-press-event", G_CALLBACK (key_press_event), instance); + g_signal_connect (G_OBJECT (instance), "focus-out-event", G_CALLBACK (focus_out_event), instance); + g_signal_connect (G_OBJECT (instance), "focus", G_CALLBACK (focus), instance); GTK_WIDGET_SET_FLAGS (instance, GTK_CAN_FOCUS); @@ -318,20 +359,15 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, ModestAttachmentsView *atts_view) { - gint widget_x, widget_y; ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); if (!GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget); if (event->button == 1 && event->type == GDK_BUTTON_PRESS) { GtkWidget *att_view = NULL; - GdkWindow *parent_window; - - parent_window = gtk_widget_get_parent_window (widget); - gdk_window_get_origin (parent_window, &widget_x, &widget_y); att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), - ((gint) event->x_root) - widget_x, ((gint) event->y_root) - widget_y); + (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)) { @@ -358,15 +394,10 @@ button_release_event (GtkWidget *widget, { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); if (widget == gtk_grab_get_current ()) { - GdkWindow *parent_window; GtkWidget *att_view = NULL; - gint widget_x, widget_y; - - parent_window = gtk_widget_get_parent_window (widget); - gdk_window_get_origin (parent_window, &widget_x, &widget_y); att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), - ((gint) event->x_root) - widget_x, ((gint) event->y_root) - widget_y); + (gint) event->x_root, (gint) event->y_root); if (att_view != NULL) { unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); @@ -375,7 +406,6 @@ button_release_event (GtkWidget *widget, MODEST_ATTACHMENT_VIEW (att_view)); } priv->rubber_start = NULL; - gtk_grab_remove (widget); } return TRUE; @@ -389,14 +419,9 @@ motion_notify_event (GtkWidget *widget, ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); if (gtk_grab_get_current () == widget) { GtkWidget *att_view = NULL; - GdkWindow *parent_window; - gint widget_x, widget_y; - - parent_window = gtk_widget_get_parent_window (widget); - gdk_window_get_origin (parent_window, &widget_x, &widget_y); att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), - ((gint) event->x_root) - widget_x, ((gint) event->y_root) - widget_y); + (gint) event->x_root, (gint) event->y_root); if (att_view != NULL) { unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); @@ -525,9 +550,12 @@ get_att_view_at_coords (ModestAttachmentsView *atts_view, for (node = att_view_list; node != NULL; node = g_list_next (node)) { GtkWidget *att_view = (GtkWidget *) node->data; gint pos_x, pos_y, w, h, int_x, int_y; + gint widget_x, widget_y; - pos_x = att_view->allocation.x; - pos_y = att_view->allocation.y; + gdk_window_get_origin (att_view->window, &widget_x, &widget_y); + + pos_x = widget_x; + pos_y = widget_y; w = att_view->allocation.width; h = att_view->allocation.height; @@ -570,12 +598,19 @@ static void set_selected (ModestAttachmentsView *atts_view, ModestAttachmentView *att_view) { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); + TnyMimePart *part; unselect_all (atts_view); - gtk_widget_set_state (GTK_WIDGET (att_view), GTK_STATE_SELECTED); + part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); + g_list_free (priv->selected); priv->selected = NULL; - priv->selected = g_list_append (priv->selected, att_view); + if (TNY_IS_MIME_PART (part) && !tny_mime_part_is_purged (part)) { + gtk_widget_set_state (GTK_WIDGET (att_view), GTK_STATE_SELECTED); + priv->selected = g_list_append (priv->selected, att_view); + } + if (part) + g_object_unref (part); own_clipboard (atts_view); } @@ -587,6 +622,7 @@ select_range (ModestAttachmentsView *atts_view, ModestAttachmentView *att1, Mode GList *children = NULL; GList *node = NULL; gboolean selecting = FALSE; + TnyMimePart *part; unselect_all (atts_view); @@ -602,12 +638,20 @@ select_range (ModestAttachmentsView *atts_view, ModestAttachmentView *att1, Mode for (node = children; node != NULL; node = g_list_next (node)) { if ((node->data == att1) || (node->data == att2)) { - gtk_widget_set_state (GTK_WIDGET (node->data), GTK_STATE_SELECTED); - priv->selected = g_list_append (priv->selected, node->data); + part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (node->data)); + if (!tny_mime_part_is_purged (part)) { + gtk_widget_set_state (GTK_WIDGET (node->data), GTK_STATE_SELECTED); + priv->selected = g_list_append (priv->selected, node->data); + } + g_object_unref (part); selecting = !selecting; } else if (selecting) { - gtk_widget_set_state (GTK_WIDGET (node->data), GTK_STATE_SELECTED); - priv->selected = g_list_append (priv->selected, node->data); + part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (node->data)); + if (!tny_mime_part_is_purged (part)) { + gtk_widget_set_state (GTK_WIDGET (node->data), GTK_STATE_SELECTED); + priv->selected = g_list_append (priv->selected, node->data); + } + g_object_unref (part); } } @@ -623,18 +667,7 @@ static void clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_ ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); if ((priv->selected != NULL)&&(priv->selected->next == NULL)) { - TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->selected->data)); - if (info != MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE_INDEX) { - if (TNY_IS_MSG (mime_part)) { - TnyHeader *header = tny_msg_get_header (TNY_MSG (mime_part)); - if (TNY_IS_HEADER (header)) { - gtk_selection_data_set_text (selection_data, tny_header_get_subject (header), -1); - g_object_unref (header); - } - } else { - gtk_selection_data_set_text (selection_data, tny_mime_part_get_filename (mime_part), -1); - } - } else { + if (info == MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE_INDEX) { /* MODEST_ATTACHMENT requested. As the content id is not filled in all the case, we'll * use an internal index. This index is simply the index of the attachment in the vbox */ GList *box_children = NULL; @@ -657,42 +690,47 @@ static void clipboard_clear (GtkClipboard *clipboard, gpointer userdata) unselect_all (atts_view); } -GList * +TnyList * modest_attachments_view_get_selection (ModestAttachmentsView *atts_view) { ModestAttachmentsViewPrivate *priv; - GList *selection, *node; + TnyList *selection; + GList *node; g_return_val_if_fail (MODEST_IS_ATTACHMENTS_VIEW (atts_view), NULL); priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); - selection = NULL; + selection = tny_simple_list_new (); for (node = priv->selected; node != NULL; node = g_list_next (node)) { ModestAttachmentView *att_view = (ModestAttachmentView *) node->data; TnyMimePart *part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); - selection = g_list_append (selection, part); + tny_list_append (selection, (GObject *) part); + g_object_unref (part); } return selection; } -GList * +TnyList * modest_attachments_view_get_attachments (ModestAttachmentsView *atts_view) { ModestAttachmentsViewPrivate *priv; - GList *children, *node, *att_list = NULL; + TnyList *att_list; + GList *children, *node= NULL; g_return_val_if_fail (MODEST_IS_ATTACHMENTS_VIEW (atts_view), NULL); priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); + att_list = TNY_LIST (tny_simple_list_new ()); + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); for (node = children; node != NULL; node = g_list_next (node)) { GtkWidget *att_view = GTK_WIDGET (node->data); TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view)); - att_list = g_list_prepend (att_list, mime_part); + tny_list_append (att_list, (GObject *) mime_part); + g_object_unref (mime_part); } g_list_free (children); - att_list = g_list_reverse (att_list); return att_list; } @@ -741,10 +779,6 @@ static void own_clipboard (ModestAttachmentsView *atts_view) { GtkTargetEntry targets[] = { - {"TEXT", 0, 0}, - {"UTF8_STRING", 0, 1}, - {"COMPOUND_TEXT", 0, 2}, - {"STRING", 0, 3}, {MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE, 0, MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE_INDEX}, }; @@ -753,3 +787,32 @@ own_clipboard (ModestAttachmentsView *atts_view) clipboard_get, clipboard_clear, G_OBJECT(atts_view)); } + +static gboolean +focus_out_event (GtkWidget *widget, GdkEventFocus *event, ModestAttachmentsView *atts_view) +{ + if (!gtk_widget_is_focus (widget)) + unselect_all (atts_view); + + return FALSE; +} + +static gboolean +focus (GtkWidget *widget, GtkDirectionType direction, ModestAttachmentsView *atts_view) +{ + ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); + GList *children = NULL; + GtkWidget *toplevel = NULL; + + toplevel = gtk_widget_get_toplevel (widget); + 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)); + } + g_list_free (children); + + return FALSE; +}