From 3a7f8e723fd42f95d91fca79bbccaad92d12e5ed Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 19 Jul 2007 21:44:28 +0000 Subject: [PATCH] Some improvements on the header view layout. It puts finally the priority icon in its place * src/maemo/modest-icon-names.h: * Added standard high and low priority icons, to be used from the custom icon renderers in thumbable headers. * src/widgets/modest-header-view-render.c: * Use the proper icons for high and low priority, instead of the old composed ones used for the shared priority and attachments cell renderer (fixes NB#62262). * src/widgets/modest-header-view.c: * Some other layout fixes in compact header view. pmo-trunk-r2760 --- src/maemo/modest-icon-names.h | 2 ++ src/widgets/modest-header-view-render.c | 4 ++-- src/widgets/modest-header-view.c | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h index 92a190b..701fa35 100644 --- a/src/maemo/modest-icon-names.h +++ b/src/maemo/modest-icon-names.h @@ -44,6 +44,8 @@ #define MODEST_HEADER_ICON_UNREAD "qgn_list_messagin_mail_unread" #define MODEST_HEADER_ICON_DELETED "qgn_list_messagin_mail_deleted" #define MODEST_HEADER_ICON_ATTACH "qgn_list_gene_attacpap" +#define MODEST_HEADER_ICON_HIGH "qgn_list_messaging_high" +#define MODEST_HEADER_ICON_LOW "qgn_list_messaging_low" /* * until we have the custom cell renderer, we use the hacked icons below; diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c index 7b14bb6..e8dfe27 100644 --- a/src/widgets/modest-header-view-render.c +++ b/src/widgets/modest-header-view-render.c @@ -128,11 +128,11 @@ get_pixbuf_for_flag (TnyHeaderFlags flag) return attachments_pixbuf; case TNY_HEADER_FLAG_HIGH_PRIORITY: if (G_UNLIKELY(!high_pixbuf)) - high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY); + high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH); return high_pixbuf; case TNY_HEADER_FLAG_LOW_PRIORITY: if (G_UNLIKELY(!low_pixbuf)) - low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY); + low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW); return low_pixbuf; default: if (G_UNLIKELY(!unread_pixbuf)) diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 640cc1e..dbd51c0 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -322,6 +322,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE); g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status); + g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL); + gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32); + gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32); + g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL); g_object_set(G_OBJECT(renderer_header), "ellipsize", PANGO_ELLIPSIZE_END, NULL); @@ -339,8 +343,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn 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); + gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26); + gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26); + gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); remove_all_columns (self); -- 1.7.9.5