#include <widgets/modest-account-view.h>
#include <modest-runtime.h>
+#include "modest-platform.h"
+#include "modest-ui-actions.h"
+#include "modest-account-protocol.h"
#include <modest-account-mgr-helpers.h>
#include <string.h>
#include "modest-tny-platform-factory.h"
-#include "maemo/easysetup/modest-easysetup-wizard.h"
-#include "maemo/modest-account-settings-dialog.h"
+#include "easysetup/modest-easysetup-wizard-dialog.h"
+#include "modest-account-settings-dialog.h"
+#include <modest-utils.h>
#include "widgets/modest-ui-constants.h"
/* 'private'/'protected' functions */
GtkWidget *delete_button;
GtkWidget *close_button;
ModestAccountView *account_view;
+ guint acc_removed_handler;
};
#define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \
gobject_class->finalize = modest_account_view_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestAccountViewWindowPrivate));
-
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
}
static void
-modest_account_view_window_finalize (GObject *obj)
+modest_account_view_window_finalize (GObject *self)
{
- G_OBJECT_CLASS(parent_class)->finalize (obj);
+ ModestAccountViewWindowPrivate *priv;
+ ModestAccountMgr *mgr;
+
+ priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
+ mgr = modest_runtime_get_account_mgr ();
+
+ if (g_signal_handler_is_connected (mgr, priv->acc_removed_handler))
+ g_signal_handler_disconnect (mgr, priv->acc_removed_handler);
+ priv->acc_removed_handler = 0;
+
+ G_OBJECT_CLASS(parent_class)->finalize (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->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());
-
- g_free (account_name);
- g_free (default_account_name);
+ gtk_widget_set_sensitive (priv->delete_button, has_selection);
}
static void
{
ModestAccountViewWindowPrivate *priv;
ModestAccountMgr *account_mgr;
-
+ gchar *account_title = NULL, *account_name = NULL;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
account_mgr = modest_runtime_get_account_mgr();
- 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);
+ account_name = modest_account_view_get_selected_account (priv->account_view);
+ account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
- if (account_name) {
- gboolean removed;
- GtkWidget *dialog;
- gchar *txt;
+ if (modest_ui_actions_check_for_active_account (self, account_name))
+ modest_ui_actions_on_delete_account (GTK_WINDOW (self), account_name, account_title);
- /* Freeze updates, so we can do just one update afterwards,
- * instead of responding to every conf key change: */
- modest_account_view_block_conf_updates (priv->account_view);
-
- 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 (_("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));
- 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 */
-
- 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);
-
- if (removed && is_default) {
- /* Set a different account as the default, so there is always at least one default:
- * This is not specified, and might be the wrong behaviour. murrayc. */
- modest_account_mgr_set_first_account_as_default (account_mgr);
- }
-
- if (removed) {
- /* Show confirmation dialog ??? */
- } else {
- /* Show error dialog ??? */
- }
- }
- gtk_widget_destroy (dialog);
- g_free (account_title);
- g_free (account_name);
-
- /* Update the view: */
- modest_account_view_unblock_conf_updates (priv->account_view);
- }
+ g_free (account_title);
+ g_free (account_name);
+}
+
+static void
+on_account_settings_dialog_response (GtkDialog *dialog,
+ gint response,
+ gpointer user_data)
+{
+ 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);
+ g_object_unref (store_account);
}
static void
on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
{
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(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)
/* 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);;
+ if (modest_ui_actions_check_for_active_account (self, account_name)) {
+ ModestAccountProtocol *proto;
+ ModestProtocolType proto_type;
+
+ /* Get proto */
+ proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (),
+ account_name);
+ proto = (ModestAccountProtocol *)
+ modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+ proto_type);
+
+ /* Create and show the dialog */
+ if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+ ModestAccountSettingsDialog *dialog =
+ modest_account_protocol_get_account_settings_dialog (proto, account_name);
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), (GtkWindow *) self);
+ gtk_widget_show (GTK_WIDGET (dialog));
}
- else
- return;
}
-
- /* Freeze updates, so we can do just one update afterwards,
- * instead of responding to every conf key change: */
- modest_account_view_block_conf_updates (priv->account_view);
-
- /* 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);
-
- /* Update the view: */
- modest_account_view_unblock_conf_updates (priv->account_view);
-
- /* TODO: Call modest_account_view_select_account() when
- * the view has actually been update. */
+}
+
+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.
+ */
+ if (dialog)
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+
+ /* Re-focus the account list view widget */
+ if (MODEST_IS_ACCOUNT_VIEW_WINDOW (user_data)) {
+ ModestAccountViewWindowPrivate *priv;
+ priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+ gtk_widget_grab_focus (GTK_WIDGET (priv->account_view));
+ }
}
static void
on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
{
- ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+ GtkDialog *wizard;
+ GtkWindow *dialog;
+
+ /* 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;
+ }
- /* Freeze updates, so we can do just one update afterwards,
- * instead of responding to every conf key change: */
- modest_account_view_block_conf_updates (priv->account_view);
+ /* 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),
+ GTK_WINDOW (self));
+
+ /* if there is already another modal dialog, make it non-modal */
+ if (dialog)
+ gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
- /* Show the easy-setup wizard: */
- ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
+ gtk_window_set_modal (GTK_WINDOW (wizard), TRUE);
gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
- gtk_dialog_run (GTK_DIALOG (wizard));
- gtk_widget_destroy (GTK_WIDGET (wizard));
-
- /* Allow updates: */
- modest_account_view_unblock_conf_updates (priv->account_view);
+ /* 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, gpointer user_data)
{
gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
}
-
-
-static GtkWidget*
-button_box_new (ModestAccountViewWindow *self)
+static void
+setup_button_box (ModestAccountViewWindow *self, GtkButtonBox *box)
{
ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
- 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_button_box_set_spacing (GTK_BUTTON_BOX (box), 6);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (box),
GTK_BUTTONBOX_START);
priv->new_button = gtk_button_new_from_stock(_("mcen_bd_new"));
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->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->delete_button, FALSE);
+ gtk_box_pack_start (GTK_BOX(box), priv->new_button, FALSE, FALSE,2);
+ gtk_box_pack_start (GTK_BOX(box), priv->edit_button, FALSE, FALSE,2);
+ gtk_box_pack_start (GTK_BOX(box), priv->delete_button, FALSE, FALSE,2);
+ gtk_box_pack_start (GTK_BOX(box), priv->close_button, FALSE, FALSE,2);
+
+ /* Should has been created by window_vbox_new */
+ if (priv->account_view) {
+ GtkTreeSelection *sel;
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
+ if (gtk_tree_selection_count_selected_rows (sel) == 0) {
+ gtk_widget_set_sensitive (priv->edit_button, FALSE);
+ gtk_widget_set_sensitive (priv->delete_button, FALSE);
+ }
+ }
- gtk_widget_show_all (button_box);
- return button_box;
+ gtk_widget_show_all (GTK_WIDGET (box));
}
-
static GtkWidget*
window_vbox_new (ModestAccountViewWindow *self)
{
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);
+
+ /* Only force the height, the width of the widget will depend
+ on the size of the column titles */
+ gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400);
gtk_widget_show (GTK_WIDGET (priv->account_view));
GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
static void
-modest_account_view_window_init (ModestAccountViewWindow *obj)
+modest_account_view_window_init (ModestAccountViewWindow *self)
{
-/*
- 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);
-
- gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)),
- TRUE, TRUE, 2);
+ ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+
+ priv->acc_removed_handler = 0;
}
+static void
+on_account_removed (ModestAccountMgr *acc_mgr,
+ const gchar *account,
+ gpointer user_data)
+{
+ ModestAccountViewWindowPrivate *priv;
+
+ /* If there is no account left then close the window */
+ if (!modest_account_mgr_has_accounts (acc_mgr, TRUE)) {
+ gboolean ret_value;
+ g_signal_emit_by_name (G_OBJECT (user_data), "delete-event", NULL, &ret_value);
+ } else {
+ /* Re-focus the account list view widget */
+ priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+ gtk_widget_grab_focus (GTK_WIDGET (priv->account_view));
+ }
+}
GtkWidget*
modest_account_view_window_new (void)
{
- GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
+ GObject *self = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
+ ModestAccountViewWindowPrivate *priv;
+ ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr ();
+
+ /* Add widgets */
+ gtk_box_pack_start (GTK_BOX((GTK_DIALOG (self)->vbox)),
+ window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self)),
+ TRUE, TRUE, 2);
+
+ setup_button_box (MODEST_ACCOUNT_VIEW_WINDOW (self), GTK_BUTTON_BOX (GTK_DIALOG (self)->action_area));
+
+ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup_accounts"));
+
+ /* Connect signals */
+ priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+ priv->acc_removed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_removed",
+ G_CALLBACK (on_account_removed), self);
- return GTK_WIDGET(obj);
+ return GTK_WIDGET (self);
}
projects / modest / blobdiff