X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=776f84c0d0e49a7c05e483b3e85c9b89a01e8e7b;hp=95d7b2ffa147649b1a0583b0432e30cc95d42a6d;hb=93b823a0e35263f7f0134a0d334d12b8cb2c0ba2;hpb=b4ea1f5e856e1cec3a7ead917d2c11ec90029514;ds=sidebyside diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 95d7b2f..776f84c 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -29,13 +29,18 @@ #include #include + +#include +#include + #include #include -#include #include -#include "modest-account-view-window.h" -#include "modest-account-assistant.h" #include "modest-tny-platform-factory.h" +#include "maemo/easysetup/modest-easysetup-wizard.h" +#include "maemo/modest-account-settings-dialog.h" +#include +#include "widgets/modest-ui-constants.h" /* 'private'/'protected' functions */ static void modest_account_view_window_class_init (ModestAccountViewWindowClass *klass); @@ -51,17 +56,17 @@ enum { typedef struct _ModestAccountViewWindowPrivate ModestAccountViewWindowPrivate; struct _ModestAccountViewWindowPrivate { - GtkWidget *add_button; + GtkWidget *new_button; GtkWidget *edit_button; - GtkWidget *remove_button; - GtkWidget *default_button; + GtkWidget *delete_button; + GtkWidget *close_button; ModestAccountView *account_view; }; #define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \ ModestAccountViewWindowPrivate)) /* globals */ -static GtkWindowClass *parent_class = NULL; +static GtkDialogClass *parent_class = NULL; /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ @@ -83,7 +88,7 @@ modest_account_view_window_get_type (void) (GInstanceInitFunc) modest_account_view_window_init, NULL }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, + my_type = g_type_register_static (GTK_TYPE_DIALOG, "ModestAccountViewWindow", &my_info, 0); } @@ -110,12 +115,6 @@ modest_account_view_window_class_init (ModestAccountViewWindowClass *klass) } static void -modest_account_view_window_init (ModestAccountViewWindow *obj) -{ - /* empty */ -} - -static void modest_account_view_window_finalize (GObject *obj) { G_OBJECT_CLASS(parent_class)->finalize (obj); @@ -127,10 +126,10 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; GtkTreeModel *model; - GtkTreeIter iter; - gboolean has_selection; - const gchar *account_name; - gchar *default_account_name; + GtkTreeIter iter; + gboolean has_selection; + gchar *account_name; + gchar *default_account_name; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); @@ -138,112 +137,178 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self) gtk_tree_selection_get_selected (sel, &model, &iter); gtk_widget_set_sensitive (priv->edit_button, has_selection); - gtk_widget_set_sensitive (priv->remove_button, has_selection); + gtk_widget_set_sensitive (priv->delete_button, has_selection); account_name = modest_account_view_get_selected_account (priv->account_view); default_account_name = modest_account_mgr_get_default_account( modest_runtime_get_account_mgr()); - gtk_widget_set_sensitive (priv->default_button, - default_account_name == NULL || account_name == NULL || - strcmp (default_account_name, account_name) != 0); + + g_free (account_name); g_free (default_account_name); } +/** Check whether any connections are active, and cancel them if + * the user wishes. + * Returns TRUE is there was no problem, + * or if an operation was cancelled so we can continue. + * Returns FALSE if the user chose to cancel his request instead. + */ +static gboolean +check_for_active_acount (ModestAccountViewWindow *self, const gchar* account_name) +{ + /* Check whether any connections are active, and cancel them if + * the user wishes. + */ + ModestAccountMgr* mgr = modest_runtime_get_account_mgr (); + ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue(); + if (modest_account_mgr_account_is_busy(mgr, account_name)) { + GtkWidget *note = hildon_note_new_confirmation (GTK_WINDOW (self), + _("emev_nc_disconnect_account")); + const int response = gtk_dialog_run (GTK_DIALOG(note)); + gtk_widget_destroy (note); + if (response == GTK_RESPONSE_OK) { + /* FIXME: We should only cancel those of this account */ + modest_mail_operation_queue_cancel_all(queue); + return TRUE; + } + else + return FALSE; + } + + return TRUE; +} + static void -on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) +on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; ModestAccountMgr *account_mgr; - const gchar *account_name; + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); account_mgr = modest_runtime_get_account_mgr(); - account_name = modest_account_view_get_selected_account (priv->account_view); - + gchar *account_name = modest_account_view_get_selected_account (priv->account_view); + if(!account_name) + return; + if (account_name) { - gboolean removed; - GError *err = NULL; - GtkWidget *dialog; - gchar *txt; - - dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"), - GTK_WINDOW (self), - GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - NULL); - txt = g_strdup_printf (_("Do you really want to delete the account %s?"), account_name); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), - gtk_label_new (txt), FALSE, FALSE, 0); - gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); - g_free (txt); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - /* Remove account. If succeeded it removes also - the account from the ModestAccountView */ - removed = modest_account_mgr_remove_account (account_mgr, - account_name, - FALSE, - &err); - if (removed) { - /* Show confirmation dialog ??? */ + gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); + + if (check_for_active_acount (self, account_name)) { + /* The warning text depends on the account type: */ + gchar *txt = NULL; + if (modest_account_mgr_get_store_protocol (account_mgr, account_name) + == MODEST_PROTOCOL_STORE_POP) { + txt = g_strdup_printf (_("emev_nc_delete_mailbox"), + account_title); } else { - /* Show error dialog ??? */ - if (err) - g_error_free (err); + txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), + account_title); + } + + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), + txt)); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); + g_free (txt); + txt = NULL; + + if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { + /* Remove account. If it succeeds then it also removes + the account from the ModestAccountView: */ + + gboolean is_default = FALSE; + gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr); + if (default_account_name && (strcmp (default_account_name, account_name) == 0)) + is_default = TRUE; + g_free (default_account_name); + + gboolean removed = modest_account_mgr_remove_account (account_mgr, account_name); + if (!removed) { + g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__); + } } + gtk_widget_destroy (GTK_WIDGET (dialog)); + g_free (account_title); } - gtk_widget_destroy (dialog); + + g_free (account_name); } } static void on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - g_message (__FUNCTION__); -} - -static void -on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) -{ - GtkWidget *assistant; - ModestAccountViewWindowPrivate *priv; + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - /* FIXME */ - g_warning (__FUNCTION__); - //assistant = modest_account_assistant_new (modest_runtime_get_account_mgr()); - gtk_window_set_transient_for (GTK_WINDOW(assistant), - GTK_WINDOW(self)); + gchar* account_name = modest_account_view_get_selected_account (priv->account_view); + if (!account_name) + return; + + /* Check whether any connections are active, and cancel them if + * the user wishes. + */ + if (check_for_active_acount (self, account_name)) { + + /* Show the Account Settings window: */ + ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); + + modest_account_settings_dialog_set_account_name (dialog, account_name); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog)); + } - gtk_widget_show (GTK_WIDGET(assistant)); + g_free (account_name); } +static void +on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data) +{ + /* The response has already been handled by the wizard dialog itself, + * creating the new account. + */ + + /* Destroy the dialog: */ + if (dialog) { + gtk_widget_destroy (GTK_WIDGET (dialog)); + modest_window_mgr_set_easysetup_dialog ( + modest_runtime_get_window_mgr(), NULL); + } +} static void -on_default_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) +on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - ModestAccountViewWindowPrivate *priv; - ModestAccountMgr *account_mgr; - const gchar *account_name; + GtkDialog *wizard; - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - - account_mgr = modest_runtime_get_account_mgr(); - account_name = modest_account_view_get_selected_account (priv->account_view); - - modest_account_mgr_set_default_account (account_mgr, account_name); + /* Show the easy-setup wizard: */ + wizard = modest_window_mgr_get_easysetup_dialog + (modest_runtime_get_window_mgr()); + if (wizard) { + /* old wizard is active already; + */ + gtk_window_present (GTK_WINDOW(wizard)); + return; + } else { + /* there is no such wizard yet */ + wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_easysetup_dialog + (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard)); + } + + gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self)); + /* Destroy the dialog when it is closed: */ + g_signal_connect (G_OBJECT (wizard), "response", G_CALLBACK + (on_wizard_response), self); + gtk_widget_show (GTK_WIDGET (wizard)); } - static void -on_close_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) -{ - gtk_widget_destroy (GTK_WIDGET(self)); +on_close_button_clicked (GtkWidget *button, gpointer user_data) +{ + ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data); + + gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK); } @@ -251,44 +316,40 @@ on_close_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) static GtkWidget* button_box_new (ModestAccountViewWindow *self) { - - GtkWidget *button_box; - ModestAccountViewWindowPrivate *priv; - - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - button_box = gtk_vbutton_box_new (); + GtkWidget *button_box = gtk_hbutton_box_new (); gtk_button_box_set_spacing (GTK_BUTTON_BOX (button_box), 6); gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_START); - priv->add_button = gtk_button_new_from_stock(GTK_STOCK_ADD); - priv->default_button = gtk_button_new_with_label(_("Make default")); - priv->remove_button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); - priv->edit_button = gtk_button_new_from_stock(GTK_STOCK_EDIT); + priv->new_button = gtk_button_new_from_stock(_("mcen_bd_new")); + priv->edit_button = gtk_button_new_with_label(_("mcen_bd_edit")); + priv->delete_button = gtk_button_new_from_stock(_("mcen_bd_delete")); + priv->close_button = gtk_button_new_from_stock(_("mcen_bd_close")); - g_signal_connect (G_OBJECT(priv->add_button), "clicked", - G_CALLBACK(on_add_button_clicked), + g_signal_connect (G_OBJECT(priv->new_button), "clicked", + G_CALLBACK(on_new_button_clicked), self); - g_signal_connect (G_OBJECT(priv->remove_button), "clicked", - G_CALLBACK(on_remove_button_clicked), + g_signal_connect (G_OBJECT(priv->delete_button), "clicked", + G_CALLBACK(on_delete_button_clicked), self); g_signal_connect (G_OBJECT(priv->edit_button), "clicked", G_CALLBACK(on_edit_button_clicked), self); - g_signal_connect (G_OBJECT(priv->default_button), "clicked", - G_CALLBACK(on_default_button_clicked), + g_signal_connect (G_OBJECT(priv->close_button), "clicked", + G_CALLBACK(on_close_button_clicked), self); - gtk_box_pack_start (GTK_BOX(button_box), priv->add_button, FALSE, FALSE,2); - gtk_box_pack_start (GTK_BOX(button_box), priv->default_button, FALSE, FALSE,2); - gtk_box_pack_start (GTK_BOX(button_box), priv->remove_button, FALSE, FALSE,2); + gtk_box_pack_start (GTK_BOX(button_box), priv->new_button, FALSE, FALSE,2); gtk_box_pack_start (GTK_BOX(button_box), priv->edit_button, FALSE, FALSE,2); + gtk_box_pack_start (GTK_BOX(button_box), priv->delete_button, FALSE, FALSE,2); + gtk_box_pack_start (GTK_BOX(button_box), priv->close_button, FALSE, FALSE,2); gtk_widget_set_sensitive (priv->edit_button, FALSE); - gtk_widget_set_sensitive (priv->remove_button, FALSE); - gtk_widget_set_sensitive (priv->default_button, FALSE); - + gtk_widget_set_sensitive (priv->delete_button, FALSE); + + gtk_widget_show_all (button_box); return button_box; } @@ -296,63 +357,56 @@ button_box_new (ModestAccountViewWindow *self) static GtkWidget* window_vbox_new (ModestAccountViewWindow *self) { - ModestAccountViewWindowPrivate *priv; - GtkTreeSelection *sel; - GtkWidget *main_hbox, *main_vbox, *button_box; - GtkWidget *close_button; - GtkWidget *close_hbox; + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - - main_vbox = gtk_vbox_new (FALSE, 6); - main_hbox = gtk_hbox_new (FALSE, 6); + GtkWidget *main_vbox = gtk_vbox_new (FALSE, 6); + GtkWidget *main_hbox = gtk_hbox_new (FALSE, 6); priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr()); gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400); + gtk_widget_show (GTK_WIDGET (priv->account_view)); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view)); + GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view)); g_signal_connect (G_OBJECT(sel), "changed", G_CALLBACK(on_selection_changed), self); + + GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view)); + gtk_widget_show (GTK_WIDGET (scrolled_window)); - button_box = button_box_new (self); + gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(scrolled_window), TRUE, TRUE, 2); - gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(priv->account_view), TRUE, TRUE, 2); - gtk_box_pack_start (GTK_BOX(main_hbox), button_box, FALSE, FALSE,2); - gtk_box_pack_start (GTK_BOX(main_vbox), main_hbox, TRUE, TRUE, 2); + gtk_widget_show (GTK_WIDGET (main_hbox)); + gtk_widget_show (GTK_WIDGET (main_vbox)); - close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - g_signal_connect (G_OBJECT(close_button), "clicked", - G_CALLBACK(on_close_button_clicked), - self); + return main_vbox; +} + + +static void +modest_account_view_window_init (ModestAccountViewWindow *obj) +{ +/* + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); +*/ + gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->vbox)), GTK_WIDGET (window_vbox_new (obj)), + TRUE, TRUE, 2); - close_hbox = gtk_hbox_new (FALSE, 2); - gtk_box_pack_end (GTK_BOX(close_hbox), - close_button, FALSE, FALSE,2); - gtk_box_pack_end (GTK_BOX(main_vbox), close_hbox, FALSE, FALSE,2); + gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)), + TRUE, TRUE, 2); - gtk_widget_show_all (main_vbox); - return main_vbox; + gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts")); } GtkWidget* modest_account_view_window_new (void) { - GObject *obj; - ModestAccountViewWindowPrivate *priv; + GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); - obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); - - gtk_window_set_resizable (GTK_WINDOW(obj), FALSE); - gtk_window_set_title (GTK_WINDOW(obj), _("Accounts")); - gtk_window_set_type_hint (GTK_WINDOW(obj), GDK_WINDOW_TYPE_HINT_DIALOG); - - gtk_window_set_modal (GTK_WINDOW(obj), TRUE); - - gtk_container_add (GTK_CONTAINER(obj), - window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj))); - return GTK_WIDGET(obj); }