X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachments-view.c;h=d2d4b2aeb1240790ddfb1fed018591db5ba1be79;hp=76706a8095e4ca6b2a763d2bf5f3687804fbd263;hb=8ec72ddce8a272e4b745af7814e928872fa27150;hpb=3d8c33cdd7df3b5c553cfca97316f9d8a96d6a8b diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c index 76706a8..d2d4b2a 100644 --- a/src/widgets/modest-attachments-view.c +++ b/src/widgets/modest-attachments-view.c @@ -67,6 +67,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 +107,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 +127,15 @@ 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,10 +144,13 @@ 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 && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) { modest_attachments_view_add_attachment (attachments_view, part); } - g_object_unref (part); + + if (part) + g_object_unref (part); + tny_iterator_next (iter); } @@ -186,7 +201,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 +243,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 +272,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); @@ -323,8 +363,10 @@ button_press_event (GtkWidget *widget, gtk_widget_grab_focus (widget); if (event->button == 1 && event->type == GDK_BUTTON_PRESS) { - GtkWidget *att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), - event->x, event->y); + GtkWidget *att_view = NULL; + + att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (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)) { @@ -351,8 +393,10 @@ button_release_event (GtkWidget *widget, { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); if (widget == gtk_grab_get_current ()) { - GtkWidget *att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), - event->x, event->y); + GtkWidget *att_view = NULL; + + att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), + (gint) event->x_root, (gint) event->y_root); if (att_view != NULL) { unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); @@ -361,7 +405,6 @@ button_release_event (GtkWidget *widget, MODEST_ATTACHMENT_VIEW (att_view)); } priv->rubber_start = NULL; - gtk_grab_remove (widget); } return TRUE; @@ -374,8 +417,10 @@ motion_notify_event (GtkWidget *widget, { ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); if (gtk_grab_get_current () == widget) { - GtkWidget *att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), - event->x, event->y); + GtkWidget *att_view = NULL; + + att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), + (gint) event->x_root, (gint) event->y_root); if (att_view != NULL) { unselect_all (MODEST_ATTACHMENTS_VIEW (widget)); @@ -504,14 +549,17 @@ 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; + + gdk_window_get_origin (att_view->window, &widget_x, &widget_y); - pos_x = att_view->allocation.x; - pos_y = att_view->allocation.y; + pos_x = widget_x; + pos_y = widget_y; w = att_view->allocation.width; h = att_view->allocation.height; - int_x = (gint) x; - int_y = (gint) y; + int_x = (gint) x - GTK_WIDGET (atts_view)->allocation.x; + int_y = (gint) y - GTK_WIDGET (atts_view)->allocation.y; if ((x >= pos_x) && (x <= (pos_x + w)) && (y >= pos_y) && (y <= (pos_y + h))) { result = att_view; @@ -602,18 +650,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; @@ -699,14 +736,27 @@ modest_attachments_view_select_all (ModestAttachmentsView *atts_view) own_clipboard (atts_view); } +gboolean +modest_attachments_view_has_attachments (ModestAttachmentsView *atts_view) +{ + ModestAttachmentsViewPrivate *priv; + GList *children; + gboolean result; + + g_return_val_if_fail (MODEST_IS_ATTACHMENTS_VIEW (atts_view), FALSE); + priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view); + + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); + result = (children != NULL); + g_list_free (children); + + return result; +} + 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}, }; @@ -715,3 +765,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; +}