X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=af25fa3912e53bd03d8d642572c805407f9a11bc;hp=52185168cc6f02b5e4e6eb57b9b0f07c81dfcd47;hb=8df610f0be41b018033b2143018f54ff732736eb;hpb=706edd7e97d7e319c03249acb0fc2d98f89e471d diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 5218516..af25fa3 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -1,5 +1,5 @@ /* Copyright (c) 2006, Nokia Corporation - * All rights reserved. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -103,6 +103,11 @@ typedef struct _ReplyForwardHelper { GtkWidget *parent_window; } ReplyForwardHelper; +typedef struct _MoveToHelper { + ModestMailOperation *mail_op; + TnyFolder *folder; +} MoveToHelper; + typedef struct _PasteAsAttachmentHelper { ModestMsgEditWindow *window; GtkWidget *banner; @@ -656,12 +661,9 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) static void on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) { - ModestWindow *main_window = MODEST_WINDOW (user_data); - /* Save any changes. */ modest_connection_specific_smtp_window_save_server_accounts ( - MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window), - modest_window_get_active_account (main_window)); + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window)); gtk_widget_destroy (GTK_WIDGET (window)); } @@ -677,22 +679,10 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ /* Create the window if necessary: */ - const gchar *active_account_name = modest_window_get_active_account (win); - - /* TODO: Dim the menu item (not in the UI spec)? or show a warning, - * or show the default account? - * If we show the default account then the account name should be shown in - * the window when we show it. */ - if (!active_account_name) { - g_warning ("%s: No account is active.", __FUNCTION__); - return; - } - GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); modest_connection_specific_smtp_window_fill_with_connections ( MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), - modest_runtime_get_account_mgr(), - active_account_name); + modest_runtime_get_account_mgr()); /* Show the window: */ gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win)); @@ -725,9 +715,9 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) return; } - 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) - 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) { g_printerr ("modest: no account found\n"); goto cleanup; @@ -770,7 +760,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) goto cleanup; } - + /* Create and register edit window */ /* This is destroyed by TODO. */ msg_win = modest_msg_edit_window_new (msg, account_name, FALSE); @@ -818,10 +808,7 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, } static void -open_msg_cb (ModestMailOperation *mail_op, - TnyHeader *header, - TnyMsg *msg, - gpointer user_data) +open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpointer user_data) { ModestWindowMgr *mgr = NULL; ModestWindow *parent_win = NULL; @@ -833,9 +820,8 @@ open_msg_cb (ModestMailOperation *mail_op, /* Do nothing if there was any problem with the mail operation. The error will be shown by the error_handler of the mail operation */ - if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { + if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) return; - } parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op); folder = tny_header_get_folder (header); @@ -1104,9 +1090,7 @@ free_reply_forward_helper (gpointer data) } static void -reply_forward_cb (ModestMailOperation *mail_op, - TnyHeader *header, - TnyMsg *msg, +reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpointer user_data) { TnyMsg *new_msg; @@ -1814,10 +1798,20 @@ set_active_account_from_tny_account (TnyAccount *account, modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store (), MODEST_TNY_ACCOUNT_STORE_QUERY_ID, server_acc_name); + if (!modest_server_account) { + g_warning ("%s: could not get tny account\n", __FUNCTION__); + return; + } + + /* Update active account, but only if it's not a pseudo-account */ + if ((!modest_tny_account_is_virtual_local_folders(modest_server_account)) && + (!modest_tny_account_is_memory_card_account(modest_server_account))) { + const gchar *modest_acc_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account); + if (modest_acc_name) + modest_window_set_active_account (window, modest_acc_name); + } - const gchar *modest_acc_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account); - modest_window_set_active_account (window, modest_acc_name); g_object_unref (modest_server_account); } @@ -1829,7 +1823,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; - TnyFolder *current_folder; gboolean folder_empty = FALSE; gboolean all_marked_as_deleted = FALSE; @@ -1840,24 +1833,22 @@ folder_refreshed_cb (ModestMailOperation *mail_op, modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW); if (header_view) { + TnyFolder *current_folder; + current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view)); if (current_folder != NULL && folder != current_folder) { + g_object_unref (current_folder); return; } + g_object_unref (current_folder); } /* Check if folder is empty and set headers view contents style */ folder_empty = (tny_folder_get_all_count (folder) == 0); all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view)); - folder_empty = folder_empty || all_marked_as_deleted ; - if (folder_empty) { - - printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__); + if (folder_empty || all_marked_as_deleted) 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 @@ -1880,8 +1871,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, if (TNY_IS_ACCOUNT (folder_store)) { 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); } @@ -1921,7 +1912,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, MODEST_CONF_HEADER_VIEW_KEY); } else { /* Update the active account */ - modest_window_set_active_account (MODEST_WINDOW (main_window), NULL); + //modest_window_set_active_account (MODEST_WINDOW (main_window), NULL); /* Save only if we're seeing headers */ if (modest_main_window_get_contents_style (main_window) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) @@ -2460,21 +2451,16 @@ modest_ui_actions_on_rename_folder (GtkAction *action, return; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!folder) - return; - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { - g_object_unref (G_OBJECT (folder)); + if (!folder) return; - } - if (TNY_IS_FOLDER (folder)) { gchar *folder_name; gint response; const gchar *current_name; TnyFolderStore *parent; + gboolean do_rename = TRUE; current_name = tny_folder_get_name (TNY_FOLDER (folder)); parent = tny_folder_get_folder_store (TNY_FOLDER (folder)); @@ -2483,7 +2469,16 @@ modest_ui_actions_on_rename_folder (GtkAction *action, &folder_name); g_object_unref (parent); - if (response == GTK_RESPONSE_ACCEPT && strlen (folder_name) > 0) { + if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) { + do_rename = FALSE; + } else if (modest_platform_is_network_folderstore(folder) && + !tny_device_is_online (modest_runtime_get_device())) { + TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); + do_rename = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); + g_object_unref(account); + } + + if (do_rename) { ModestMailOperation *mail_op; GtkTreeSelection *sel = NULL; @@ -2492,7 +2487,6 @@ modest_ui_actions_on_rename_folder (GtkAction *action, G_OBJECT(main_window), modest_ui_actions_rename_folder_error_handler, main_window); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2505,6 +2499,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action, modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), TNY_FOLDER(folder), TRUE); + /* Actually rename the folder */ modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), (const gchar *) folder_name); @@ -2534,7 +2529,8 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) GtkWidget *folder_view; gint response; gchar *message; - + gboolean do_delete = TRUE; + g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window)); folder_view = modest_main_window_get_child_widget (main_window, @@ -2552,12 +2548,6 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) return ; } - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { - g_object_unref (G_OBJECT (folder)); - return; - } - /* Ask the user */ message = g_strdup_printf (_("mcen_nc_delete_folder_text"), tny_folder_get_name (TNY_FOLDER (folder))); @@ -2565,7 +2555,16 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) (const gchar *) message); g_free (message); - if (response == GTK_RESPONSE_OK) { + if (response != GTK_RESPONSE_OK) { + do_delete = FALSE; + } else if (modest_platform_is_network_folderstore(folder) && + !tny_device_is_online (modest_runtime_get_device())) { + TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); + do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); + g_object_unref(account); + } + + if (do_delete) { ModestMailOperation *mail_op; GtkTreeSelection *sel; @@ -2966,6 +2965,7 @@ paste_msgs_cb (const GObject *object, gpointer user_data) gtk_widget_destroy (GTK_WIDGET(user_data)); } + static void paste_as_attachment_free (gpointer data) { @@ -3501,8 +3501,9 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, GList *children = NULL; gboolean ok_sensitive = TRUE, new_sensitive = TRUE; gboolean moving_folder = FALSE; - gboolean is_remote_account = FALSE; + gboolean is_local_account = TRUE; GtkWidget *folder_view = NULL; + ModestTnyFolderRules rules; if (!selected) return; @@ -3525,23 +3526,26 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, account_store = modest_runtime_get_account_store (); local_account = modest_tny_account_store_get_local_folders_account (account_store); - if ((gpointer) local_account != (gpointer) folder_store) - is_remote_account = TRUE; + if ((gpointer) local_account != (gpointer) folder_store) { + is_local_account = FALSE; + /* New button should be dimmed on remote + account root */ + new_sensitive = FALSE; + } g_object_unref (local_account); } - /* New button should be dimmed on remote account root folder - * and on inbox folder. */ - if (is_remote_account) - new_sensitive = FALSE; - - /* check if folder_store is an rmeote inbox folder */ - if (TNY_IS_FOLDER (folder_store)) - if (tny_folder_get_folder_type(TNY_FOLDER(folder_store)) - == TNY_FOLDER_TYPE_INBOX) + /* Check the target folder rules */ + if (TNY_IS_FOLDER (folder_store)) { + rules = modest_tny_folder_get_rules (TNY_FOLDER (folder_store)); + if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + ok_sensitive = FALSE; new_sensitive = FALSE; + goto end; + } + } - /* If it */ + /* Check if we're moving a folder */ if (MODEST_IS_MAIN_WINDOW (user_data)) { /* Get the widgets */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data), @@ -3567,7 +3571,7 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) { /* Do not allow to move to an account unless it's the local folders account */ - if (is_remote_account) + if (!is_local_account) ok_sensitive = FALSE; } @@ -3598,6 +3602,7 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, g_object_unref (src_folder); } + end: /* Set sensitivity of the OK button */ gtk_widget_set_sensitive (ok_button, ok_sensitive); /* Set sensitivity of the NEW button */ @@ -3794,23 +3799,29 @@ msgs_move_to_confirmation (GtkWindow *win, static void -transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data) +move_to_cb (const GObject *object, gpointer user_data) { ModestMsgViewWindow *self = NULL; + g_return_if_fail (GTK_IS_WIDGET (user_data)); + g_return_if_fail (MODEST_IS_WINDOW (object)); - g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object)); - self = MODEST_MSG_VIEW_WINDOW (object); - - if (!modest_msg_view_window_select_next_message (self)) - if (!modest_msg_view_window_select_previous_message (self)) - /* No more messages to view, so close this window */ - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self)); + if (MODEST_IS_MSG_VIEW_WINDOW (object)) { + self = MODEST_MSG_VIEW_WINDOW (object); + + if (!modest_msg_view_window_select_next_message (self)) + if (!modest_msg_view_window_select_previous_message (self)) + /* No more messages to view, so close this window */ + modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self)); + } + gtk_widget_destroy (GTK_WIDGET(user_data)); } void modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { + ModestMainWindow *main_window = NULL; + GtkWidget *folder_view = NULL; GObject *win = modest_mail_operation_get_source (mail_op); const GError *error = NULL; const gchar *message = NULL; @@ -3823,6 +3834,14 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, message = _("mail_in_ui_folder_move_target_error"); } + /* Disable next automatic folder selection */ + if (MODEST_IS_MAIN_WINDOW (user_data)) { + main_window = MODEST_MAIN_WINDOW(user_data); + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); + modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view)); + } + /* Show notification dialog */ modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message); g_object_unref (win); @@ -4050,6 +4069,14 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, /* Transfer messages */ if (response == GTK_RESPONSE_OK) { + GtkWidget *inf_note; + inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL, + _CS("ckct_nw_pasting")); + if (inf_note != NULL) { + gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); + gtk_widget_show (GTK_WIDGET(inf_note)); + } + ModestMailOperation *mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win), @@ -4062,8 +4089,8 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, headers, TNY_FOLDER (dst_folder), TRUE, - (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL, - NULL); + move_to_cb, + inf_note); g_object_unref (G_OBJECT (mail_op)); } @@ -4113,6 +4140,13 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, } if (do_xfer) { + GtkWidget *inf_note; + inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL, + _CS("ckct_nw_pasting")); + if (inf_note != NULL) { + gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); + gtk_widget_show (GTK_WIDGET(inf_note)); + } /* Clean folder on header view before moving it */ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); gtk_tree_selection_unselect_all (sel); @@ -4121,14 +4155,19 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win), modest_ui_actions_move_folder_error_handler, - NULL); + win); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + /* Select *after* the changes */ + /* TODO: this function hangs UI after transfer */ +/* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ +/* TNY_FOLDER (src_folder), TRUE); */ + modest_mail_operation_xfer_folder (mail_op, TNY_FOLDER (src_folder), dst_folder, - TRUE, NULL, NULL); + TRUE, move_to_cb, inf_note); /* Unref mail operation */ g_object_unref (G_OBJECT (mail_op)); } @@ -4336,49 +4375,42 @@ modest_ui_actions_on_help (GtkAction *action, 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 (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) { - case TNY_FOLDER_TYPE_NORMAL: - help_id = "applications_email_managefolders"; - 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_managefolders"; - break; - default: - help_id = "applications_email_managefolders"; - } - } else { - help_id = "applications_email_mainview"; + 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 (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) { + case TNY_FOLDER_TYPE_NORMAL: + help_id = "applications_email_managefolders"; + 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_managefolders"; + break; + default: + help_id = "applications_email_managefolders"; } - g_object_unref (folder_store); } else { - help_id = "applications_email_mainview"; + help_id = "applications_email_mainview"; } + g_object_unref (folder_store); } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { help_id = "applications_email_viewer"; } else if (MODEST_IS_MSG_EDIT_WINDOW (win))