Show accounts in first step of move to dialog

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 5bd11f4..d15e18f 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -31,6 +31,7 @@
 #include <glib/gi18n.h>
 
 #include <modest-platform.h>
+#include <modest-defs.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
 #include <modest-header-view.h>
@@ -690,8 +691,8 @@ folder_chooser_dialog_run (ModestFolderView *original)
        userdata.dialog = hildon_dialog_new ();
        pannable = hildon_pannable_area_new ();
        folder_view = modest_platform_create_folder_view (NULL);
-       modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
-                                      MODEST_FOLDER_VIEW_FILTER_CAN_HAVE_FOLDERS);
+
+       gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder"));
 
        modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), 
                                       MODEST_FOLDER_VIEW (folder_view));
@@ -2426,6 +2427,10 @@ _modest_platform_play_email_tone (void)
        g_free (active_profile);
 }
 
+#define MOVE_TO_DIALOG_FOLDER_VIEW "folder-view"
+#define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
+#define MOVE_TO_DIALOG_SELECTION_BUTTON "selection-button"
+
 static void
 on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
                                     GtkTreePath       *path,
@@ -2435,11 +2440,34 @@ on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
         gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
 }
 
+static void
+move_to_dialog_show_accounts (GtkWidget *dialog)
+{
+       GtkWidget *selection_button;
+       GtkWidget *back_button;
+       GtkWidget *folder_view;
+
+        selection_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_BUTTON));
+        back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
+        folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+       
+       gtk_widget_hide (selection_button);
+       gtk_widget_set_sensitive (back_button, FALSE);
+
+       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
+       modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
+       modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
+       modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
+}
+
 GtkWidget *
 modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                       GtkWidget **folder_view)
 {
        GtkWidget *dialog, *folder_view_container;
+       GtkWidget *buttons_hbox;
+       GtkWidget *back_button, *selection_button;
+       GdkPixbuf *back_pixbuf;
 
        /* Create dialog. We cannot use a touch selector because we
           need to use here the folder view widget directly */
@@ -2462,9 +2490,23 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (*folder_view),
                                                  (TnyAccountStore *) modest_runtime_get_account_store ());
 
+       buttons_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
+       back_button = gtk_button_new ();
+       back_pixbuf = modest_platform_get_icon (_FM("filemanager_folder_up"), MODEST_ICON_SIZE_BIG);
+       if (back_pixbuf) {
+               gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf));
+               g_object_unref (back_pixbuf);
+       }
+       selection_button = gtk_button_new ();
+       gtk_box_pack_start (GTK_BOX (buttons_hbox), back_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (buttons_hbox), selection_button, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (GTK_WIDGET (back_button), FALSE);
+       gtk_widget_hide (selection_button);
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), buttons_hbox, FALSE, FALSE, 0);
+
        /* Create pannable and add it to the dialog */
        folder_view_container = hildon_pannable_area_new ();
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), folder_view_container);
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), folder_view_container, TRUE, TRUE, 0);
        gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
 
        gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
@@ -2472,6 +2514,14 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        gtk_widget_show (GTK_DIALOG (dialog)->vbox);
        gtk_widget_show (folder_view_container);
        gtk_widget_show (*folder_view);
+       gtk_widget_show_all (back_button);
+       gtk_widget_show (buttons_hbox);
+
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_BUTTON, selection_button);
+
+       move_to_dialog_show_accounts (dialog);
 
        return dialog;
 }