From 3c20b59771b2dd957aa79b402fc0b9382d680a32 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Mon, 14 Jan 2008 11:58:17 +0000 Subject: [PATCH] * Update the dimming rules management for the "+" toolbar icon depending on the selected folder pmo-trunk-r4032 --- src/maemo/modest-main-window-ui-dimming.h | 2 +- src/maemo/modest-msg-view-window.c | 1 - src/modest-ui-dimming-rules.c | 17 +++++++++++++++++ src/modest-ui-dimming-rules.h | 1 + src/widgets/modest-gtkhtml-msg-view.c | 1 - 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/maemo/modest-main-window-ui-dimming.h b/src/maemo/modest-main-window-ui-dimming.h index ab3e2d6..ad3f67b 100644 --- a/src/maemo/modest-main-window-ui-dimming.h +++ b/src/maemo/modest-main-window-ui-dimming.h @@ -115,7 +115,7 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = { static const ModestDimmingEntry modest_main_window_toolbar_dimming_entries [] = { /* Toolbar */ - { "/ToolBar/ToolbarMessageNew", G_CALLBACK(modest_ui_dimming_rules_on_new_msg) }, + { "/ToolBar/ToolbarMessageNew", G_CALLBACK(modest_ui_dimming_rules_on_new_msg_or_folder) }, { "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, { "/ToolBar/ToolbarDeleteMessage", G_CALLBACK(modest_ui_dimming_rules_on_delete) }, { "/ToolBar/ToolbarToggleView", NULL }, diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 38a6e72..bdabf0b 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include "modest-msg-view-window-ui-dimming.h" #include diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index b637877..322c5a3 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -319,6 +319,23 @@ modest_ui_dimming_rules_define_dimming_state (ModestWindow *window) return state; } +gboolean +modest_ui_dimming_rules_on_new_msg_or_folder (ModestWindow *win, + gpointer user_data) +{ + GtkWidget *folder_view; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE); + + /* Check first if the folder view has the focus */ + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (gtk_widget_is_focus (folder_view)) { + return modest_ui_dimming_rules_on_new_folder (win, user_data); + } else { + return modest_ui_dimming_rules_on_new_msg (win, user_data); + } +} gboolean modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data) diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h index 359a6ff..555d3c9 100644 --- a/src/modest-ui-dimming-rules.h +++ b/src/modest-ui-dimming-rules.h @@ -42,6 +42,7 @@ DimmedState *modest_ui_dimming_rules_define_dimming_state (ModestWindow *window) /* Menu & toolbar dimming rules */ gboolean modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data); +gboolean modest_ui_dimming_rules_on_new_msg_or_folder (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data); diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c index 4e8ef57..fa53d07 100644 --- a/src/widgets/modest-gtkhtml-msg-view.c +++ b/src/widgets/modest-gtkhtml-msg-view.c @@ -2117,4 +2117,3 @@ modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *self, TnyMimeP { remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment); } - -- 1.7.9.5