* Added new folder dialog

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 13866f5..cc73773 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -47,10 +47,11 @@
 #include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
 #include <widgets/modest-account-view-window.h>
-#include <widgets/modest-msg-view-details-dialog.h>
+#include <widgets/modest-details-dialog.h>
 
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
+#include "modest-text-utils.h"
 
 #ifdef MODEST_HAVE_EASYSETUP
 #include "easysetup/modest-easysetup-wizard.h"
@@ -1265,27 +1266,10 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
        parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
        if (parent_folder) {
-               gchar *folder_name;
-
-               folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
-                                                  _("Please enter a name for the new folder"));
-
-               if (folder_name != NULL && strlen (folder_name) > 0) {
-                       TnyFolder *new_folder;
-                       ModestMailOperation *mail_op;
+               /* Run the new folder dialog */
+               while (!modest_platform_run_new_folder_dialog (MODEST_WINDOW (main_window),
+                                                              parent_folder));
 
-                       mail_op = modest_mail_operation_new ();
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                        mail_op);
-
-                       new_folder = modest_mail_operation_create_folder (mail_op,
-                                                                         parent_folder,
-                                                                         (const gchar *) folder_name);
-                       if (new_folder) 
-                               g_object_unref (new_folder);
-                       g_object_unref (mail_op);
-                       g_free (folder_name);
-               }
                g_object_unref (parent_folder);
        }
 }
@@ -1608,21 +1592,45 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action,
        gtk_window_present (GTK_WINDOW (window));
 }
 
+/*
+ * Show the header details in a ModestDetailsDialog widget
+ */
 static void
 show_header_details (TnyHeader *header, 
                     GtkWindow *window)
 {
        GtkWidget *dialog;
        
-       dialog = modest_msg_view_details_dialog_new (window, header);
-       g_object_unref (header);
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_header (window, header);
+
+       /* Run dialog */
        gtk_widget_show_all (dialog);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+
+       gtk_widget_destroy (dialog);
+}
 
+/*
+ * Show the folder details in a ModestDetailsDialog widget
+ */
+static void
+show_folder_details (TnyFolder *folder, 
+                    GtkWindow *window)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_folder (window, folder);
+
+       /* Run dialog */
+       gtk_widget_show_all (dialog);
        gtk_dialog_run (GTK_DIALOG (dialog));
 
        gtk_widget_destroy (dialog);
 }
 
+
 void     
 modest_ui_actions_on_details (GtkAction *action, 
                              ModestWindow *win)
@@ -1659,13 +1667,14 @@ modest_ui_actions_on_details (GtkAction *action,
                if (gtk_widget_is_focus (folder_view)) {
                        TnyFolder *folder;
 
-                       folder = modest_folder_view_get_selected (folder_view);
+                       folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
                        /* Show only when it's a folder */
                        if (!folder || !TNY_IS_FOLDER (folder))
                                return;
 
-                       /* TODO */
+                       show_folder_details (folder, GTK_WINDOW (win));
+
                } else {
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
                                                                           MODEST_WIDGET_TYPE_HEADER_VIEW);