From 6f839c90aa26fbc42532cb8ee1bd4769f8539a14 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Thu, 31 May 2007 17:52:47 +0000 Subject: [PATCH 1/1] * Fixes NB#57580 * Fixed some issues in a text conversion function * Do not dimm Email->Details if the folder view has the focus pmo-trunk-r2020 --- src/maemo/modest-main-window-ui-dimming.h | 2 +- src/maemo/modest-msg-view-window-ui-dimming.h | 2 +- src/modest-text-utils.c | 6 +++--- src/modest-ui-dimming-rules.c | 20 +++++++++++++++----- src/modest-ui-dimming-rules.h | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/maemo/modest-main-window-ui-dimming.h b/src/maemo/modest-main-window-ui-dimming.h index d1e128a..874c61d 100644 --- a/src/maemo/modest-main-window-ui-dimming.h +++ b/src/maemo/modest-main-window-ui-dimming.h @@ -21,7 +21,7 @@ static const ModestDimmingEntry modest_dimming_entries [] = { { "/MenuBar/EmailMenu/EmailContentsMenu", G_CALLBACK(modest_ui_dimming_rules_on_contents_msg) }, { "/MenuBar/EmailMenu/EmailPurgeAttachmentsMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) }, { "/MenuBar/EmailMenu/EmailDeleteMenu", G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) }, - { "/MenuBar/EmailMenu/EmailDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details_msg) }, + { "/MenuBar/EmailMenu/EmailDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details) }, /* Edit Menu */ { "/MenuBar/EditMenu", NULL }, diff --git a/src/maemo/modest-msg-view-window-ui-dimming.h b/src/maemo/modest-msg-view-window-ui-dimming.h index f9ec059..2f3dc57 100644 --- a/src/maemo/modest-msg-view-window-ui-dimming.h +++ b/src/maemo/modest-msg-view-window-ui-dimming.h @@ -16,7 +16,7 @@ static const ModestDimmingEntry modest_msg_view_dimming_entries [] = { { "/MenuBar/MessageMenu/MessageReplyAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, { "/MenuBar/MessageMenu/MessageForwardMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, { "/MenuBar/MessageMenu/MessageDeleteMenu", NULL }, - { "/MenuBar/MessageMenu/MessageDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details_msg) }, + { "/MenuBar/MessageMenu/MessageDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details) }, /* Edit Menu */ { "/MenuBar/EditMenu", NULL }, diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 24d42de..973b19e 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -1121,11 +1121,11 @@ modest_text_utils_get_display_size (guint64 size) else if (KB <= size && size < 100 * KB) return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB); else if (100*KB <= size && size < MB) - return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), size / MB); + return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (float) size / MB); else if (MB <= size && size < 10*MB) - return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), size / MB); + return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), (float) size / MB); else if (10*MB <= size && size < GB) return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), size / MB); else - return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), size / GB); + return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB); } diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index d9b6959..f5d81e7 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -207,16 +207,26 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) } gboolean -modest_ui_dimming_rules_on_details_msg (ModestWindow *win, gpointer user_data) +modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data) { gboolean dimmed = FALSE; /* main window dimming rules */ if (MODEST_IS_MAIN_WINDOW(win)) { - - /* Check dimmed rule */ - if (!dimmed) - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), TRUE); + GtkWidget *header_view; + + /* Check dimmed rule */ + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_WIDGET_TYPE_HEADER_VIEW); + + /* If the header view does not have the focus then do + not apply msg dimming rules because the action will + show the folder details that have no dimming + rule */ + if (gtk_widget_is_focus (header_view)) { + if (!dimmed) + dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), TRUE); + } /* msg view window dimming rules */ } else { diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h index 9e9704f..5f5c7ca 100644 --- a/src/modest-ui-dimming-rules.h +++ b/src/modest-ui-dimming-rules.h @@ -45,7 +45,7 @@ gboolean modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_ gboolean modest_ui_dimming_rules_on_contents_msg (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_always_dimmed (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data); -gboolean modest_ui_dimming_rules_on_details_msg (ModestWindow *win, gpointer user_data); +gboolean modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data); -- 1.7.9.5