X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=6c1b443a931f84e67ed1980dc61a37ea8d1e3ffa;hp=1f4b5c5b8ac9e5b3bcce5a1ac1e6bc787be8d783;hb=5c6d0fb527a735c4a53b4041c57c325927fb4cfe;hpb=417ddaf0d4d6e5f5ee2ce1f9be55f64a6b204a83 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 1f4b5c5..6c1b443 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -53,6 +53,7 @@ #include #include #include +#include #endif #ifdef MODEST_PLATFORM_MAEMO @@ -176,6 +177,10 @@ static void modest_ui_actions_on_main_window_move_to (GtkAction *action, GtkWidget *folder_view, TnyFolderStore *dst_folder, ModestMainWindow *win); +static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, + TnyFolderStore *dst_folder, + TnyList *selection, + GtkWindow *win); static void modest_ui_actions_on_window_move_to (GtkAction *action, TnyList *list_to_move, @@ -599,7 +604,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (gtk_widget_is_focus (w)) { - modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win)); + modest_ui_actions_on_delete_folder (action, MODEST_WINDOW(win)); return; } } @@ -3153,7 +3158,6 @@ modest_ui_actions_on_remove_attachments (GtkAction *action, ModestMsgEditWindow *window) { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); - g_return_if_fail (GTK_IS_ACTION (action)); modest_msg_edit_window_remove_attachments (window, NULL); } @@ -3257,18 +3261,20 @@ do_create_folder_cb (ModestMailOperation *mail_op, static void do_create_folder (GtkWindow *parent_window, - TnyFolderStore *parent_folder, + TnyFolderStore *suggested_parent, const gchar *suggested_name) { gint result; gchar *folder_name = NULL; + TnyFolderStore *parent_folder; result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), - parent_folder, + suggested_parent, (gchar *) suggested_name, - &folder_name); + &folder_name, + &parent_folder); - if (result == GTK_RESPONSE_ACCEPT) { + if (result == GTK_RESPONSE_ACCEPT && parent_folder) { ModestMailOperation *mail_op; mail_op = modest_mail_operation_new ((GObject *) parent_window); @@ -3281,6 +3287,7 @@ do_create_folder (GtkWindow *parent_window, folder_name); g_object_unref (mail_op); } + g_object_unref (parent_folder); } static void @@ -3311,7 +3318,19 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, { TnyFolderStore *parent_folder; +#ifdef MODEST_TOOLKIT_HILDON2 + const gchar *active_account; + TnyAccount *account; + + /* In hildon 2.2 we use the current account as default parent */ + active_account = modest_window_get_active_account (MODEST_WINDOW (parent_window)); + account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + active_account, + TNY_ACCOUNT_TYPE_STORE); + parent_folder = TNY_FOLDER_STORE (account); +#else parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); +#endif if (parent_folder) { /* The parent folder will be freed in the callback */ @@ -3321,21 +3340,36 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, create_folder_performer, parent_folder); } +#ifdef MODEST_TOOLKIT_HILDON2 + g_object_unref (parent_folder); +#endif } void -modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window) +modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window) { - GtkWidget *folder_view; - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + g_return_if_fail (MODEST_IS_WINDOW(window)); - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return; + if (MODEST_IS_MAIN_WINDOW (window)) { + GtkWidget *folder_view; + + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; + + modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_FOLDER_WINDOW (window)) { + GtkWidget *folder_view; - modest_ui_actions_create_folder (GTK_WIDGET (main_window), folder_view); + folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window))); + modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view); +#endif + } else { + g_assert_not_reached (); + } } static void @@ -3379,8 +3413,8 @@ on_rename_folder_cb (ModestMailOperation *mail_op, { ModestFolderView *folder_view; - /* If the window was closed when renaming a folder this could - happen */ + /* If the window was closed when renaming a folder, or if + * it's not a main window this will happen */ if (!MODEST_IS_FOLDER_VIEW (user_data)) return; @@ -3409,11 +3443,7 @@ on_rename_folder_performer (gboolean canceled, if (canceled || err) { /* In memory full conditions we could get this error here */ check_memory_full_error ((GtkWidget *) parent_window, err); - } else if (MODEST_IS_MAIN_WINDOW(parent_window)) { - - folder_view = modest_main_window_get_child_widget ( - MODEST_MAIN_WINDOW (parent_window), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + } else { mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), @@ -3423,9 +3453,18 @@ on_rename_folder_performer (gboolean canceled, modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - /* Clear the headers view */ - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); - gtk_tree_selection_unselect_all (sel); + if (MODEST_IS_MAIN_WINDOW(parent_window)) { + + folder_view = modest_main_window_get_child_widget ( + MODEST_MAIN_WINDOW (parent_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + + /* Clear the headers view */ + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); + gtk_tree_selection_unselect_all (sel); + } else { + folder_view = NULL; + } /* Actually rename the folder */ modest_mail_operation_rename_folder (mail_op, @@ -3443,40 +3482,46 @@ on_rename_folder_performer (gboolean canceled, void modest_ui_actions_on_rename_folder (GtkAction *action, - ModestMainWindow *main_window) + ModestWindow *window) +{ + modest_ui_actions_on_edit_mode_rename_folder (window); +} + +gboolean +modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window) { TnyFolderStore *folder; GtkWidget *folder_view; - GtkWidget *header_view; + gboolean do_rename = TRUE; - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + g_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE); - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return; + if (MODEST_IS_MAIN_WINDOW (window)) { + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return FALSE; - header_view = modest_main_window_get_child_widget (main_window, - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - if (!header_view) - return; +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_FOLDER_WINDOW (window)) { + folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window))); +#endif + } folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); if (!folder) - return; + return FALSE; if (TNY_IS_FOLDER (folder)) { gchar *folder_name = NULL; 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)); - response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), + response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (window), parent, current_name, &folder_name); g_object_unref (parent); @@ -3487,11 +3532,12 @@ modest_ui_actions_on_rename_folder (GtkAction *action, RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1); rename_folder_data->folder = g_object_ref (folder); rename_folder_data->new_name = folder_name; - modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), TRUE, + modest_platform_connect_if_remote_and_perform (GTK_WINDOW(window), TRUE, folder, on_rename_folder_performer, rename_folder_data); } } g_object_unref (folder); + return do_rename; } static void @@ -3523,15 +3569,21 @@ on_delete_folder_cb (gboolean canceled, ModestMailOperation *mail_op; GtkTreeSelection *sel; - if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) { + if (!MODEST_IS_WINDOW(parent_window) || canceled || (err!=NULL)) { g_object_unref (G_OBJECT (info->folder)); g_free (info); return; } - folder_view = modest_main_window_get_child_widget ( + if (MODEST_IS_MAIN_WINDOW (parent_window)) { + folder_view = modest_main_window_get_child_widget ( MODEST_MAIN_WINDOW (parent_window), MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_FOLDER_WINDOW (parent_window)) { + folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window))); +#endif + } /* Unselect the folder before deleting it to free the headers */ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); @@ -3554,36 +3606,43 @@ on_delete_folder_cb (gboolean canceled, g_free (info); } -static void -delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) +static gboolean +delete_folder (ModestWindow *window, gboolean move_to_trash) { TnyFolderStore *folder; GtkWidget *folder_view; gint response; gchar *message; - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + g_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE); - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (MODEST_IS_MAIN_WINDOW (window)) { + + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_FOLDER_WINDOW (window)) { + folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window))); +#endif + } if (!folder_view) - return; + return FALSE; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); /* Show an error if it's an account */ if (!TNY_IS_FOLDER (folder)) { - modest_platform_run_information_dialog (GTK_WINDOW (main_window), + modest_platform_run_information_dialog (GTK_WINDOW (window), _("mail_in_ui_folder_delete_error"), FALSE); g_object_unref (G_OBJECT (folder)); - return; + return FALSE; } /* Ask the user */ message = g_strdup_printf (_("mcen_nc_delete_folder_text"), tny_folder_get_name (TNY_FOLDER (folder))); - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (main_window), + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), (const gchar *) message); g_free (message); @@ -3594,22 +3653,31 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) info->move_to_trash = move_to_trash; g_object_ref (G_OBJECT (info->folder)); TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder)); - modest_platform_connect_if_remote_and_perform (GTK_WINDOW (main_window), + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (window), TRUE, TNY_FOLDER_STORE (account), on_delete_folder_cb, info); g_object_unref (account); + return TRUE; + } else { + return FALSE; } g_object_unref (G_OBJECT (folder)); } -void +void modest_ui_actions_on_delete_folder (GtkAction *action, - ModestMainWindow *main_window) + ModestWindow *window) { - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + modest_ui_actions_on_edit_mode_delete_folder (window); +} + +gboolean +modest_ui_actions_on_edit_mode_delete_folder (ModestWindow *window) +{ + g_return_val_if_fail (MODEST_IS_WINDOW(window), TRUE); - delete_folder (main_window, FALSE); + return delete_folder (window, FALSE); } void @@ -3617,7 +3685,7 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW { g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - delete_folder (main_window, TRUE); + delete_folder (MODEST_WINDOW (main_window), TRUE); } @@ -4739,6 +4807,13 @@ on_move_to_dialog_response (GtkDialog *dialog, folder_view, dst_folder, MODEST_MAIN_WINDOW (parent_win)); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_FOLDER_WINDOW (parent_win)) { + modest_ui_actions_on_folder_window_move_to (folder_view, + dst_folder, + helper->list, + GTK_WINDOW (parent_win)); +#endif } else { /* Moving from headers window in edit mode */ modest_ui_actions_on_window_move_to (NULL, helper->list, @@ -4970,13 +5045,17 @@ folder_move_to_cb (ModestMailOperation *mail_op, GObject *object; object = modest_mail_operation_get_source (mail_op); - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - g_object_ref (folder_view); - g_object_unref (object); - move_to_cb (mail_op, user_data); - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE); - g_object_unref (folder_view); + if (MODEST_IS_MAIN_WINDOW (object)) { + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + g_object_ref (folder_view); + g_object_unref (object); + move_to_cb (mail_op, user_data); + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE); + g_object_unref (folder_view); + } else { + move_to_cb (mail_op, user_data); + } } static void @@ -5362,7 +5441,7 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, GtkTreeSelection *sel; ModestMailOperation *mail_op = NULL; - if (canceled || err || !MODEST_IS_MAIN_WINDOW (parent_window)) { + if (canceled || err || !MODEST_IS_WINDOW (parent_window)) { g_object_unref (G_OBJECT (info->src_folder)); g_object_unref (G_OBJECT (info->dst_folder)); g_free (info); @@ -5401,8 +5480,10 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, /* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ /* TNY_FOLDER (src_folder), TRUE); */ - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), - TNY_FOLDER (info->dst_folder), TRUE); + if (MODEST_IS_MAIN_WINDOW (parent_window)) { + modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), + TNY_FOLDER (info->dst_folder), TRUE); + } modest_mail_operation_xfer_folder (mail_op, TNY_FOLDER (info->src_folder), info->dst_folder, @@ -5498,6 +5579,62 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, g_object_unref (src_folder); } +#ifdef MODEST_TOOLKIT_HILDON2 +/* + * UI handler for the "Move to" action when invoked from the + * ModestFolderWindow + */ +static void +modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view, + TnyFolderStore *dst_folder, + TnyList *selection, + GtkWindow *win) +{ + TnyFolderStore *src_folder = NULL; + TnyIterator *iterator; + + if (tny_list_get_length (selection) != 1) + return; + + iterator = tny_list_create_iterator (selection); + src_folder = TNY_FOLDER_STORE (tny_iterator_get_current (iterator)); + g_object_unref (iterator); + + + 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) && + !modest_tny_account_is_memory_card_account (TNY_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; + } + + if (do_xfer) { + MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); + DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); + + info->src_folder = g_object_ref (src_folder); + info->dst_folder = g_object_ref (dst_folder); + info->delete_original = TRUE; + info->folder_view = folder_view; + + connect_info->callback = on_move_folder_cb; + connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder)); + connect_info->data = info; + + modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (src_folder), + connect_info); + } + /* Frees */ + g_object_unref (src_folder); +} +#endif + void modest_ui_actions_transfer_messages_helper (GtkWindow *win, @@ -5582,11 +5719,17 @@ void modest_ui_actions_on_move_to (GtkAction *action, ModestWindow *win) { + modest_ui_actions_on_edit_mode_move_to (win); +} + +gboolean +modest_ui_actions_on_edit_mode_move_to (ModestWindow *win) +{ GtkWidget *dialog = NULL, *folder_view = NULL; ModestMainWindow *main_window; MoveToInfo *helper = NULL; - g_return_if_fail (MODEST_IS_WINDOW (win)); + g_return_val_if_fail (MODEST_IS_WINDOW (win), FALSE); /* Get the main window if exists */ if (MODEST_IS_MAIN_WINDOW (win)) @@ -5619,6 +5762,8 @@ modest_ui_actions_on_move_to (GtkAction *action, /* Show the dialog */ gtk_widget_show (dialog); + + return TRUE; } /*