X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=68126350354bcfb46d8f813c123d5cf662be17ef;hp=715e90706009f1386aa8acd922b7d29172b89b8d;hb=07c0fefbd027f14c5c3c4c509f9b7e0e6970ffbd;hpb=00e4c46d15d915198d9218bd189f33a368996503 diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 715e907..6812635 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -206,11 +206,7 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) rule = MODEST_DIMMING_RULE (user_data); if (MODEST_IS_FOLDER_WINDOW (win)) { -#ifdef MODEST_TOOLKIT_HILDON2 dimmed = modest_ui_dimming_rules_on_folder_window_delete (win, user_data); -#else - dimmed = FALSE; -#endif } else if (MODEST_IS_HEADER_WINDOW (win)) { if (!dimmed) @@ -411,7 +407,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) if (state) dimmed = state->sent_in_progress; if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); + modest_dimming_rule_set_notification (rule, _CS_UNABLE_TO_DELETE); } /* This could happen if we're viewing a message of the @@ -424,11 +420,14 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) * or when viewing a search result. */ if (!dimmed) { - if (!modest_msg_view_window_is_search_result (MODEST_MSG_VIEW_WINDOW(win))) { - dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win)); - if (dimmed) { - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); - } + TnyMsg *top_msg = NULL; + top_msg = modest_msg_view_window_get_top_message ((ModestMsgViewWindow *) win); + if (top_msg != NULL) { + g_object_unref (top_msg); + dimmed = TRUE; + } + if (dimmed) { + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); } } } @@ -460,11 +459,24 @@ gboolean modest_ui_dimming_rules_on_fetch_images (ModestWindow *win, gpointer user_data) { gboolean dimmed = FALSE; + ModestDimmingRule *rule = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win), FALSE); + rule = MODEST_DIMMING_RULE (user_data); dimmed = !modest_msg_view_window_has_blocked_external_images (MODEST_MSG_VIEW_WINDOW (win)); + if (!dimmed) { + dimmed = _transfer_mode_enabled (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); + } + if (!dimmed) { + dimmed = _msg_download_in_progress (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); + } + return dimmed; } @@ -546,17 +558,9 @@ modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data) rule = MODEST_DIMMING_RULE (user_data); if (MODEST_IS_HEADER_WINDOW (win)) -#ifdef MODEST_TOOLKIT_HILDON2 dimmed = modest_ui_dimming_rules_on_header_window_move_to (win, user_data); -#else - dimmed = TRUE; -#endif else if (MODEST_IS_FOLDER_WINDOW (win)) -#ifdef MODEST_TOOLKIT_HILDON2 dimmed = modest_ui_dimming_rules_on_folder_window_move_to (win, user_data); -#else - dimmed = TRUE; -#endif else if (MODEST_IS_MSG_VIEW_WINDOW (win)) dimmed = modest_ui_dimming_rules_on_view_window_move_to (win, user_data); @@ -567,14 +571,34 @@ modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data) static gboolean _forbid_outgoing_xfers (ModestWindow *window) { - const gchar *account_name; - TnyAccount *account; + const gchar *account_name = NULL; + TnyAccount *account = NULL; gboolean dimmed = FALSE; - account_name = modest_window_get_active_account (window); - account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), - account_name, - TNY_ACCOUNT_TYPE_STORE); +#ifdef MODEST_TOOLKIT_HILDON2 + /* We cannot just get the active account because the active + account of a header window that shows the headers of a + local account is the ID of the remote account */ + if (MODEST_IS_HEADER_WINDOW (window)) { + ModestHeaderView *header_view; + TnyFolder *folder; + + header_view = modest_header_window_get_header_view ((ModestHeaderWindow *) window); + folder = modest_header_view_get_folder (header_view); + + if (folder) { + account = modest_tny_folder_get_account (folder); + g_object_unref (folder); + } + } +#endif + + if (!account) { + account_name = modest_window_get_active_account (window); + account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + account_name, + TNY_ACCOUNT_TYPE_STORE); + } if (account) { ModestProtocolType protocol_type; @@ -698,8 +722,7 @@ modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); - focused = gtk_window_get_focus (GTK_WINDOW (win)); - + focused = gtk_container_get_focus_child ((GtkContainer *) win); if (!dimmed && GTK_IS_ENTRY (focused)) { const gchar *current_text; @@ -991,7 +1014,7 @@ modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), TRUE); rule = MODEST_DIMMING_RULE (user_data); - focused = gtk_window_get_focus (GTK_WINDOW (win)); + focused = gtk_container_get_focus_child ((GtkContainer *) win); dimmed = MODEST_IS_ATTACHMENTS_VIEW (focused); @@ -1037,7 +1060,7 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer return dimmed; } -gboolean +gboolean modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; @@ -1067,6 +1090,14 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data) dimmed = ((gtk_text_buffer_get_char_count (to_buffer) + gtk_text_buffer_get_char_count (cc_buffer) + gtk_text_buffer_get_char_count (bcc_buffer)) == 0); + + if (!dimmed) { + if (modest_text_utils_no_recipient (to_buffer) && + modest_text_utils_no_recipient (cc_buffer) && + modest_text_utils_no_recipient (bcc_buffer)) + dimmed = TRUE; + } + if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_add_recipients_first")); } @@ -1310,7 +1341,7 @@ _invalid_clipboard_selected (ModestWindow *win, g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); /* Get focuesed widget */ - focused = gtk_window_get_focus (GTK_WINDOW (win)); + focused = gtk_container_get_focus_child ((GtkContainer *) win); if (MODEST_IS_MSG_EDIT_WINDOW (win)) { gboolean has_selection = FALSE; @@ -1716,10 +1747,6 @@ _msgs_send_in_progress (void) return found; } -/*****************************************************************************/ -/********************** HILDON2 only dimming rules ***************************/ -/*****************************************************************************/ - gboolean modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data) { @@ -1793,7 +1820,7 @@ modest_ui_dimming_rules_on_folder_window_move_to (ModestWindow *win, gpointer us return dimmed; } -gboolean +gboolean modest_ui_dimming_rules_on_folder_window_delete (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; @@ -1803,7 +1830,7 @@ modest_ui_dimming_rules_on_folder_window_delete (ModestWindow *win, gpointer use g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); - /* Check dimmed rule */ + /* Check dimmed rule */ dimmed = _transfer_mode_enabled (win); if (dimmed) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading"));