X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=fc40ea2be4d2ad9d3b16b4ee2e761fcb7aa1ab71;hp=8406c6f066779ea5584299b4b7ce5fd496605db5;hb=d2766e0125d45ae66dbe70b51eb90e3b0e493982;hpb=04bcdb4f80ae5bd55cb659940572ceb0fc1d58cc diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 8406c6f..fc40ea2 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -38,6 +38,8 @@ #include #include "modest-tny-platform-factory.h" #include "maemo/easysetup/modest-easysetup-wizard.h" +#include "maemo/modest-account-settings-dialog.h" +#include "widgets/modest-ui-constants.h" /* 'private'/'protected' functions */ static void modest_account_view_window_class_init (ModestAccountViewWindowClass *klass); @@ -149,18 +151,22 @@ 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; + + gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); if (account_name) { gboolean removed; GtkWidget *dialog; gchar *txt; - + dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"), GTK_WINDOW (self), GTK_DIALOG_MODAL, @@ -169,7 +175,8 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - txt = g_strdup_printf (_("Do you really want to delete the account %s?"), account_name); + txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), + account_title); 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)); @@ -178,9 +185,17 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { /* Remove account. If succeeded it removes also 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); + removed = modest_account_mgr_remove_account (account_mgr, - account_name, - FALSE); + account_name, + FALSE); + if (removed) { /* Show confirmation dialog ??? */ } else { @@ -188,6 +203,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) } } gtk_widget_destroy (dialog); + g_free (account_title); g_free (account_name); } } @@ -195,7 +211,39 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) static void on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - modest_runtime_not_implemented (GTK_WINDOW(self)); + 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. + * TODO: Check only for connections with this account, instead of all. + * Maybe we need a queue per account. + */ + ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue (); + if (modest_mail_operation_queue_num_elements(queue)) { + 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) { + modest_mail_operation_queue_cancel_all(queue); + } + else + return; + } + + /* Show the Account Settings window: */ + ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); + modest_account_settings_dialog_set_account_name (dialog, account_name); + + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + + g_free (account_name); } static void @@ -211,7 +259,7 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) static void 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); @@ -230,9 +278,9 @@ button_box_new (ModestAccountViewWindow *self) GTK_BUTTONBOX_START); priv->new_button = gtk_button_new_from_stock(_("mcen_bd_new")); - priv->edit_button = gtk_button_new_with_label(_("mcen_bd_emailsetup_edit")); - priv->delete_button = gtk_button_new_from_stock(_("mcen_bd_emailsetup_delete")); - priv->close_button = gtk_button_new_from_stock(_("mcen_bd_emailsetup_close")); + 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->new_button), "clicked", G_CALLBACK(on_new_button_clicked), @@ -277,6 +325,9 @@ window_vbox_new (ModestAccountViewWindow *self) 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)); @@ -301,6 +352,8 @@ modest_account_view_window_init (ModestAccountViewWindow *obj) 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")); }