X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=3780e5baa6dcba3f50e80cc6f5eb856ef9a99bf6;hp=38da460c7a25d27c40c9c7137859089f8f252e2c;hb=391b0d19bd75e39f1dd12807a7d0ae1289d06f52;hpb=e0d1b5a0a857824eaddd2885f3d28fee25310777 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 38da460..3780e5b 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -142,7 +142,7 @@ static void _on_send_receive_progress_changed (ModestMailOperation *mail_op static gint header_list_count_uncached_msgs ( TnyList *header_list, GtkWindow *win); -static gboolean download_uncached_messages ( +static gboolean connect_to_get_msg ( GtkWindow *win, gint num_of_uncached_msgs); @@ -1235,12 +1235,11 @@ header_list_count_uncached_msgs ( * messages. Returns TRUE if the user allowed the download. */ static gboolean -download_uncached_messages ( - GtkWindow *win, - gint num_of_uncached_msgs) +connect_to_get_msg (GtkWindow *win, + gint num_of_uncached_msgs) { /* Allways download if we are online. */ - if (tny_device_is_online (modest_runtime_get_device())) + if (tny_device_is_online (modest_runtime_get_device ())) return TRUE; /* If offline, then ask for user permission to download the messages */ @@ -1299,7 +1298,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) /* If there are any uncached message ask the user * whether he/she wants to download them. */ if (num_of_unc_msgs) - continue_download = download_uncached_messages ( + continue_download = connect_to_get_msg ( GTK_WINDOW (win), num_of_unc_msgs); } @@ -2461,21 +2460,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)); - 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)); @@ -2484,7 +2478,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; @@ -2493,7 +2496,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); @@ -2535,7 +2537,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, @@ -2553,12 +2556,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))); @@ -2566,7 +2563,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; @@ -2845,7 +2851,7 @@ modest_ui_actions_on_cut (GtkAction *action, header_list, GTK_WINDOW (window)); if (num_of_unc_msgs) - continue_download = download_uncached_messages( + continue_download = connect_to_get_msg( GTK_WINDOW (window), num_of_unc_msgs); @@ -2902,7 +2908,7 @@ modest_ui_actions_on_copy (GtkAction *action, GTK_WINDOW (window)); if (num_of_unc_msgs) - continue_download = download_uncached_messages( + continue_download = connect_to_get_msg( GTK_WINDOW (window), num_of_unc_msgs); @@ -2918,7 +2924,7 @@ modest_ui_actions_on_copy (GtkAction *action, } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget)); - } + } /* Show information banner if there was a copy to clipboard */ if(copied) @@ -3483,6 +3489,128 @@ create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data) GTK_WIDGET (user_data)); } +/* + * This function is used to track changes in the selection of the + * folder view that is inside the "move to" dialog to enable/disable + * the OK button because we do not want the user to select a disallowed + * destination for a folder. + * The user also not desired to be able to use NEW button on items where + * folder creation is not possibel. + */ +static void +on_move_to_dialog_folder_selection_changed (ModestFolderView* self, + TnyFolderStore *folder_store, + gboolean selected, + gpointer user_data) +{ + GtkWidget *dialog = NULL; + GtkWidget *ok_button = NULL, *new_button = NULL; + GList *children = NULL; + gboolean ok_sensitive = TRUE, new_sensitive = TRUE; + gboolean moving_folder = FALSE; + gboolean is_remote_account = FALSE; + GtkWidget *folder_view = NULL; + + if (!selected) + return; + + /* Get the OK button */ + dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG); + if (!dialog) + return; + + children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + ok_button = GTK_WIDGET (children->next->next->data); + new_button = GTK_WIDGET (children->next->data); + g_list_free (children); + + /* check if folder_store is an remote account */ + if (TNY_IS_ACCOUNT (folder_store)) { + TnyAccount *local_account = NULL; + ModestTnyAccountStore *account_store = NULL; + + 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; + 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) + new_sensitive = FALSE; + + /* If it */ + if (MODEST_IS_MAIN_WINDOW (user_data)) { + /* Get the widgets */ + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (gtk_widget_is_focus (folder_view)) + moving_folder = TRUE; + } + + if (moving_folder) { + TnyFolderStore *moved_folder = NULL, *parent = NULL; + + /* Get the folder to move */ + moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Check that we're not moving to the same folder */ + if (TNY_IS_FOLDER (moved_folder)) { + parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder)); + if (parent == folder_store) + ok_sensitive = FALSE; + g_object_unref (parent); + } + + 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) + ok_sensitive = FALSE; + } + + if (ok_sensitive && (moved_folder == folder_store)) { + /* Do not allow to move to itself */ + ok_sensitive = FALSE; + } + g_object_unref (moved_folder); + } else { + TnyHeader *header = NULL; + TnyFolder *src_folder = NULL; + + /* Moving a message */ + if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) { + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (user_data)); + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } else { + src_folder = + TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view))); + } + + /* Do not allow to move the msg to the same folder */ + /* Do not allow to move the msg to an account */ + if ((gpointer) src_folder == (gpointer) folder_store || + TNY_IS_ACCOUNT (folder_store)) + ok_sensitive = FALSE; + g_object_unref (src_folder); + } + + /* Set sensitivity of the OK button */ + gtk_widget_set_sensitive (ok_button, ok_sensitive); + /* Set sensitivity of the NEW button */ + gtk_widget_set_sensitive (new_button, new_sensitive); +} + static GtkWidget* create_move_to_dialog (GtkWindow *win, GtkWidget *folder_view, @@ -3512,6 +3640,15 @@ create_move_to_dialog (GtkWindow *win, /* Create folder view */ *tree_view = modest_platform_create_folder_view (NULL); + /* Track changes in the selection to + * disable the OK button whenever "Move to" is not possible + * disbale NEW button whenever New is not possible */ + g_signal_connect (*tree_view, + "folder_selection_changed", + G_CALLBACK (on_move_to_dialog_folder_selection_changed), + win); + + /* Listen to clicks on New button */ g_signal_connect (G_OBJECT (new_button), "clicked", G_CALLBACK(create_move_to_dialog_on_new_folder), @@ -3607,8 +3744,13 @@ has_retrieved_msgs (TnyList *list) /* * Shows a confirmation dialog to the user when we're moving messages * from a remote server to the local storage. Returns the dialog - * response. If it's other kind of movement the it always returns + * response. If it's other kind of movement then it always returns * GTK_RESPONSE_OK + * + * This one is used by the next functions: + * modest_ui_actions_xfer_messages_from_move_to + * modest_ui_actions_on_paste - commented out + * drag_and_drop_from_header_view (for d&d in modest_folder_view.c) */ gint msgs_move_to_confirmation (GtkWindow *win, @@ -3618,54 +3760,41 @@ msgs_move_to_confirmation (GtkWindow *win, { gint response = GTK_RESPONSE_OK; - /* If the destination is a local folder (or MMC folder )*/ - if (!modest_tny_folder_is_remote_folder (dest_folder)) { - - gboolean is_online; - TnyDevice *device; - - TnyFolder *src_folder = NULL; - TnyIterator *iter = NULL; - TnyHeader *header = NULL; - - /* get the device */ - - device = modest_runtime_get_device (); - if (device) - is_online = tny_device_is_online (device); - else { - g_warning ("failed to get tny device"); /* should not happend */ - is_online = FALSE; - } - - /* Get source folder */ - iter = tny_list_create_iterator (headers); - header = TNY_HEADER (tny_iterator_get_current (iter)); - if (header) { - src_folder = tny_header_get_folder (header); - g_object_unref (header); - } + /* return with OK if the destination is a remote folder */ + if (modest_tny_folder_is_remote_folder (dest_folder)) + return GTK_RESPONSE_OK; - g_object_unref (iter); + TnyFolder *src_folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; - /* if no src_folder, message may be an attahcment */ - if (src_folder == NULL) - return GTK_RESPONSE_CANCEL; + /* Get source folder */ + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + if (header) { + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } + g_object_unref (iter); - /* If the source is a remote folder */ - if (!is_online && modest_tny_folder_is_remote_folder (src_folder)) { + /* if no src_folder, message may be an attahcment */ + if (src_folder == NULL) + return GTK_RESPONSE_CANCEL; - const gchar *message = NULL; - message = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", - tny_list_get_length (headers)); - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - (const gchar *) message); - } else - response = GTK_RESPONSE_OK; - + /* If the source is a local or MMC folder */ + if (!modest_tny_folder_is_remote_folder (src_folder)) { g_object_unref (src_folder); + return GTK_RESPONSE_OK; } - + g_object_unref (src_folder); + + /* now if offline we ask the user */ + if(connect_to_get_msg( GTK_WINDOW (win), + tny_list_get_length (headers))) + response = GTK_RESPONSE_OK; + else + response = GTK_RESPONSE_CANCEL; + return response; } @@ -3958,61 +4087,71 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, TnyFolderStore *dst_folder, ModestMainWindow *win) { - GtkWidget *header_view = NULL; + ModestHeaderView *header_view = NULL; ModestMailOperation *mail_op = NULL; TnyFolderStore *src_folder; + gboolean online = (tny_device_is_online (modest_runtime_get_device())); g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); /* Get the source folder */ src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Offer the connection dialog if necessary, if the source folder is in a networked account: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), - src_folder)) - goto end; /* Get header view */ - header_view = - modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW); + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW)); /* Get folder or messages to transfer */ if (gtk_widget_is_focus (folder_view)) { GtkTreeSelection *sel; + gboolean do_xfer = TRUE; /* Allow only to transfer folders to the local root folder */ if (TNY_IS_ACCOUNT (dst_folder) && - !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) - goto end; - - /* 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); - - if (TNY_IS_FOLDER (src_folder)) { - 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), - dst_folder, - TRUE, NULL, NULL); - /* Unref mail operation */ - g_object_unref (G_OBJECT (mail_op)); - } else { - g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); - } - } else if (gtk_widget_is_focus (header_view)) { - /* Transfer messages */ - modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) { + do_xfer = FALSE; + } else if (!TNY_IS_FOLDER (src_folder)) { + g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); + do_xfer = FALSE; + } else if (!online && modest_platform_is_network_folderstore(src_folder)) { + guint num_headers = tny_folder_get_all_count(TNY_FOLDER(src_folder)); + if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + do_xfer = FALSE; + } + } + + if (do_xfer) { + /* 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); + + 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), + dst_folder, + TRUE, NULL, NULL); + /* Unref mail operation */ + g_object_unref (G_OBJECT (mail_op)); + } + } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { + gboolean do_xfer = TRUE; + /* Ask for confirmation if the source folder is remote and we're not connected */ + if (!online && modest_platform_is_network_folderstore(src_folder)) { + guint num_headers = modest_header_view_count_selected_headers(header_view); + if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + do_xfer = FALSE; + } + } + if (do_xfer) /* Transfer messages */ + modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); } - - end: + if (src_folder) g_object_unref (src_folder); } @@ -4028,16 +4167,18 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, ModestMsgViewWindow *win) { TnyHeader *header = NULL; - TnyFolder *src_folder; + TnyFolderStore *src_folder; /* Create header list */ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - src_folder = tny_header_get_folder(header); + src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header)); g_object_unref (header); - /* Transfer the message */ - if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder))) + /* Transfer the message if online or confirmed by the user */ + if (tny_device_is_online (modest_runtime_get_device()) || + (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) { modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + } g_object_unref (src_folder); } @@ -4080,21 +4221,18 @@ modest_ui_actions_on_move_to (GtkAction *action, return; dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view)); - /* Offer the connection dialog if necessary: */ - if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), - dst_folder)) { - - /* Do window specific stuff */ - if (MODEST_IS_MAIN_WINDOW (win)) - modest_ui_actions_on_main_window_move_to (action, - folder_view, - dst_folder, - MODEST_MAIN_WINDOW (win)); - else - modest_ui_actions_on_msg_view_window_move_to (action, - dst_folder, - MODEST_MSG_VIEW_WINDOW (win)); - } + /* Do window specific stuff */ + if (MODEST_IS_MAIN_WINDOW (win)) { + modest_ui_actions_on_main_window_move_to (action, + folder_view, + dst_folder, + MODEST_MAIN_WINDOW (win)); + } else { + modest_ui_actions_on_msg_view_window_move_to (action, + dst_folder, + MODEST_MSG_VIEW_WINDOW (win)); + } + if (dst_folder) g_object_unref (dst_folder); }