This is a manual merge of branch drop split view intro trunk.

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

diff --git a/src/gnome/modest-platform.c b/src/gnome/modest-platform.c
index c11e23b..bda9c2c 100644 (file)
--- a/src/gnome/modest-platform.c
+++ b/src/gnome/modest-platform.c
@@ -38,6 +38,10 @@
 #include "modest-runtime.h"
 
 #include "gnome/modest-gnome-global-settings-dialog.h"
+#include "widgets/modest-account-settings-dialog.h"
+#include "gnome/modest-account-assistant.h"
+#include "gnome/modest-gnome-sort-dialog.h"
+#include "widgets/modest-details-dialog.h"
 
 gboolean
 modest_platform_init (int argc, char *argv[])
@@ -126,6 +130,12 @@ modest_platform_get_icon (const gchar *name, guint icon_size)
 /*             g_printerr ("modest: error while loading icon '%s': %s\n", */
 /*                         name, err->message); */
                g_error_free (err);
+               err = NULL;
+
+               pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), name, icon_size, 0, &err);
+               if (!pixbuf) {
+                       g_error_free (err);
+               }
        }
        
        return pixbuf;
@@ -309,11 +319,10 @@ gboolean modest_platform_set_update_interval (guint minutes)
        return FALSE;
 }
 
-void
-modest_platform_run_sort_dialog (GtkWindow *parent_window,
-                                ModestSortDialogType type)
+GtkWidget *
+modest_platform_create_sort_dialog (GtkWindow *parent_window)
 {
-       /* TODO */
+       return modest_gnome_sort_dialog_new (parent_window);
 }
 
 GtkWidget *
@@ -417,7 +426,7 @@ modest_platform_double_connect_and_perform (GtkWindow *parent_window,
                                            DoubleConnectionInfo *connect_info)
 {
        if (connect_info->callback)
-               connect_info->callback (FALSE, NULL, parent_window, folder_store, connect_info->data);
+               connect_info->callback (FALSE, NULL, parent_window, TNY_ACCOUNT (folder_store), connect_info->data);
 }
 
 void 
@@ -482,19 +491,17 @@ modest_platform_show_addressbook (GtkWindow *parent_window)
 GtkWidget *
 modest_platform_get_account_settings_dialog (ModestAccountSettings *settings)
 {
-       GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                                   GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                                                   "NOT IMPLEMENTED");
-       return dialog;
+       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+
+       modest_account_settings_dialog_set_account (dialog, settings);
+       return GTK_WIDGET (dialog);
 }
 
 GtkWidget *
 modest_platform_get_account_settings_wizard (void)
 {
-       GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                                   GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                                                   "NOT IMPLEMENTED");
-       return dialog;
+       GtkWidget *widget = modest_account_assistant_new (modest_runtime_get_account_mgr ());
+       return widget;
 }
 
 
@@ -505,3 +512,74 @@ gboolean modest_platform_check_memory_low (ModestWindow *win,
        g_debug ("%s not implemented", __FUNCTION__);
        return FALSE;
 }
+
+void 
+modest_platform_run_folder_details_dialog (GtkWindow *parent_window,
+                                          TnyFolder *folder)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_folder (parent_window, folder);
+
+       /* Run dialog */
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog), 
+                                    parent_window);
+       gtk_widget_show_all (dialog);
+
+       g_signal_connect_swapped (dialog, "response", 
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 dialog);
+}
+
+void
+modest_platform_run_header_details_dialog (GtkWindow *parent_window,
+                                          TnyHeader *header)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_header (parent_window, header);
+
+       /* Run dialog */
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog),
+                                    parent_window);
+       gtk_widget_show_all (dialog);
+
+       g_signal_connect_swapped (dialog, "response", 
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 dialog);
+}
+
+GtkWidget* 
+modest_platform_create_move_to_dialog (GtkWindow *parent_window,
+                                      GtkWidget **folder_view)
+{
+       GtkWidget *dialog, *folder_view_container;
+
+       dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
+                                             GTK_WINDOW (parent_window),
+                                             GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK,
+                                             _("mcen_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+                                             _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL,
+                                             NULL);
+
+       /* Create folder view */
+       *folder_view = modest_platform_create_folder_view (NULL);
+
+       /* Create pannable and add it to the dialog */
+       folder_view_container = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy  (GTK_SCROLLED_WINDOW (*folder_view_container),
+                                        GTK_POLICY_AUTOMATIC,
+                                        GTK_POLICY_AUTOMATIC);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), folder_view_container);
+       gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
+
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
+
+       return dialog;
+}