X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachments-view.c;h=5617a6510f57a1bd6afb24b326d6f8d2518862d1;hp=69c0d164f253c111edcf9906a0874f52f60b2ac2;hb=b7bf04ac61a9d14b0cd1ead1056f82760708875c;hpb=bbd6e536bd3f489fe660b49e074805c3e0a501e9

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index 69c0d16..5617a65 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
@@ -58,6 +58,7 @@ struct _ModestAttachmentsViewPrivate
 	GtkWidget *box;
 	GList *selected;
 	GtkWidget *rubber_start;
+	ModestAttachmentsViewStyle style;
 };
 
 #define MODEST_ATTACHMENTS_VIEW_GET_PRIVATE(o)	\
@@ -76,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};
@@ -101,13 +101,14 @@ 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;
 	
 	if (msg == priv->msg) return;
 
@@ -129,20 +130,18 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
 
 	/* 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 ((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);
 
@@ -151,14 +150,14 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
 			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));
@@ -206,8 +205,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
@@ -243,22 +243,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
@@ -289,6 +291,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
@@ -300,6 +303,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);
@@ -404,7 +408,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) {
@@ -414,7 +419,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);
@@ -530,6 +538,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) {
@@ -844,6 +857,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;
@@ -951,11 +967,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);
+		}
+
+	}
+}