X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=008432ed1e56274ebb74e30fb62a6932b2dfe059;hp=2857cf708b7316a3ac8af677301d066a192fc9a4;hb=f65289e467bc8ce1c1c4d8c13fafff637ae13034;hpb=f0308a557ea83318786ab332f5de2a3be5edc74a diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 2857cf7..008432e 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -468,15 +468,15 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) dimmed = TRUE; modest_dimming_rule_set_notification (rule, _CS("ckct_ib_nothing_to_delete")); } - + #ifdef MODEST_TOOLKIT_HILDON2 } else if (MODEST_IS_HEADER_WINDOW (win)) { - if (!dimmed) { + if (!dimmed) dimmed = _transfer_mode_enabled (win); - } + if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); + modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); if (!dimmed) { GtkWidget *header_view; @@ -729,7 +729,7 @@ _message_already_sent (ModestMsgViewWindow *view_window) folder = tny_header_get_folder (header); if (folder) { if (modest_tny_folder_guess_folder_type (folder) == - TNY_FOLDER_TYPE_OUTBOX) { + TNY_FOLDER_TYPE_OUTBOX) { ModestTnySendQueueStatus status = modest_tny_all_send_queues_get_msg_status (header); if (status == MODEST_TNY_SEND_QUEUE_UNKNOWN || @@ -753,13 +753,20 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); - state = modest_window_get_dimming_state (win); - - /* Check dimmed rule */ + state = modest_window_get_dimming_state (win); + + /* If we're in transfer mode then do not allow to delete messages */ + dimmed = _transfer_mode_enabled (win); + if (dimmed) { + modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); + return dimmed; + } + + /* Check dimmed rule */ if (MODEST_IS_MAIN_WINDOW (win)) { - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); + dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_nothing_to_delete")); + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_nothing_to_delete")); if (!dimmed) { dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); } @@ -781,18 +788,15 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) if (dimmed) { gchar *message = NULL; - message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), + message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), state->already_opened_msg); modest_dimming_rule_set_notification (rule, message); g_free(message); } - + } } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - dimmed = _transfer_mode_enabled (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); if (!dimmed) { dimmed = state->any_marked_as_deleted; if (dimmed) { @@ -811,7 +815,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) outbox that has been already sent */ if (!dimmed) dimmed = _message_already_sent (MODEST_MSG_VIEW_WINDOW(win)); - + /* The delete button should be dimmed when viewing an attachment, * but should be enabled when viewing a message from the list, * or when viewing a search result. @@ -912,17 +916,21 @@ modest_ui_dimming_rules_on_mark_as_read_msg_in_view (ModestWindow *win, gpointer TnyHeader *header; TnyHeaderFlags flags; gboolean dimmed = FALSE; - + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW(win), FALSE); g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); - + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); if (!header) { dimmed = TRUE; } + /* If the viewer is showing a message sent as attachment */ + if (!dimmed) + dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW (win)); + if (!dimmed) { flags = tny_header_get_flags (header); if (flags & TNY_HEADER_FLAG_SEEN) @@ -953,6 +961,10 @@ modest_ui_dimming_rules_on_mark_as_unread_msg_in_view (ModestWindow *win, gpoint dimmed = TRUE; } + /* If the viewer is showing a message sent as attachment */ + if (!dimmed) + dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW (win)); + if (!dimmed) { flags = tny_header_get_flags (header); if (!(flags & TNY_HEADER_FLAG_SEEN)) @@ -1165,7 +1177,7 @@ modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer us rule = MODEST_DIMMING_RULE (user_data); /* Check dimmed rule */ - dimmed = _transfer_mode_enabled (win); + dimmed = _transfer_mode_enabled (win); if (dimmed) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); @@ -1711,9 +1723,8 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data) const DimmedState *state = NULL; gboolean dimmed = FALSE; GtkWidget *subject_field, *body_field; - GtkTextBuffer *body_buffer; const gchar *subject = NULL; - + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), TRUE); rule = MODEST_DIMMING_RULE (user_data); @@ -1725,13 +1736,12 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data) subject_field = modest_msg_edit_window_get_child_widget ( MODEST_MSG_EDIT_WINDOW (win), MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT); - body_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (body_field)); subject = gtk_entry_get_text (GTK_ENTRY (subject_field)); dimmed = (subject == NULL || subject[0] == '\0'); if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_not_modified")); - + if (!dimmed) { GtkWidget *to_field, *cc_field, *bcc_field; GtkTextBuffer * to_buffer, *cc_buffer, *bcc_buffer; @@ -1864,7 +1874,11 @@ modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ account_name = modest_window_get_active_account (win); - dimmed = modest_account_mgr_account_is_busy (mgr, account_name); + + if (account_name) + dimmed = modest_account_mgr_account_is_busy (mgr, account_name); + else + dimmed = TRUE; if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); @@ -2903,12 +2917,12 @@ _msgs_send_in_progress (void) cache_mgr = modest_runtime_get_cache_mgr (); send_queue_cache = modest_cache_mgr_get_cache (cache_mgr, MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE); - + g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues); - + for (node = send_queues; node != NULL && !found; node = g_slist_next (node)) { send_queue = MODEST_TNY_SEND_QUEUE (node->data); - + /* Check if msg uid is being processed inside send queue */ if (modest_tny_send_queue_sending_in_progress (send_queue)) { found = TRUE;