X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=307a6b95cc06640836eae749f3c8c8e7e343afbc;hp=3780e5baa6dcba3f50e80cc6f5eb856ef9a99bf6;hb=f404ba79e8d272966fd48b2e30fa52b66290afe7;hpb=391b0d19bd75e39f1dd12807a7d0ae1289d06f52 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 3780e5b..307a6b9 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; @@ -139,9 +144,7 @@ static void _on_send_receive_progress_changed (ModestMailOperation *mail_op ModestMailOperationState *state, gpointer user_data); -static gint header_list_count_uncached_msgs ( - TnyList *header_list, - GtkWindow *win); +static gint header_list_count_uncached_msgs (TnyList *header_list); static gboolean connect_to_get_msg ( GtkWindow *win, gint num_of_uncached_msgs); @@ -447,8 +450,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) GtkTreeModel *model = NULL; GtkTreeSelection *sel = NULL; GList *sel_list = NULL, *tmp = NULL; - GtkTreeRowReference *row_reference = NULL; + GtkTreeRowReference *next_row_reference = NULL; + GtkTreeRowReference *prev_row_reference = NULL; GtkTreePath *next_path = NULL; + GtkTreePath *prev_path = NULL; GError *err = NULL; /* Find last selected row */ @@ -458,10 +463,14 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) sel_list = gtk_tree_selection_get_selected_rows (sel, &model); for (tmp=sel_list; tmp; tmp=tmp->next) { if (tmp->next == NULL) { + prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); + + gtk_tree_path_prev (prev_path); gtk_tree_path_next (next_path); - row_reference = gtk_tree_row_reference_new (model, next_path); - gtk_tree_path_free (next_path); + + prev_row_reference = gtk_tree_row_reference_new (model, prev_path); + next_row_reference = gtk_tree_row_reference_new (model, next_path); } } } @@ -470,17 +479,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) modest_window_disable_dimming (MODEST_WINDOW(win)); /* Remove each header. If it's a view window header_view == NULL */ -/* do_headers_action (win, headers_action_delete, header_view); */ modest_do_messages_delete (header_list, win); - /* Enable window dimming management */ gtk_tree_selection_unselect_all (sel); modest_window_enable_dimming (MODEST_WINDOW(win)); - - /* FIXME: May be folder_monitor will also refilter treemode on EXPUNGE changes ? */ - /* refresh the header view (removing marked-as-deleted) */ -/* modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); */ if (MODEST_IS_MSG_VIEW_WINDOW (win)) { modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win)); @@ -493,14 +496,24 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Move cursor to next row */ main_window = win; - /* Select next row */ - if (gtk_tree_row_reference_valid (row_reference)) { - next_path = gtk_tree_row_reference_get_path (row_reference); + /* Select next or previous row */ + if (gtk_tree_row_reference_valid (next_row_reference)) { +/* next_path = gtk_tree_row_reference_get_path (row_reference); */ gtk_tree_selection_select_path (sel, next_path); - gtk_tree_path_free (next_path); } - if (row_reference != NULL) - gtk_tree_row_reference_free (row_reference); + else if (gtk_tree_row_reference_valid (prev_row_reference)) { + gtk_tree_selection_select_path (sel, prev_path); + } + + /* Free */ + if (next_row_reference != NULL) + gtk_tree_row_reference_free (next_row_reference); + if (next_path != NULL) + gtk_tree_path_free (next_path); + if (prev_row_reference != NULL) + gtk_tree_row_reference_free (prev_row_reference); + if (prev_path != NULL) + gtk_tree_path_free (prev_path); } if (err != NULL) { @@ -548,7 +561,9 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * void modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) -{ +{ + ModestWindowMgr *mgr = NULL; + #ifdef MODEST_PLATFORM_MAEMO modest_osso_save_state(); #endif /* MODEST_PLATFORM_MAEMO */ @@ -563,11 +578,16 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) g_debug ("queue has been cleared"); + + /* Check if there are opened editing windows */ + mgr = modest_runtime_get_window_mgr (); + modest_window_mgr_close_all_windows (mgr); + /* note: when modest-tny-account-store is finalized, it will automatically set all network connections to offline */ - gtk_main_quit (); +/* gtk_main_quit (); */ } void @@ -656,12 +676,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 +694,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 +730,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 +775,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); @@ -779,7 +784,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) if (win) gtk_window_set_transient_for (GTK_WINDOW (msg_win), - GTK_WINDOW (win)); + GTK_WINDOW (win)); gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: @@ -818,10 +823,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 +835,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); @@ -863,7 +864,11 @@ open_msg_cb (ModestMailOperation *mail_op, goto cleanup; } win = modest_msg_edit_window_new (msg, account, TRUE); - + + + /* Show banner */ + modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message")); + } else { gchar *uid = modest_tny_folder_get_header_unique_id (header); @@ -1104,9 +1109,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; @@ -1206,9 +1209,7 @@ cleanup: * downloaded (CACHED) then returns TRUE else returns FALSE. */ static gint -header_list_count_uncached_msgs ( - TnyList *header_list, - GtkWindow *win) +header_list_count_uncached_msgs (TnyList *header_list) { TnyIterator *iter; gint uncached_messages = 0; @@ -1292,9 +1293,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (do_retrieve){ gint num_of_unc_msgs; /* check that the messages have been previously downloaded */ - num_of_unc_msgs = header_list_count_uncached_msgs( - header_list, - GTK_WINDOW (win)); + num_of_unc_msgs = header_list_count_uncached_msgs(header_list); /* If there are any uncached message ask the user * whether he/she wants to download them. */ if (num_of_unc_msgs) @@ -1814,10 +1813,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 +1838,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 +1848,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 +1886,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 +1927,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) @@ -2508,6 +2514,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); @@ -2847,8 +2854,7 @@ modest_ui_actions_on_cut (GtkAction *action, gboolean continue_download = FALSE; gint num_of_unc_msgs; - num_of_unc_msgs = header_list_count_uncached_msgs( - header_list, GTK_WINDOW (window)); + num_of_unc_msgs = header_list_count_uncached_msgs(header_list); if (num_of_unc_msgs) continue_download = connect_to_get_msg( @@ -2903,9 +2909,7 @@ modest_ui_actions_on_copy (GtkAction *action, gboolean continue_download = FALSE; gint num_of_unc_msgs; - num_of_unc_msgs = header_list_count_uncached_msgs( - header_list, - GTK_WINDOW (window)); + num_of_unc_msgs = header_list_count_uncached_msgs(header_list); if (num_of_unc_msgs) continue_download = connect_to_get_msg( @@ -2973,6 +2977,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) { @@ -3209,9 +3214,10 @@ modest_ui_actions_on_change_zoom (GtkRadioAction *action, } } -void modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, - GtkRadioAction *selected, - ModestWindow *window) +void +modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, + GtkRadioAction *selected, + ModestWindow *window) { TnyHeaderFlags flags; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); @@ -3220,9 +3226,10 @@ void modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags); } -void modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action, - GtkRadioAction *selected, - ModestWindow *window) +void +modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action, + GtkRadioAction *selected, + ModestWindow *window) { gint file_format; @@ -3441,7 +3448,7 @@ modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle, /* Toggle toolbar */ mgr = modest_runtime_get_window_mgr (); - modest_window_mgr_show_toolbars (mgr, active, fullscreen); + modest_window_mgr_show_toolbars (mgr, G_TYPE_FROM_INSTANCE (window), active, fullscreen); } void @@ -3508,8 +3515,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; @@ -3532,23 +3540,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), @@ -3574,7 +3585,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; } @@ -3605,6 +3616,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 */ @@ -3748,7 +3760,6 @@ has_retrieved_msgs (TnyList *list) * 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) */ @@ -3801,23 +3812,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; @@ -3830,6 +3847,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); @@ -4014,7 +4039,6 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, ModestWindow *win) { TnyList *headers = NULL; - gint response = 0; TnyAccount *dst_account = NULL; const gchar *proto_str = NULL; gboolean dst_is_pop = FALSE; @@ -4049,31 +4073,30 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, return; } - /* Ask for user confirmation */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (dst_folder), - TRUE, - headers); - - /* Transfer messages */ - if (response == GTK_RESPONSE_OK) { - ModestMailOperation *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); + 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)); + } - modest_mail_operation_xfer_msgs (mail_op, - headers, - TNY_FOLDER (dst_folder), - TRUE, - (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL, - NULL); + ModestMailOperation *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); - g_object_unref (G_OBJECT (mail_op)); - } + modest_mail_operation_xfer_msgs (mail_op, + headers, + TNY_FOLDER (dst_folder), + TRUE, + move_to_cb, + inf_note); + + g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); } @@ -4120,6 +4143,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); @@ -4128,14 +4158,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)); } @@ -4343,49 +4378,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))