From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 9 Jul 2007 14:12:42 +0000 (+0000)
Subject: * src/widgets/modest-header-view-render.c:
X-Git-Tag: git_migration_finished~2888
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=38825281b43b0645920f309dc970d6ff14378891;hp=94945a4ee31acfc11dbd1aedf0514ca833c708ee

* src/widgets/modest-header-view-render.c:
        * Change the way we set the grey color in the field that
          require this. This way when we select a header, it does not
          get black color.
* src/widgets/modest-header-view.c:
        * Added alignments to fields of the header, to make the message
          appear clearly separated (fixes NB#62262).

pmo-trunk-r2650
---

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index e0b128d..240a490 100644
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -322,11 +322,10 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 	/* fixme: we hardcode the color to #666666; instead we should use SecundaryTextColour from the
 	 * theme (gtkrc file) */
 	
-	header = g_markup_printf_escaped ("<small>%s</small>", modest_text_utils_get_display_address (address));
+	header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>", modest_text_utils_get_display_address (address));
 	g_free (address);
 	g_object_set (G_OBJECT (recipient_cell),
 		      "markup", header,
-		      "foreground", "#666666",
 		      NULL);
 	g_free (header);
 	set_common_flags (recipient_cell, flags);
@@ -344,10 +343,9 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 /* 				status = MODEST_TNY_SEND_QUEUE_SUSPENDED; */
 		}
 		status_str = get_status_string (status);
-		display_date = g_strdup_printf("<small>%s</small>", status_str);
+		display_date = g_strdup_printf("<span size='small' foreground='#666666'>%s</span>", status_str);
 		g_object_set (G_OBJECT (date_or_status_cell),
 			      "markup", display_date,
-			      "foreground", "#666666",
 			      NULL);
 		g_free (display_date);
 	} else {
@@ -359,10 +357,9 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 		else
 			tmp_date = g_strdup ("");
 		
-		display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
+		display_date = g_strdup_printf ("<span size='small' foreground='#666666'>%s</span>", tmp_date);
 		g_object_set (G_OBJECT (date_or_status_cell),
 			      "markup", display_date,
-			      "foreground", "#666666",
 			      NULL);
 		g_free (tmp_date);
 		g_free (display_date);
diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index ba3ebe9..3ad0838 100644
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -326,14 +326,18 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
 		     "ellipsize", PANGO_ELLIPSIZE_END,
 		     NULL);
 	g_object_set (G_OBJECT (renderer_subject),
-		      "ellipsize", PANGO_ELLIPSIZE_END,
+		      "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
 		      NULL);
 	g_object_set (G_OBJECT (renderer_recpt),
-		      "ellipsize", PANGO_ELLIPSIZE_END,
+		      "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
 		      NULL);
 	g_object_set(G_OBJECT(renderer_compact_date_or_status),
-		     "xalign", 1.0,
+		     "xalign", 1.0, "yalign", 0.0,
 		     NULL);
+	g_object_set (G_OBJECT (renderer_priority),
+		      "yalign", 1.0, NULL);
+	g_object_set (G_OBJECT (renderer_attach),
+		      "yalign", 0.0, NULL);
 
 	gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 32);
 	gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 32);