From: Javier Fernandez Garcia-Boente Date: Thu, 7 Jun 2007 15:23:38 +0000 (+0000) Subject: * Fixes: NB#59805 X-Git-Tag: git_migration_finished~3386 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=00fbcf47af2d9d6986d5a7346093c328d736a371 * Fixes: NB#59805 * Implement dimmig rules for Header View context sensitive menus. pmo-trunk-r2107 --- diff --git a/src/maemo/modest-main-window-ui-dimming.h b/src/maemo/modest-main-window-ui-dimming.h index 8eb4fa8..01d6edb 100644 --- a/src/maemo/modest-main-window-ui-dimming.h +++ b/src/maemo/modest-main-window-ui-dimming.h @@ -29,7 +29,7 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = { { "/MenuBar/EditMenu/EditCutMenu", NULL }, { "/MenuBar/EditMenu/EditCopyMenu", NULL }, { "/MenuBar/EditMenu/EditPasteMenu", G_CALLBACK(modest_ui_dimming_rules_on_paste_msgs) }, - { "/MenuBar/EditMenu/EditSelectAllMenu", NULL }, + { "/MenuBar/EditMenu/EditSelectAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_select_all)}, { "/MenuBar/EditMenu/EditMarkAsReadMenu", G_CALLBACK(modest_ui_dimming_rules_on_mark_as_read_msg) }, { "/MenuBar/EditMenu/EditMarkAsUnreadMenu", G_CALLBACK(modest_ui_dimming_rules_on_mark_as_unread_msg) }, { "/MenuBar/EditMenu/EditMoveToMenu", G_CALLBACK(modest_ui_dimming_rules_on_move_to) }, diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 3bc7edc..22195df 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -1382,12 +1382,18 @@ modest_main_window_notify_send_receive_initied (ModestMainWindow *self) g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + /* Tools menu options */ action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); gtk_action_set_sensitive (action, FALSE); action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu"); gtk_action_set_sensitive (action, FALSE); widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions"); gtk_widget_set_sensitive (widget, FALSE); + + /* Header view CSM */ + action = modest_window_get_action (MODEST_WINDOW(self), "/HeaderViewCSM/HeaderViewCSMCancelSending"); + gtk_action_set_sensitive (action, FALSE); + } void diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 6968a16..4cb0167 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -48,6 +48,7 @@ static gboolean _selected_folder_is_root (ModestMainWindow *win); static gboolean _selected_folder_is_empty (ModestMainWindow *win); static gboolean _msg_download_in_progress (ModestMsgViewWindow *win); static gboolean _msg_sent_in_progress (ModestWindow *win); +static gboolean _marked_as_deleted (ModestWindow *win); gboolean @@ -251,6 +252,14 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) dimmed = _already_opened_msg (win); modest_dimming_rule_set_notification (rule, _("mcen_nc_unable_to_delete_n_messages")); } + if (!dimmed) { + dimmed = _marked_as_deleted (win); + modest_dimming_rule_set_notification (rule, _("mcen_ib_message_unableto_delete")); + } + if (!dimmed) { + dimmed = _msg_sent_in_progress (win); + modest_dimming_rule_set_notification (rule, _("mcen_ib_message_unableto_delete")); + } return dimmed; } @@ -289,6 +298,7 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data) return dimmed; } + gboolean modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_data) { @@ -423,10 +433,37 @@ modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data) return dimmed; } +gboolean +modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data) +{ + gboolean dimmed = FALSE; + + /* Check dimmed rule */ + if (!dimmed) + dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); + + return dimmed; +} /* *********************** static utility functions ******************** */ +static gboolean +_marked_as_deleted (ModestWindow *win) +{ + gboolean result = FALSE; + TnyHeaderFlags flags; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); + + flags = TNY_HEADER_FLAG_DELETED; + + /* Check dimmed rule */ + result = _selected_msg_marked_as (win, flags, FALSE); + + return result; +} + static gboolean _selected_folder_not_writeable (ModestMainWindow *win) { @@ -473,6 +510,36 @@ _selected_folder_is_root (ModestMainWindow *win) /* Check folder type */ result = _selected_folder_is_any_of_type (win, types, 2); + if (!result) { + GtkWidget *folder_view = NULL; + TnyFolderStore *parent_folder = NULL; + + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + /* Get selected folder as parent of new folder to create */ + parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); + if (!parent_folder) + return TRUE; + + if (TNY_IS_ACCOUNT (parent_folder)) { + /* If it's the local account then do not dim */ + if (modest_tny_account_is_virtual_local_folders ( + TNY_ACCOUNT (parent_folder))) + return FALSE; + else { + /* If it's the MMC root folder then dim it */ + if (!strcmp (tny_account_get_id (TNY_ACCOUNT (parent_folder)), MODEST_MMC_ACCOUNT_ID)) { + result = TRUE; + } else { + const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (parent_folder)); + /* If it's POP then dim */ + result = (modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE; + } + } + } + } + return result; } @@ -596,7 +663,7 @@ _invalid_msg_selected (ModestMainWindow *win, (GTK_WIDGET_HAS_FOCUS (folder_view))); modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected")); } - if (!result) { + if (!result && unique) { result = tny_list_get_length (selected_headers) > 1; modest_dimming_rule_set_notification (rule, _("mcen_ib_select_one_message")); } diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h index 4022e66..8b6291e 100644 --- a/src/modest-ui-dimming-rules.h +++ b/src/modest-ui-dimming-rules.h @@ -54,6 +54,7 @@ gboolean modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpoi gboolean modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data); +gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data); G_END_DECLS #endif