-/* 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
/* signals */
enum {
ACTIVATE_SIGNAL,
+ DELETE_SIGNAL,
LAST_SIGNAL
};
GtkWidget *box;
GList *selected;
GtkWidget *rubber_start;
+ ModestAttachmentsViewStyle style;
};
#define MODEST_ATTACHMENTS_VIEW_GET_PRIVATE(o) \
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};
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;
if (msg == priv->msg) 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));
+ 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;
- 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 (priv->msg));
- if (!strstr (header_content_type_lower, "application/"))
+ if ((header_content_type != NULL) &&
+ !strstr (header_content_type, "application/")) {
application_multipart = TRUE;
-
+ }
g_free (header_content_type);
- g_free (header_content_type_lower);
+
if (application_multipart) {
gtk_widget_queue_draw (GTK_WIDGET (attachments_view));
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);
gtk_widget_queue_draw (GTK_WIDGET (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
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
own_clipboard (atts_view);
+ gtk_widget_queue_resize (GTK_WIDGET (atts_view));
}
static void
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);
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;
}
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) {
(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);
priv->rubber_start = att_view;
gtk_grab_add (widget);
}
+ g_object_unref (mime_part);
}
}
}
tmp = g_list_next (tmp);
is_valid = FALSE;
}
+ g_object_unref (mime_part);
} while (!is_valid && tmp);
return tmp;
{
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) {
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;
}
}
-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)
{
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;
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);
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));
}
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);
+ }
+
+ }
+}
projects / modest / blobdiff