X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=93e78f886bca95645a284a9d11306709f17b37ae;hp=c97f21e746cf5eadea199892882234be15893347;hb=180a6c986b177f0818ca0e25d35da5bb702d2039;hpb=6c06ef5b1115237bd788e816faafeabca9feab91 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index c97f21e..93e78f8 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -32,13 +32,14 @@ #endif /*HAVE_CONFIG_H*/ #include +#include #include #include #include #include #include #include - +#include "modest-error.h" #include "modest-ui-actions.h" #include "modest-tny-platform-factory.h" @@ -54,6 +55,7 @@ #include #include #include +#include "widgets/modest-folder-view.h" #include "widgets/modest-global-settings-dialog.h" #include "modest-connection-specific-smtp-window.h" #include "modest-account-mgr-helpers.h" @@ -71,6 +73,8 @@ #include #include +#include + typedef struct _GetMsgAsyncHelper { ModestWindow *window; ModestMailOperation *mail_op; @@ -90,8 +94,10 @@ typedef struct _ReplyForwardHelper { guint reply_forward_type; ReplyForwardAction action; gchar *account_name; + GtkWidget *parent_window; } ReplyForwardHelper; + /* * The do_headers_action uses this kind of functions to perform some * action to each member of a list of headers @@ -116,7 +122,26 @@ static void reply_forward_cb (ModestMailOperation *mail_op, static void reply_forward (ReplyForwardAction action, ModestWindow *win); -static gchar* ask_for_folder_name (GtkWindow *parent_window, const gchar *title); + +static void _on_send_receive_progress_changed (ModestMailOperation *mail_op, + ModestMailOperationState *state, + gpointer user_data); + + + +static void +run_account_setup_wizard (ModestWindow *win) +{ + ModestEasysetupWizardDialog *wizard; + + g_return_if_fail (MODEST_IS_WINDOW(win)); + + wizard = modest_easysetup_wizard_dialog_new (); + gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); + gtk_dialog_run (GTK_DIALOG (wizard)); + gtk_widget_destroy (GTK_WIDGET (wizard)); +} + void modest_ui_actions_on_about (GtkAction *action, ModestWindow *win) @@ -235,21 +260,60 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win) gchar *message = NULL; gchar *desc = NULL; gint response; + gboolean found; + ModestWindowMgr *mgr; + GtkWidget *header_view; g_return_if_fail (MODEST_IS_WINDOW(win)); + /* Check first if the header view has the focus */ + if (MODEST_IS_MAIN_WINDOW (win)) { + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_WIDGET_TYPE_HEADER_VIEW); + if (!gtk_widget_is_focus (header_view)) + return; + } + header_list = get_selected_headers (win); if (!header_list) return; + /* Check if any of the headers is already opened */ + iter = tny_list_create_iterator (header_list); + found = FALSE; + mgr = modest_runtime_get_window_mgr (); + while (!tny_iterator_is_done (iter) && !found) { + header = TNY_HEADER (tny_iterator_get_current (iter)); + if (modest_window_mgr_find_window_by_header (mgr, header)) + found = TRUE; + g_object_unref (header); + tny_iterator_next (iter); + } + g_object_unref (iter); + + if (found) { + gchar *num, *msg; + + num = g_strdup_printf ("%d", tny_list_get_length (header_list)); + msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), num); + + modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg); + + g_free (msg); + g_free (num); + g_object_unref (header_list); + return; + } + /* Select message */ - if (tny_list_get_length(header_list) > 1) - message = g_strdup(_("emev_nc_delete_messages")); - else { + if (tny_list_get_length(header_list) == 1) { iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); desc = g_strdup_printf ("%s", tny_header_get_subject (header)); - message = g_strdup_printf(_("emev_nc_delete_message"), desc); + g_object_unref (header); + g_object_unref (iter); } + message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", + tny_list_get_length(header_list)), desc); /* Confirmation dialog */ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), @@ -275,17 +339,19 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win) g_free(message); g_free(desc); g_object_unref (header_list); - g_object_unref (iter); } void modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) { - #ifdef MODEST_PLATFORM_MAEMO +#ifdef MODEST_PLATFORM_MAEMO modest_osso_save_state(); - #endif /* MODEST_PLATFORM_MAEMO */ - +#endif /* MODEST_PLATFORM_MAEMO */ + + /* FIXME: we need to cancel all actions/threads here, + so we really quit */ + gtk_main_quit (); } @@ -313,28 +379,24 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); selection = gtk_clipboard_wait_for_text (clipboard); - modest_address_book_add_address (selection); - g_free (selection); + /* Question: why is the clipboard being used here? + * It doesn't really make a lot of sense. */ + + if (selection) + { + modest_address_book_add_address (selection); + g_free (selection); + } } void modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) { - /* This is currently only implemented for Maemo, - * because it requires a providers preset file which is not publically available. - */ + /* This is currently only implemented for Maemo */ #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ - GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), - TRUE /* enabled accounts only */); - gboolean accounts_exist = account_names != NULL; - g_slist_free (account_names); - - if (!accounts_exist) { - /* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */ - ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new (); - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); - gtk_dialog_run (GTK_DIALOG (wizard)); - gtk_widget_destroy (GTK_WIDGET (wizard)); + if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { + run_account_setup_wizard (win); + return; } else { /* Show the list of accounts: */ GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ()); @@ -381,6 +443,8 @@ on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) gtk_widget_destroy (GTK_WIDGET (window)); } + + void modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) { @@ -411,9 +475,9 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) /* Show the window: */ gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win)); gtk_window_set_modal (GTK_WINDOW (specific_window), TRUE); - gtk_widget_show (specific_window); + gtk_widget_show (specific_window); - /* Save changes when the window is hidden: */ + /* Save changes when the window is hidden: */ g_signal_connect (specific_window, "hide", G_CALLBACK (on_smtp_servers_window_hide), win); #endif /* MODEST_PLATFORM_MAEMO */ @@ -422,7 +486,7 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) void modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) { - ModestWindow *msg_win; + ModestWindow *msg_win = NULL; TnyMsg *msg = NULL; TnyFolder *folder = NULL; gchar *account_name = NULL; @@ -430,17 +494,23 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) /* GError *err = NULL; */ TnyAccount *account = NULL; ModestWindowMgr *mgr; - gchar *signature = NULL; + gchar *signature = NULL, *blank_and_signature = NULL; + + /* if there are no accounts yet, just show the wizard */ + if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) { + run_account_setup_wizard (win); + return; + } - account_name = g_strdup(modest_window_get_active_account (win)); + account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); if (!account_name) - account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); + account_name = g_strdup (modest_window_get_active_account (win)); if (!account_name) { g_printerr ("modest: no account found\n"); goto cleanup; } - account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(), + account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(), account_name, TNY_ACCOUNT_TYPE_STORE); if (!account) { @@ -458,11 +528,13 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) { signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name, MODEST_ACCOUNT_SIGNATURE, FALSE); + blank_and_signature = g_strconcat ("\n", signature, NULL); + g_free (signature); } else { - signature = g_strdup (""); + blank_and_signature = g_strdup (""); } - msg = modest_tny_msg_new ("", from_str, "", "", "", signature, NULL); + msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL); if (!msg) { g_printerr ("modest: failed to create new msg\n"); goto cleanup; @@ -474,13 +546,6 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) goto cleanup; } -/* tny_folder_add_msg (folder, msg, &err); */ -/* if (err) { */ -/* g_printerr ("modest: error adding msg to Drafts folder: %s", */ -/* err->message); */ -/* g_error_free (err); */ -/* goto cleanup; */ -/* } */ /* Create and register edit window */ /* This is destroyed by TOOD. */ @@ -496,7 +561,9 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) cleanup: g_free (account_name); g_free (from_str); - g_free (signature); + g_free (blank_and_signature); + if (msg_win) + g_object_unref (msg_win); if (account) g_object_unref (G_OBJECT(account)); if (msg) @@ -529,9 +596,9 @@ open_msg_cb (ModestMailOperation *mail_op, headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL); /* Get account */ - account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); + account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); if (!account) - account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); + account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); /* Gets folder type (OUTBOX headers will be opened in edit window */ if (modest_tny_folder_is_local_folder (folder)) @@ -540,8 +607,15 @@ open_msg_cb (ModestMailOperation *mail_op, /* If the header is in the drafts folder then open the editor, else the message view window */ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { + /* we cannot edit without a valid account... */ + if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { + run_account_setup_wizard(parent_win); + goto cleanup; + } win = modest_msg_edit_window_new (msg, account); } else { + gchar *uid = modest_tny_folder_get_header_unique_id (header); + if (MODEST_IS_MAIN_WINDOW (parent_win)) { GtkWidget *header_view; GtkTreeSelection *sel; @@ -562,31 +636,55 @@ open_msg_cb (ModestMailOperation *mail_op, g_list_free (sel_list); win = modest_msg_view_window_new_with_header_model (msg, - account, + account, + (const gchar*) uid, model, row_reference); gtk_tree_row_reference_free (row_reference); } else { - win = modest_msg_view_window_new (msg, account); + win = modest_msg_view_window_new (msg, account, (const gchar*) uid); } } else { - win = modest_msg_view_window_new (msg, account); + win = modest_msg_view_window_new (msg, account, (const gchar*) uid); } + g_free (uid); } /* Register and show new window */ if (win != NULL) { mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, win); + g_object_unref (win); gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parent_win)); gtk_widget_show_all (GTK_WIDGET(win)); } +cleanup: /* Free */ g_free(account); + g_object_unref (parent_win); g_object_unref (msg); g_object_unref (folder); - g_object_unref (header); +} + +/* + * This function is the error handler of the + * modest_mail_operation_get_msgs_full operation + */ +static void +modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, + gpointer user_data) +{ + const GError *error; + + error = modest_mail_operation_get_error (mail_op); + if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) { + GObject *win = modest_mail_operation_get_source (mail_op); + + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + error->message); + g_object_unref (win); + } } /* @@ -597,39 +695,98 @@ open_msg_cb (ModestMailOperation *mail_op, static void _modest_ui_actions_open (TnyList *headers, ModestWindow *win) { - ModestWindowMgr *mgr; - TnyIterator *iter; - ModestMailOperation *mail_op; - + ModestWindowMgr *mgr = NULL; + TnyIterator *iter = NULL; + ModestMailOperation *mail_op1 = NULL; + ModestMailOperation *mail_op2 = NULL; + TnyList *not_opened_headers = NULL; + TnyList *not_opened_cached_headers = NULL; + TnyHeaderFlags flags; + /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to open */ mgr = modest_runtime_get_window_mgr (); iter = tny_list_create_iterator (headers); + not_opened_headers = tny_simple_list_new (); + not_opened_cached_headers = tny_simple_list_new (); while (!tny_iterator_is_done (iter)) { ModestWindow *window; TnyHeader *header; - + header = TNY_HEADER (tny_iterator_get_current (iter)); - window = modest_window_mgr_find_window_by_msguid (mgr, tny_header_get_uid (header)); - if (window) - tny_list_remove (headers, G_OBJECT (header)); + flags = tny_header_get_flags (header); + window = modest_window_mgr_find_window_by_header (mgr, header); + /* Do not open again the message and present the + window to the user */ + if (window) + gtk_window_present (GTK_WINDOW (window)); + else if (!(flags & TNY_HEADER_FLAG_CACHED)) + tny_list_append (not_opened_headers, G_OBJECT (header)); + /* Check if msg has already been retreived */ + else + tny_list_append (not_opened_cached_headers, G_OBJECT (header)); + g_object_unref (header); tny_iterator_next (iter); } + + /* Open each uncached message */ + if (tny_list_get_length (not_opened_headers) > 0) { + mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT (win), + modest_ui_actions_get_msgs_full_error_handler, + NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1); + if (tny_list_get_length (not_opened_headers) > 1) { + modest_mail_operation_get_msgs_full (mail_op1, + not_opened_headers, + open_msg_cb, + NULL, + NULL); + } else { + TnyIterator *iter = tny_list_create_iterator (not_opened_headers); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL); + g_object_unref (header); + g_object_unref (iter); + } + } - /* Open each message */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT (win)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msgs_full (mail_op, - headers, - open_msg_cb, - NULL, - NULL); + /* Open each cached message */ + if (tny_list_get_length (not_opened_cached_headers) > 0) { + mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_OPEN, + G_OBJECT (win), + modest_ui_actions_get_msgs_full_error_handler, + NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2); + if (tny_list_get_length (not_opened_cached_headers) > 1) { + modest_mail_operation_get_msgs_full (mail_op2, + not_opened_headers, + open_msg_cb, + NULL, + NULL); + } else { + TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL); + g_object_unref (header); + g_object_unref (iter); + } + } /* Clean */ - g_object_unref(mail_op); + if (not_opened_headers != NULL) + g_object_unref (not_opened_headers); + if (not_opened_cached_headers != NULL) + g_object_unref (not_opened_cached_headers); + if (iter != NULL) + g_object_unref (iter); + if (mail_op1 != NULL) + g_object_unref (mail_op1); + if (mail_op2 != NULL) + g_object_unref (mail_op2); } void @@ -667,13 +824,11 @@ reply_forward_cb (ModestMailOperation *mail_op, { TnyMsg *new_msg; ReplyForwardHelper *rf_helper; - ModestWindow *msg_win; + ModestWindow *msg_win = NULL; ModestEditType edit_type; - gchar *from; - GError *err = NULL; - TnyFolder *folder = NULL; + gchar *from = NULL; TnyAccount *account = NULL; - ModestWindowMgr *mgr; + ModestWindowMgr *mgr = NULL; gchar *signature = NULL; g_return_if_fail (user_data != NULL); @@ -720,7 +875,7 @@ reply_forward_cb (ModestMailOperation *mail_op, goto cleanup; } - account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(), + account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(), rf_helper->account_name, TNY_ACCOUNT_TYPE_STORE); if (!account) { @@ -728,33 +883,26 @@ reply_forward_cb (ModestMailOperation *mail_op, goto cleanup; } - folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS); - if (!folder) { - g_printerr ("modest: failed to find Drafts folder\n"); - goto cleanup; - } - - tny_folder_add_msg (folder, msg, &err); - if (err) { - g_printerr ("modest: error adding msg to Drafts folder: %s", - err->message); - g_error_free (err); - goto cleanup; - } - - /* Create and register the windows */ + /* Create and register the windows */ msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name); mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, msg_win); + if (rf_helper->parent_window != NULL) { + gdouble parent_zoom; + + parent_zoom = modest_window_get_zoom (MODEST_WINDOW (rf_helper->parent_window)); + modest_window_set_zoom (msg_win, parent_zoom); + } + /* Show edit window */ gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: + if (msg_win) + g_object_unref (msg_win); if (new_msg) g_object_unref (G_OBJECT (new_msg)); - if (folder) - g_object_unref (G_OBJECT (folder)); if (account) g_object_unref (G_OBJECT (account)); g_object_unref (msg); @@ -774,11 +922,11 @@ static gboolean download_uncached_messages (TnyList *header_list, GtkWindow *win) { TnyIterator *iter; - gboolean found, retval; + gboolean retval; + gint uncached_messages = 0; iter = tny_list_create_iterator (header_list); - found = FALSE; - while (!tny_iterator_is_done (iter) && !found) { + while (!tny_iterator_is_done (iter)) { TnyHeader *header; TnyHeaderFlags flags; @@ -787,7 +935,8 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win) /* TODO: is this the right flag?, it seems that some headers that have been previously downloaded do not come with it */ - found = !(flags & TNY_HEADER_FLAG_CACHED); + if (! (flags & TNY_HEADER_FLAG_CACHED)) + uncached_messages ++; g_object_unref (header); tny_iterator_next (iter); } @@ -795,11 +944,13 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win) /* Ask for user permission to download the messages */ retval = TRUE; - if (found) { + if (uncached_messages > 0) { GtkResponseType response; response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - _("mcen_nc_get_multi_msg_txt")); + ngettext("mcen_nc_get_msg", + "mcen_nc_get_msgs", + uncached_messages)); if (response == GTK_RESPONSE_CANCEL) retval = FALSE; } @@ -821,6 +972,12 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) g_return_if_fail (MODEST_IS_WINDOW(win)); + /* we need an account when editing */ + if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { + run_account_setup_wizard (win); + return; + } + header_list = get_selected_headers (win); if (!header_list) return; @@ -846,6 +1003,8 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) rf_helper->reply_forward_type = reply_forward_type; rf_helper->action = action; rf_helper->account_name = g_strdup (modest_window_get_active_account (win)); + if ((win != NULL) && (MODEST_IS_WINDOW (win))) + rf_helper->parent_window = GTK_WIDGET (win); if (!rf_helper->account_name) rf_helper->account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); @@ -857,7 +1016,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) reply_forward_cb must do it */ msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win)); header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW(win)); - if (!msg || !header) { + if (!msg || !header) { if (msg) g_object_unref (msg); if (header) @@ -868,7 +1027,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) reply_forward_cb (NULL, header, msg, rf_helper); } else { /* Retrieve messages */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win)); + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT(win), + modest_ui_actions_get_msgs_full_error_handler, + NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msgs_full (mail_op, header_list, @@ -967,6 +1129,17 @@ modest_ui_actions_on_sort (GtkAction *action, } } +static void +new_messages_arrived (ModestMailOperation *self, + gint new_messages, + gpointer user_data) +{ + if (new_messages == 0) + return; + + modest_platform_on_new_msg (); +} + /* * This function performs the send & receive required actions. The * window is used to create the mail operation. Typically it should @@ -993,6 +1166,14 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) acc_name = g_strdup (account_name); } + /* Set send/receive operation in progress */ + modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win)); + + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win)); + g_signal_connect (G_OBJECT(mail_op), "progress-changed", + G_CALLBACK (_on_send_receive_progress_changed), + win); + /* Send & receive. */ /* TODO: The spec wants us to first do any pending deletions, before receiving. */ /* Receive and then send. The operation is tagged initially as @@ -1000,9 +1181,8 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) receive and then a send. The operation changes its type internally, so the progress objects will receive the proper progress information */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_update_account (mail_op, acc_name); + modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, NULL); g_object_unref (G_OBJECT (mail_op)); /* Free */ @@ -1026,9 +1206,9 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) modest_ui_actions_do_send_receive ((const char*) iter->data, win); iter = g_slist_next (iter); } - - g_slist_foreach (account_names, (GFunc) g_free, NULL); - g_slist_free (account_names); + + modest_account_mgr_free_account_names (account_names); + account_names = NULL; } /* @@ -1037,11 +1217,9 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) void modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) { - /* Check that at least one account exists: */ - GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), - TRUE /* enabled accounts only */); - gboolean accounts_exist = account_names != NULL; - g_slist_free (account_names); + /* Check if accounts exist */ + gboolean accounts_exist = + modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); /* If not, allow the user to create an account before trying to send/receive. */ if (!accounts_exist) @@ -1091,19 +1269,27 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, ModestMainWindow *main_window) { g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - + g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + /* If no header has been selected then exit */ if (!header) return; + /* Update focus */ + if (!gtk_widget_is_focus (GTK_WIDGET(header_view))) + gtk_widget_grab_focus (GTK_WIDGET(header_view)); + /* Update Main window title */ - if (GTK_WIDGET_HAS_FOCUS (header_view)) { + if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { const gchar *subject = tny_header_get_subject (header); - if (subject && strcmp (subject, "")) + if (subject && strlen(subject) > 0) gtk_window_set_title (GTK_WINDOW (main_window), subject); else gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject")); } + + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); } void @@ -1136,8 +1322,9 @@ set_active_account_from_tny_account (TnyAccount *account, account store because that is the one that knows the name of the Modest account */ TnyAccount *modest_server_account = modest_server_account = - modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store (), - server_acc_name); + modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store (), + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + server_acc_name); const gchar *modest_acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account); @@ -1145,6 +1332,31 @@ set_active_account_from_tny_account (TnyAccount *account, g_object_unref (modest_server_account); } + +static void +folder_refreshed_cb (const GObject *obj, + TnyFolder *folder, + gpointer user_data) +{ + ModestMainWindow *win = NULL; + GtkWidget *header_view; + + g_return_if_fail (TNY_IS_FOLDER (folder)); + + win = MODEST_MAIN_WINDOW (user_data); + header_view = + modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW); + + /* Check if folder is empty and set headers view contents style */ + if (tny_folder_get_all_count (folder) == 0) { + printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__); + modest_main_window_set_contents_style (win, + MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); + } else { + printf ("DEBUG: %s: tny_folder_get_all_count() returned >0.\n", __FUNCTION__); + } +} + void modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, TnyFolderStore *folder_store, @@ -1153,7 +1365,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, { ModestConf *conf; GtkWidget *header_view; - + g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); header_view = modest_main_window_get_child_widget(main_window, @@ -1164,38 +1376,60 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, conf = modest_runtime_get_conf (); if (TNY_IS_ACCOUNT (folder_store)) { - /* Update active account */ - set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window)); - /* Show account details */ - modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS); - } else if (modest_tny_folder_store_is_virtual_local_folders (folder_store )) { - //TODO: Set the virtual folder store as the "active account" somehow: - modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS); + if (selected) { + /* Update active account */ + set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window)); + /* Show account details */ + modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS); + } } else { if (TNY_IS_FOLDER (folder_store) && selected) { - if (!TNY_IS_MERGE_FOLDER (folder_store)) { /* TnyMergeFolder can have no get_account() implementation. */ - /* Update the active account */ - TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder_store)); + /* Update the active account */ + TnyAccount *account = modest_tny_folder_get_account (TNY_FOLDER (folder_store)); + if (account) { set_active_account_from_tny_account (account, MODEST_WINDOW (main_window)); g_object_unref (account); + account = NULL; } - - /* Set folder on header view */ + + /* Set the header style by default, it could + be changed later by the refresh callback to + empty */ modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); + + /* Set folder on header view. This function + will call tny_folder_refresh_async so we + pass a callback that will be called when + finished. We use that callback to set the + empty view if there are no messages */ modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), - TNY_FOLDER (folder_store)); - modest_widget_memory_restore (conf, G_OBJECT(header_view), + TNY_FOLDER (folder_store), + folder_refreshed_cb, + main_window); + + /* Restore configuration. We need to do this + *after* the set_folder because the widget + memory asks the header view about its + folder */ + modest_widget_memory_restore (modest_runtime_get_conf (), + G_OBJECT(header_view), MODEST_CONF_HEADER_VIEW_KEY); } else { /* Update the active account */ modest_window_set_active_account (MODEST_WINDOW (main_window), NULL); - /* Do not show folder */ - modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); - modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL); + /* Save only if we're seeing headers */ + if (modest_main_window_get_contents_style (main_window) == + MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) + modest_widget_memory_save (conf, G_OBJECT (header_view), + MODEST_CONF_HEADER_VIEW_KEY); + modest_header_view_clear (MODEST_HEADER_VIEW(header_view)); } } + + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); } void @@ -1239,7 +1473,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300); if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { -// modest_platform_connect_and_wait ();; +// modest_platform_connect_and_wait (); } } gtk_widget_destroy (dialog); @@ -1292,6 +1526,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi MsgData *data; gchar *account_name, *from; ModestAccountMgr *account_mgr; + gchar *info_text = NULL; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); @@ -1306,8 +1541,13 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi modest_msg_edit_window_free_msg_data (edit_window, data); return; } + + if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + account_name = g_strdup (data->account_name); + } + transport_account = - TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_tny_account_by_account + TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account (modest_runtime_get_account_store(), account_name, TNY_ACCOUNT_TYPE_TRANSPORT)); @@ -1325,6 +1565,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi modest_mail_operation_save_to_drafts (mail_operation, transport_account, + data->draft_msg, from, data->to, data->cc, @@ -1342,8 +1583,9 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi modest_msg_edit_window_free_msg_data (edit_window, data); - /* Save settings and close the window */ - gtk_widget_destroy (GTK_WIDGET (edit_window)); + info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); + modest_platform_information_banner (NULL, NULL, info_text); + g_free (info_text); } /* For instance, when clicking the Send toolbar button when editing a message: */ @@ -1368,6 +1610,12 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) return; } + MsgData *data = modest_msg_edit_window_get_msg_data (edit_window); + + if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + account_name = g_strdup (data->account_name); + } + /* Get the currently-active transport account for this modest account: */ TnyTransportAccount *transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection @@ -1376,18 +1624,48 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (!transport_account) { g_printerr ("modest: no transport account found for '%s'\n", account_name); g_free (account_name); + modest_msg_edit_window_free_msg_data (edit_window, data); return; } gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); + /* mail content checks and dialogs */ + if (data->subject == NULL || data->subject[0] == '\0') { + GtkResponseType response; + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window), + _("mcen_nc_subject_is_empty_send")); + if (response == GTK_RESPONSE_CANCEL) { + g_free (account_name); + return; + } + } + + if (data->plain_body == NULL || data->plain_body[0] == '\0') { + GtkResponseType response; + gchar *note_message; + gchar *note_subject = data->subject; + if (note_subject == NULL || note_subject[0] == '\0') + note_subject = _("mail_va_no_subject"); + note_message = g_strdup_printf (_("emev_ni_ui_smtp_message_null"), note_subject); + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window), + note_message); + g_free (note_message); + if (response == GTK_RESPONSE_CANCEL) { + g_free (account_name); + return; + } + } + + modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); + /* Create the mail operation */ ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); - MsgData *data = modest_msg_edit_window_get_msg_data (edit_window); modest_mail_operation_send_new_mail (mail_operation, transport_account, + data->draft_msg, from, data->to, data->cc, @@ -1405,6 +1683,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) g_object_unref (G_OBJECT (mail_operation)); modest_msg_edit_window_free_msg_data (edit_window, data); + modest_msg_edit_window_set_sent (edit_window, TRUE); /* Save settings and close the window: */ gtk_widget_destroy (GTK_WIDGET (edit_window)); @@ -1555,46 +1834,6 @@ modest_ui_actions_on_remove_attachments (GtkAction *action, modest_msg_edit_window_remove_attachments (window, NULL); } -/* - * Shows a dialog with an entry that asks for some text. The returned - * value must be freed by the caller. The dialog window title will be - * set to @title. - */ -static gchar * -ask_for_folder_name (GtkWindow *parent_window, - const gchar *title) -{ - GtkWidget *dialog, *entry; - gchar *folder_name = NULL; - - /* Ask for folder name */ - dialog = gtk_dialog_new_with_buttons (_("New Folder Name"), - parent_window, - GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - NULL); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), - gtk_label_new(title), - FALSE, FALSE, 0); - - entry = gtk_entry_new_with_max_length (40); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), - entry, - TRUE, FALSE, 0); - - gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); - - if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); - - gtk_widget_destroy (dialog); - - return folder_name; -} - void modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window) { @@ -1625,26 +1864,20 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo if (result == GTK_RESPONSE_REJECT) { finished = TRUE; } else { - ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window)); + ModestMailOperation *mail_op; TnyFolder *new_folder = NULL; + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, + G_OBJECT(main_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - new_folder = modest_mail_operation_create_folder (mail_op, parent_folder, (const gchar *) folder_name); if (new_folder) { g_object_unref (new_folder); finished = TRUE; - } -/* else { */ -/* /\* TODO: check error and follow proper actions *\/ */ -/* /\* suggested_name = X; *\/ */ -/* /\* Show error to the user *\/ */ -/* modest_platform_run_information_dialog (GTK_WINDOW (main_window), */ -/* _("mail_in_ui_folder_create_error")); */ -/* } */ + } g_object_unref (mail_op); } g_free (folder_name); @@ -1680,17 +1913,21 @@ modest_ui_actions_on_rename_folder (GtkAction *action, if (folder && TNY_IS_FOLDER (folder)) { gchar *folder_name; - folder_name = ask_for_folder_name (GTK_WINDOW (main_window), - _("Please enter a new name for the folder")); + gint response; + const gchar *current_name; + + current_name = tny_folder_get_name (TNY_FOLDER (folder)); + response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), NULL, + current_name, &folder_name); - if (folder_name != NULL && strlen (folder_name) > 0) { + if (response == GTK_RESPONSE_OK && strlen (folder_name) > 0) { ModestMailOperation *mail_op; mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL); + modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), @@ -1704,6 +1941,17 @@ modest_ui_actions_on_rename_folder (GtkAction *action, } static void +modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op, + gpointer user_data) +{ + GObject *win = modest_mail_operation_get_source (mail_op); + + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + _("mail_in_ui_folder_delete_error")); + g_object_unref (win); +} + +static void delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) { TnyFolderStore *folder; @@ -1735,17 +1983,15 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) g_free (message); if (response == GTK_RESPONSE_OK) { - ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(main_window)); + ModestMailOperation *mail_op = + modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_DELETE, + G_OBJECT(main_window), + modest_ui_actions_delete_folder_error_handler, + NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash); - - /* Show error if happened */ - if (modest_mail_operation_get_error (mail_op)) - modest_platform_run_information_dialog (GTK_WINDOW (main_window), - _("mail_in_ui_folder_delete_error")); - g_object_unref (G_OBJECT (mail_op)); } @@ -1815,6 +2061,11 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gchar *server_name = modest_server_account_get_hostname ( modest_runtime_get_account_mgr(), server_account_name); + if (!server_name) {/* This happened once, though I don't know why. murrayc. */ + g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name); + *cancel = TRUE; + return; + } /* This causes a warning because the logical ID has no %s in it, * though the translation does, but there is not much we can do about that: */ @@ -1900,12 +2151,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, const gboolean username_was_changed = (strcmp (*username, initial_username) != 0); if (username_was_changed) { - /* To actually use a changed username, - * we must reset the connection, according to pvanhoof. - * This _might_ be a sensible way to do that: */ - TnyDevice *device = modest_runtime_get_device(); - tny_device_force_offline (device); - tny_device_force_online (device); + g_warning ("%s: tinymail does not yet support changing the " + "username in the get_password() callback.\n", __FUNCTION__); } } @@ -1944,7 +2191,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_widget_destroy (dialog); - printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel); + /* printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel); */ } void @@ -1960,9 +2207,13 @@ modest_ui_actions_on_cut (GtkAction *action, GtkTextBuffer *buffer; GtkClipboard *clipboard; - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE); + } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { + modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget)); + } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { + modest_folder_view_cut_selection (MODEST_FOLDER_VIEW (focused_widget)); } } @@ -1973,27 +2224,63 @@ modest_ui_actions_on_copy (GtkAction *action, GtkClipboard *clipboard; GtkWidget *focused_widget; - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); + if (GTK_IS_LABEL (focused_widget)) { gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1); } else if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget)); } else if (GTK_IS_TEXT_VIEW (focused_widget)) { GtkTextBuffer *buffer; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); gtk_text_buffer_copy_clipboard (buffer, clipboard); - } + modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget)); + } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { + TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget)); + TnyIterator *iter = tny_list_create_iterator (header_list); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *folder = tny_header_get_folder (header); + TnyAccount *account = tny_folder_get_account (folder); + const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); + /* If it's POP then ask */ + gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE; + g_object_unref (account); + g_object_unref (folder); + g_object_unref (header); + g_object_unref (iter); + + /* Check that the messages have been previously downloaded */ + gboolean continue_download = TRUE; + if (ask) + continue_download = download_uncached_messages (header_list, GTK_WINDOW (window)); + if (continue_download) + modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget)); + g_object_unref (header_list); + } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { + modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget)); + } + + /* Show information banner */ + modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied")); + } void modest_ui_actions_on_undo (GtkAction *action, ModestWindow *window) { + ModestEmailClipboard *clipboard = NULL; + if (MODEST_IS_MSG_EDIT_WINDOW (window)) { modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window)); - } else { + } if (MODEST_IS_MAIN_WINDOW (window)) { + /* Clear clipboard source */ + clipboard = modest_runtime_get_email_clipboard (); + modest_email_clipboard_clear (clipboard); + } + else { g_return_if_reached (); } } @@ -2003,6 +2290,7 @@ modest_ui_actions_on_paste (GtkAction *action, ModestWindow *window) { GtkWidget *focused_widget; + ModestMailOperation *mail_op = NULL; focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); if (GTK_IS_EDITABLE (focused_widget)) { @@ -2011,9 +2299,55 @@ modest_ui_actions_on_paste (GtkAction *action, GtkTextBuffer *buffer; GtkClipboard *clipboard; - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE); + } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { + ModestEmailClipboard *clipboard = NULL; + TnyFolder *src_folder = NULL; + TnyFolderStore *folder_store = NULL; + TnyList *data = NULL; + gboolean delete = FALSE; + + /* Check clipboard source */ + clipboard = modest_runtime_get_email_clipboard (); + if (modest_email_clipboard_cleared (clipboard)) + return; + + /* Get elements to paste */ + modest_email_clipboard_get_data (clipboard, &src_folder, &data, &delete); + + /* Create a new mail operation */ + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Get destination folder */ + folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget)); + + /* transfer messages */ + if (data != NULL) { + modest_mail_operation_xfer_msgs (mail_op, + data, + TNY_FOLDER (folder_store), + delete, + NULL, + NULL); + + } else if (src_folder != NULL) { + modest_mail_operation_xfer_folder (mail_op, + src_folder, + folder_store, + delete); + } + + /* Free */ + if (data != NULL) + g_object_unref (data); + if (src_folder != NULL) + g_object_unref (src_folder); + if (folder_store != NULL) + g_object_unref (folder_store); } } @@ -2038,7 +2372,24 @@ modest_ui_actions_on_select_all (GtkAction *action, gtk_text_buffer_get_start_iter (buffer, &start); gtk_text_buffer_get_end_iter (buffer, &end); gtk_text_buffer_select_range (buffer, &start, &end); + } else if (GTK_IS_HTML (focused_widget)) { + gtk_html_select_all (GTK_HTML (focused_widget)); + } else if (MODEST_IS_MAIN_WINDOW (window)) { + GtkWidget *header_view = focused_widget; + GtkTreeSelection *selection = NULL; + + if (!(MODEST_IS_HEADER_VIEW (focused_widget))) + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_WIDGET_TYPE_HEADER_VIEW); + + /* Select all messages */ + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view)); + gtk_tree_selection_select_all (selection); + + /* Set focuse on header view */ + gtk_widget_grab_focus (header_view); } + } void @@ -2230,15 +2581,20 @@ modest_ui_actions_on_details (GtkAction *action, folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_WIDGET_TYPE_FOLDER_VIEW); if (gtk_widget_is_focus (folder_view)) { - TnyFolder *folder; - - folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - + TnyFolderStore *folder_store + = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + if (!folder_store) { + g_warning ("%s: No item was selected.\n", __FUNCTION__); + return; + } /* Show only when it's a folder */ - if (!folder || !TNY_IS_FOLDER (folder)) - return; + /* This function should not be called for account items, + * because we dim the menu item for them. */ + if (TNY_IS_FOLDER (folder_store)) { + show_folder_details (TNY_FOLDER (folder_store), GTK_WINDOW (win)); + } - show_folder_details (folder, GTK_WINDOW (win)); + g_object_unref (folder_store); } else { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), @@ -2366,9 +2722,19 @@ create_move_to_dialog (ModestWindow *win, GTK_POLICY_AUTOMATIC); /* Create folder view */ - *tree_view = modest_folder_view_new (NULL); - gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view), - gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view))); + *tree_view = modest_platform_create_folder_view (NULL); + + /* It could happen that we're trying to move a message from a + window (msg window for example) after the main window was + closed, so we can not just get the model of the folder + view */ + if (MODEST_IS_FOLDER_VIEW (folder_view)) + gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view), + gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view))); + else + modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), + TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + gtk_container_add (GTK_CONTAINER (scroll), *tree_view); /* Add scroll to dialog */ @@ -2377,6 +2743,9 @@ create_move_to_dialog (ModestWindow *win, gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + /* Select INBOX or local account */ + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (*tree_view)); + return dialog; } @@ -2434,21 +2803,21 @@ msgs_move_to_confirmation (GtkWindow *win, g_object_unref (header); g_object_unref (iter); + /* if no src_folder, message may be an attahcment */ + if (src_folder == NULL) + return GTK_RESPONSE_CANCEL; + /* If the source is a remote folder */ if (!modest_tny_folder_is_local_folder (src_folder)) { const gchar *message; - if (tny_list_get_length (headers) == 1) - if (has_retrieved_msgs (headers)) - message = _("mcen_nc_move_retrieve"); - else - message = _("mcen_nc_move_header"); - else - if (has_retrieved_msgs (headers)) - message = _("mcen_nc_move_retrieves"); - else - message = _("mcen_nc_move_headers"); - + if (has_retrieved_msgs (headers)) + message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves", + tny_list_get_length (headers)); + else + message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers", + tny_list_get_length (headers)); + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), (const gchar *) message); } @@ -2459,29 +2828,29 @@ msgs_move_to_confirmation (GtkWindow *win, static void -tranasfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data) +transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data) { ModestMsgViewWindow *self = NULL; - gboolean found = FALSE; g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object)); self = MODEST_MSG_VIEW_WINDOW (object); - found = modest_msg_view_window_select_first_message (self); - g_return_if_fail (found); + /* If there are not more messages don't do anything. The + viewer will show the same message */ + if (!modest_msg_view_window_select_first_message (self)) + return; } -static void -move_to_error_checking (const GObject *obj, gpointer user_data) +void +modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, + gpointer user_data) { - ModestWindow *win = NULL; - - g_return_if_fail (MODEST_IS_WINDOW (obj)); - win = MODEST_WINDOW (obj); + GObject *win = modest_mail_operation_get_source (mail_op); /* TODO: show error message */ -/* modest_platform_run_information_dialog (GTK_WINDOW (win), */ -/* _("mail_in_ui_folder_move_target_error")); */ + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + _("mail_in_ui_folder_move_target_error")); + g_object_unref (win); } /* @@ -2510,6 +2879,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, /* Create and run the dialog */ dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view); + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); result = gtk_dialog_run (GTK_DIALOG(dialog)); g_object_ref (tree_view); @@ -2528,21 +2898,22 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); /* Clean folder on header view before moving it */ - modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), NULL); + modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); if (TNY_IS_FOLDER (src_folder)) { - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), - move_to_error_checking); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); + mail_op = + modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT(win), + modest_ui_actions_move_folder_error_handler, + NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_xfer_folder (mail_op, TNY_FOLDER (src_folder), folder_store, TRUE); + /* Unref mail operation */ g_object_unref (G_OBJECT (mail_op)); - } /* Frees */ @@ -2571,14 +2942,15 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, TRUE, NULL, NULL); + g_object_unref (G_OBJECT (mail_op)); } g_object_unref (headers); } } - g_object_unref (folder_store); - end: + if (folder_store != NULL) + g_object_unref (folder_store); gtk_widget_destroy (dialog); } @@ -2599,8 +2971,11 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, /* Get the folder view */ main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (main_window) + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); + else + folder_view = NULL; /* Create and run the dialog */ dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view); @@ -2615,6 +2990,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, /* Create header list */ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + headers = tny_simple_list_new (); tny_list_prepend (headers, G_OBJECT (header)); g_object_unref (header); @@ -2638,10 +3014,10 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, headers, TNY_FOLDER (folder_store), TRUE, - tranasfer_msgs_from_viewer_cb, + transfer_msgs_from_viewer_cb, NULL); g_object_unref (G_OBJECT (mail_op)); - } + } g_object_unref (headers); g_object_unref (folder_store); } @@ -2674,22 +3050,34 @@ do_headers_action (ModestWindow *win, { TnyList *headers_list; TnyIterator *iter; + TnyHeader *header; + TnyFolder *folder; /* Get headers */ headers_list = get_selected_headers (win); if (!headers_list) return; - /* Call the function for each header */ + /* Get the folder */ iter = tny_list_create_iterator (headers_list); - while (!tny_iterator_is_done (iter)) { - TnyHeader *header; + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = tny_header_get_folder (header); + g_object_unref (header); + /* Call the function for each header */ + while (!tny_iterator_is_done (iter)) { header = TNY_HEADER (tny_iterator_get_current (iter)); func (header, win, user_data); g_object_unref (header); tny_iterator_next (iter); } + + /* Trick: do a poke status in order to speed up the signaling + of observers */ + tny_folder_poke_status (folder); + + /* Frees */ + g_object_unref (folder); g_object_unref (iter); g_object_unref (headers_list); } @@ -2723,7 +3111,7 @@ modest_ui_actions_remove_attachments (GtkAction *action, ModestWindow *window) { if (MODEST_IS_MSG_VIEW_WINDOW (window)) { - modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window), NULL); + modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window)); } else { /* not supported window for this action */ g_return_if_reached (); @@ -2738,7 +3126,7 @@ modest_ui_actions_on_settings (GtkAction *action, dialog = modest_platform_get_global_settings_dialog (); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win)); - gtk_widget_show (dialog); + gtk_widget_show_all (dialog); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -2746,6 +3134,62 @@ modest_ui_actions_on_settings (GtkAction *action, } void +modest_ui_actions_on_help (GtkAction *action, + ModestWindow *win) +{ + const gchar *help_id = NULL; + + if (MODEST_IS_MAIN_WINDOW (win)) { + const gchar *action_name; + action_name = gtk_action_get_name (action); + + if (!strcmp (action_name, "FolderViewCSMHelp") || + !strcmp (action_name, "HeaderViewCSMHelp")) { + GtkWidget *folder_view; + TnyFolderStore *folder_store; + /* Get selected folder */ + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Switch help_id */ + if (TNY_IS_FOLDER (folder_store)) { + switch (tny_folder_get_folder_type (TNY_FOLDER (folder_store))) { + case TNY_FOLDER_TYPE_NORMAL: + help_id = "applications_email_userfolder"; + break; + case TNY_FOLDER_TYPE_INBOX: + help_id = "applications_email_inbox"; + break; + case TNY_FOLDER_TYPE_OUTBOX: + help_id = "applications_email_outbox"; + break; + case TNY_FOLDER_TYPE_SENT: + help_id = "applications_email_sent"; + break; + case TNY_FOLDER_TYPE_DRAFTS: + help_id = "applications_email_drafts"; + break; + case TNY_FOLDER_TYPE_ARCHIVE: + help_id = "applications_email_archive"; + break; + default: + help_id = NULL; + } + } + g_object_unref (folder_store); + } else { + help_id = "applications_email_mainview"; + } + } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { + help_id = "applications_email_viewer"; + } else if (MODEST_IS_MSG_EDIT_WINDOW (win)) + help_id = "applications_email_editor"; + + modest_platform_show_help (GTK_WINDOW (win), help_id); +} + +void modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, ModestWindow *window) { @@ -2758,7 +3202,10 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, return; /* Create mail operation */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT (window)); + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT (window), + modest_ui_actions_get_msgs_full_error_handler, + NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL); @@ -2766,3 +3213,132 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, g_object_unref (headers); g_object_unref (mail_op); } + +void +modest_ui_actions_on_email_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_edit_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_view_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_tools_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_attachment_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_toolbar_csm_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_folder_view_csm_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void +modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestToolbarDimmingRules"); +} + +void +modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + modest_platform_show_search_messages (GTK_WINDOW (window)); +} + +void +modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win) +{ + g_return_if_fail (MODEST_IS_WINDOW (win)); + modest_platform_show_addressbook (GTK_WINDOW (win)); +} + + +void +modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); + + modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window), gtk_toggle_action_get_active (action)); +} + +static void +_on_send_receive_progress_changed (ModestMailOperation *mail_op, + ModestMailOperationState *state, + gpointer user_data) +{ + g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data)); + + /* Set send/receive operation finished */ + if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) + modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data)); + +} + +