* some cleanup in modest-ui-wizzard.c/h

* added modest-ui-account-setup.c/h and applied changes to Makefile.am
* bound main account dialog to menu "Tools->Identities and accounts" in modest-ui-main-view.c
* removed obsoleted account-settings function from modest-ui.c

pmo-trunk-r252

diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am
index 82dac97..a53db65 100644 (file)
--- a/src/gtk-glade/Makefile.am
+++ b/src/gtk-glade/Makefile.am
@@ -17,7 +17,7 @@ noinst_LTLIBRARIES=\
 
 GLADE_FILES=\
        modest.glade\
-       glade/*.png 
+       glade/*.png
 
 PIXMAP_FILES=\
        pixmaps/*.png
@@ -33,7 +33,9 @@ libmodest_ui_la_SOURCES=\
        modest-ui-message-viewer.c\
        modest-ui-message-viewer.h\
        modest-ui-wizard.h\
-       modest-ui-wizard.c
+       modest-ui-wizard.c\
+       modest-ui-account-setup.h\
+       modest-ui-account-setup.c
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \

diff --git a/src/gtk-glade/modest-ui-account-setup.c b/src/gtk-glade/modest-ui-account-setup.c
new file mode 100644 (file)
index 0000000..e0a3cfa
--- /dev/null
+++ b/src/gtk-glade/modest-ui-account-setup.c
@@ -0,0 +1,52 @@
+/* modest-ui-wizard.c */
+
+/* insert (c)/licensing information) */
+
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+#include <glib/gi18n.h>
+#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /*HAVE_CONFIG_H*/
+
+#include "../modest-account-mgr.h"
+
+#include "modest-ui-glade.h"
+#include "modest-ui-account-setup.h"
+
+static void
+accounts_and_identities_dialog (gpointer user_data)
+{
+       GladeXML *glade_xml;
+       GtkWidget *advanced_account_setup;
+       ModestUIPrivate *priv;
+       gint retval;
+
+
+        g_return_if_fail(MODEST_IS_UI(user_data));
+       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
+
+       glade_xml = glade_xml_new(MODEST_GLADE, "IdentitiesAndAccountsDialog", NULL);
+       advanced_account_setup = glade_xml_get_widget(glade_xml, "IdentitiesAndAccountsDialog");
+
+
+       gtk_widget_show_all(GTK_WIDGET(advanced_account_setup));
+
+       while (TRUE) {
+               retval=gtk_dialog_run(GTK_DIALOG(advanced_account_setup));
+               if (retval==GTK_RESPONSE_CANCEL)
+                       break;
+       }
+
+       gtk_widget_destroy(GTK_WIDGET(advanced_account_setup));
+       g_object_unref(glade_xml);
+}
+
+void account_settings (GtkWidget *widget,
+                       gpointer user_data)
+{
+       accounts_and_identities_dialog (MODEST_UI(user_data));
+}
+

diff --git a/src/gtk-glade/modest-ui-account-setup.h b/src/gtk-glade/modest-ui-account-setup.h
new file mode 100644 (file)
index 0000000..77b0a5e
--- /dev/null
+++ b/src/gtk-glade/modest-ui-account-setup.h
@@ -0,0 +1,13 @@
+/* modest-ui-account-setup.h */
+/* insert (c)/licensing information) */
+
+#ifndef __MODEST_UI_ACCOUNT_SETUP_H__
+#define __MODEST_UI_ACCOUNT_SETUP_H__
+
+#include "modest-ui-glade.h"
+
+void account_settings (GtkWidget *,
+                       gpointer);
+
+#endif /* __MODEST_UI_ACCOUNT_SETUP_H__ */
+

diff --git a/src/gtk-glade/modest-ui-main-view.c b/src/gtk-glade/modest-ui-main-view.c
index 5a225af..cf9e72b 100644 (file)
--- a/src/gtk-glade/modest-ui-main-view.c
+++ b/src/gtk-glade/modest-ui-main-view.c
@@ -31,6 +31,7 @@
 
 #include "modest-ui-glade.h"
 #include "modest-ui-wizard.h"
+#include "modest-ui-account-setup.h"
 
 #include "modest-ui-main-view.h"
 #include "modest-ui-message-editor.h"
@@ -142,7 +143,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                g_warning ("failed to create message view");
                return FALSE;
        }
-       
+
        mail_paned = glade_xml_get_widget (priv->glade_xml, "mail_paned");
        gtk_paned_add2 (GTK_PANED(mail_paned), message_view);
 
@@ -159,10 +160,9 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                g_warning ("The account settings item isn't available!\n");
                return FALSE;
        }
-       /*
-       g_signal_connect (account_settings_item, "activate",
-               G_CALLBACK(on_account_settings1_activate), modest_ui);
-       */
+
+        g_signal_connect (account_settings_item, "activate",
+                          G_CALLBACK(account_settings), modest_ui);
 
        new_account_item = glade_xml_get_widget (priv->glade_xml, "NewAccountWizardMenuItem");
        if (!new_account_item) {
@@ -436,18 +436,18 @@ on_view_attachments_toggled(GtkWidget *widget, ModestUI *modest_ui)
        priv = MODEST_UI_GET_PRIVATE(modest_ui);
        view_attachments_item = glade_xml_get_widget (priv->glade_xml, "menu_view_attachments");
        g_return_if_fail(view_attachments_item);
-       
+
        paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
        msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
-       
+
        view_attachments_inline = gtk_check_menu_item_get_active(
                                        GTK_CHECK_MENU_ITEM(view_attachments_item));
-       
+
        modest_conf_set_bool(priv->modest_conf,
                             MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE,
                             view_attachments_inline,
                             NULL);
-       
+
        modest_tny_msg_view_set_show_attachments_inline_flag(msg_view, view_attachments_inline);
 }
 

diff --git a/src/gtk-glade/modest-ui-wizard.h b/src/gtk-glade/modest-ui-wizard.h
index bd8369e..946bb01 100644 (file)
--- a/src/gtk-glade/modest-ui-wizard.h
+++ b/src/gtk-glade/modest-ui-wizard.h
@@ -1,19 +1,13 @@
-/* modest-ui-wizzard.h */
+/* modest-ui-wizard.h */
 /* insert (c)/licensing information) */
 
-#ifndef __MODEST_UI_WIZZARD_H__
-#define __MODEST_UI_WIZZARD_H__
+#ifndef __MODEST_UI_WIZARD_H__
+#define __MODEST_UI_WIZARD_H__
 
 #include "modest-ui-glade.h"
 
-void wizard_account_dialog(ModestUI *);
-
 void new_wizard_account (GtkWidget *,
                          gpointer);
 
-void setup_account_wizardry_menu(GtkWidget *,
-                                 ModestUI *);
-
-
-#endif /* __MODEST_UI_WIZZARD_H__ */
+#endif /* __MODEST_UI_WIZARD_H__ */
 

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index a181921..b178682 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -46,11 +46,6 @@ static void   modest_ui_last_window_closed (GObject *obj, gpointer data);
 
 static void   on_password_requested (ModestTnyAccountStore *account_store, const gchar *account_name, gpointer user_data);
 
-
-//static void on_account_settings1_activate (GtkMenuItem *,
-//                                 gpointer);
-
-
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -305,67 +300,4 @@ on_account_selector_selection_changed (GtkWidget *widget,
        free(account_name);
 }
 
-#if 0
-static void
-on_account_settings1_activate (GtkMenuItem *menuitem,
-                              gpointer user_data)
-{
-       GladeXML *glade_xml;
-       GtkWidget *advanced_account_setup;
-       ModestUIPrivate *priv;
-       gint retval;
-       GSList *account_name_list;
-       GSList *account_name_list_iter;
-       GtkListStore *account_names;
-       GtkTreeIter account_names_iter;
-       GtkWidget *account_selector;
-       GtkCellRenderer *renderer;
 
-
-        g_return_if_fail(MODEST_IS_UI(user_data));
-       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
-
-       glade_xml = glade_xml_new(MODEST_GLADE, "mailbox_setup_advanced", NULL);
-       advanced_account_setup = glade_xml_get_widget(glade_xml, "mailbox_setup_advanced");
-
-       account_name_list=modest_account_mgr_account_names(priv->modest_acc_mgr, NULL);
-       account_names = gtk_list_store_new(1, G_TYPE_STRING);
-
-       for (account_name_list_iter=account_name_list;
-            account_name_list_iter!=NULL;
-            account_name_list_iter=g_slist_next(account_name_list_iter))
-       {
-               gtk_list_store_append(account_names, &account_names_iter);
-               gtk_list_store_set(account_names, &account_names_iter,
-                                  0, account_name_list_iter->data,
-                                  -1);
-       }
-
-       g_slist_free(account_name_list);
-
-       account_selector = glade_xml_get_widget(glade_xml, "account_selector");
-       gtk_combo_box_set_model(GTK_COMBO_BOX(account_selector), GTK_TREE_MODEL(account_names));
-
-       renderer = gtk_cell_renderer_text_new ();
-       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (account_selector), renderer, TRUE);
-       gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (account_selector), renderer,
-                                       "text", 0,
-                                       NULL);
-
-       g_signal_connect(GTK_WIDGET(account_selector), "changed",
-                        G_CALLBACK(on_account_selector_selection_changed),
-                        GTK_WIDGET(advanced_account_setup));
-
-       gtk_combo_box_set_active(GTK_COMBO_BOX(account_selector), 0);
-
-       gtk_widget_show_all(GTK_WIDGET(advanced_account_setup));
-
-       retval=gtk_dialog_run(GTK_DIALOG(advanced_account_setup));
-
-       g_object_unref(account_names);
-
-       gtk_widget_destroy(GTK_WIDGET(advanced_account_setup));
-
-       g_object_unref(glade_xml);
-}
-#endif