#include <modest-runtime.h>
#include <modest-account-mgr-helpers.h>
#include <string.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"
/* 'private'/'protected' functions */
static void modest_account_view_window_class_init (ModestAccountViewWindowClass *klass);
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}; */
(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);
}
}
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);
{
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);
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);
}
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;
+ gchar *account_name;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
}
}
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;
+
+ /* 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));
- gtk_widget_show (GTK_WIDGET(assistant));
+ g_free (account_name);
}
-
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;
-
- 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: */
+ ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
+ gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
+ gtk_dialog_run (GTK_DIALOG (wizard));
+ gtk_widget_destroy (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);
}
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_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"));
- 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, *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_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);
-
- 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_widget_show_all (main_vbox);
return main_vbox;
}
-GtkWidget*
-modest_account_view_window_new (void)
+static void
+modest_account_view_window_init (ModestAccountViewWindow *obj)
{
- GObject *obj;
- ModestAccountViewWindowPrivate *priv;
+/*
+ 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);
- obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
- priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
+ gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)),
+ TRUE, TRUE, 2);
+}
- 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);
+
+GtkWidget*
+modest_account_view_window_new (void)
+{
+ GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
- 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);
}
projects / modest / blobdiff