X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=b48cdad6c744f8e76cb1b006c2ea3899a7b5888f;hp=0a5b200efed2e933c8cf54af4363dd0e79dbef00;hb=30ec701bc2d1c270022e3543994f0221f6fb8b8c;hpb=5005b6ea5c9c552cc50414c548515737acf314b8 diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 0a5b200..b48cdad 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -34,10 +34,14 @@ #include #include +#include "modest-platform.h" #include #include -#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); @@ -53,10 +57,10 @@ 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), \ @@ -125,116 +129,258 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self) GtkTreeModel *model; GtkTreeIter iter; gboolean has_selection; - gchar *account_name; - gchar *default_account_name; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); has_selection = gtk_tree_selection_get_selected (sel, &model, &iter); + /* Set the status of the buttons */ 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_account (ModestAccountViewWindow *self, const gchar* account_name) +{ + ModestTnyAccountStore *acc_store; + ModestMailOperationQueue* queue; + TnyConnectionStatus store_conn_status, transport_conn_status; + TnyAccount *store_account = NULL, *transport_account = NULL; + gboolean retval = TRUE; + + acc_store = modest_runtime_get_account_store (); + queue = modest_runtime_get_mail_operation_queue (); + + store_account = + modest_tny_account_store_get_server_account (acc_store, + account_name, + TNY_ACCOUNT_TYPE_STORE); + transport_account = + modest_tny_account_store_get_server_account (acc_store, + account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + + store_conn_status = tny_account_get_connection_status (store_account); + transport_conn_status = tny_account_get_connection_status (transport_account); + + if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || + transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) { + GtkWidget *note = NULL; + gint response; + + note = hildon_note_new_confirmation (GTK_WINDOW (self), + _("emev_nc_disconnect_account")); + 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); + + /* Also disconnect the account */ + if (tny_account_get_connection_status (store_account) == TNY_CONNECTION_STATUS_CONNECTED) { + tny_account_cancel (store_account); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), + FALSE, NULL, NULL); + } + if (tny_account_get_connection_status (transport_account) == TNY_CONNECTION_STATUS_CONNECTED) { + tny_account_cancel (transport_account); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), + FALSE, NULL, NULL); + } + retval = TRUE; + } else { + retval = FALSE; + } + } + + /* Frees */ + g_object_unref (store_account); + g_object_unref (transport_account); + + return retval; } static void -on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) +on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; ModestAccountMgr *account_mgr; - 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; - 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); - if (removed) { - /* Show confirmation dialog ??? */ + gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); + + if (check_for_active_account (self, account_name)) { + /* The warning text depends on the account type: */ + gchar *txt = NULL; + gint response; + + 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 ??? */ + txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), + account_title); } - } - gtk_widget_destroy (dialog); + + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), + txt)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); + g_free (txt); + txt = NULL; + + response = gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); + while (gtk_events_pending ()) + gtk_main_iteration (); + + if (response == 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__); + } + } + g_free (account_title); + } g_free (account_name); } } static void -on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) +on_account_settings_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) { - modest_runtime_not_implemented (GTK_WINDOW(self)); + TnyAccount *store_account = NULL; + gchar* account_name = NULL; + ModestAccountViewWindowPrivate *priv = NULL; + + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data); + account_name = modest_account_view_get_selected_account (priv->account_view); + store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + account_name, + TNY_ACCOUNT_TYPE_STORE); + + /* Reconnect the store account, no need to reconnect the + transport account because it will connect when needed */ + if (tny_account_get_connection_status (store_account) == + TNY_CONNECTION_STATUS_DISCONNECTED) + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), + TRUE, NULL, NULL); + + /* Disconnect this handler */ + g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data); + + /* Free */ + g_free (account_name); } static void -on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) +on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - GtkWidget *notebook, *assistant; - ModestAccountViewWindowPrivate *priv; + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (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_account (self, account_name)) { + + /* Show the Account Settings window: */ + ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); - modest_runtime_not_implemented (GTK_WINDOW(self)); - return; + modest_account_settings_dialog_set_account_name (dialog, account_name); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); + /* When the dialog is closed, reconnect */ + g_signal_connect (dialog, "response", + G_CALLBACK (on_account_settings_dialog_response), + self); - notebook = modest_account_assistant_new (modest_runtime_get_account_mgr()); - assistant = hildon_wizard_dialog_new (GTK_WINDOW(self), _("Account setup wizard"), - GTK_NOTEBOOK(notebook)); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog)); + } - gtk_dialog_run (GTK_DIALOG(assistant)); - gtk_widget_destroy (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)); +} static void -on_default_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) +on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - ModestAccountViewWindowPrivate *priv; - ModestAccountMgr *account_mgr; - gchar *account_name; + GtkDialog *wizard; + GtkWindow *dialog; - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); + /* Show the easy-setup wizard: */ + dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); + if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) { + /* old wizard is active already; + */ + gtk_window_present (dialog); + return; + } + + /* there is no such wizard yet */ + wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), + GTK_WINDOW (wizard)); + + /* if there is already another modal dialog, make it non-modal */ + if (dialog) + gtk_window_set_modal (GTK_WINDOW(dialog), FALSE); + + gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); + 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)); +} - 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); +static void +on_close_button_clicked (GtkWidget *button, gpointer user_data) +{ + ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data); - g_free (account_name); + gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK); } @@ -242,71 +388,73 @@ on_default_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_hbutton_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; } - static GtkWidget* window_vbox_new (ModestAccountViewWindow *self) { - ModestAccountViewWindowPrivate *priv; - GtkTreeSelection *sel; - GtkWidget *main_hbox, *main_vbox; - - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); + ModestAccountViewWindowPrivate *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)); + + 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_vbox), main_hbox, TRUE, TRUE, 2); + gtk_widget_show (GTK_WIDGET (main_hbox)); + gtk_widget_show (GTK_WIDGET (main_vbox)); - gtk_widget_show_all (main_vbox); return main_vbox; } @@ -314,21 +462,20 @@ window_vbox_new (ModestAccountViewWindow *self) static void modest_account_view_window_init (ModestAccountViewWindow *obj) { - ModestAccountViewWindowPrivate *priv; - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); - - //GTK_DIALOG(obj)->vbox = window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); - GTK_DIALOG(obj)->action_area = window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); -} + gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->vbox)), GTK_WIDGET (window_vbox_new (obj)), + TRUE, TRUE, 2); + + gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)), + TRUE, TRUE, 2); + gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts")); + +} GtkWidget* modest_account_view_window_new (void) { GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); - GTK_DIALOG(obj)->vbox = window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); - GTK_DIALOG(obj)->action_area = button_box_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); - return GTK_WIDGET(obj); }