X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=a422bb821d7e3b9187bb12c5f3fba5a57e8640c8;hp=1e0fc5778995e7535e7119913ea405fbab1219f9;hb=1cb8d01ea12aa1a9d17a25f7b57cd57f88d22f31;hpb=91526797480db76525e1295ec4a65f29f4bdc9cf diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 1e0fc57..a422bb8 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -33,10 +33,12 @@ #include #include "modest-ui-dimming-rules.h" +#include "modest-ui-actions.h" #include "modest-dimming-rule.h" #include "modest-debug.h" #include "modest-tny-folder.h" #include "modest-tny-account.h" +#include "modest-tny-mime-part.h" #include "modest-text-utils.h" #include #include @@ -319,7 +321,6 @@ modest_ui_dimming_rules_define_dimming_state (ModestWindow *window) return state; } - gboolean modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data) { @@ -372,6 +373,9 @@ modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data) /* Get selected folder as parent of new folder to create */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) /* folder view may not have been created yet */ + return TRUE; + parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); if (!parent_folder) return TRUE; @@ -597,8 +601,11 @@ modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data) } if (!dimmed) { dimmed = state->any_marked_as_deleted; - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + if (dimmed) { + gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win); + modest_dimming_rule_set_notification (rule, msg); + g_free (msg); + } } if (!dimmed) { dimmed = _selected_msg_sent_in_progress (win); @@ -619,19 +626,20 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); + types[0] = TNY_FOLDER_TYPE_DRAFTS; + types[1] = TNY_FOLDER_TYPE_OUTBOX; + types[2] = TNY_FOLDER_TYPE_ROOT; + + /* Check dimmed rule */ + if (!dimmed) { + dimmed = _selected_folder_is_any_of_type (win, types, 3); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); + } + /* main window dimming rules */ if (MODEST_IS_MAIN_WINDOW(win)) { - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_ROOT; - - /* Check dimmed rule */ - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); - } if (!dimmed) { dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); if (dimmed) @@ -719,28 +727,29 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); } if (!dimmed) { - dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; - if (dimmed) { - gchar *num = NULL, *message = NULL; - - num = g_strdup_printf ("%d", state->already_opened_msg); - message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), num); - modest_dimming_rule_set_notification (rule, message); - g_free(num); - g_free(message); - } - + dimmed = state->sent_in_progress; + if (dimmed) + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); } if (!dimmed) { dimmed = state->any_marked_as_deleted; if (dimmed) { - modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win); + modest_dimming_rule_set_notification (rule, msg); + g_free (msg); } } if (!dimmed) { - dimmed = state->sent_in_progress; - if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); + dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; + if (dimmed) { + gchar *message = NULL; + + 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)) { @@ -751,8 +760,11 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) } if (!dimmed) { dimmed = state->any_marked_as_deleted; - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + if (dimmed) { + gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win); + modest_dimming_rule_set_notification (rule, msg); + g_free (msg); + } } if (!dimmed) { dimmed = state->sent_in_progress; @@ -947,7 +959,7 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user /* Check diming rules for folders transfer */ - if (gtk_widget_is_focus (folder_view)) { + if (folder_view && gtk_widget_is_focus (folder_view)) { TnyFolderType types[5]; types[0] = TNY_FOLDER_TYPE_DRAFTS; @@ -960,12 +972,12 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user if (!dimmed) { dimmed = _selected_folder_not_moveable (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } if (!dimmed) { dimmed = _selected_folder_is_any_of_type (win, types, 5); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } } @@ -973,14 +985,14 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user if (!dimmed) { dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; if (dimmed) { - gchar *message = g_strdup_printf(_("emev_bd_unabletomove_items"), + gchar *message = g_strdup_printf(_("emev_nc_unabletomove_items"), state->already_opened_msg); modest_dimming_rule_set_notification (rule, message); g_free(message); } } if (!dimmed) { - if (!gtk_widget_is_focus (folder_view)) + if (!(folder_view && gtk_widget_is_focus (folder_view))) dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); } @@ -1231,6 +1243,8 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ /* cannot purge in editable drafts nor pop folders */ if (!dimmed) { dimmed = _invalid_folder_for_purge (win, rule); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); } /* Check if the selected message in main window has attachments */ @@ -1345,17 +1359,17 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } if (!dimmed) { dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } if (!dimmed) { dimmed = _selected_folder_is_any_of_type (win, types, 3); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } } } @@ -1512,9 +1526,10 @@ modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data) if (!dimmed) { ModestEmailClipboard *e_clipboard = modest_runtime_get_email_clipboard (); + const gchar *clipboard_text = modest_msg_edit_window_get_clipboard_text (MODEST_MSG_EDIT_WINDOW (win)); + dimmed = modest_email_clipboard_cleared (e_clipboard) && - (modest_msg_edit_window_get_clipboard_text(MODEST_MSG_EDIT_WINDOW (win)) == NULL) && - !gtk_clipboard_wait_is_text_available(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD)); + ((clipboard_text == NULL) || (clipboard_text[0] == '\0')); } return dimmed; @@ -1545,7 +1560,7 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer n_att_selected = tny_list_get_length (selected_attachments); g_object_unref (selected_attachments); - dimmed = (n_att_selected != 1); + dimmed = (n_att_selected < 1); } return dimmed; @@ -1576,8 +1591,7 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data) 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') - || (gtk_text_buffer_get_char_count(body_buffer) == 0)); + dimmed = (subject == NULL || subject[0] == '\0'); if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_or_body_not_modified")); } @@ -1796,14 +1810,7 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat selection = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); } } else if (GTK_IS_LABEL (focused)) { - gint start, end; - if (gtk_label_get_selection_bounds (GTK_LABEL (focused), &start, &end)) { - const gchar *start_offset; - start_offset = gtk_label_get_text (GTK_LABEL (focused)); - start_offset = g_utf8_offset_to_pointer (start_offset, start); - selection = g_new0 (gchar, end - start + 1); - g_utf8_strncpy (selection, start_offset, end - start); - } + selection = modest_text_utils_label_get_selection (GTK_LABEL (focused)); } else { gboolean do_check = TRUE; GtkClipboard *clipboard; @@ -2235,7 +2242,8 @@ _selected_folder_is_any_of_type (ModestWindow *win, /* free */ - g_object_unref (folder); + if (folder) + g_object_unref (folder); return result; } @@ -2297,7 +2305,7 @@ _invalid_clipboard_selected (ModestWindow *win, if (GTK_IS_TEXT_VIEW (focused)) { GtkTextBuffer *buffer = NULL; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused)); - has_selection = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (buffer)); + has_selection = modest_text_utils_buffer_selection_is_valid (buffer); } else if (GTK_IS_EDITABLE (focused)) { has_selection = gtk_editable_get_selection_bounds (GTK_EDITABLE (focused), NULL, NULL); } @@ -2394,7 +2402,7 @@ _invalid_attach_selected (ModestWindow *win, while (!tny_iterator_is_done (iter) && !result) { TnyMimePart *mime_part = TNY_MIME_PART (tny_iterator_get_current (iter)); TnyList *nested_list = tny_simple_list_new (); - if (!for_remove && TNY_IS_MSG (mime_part)) { + if (!for_remove && modest_tny_mime_part_is_msg (mime_part)) { selected_messages = TRUE; result = TRUE; } @@ -2604,7 +2612,7 @@ _invalid_folder_for_purge (ModestWindow *win, folder = tny_msg_get_folder (msg); g_object_unref (msg); if (folder == NULL) { - modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); + result = TRUE; goto frees; } } else if (MODEST_IS_MAIN_WINDOW (win)) { @@ -2629,31 +2637,14 @@ _invalid_folder_for_purge (ModestWindow *win, if (_selected_folder_is_any_of_type (win, types, 2)) { result = TRUE; - modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_editable_msg")); - } else { - result = FALSE; } } else { const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - /* If it's POP then dim */ - if (modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) { - TnyList *attachments = NULL; - gint n_selected = 0; + ModestTransportStoreProtocol proto; + proto = modest_protocol_info_get_transport_store_protocol (proto_str); + /* If it's a remote folder then dim */ + if (proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP) { result = TRUE; - - /* TODO: This check is here to prevent a gwarning, but this looks like a logic error. - * murrayc */ - if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = tny_list_get_length (attachments); - g_object_unref (attachments); - } - - modest_dimming_rule_set_notification (rule, - ngettext ("mail_ib_unable_to_pure_attach_pop_mail_singular", - "mail_ib_unable_to_pure_attach_pop_mail_plural", - n_selected)); } }