* enabled stepping through wizzard dialog

* renamed some of the wizzards widgets in modest.glade
* removed some debug messages from modest-ui.c

pmo-trunk-r163

diff --git a/src/gtk-glade/modest-ui-wizzard.c b/src/gtk-glade/modest-ui-wizzard.c
index f0683d9..f7791ba 100644 (file)
--- a/src/gtk-glade/modest-ui-wizzard.c
+++ b/src/gtk-glade/modest-ui-wizzard.c
@@ -20,7 +20,7 @@ gint do_wizzdialog1(GtkDialog *dialog, ModestUIPrivate *priv, void *account_data
 {
        gint result;
 
-       gtk_widget_show_all(dialog);
+       gtk_widget_show_all(GTK_WIDGET(dialog));
 
        result=gtk_dialog_run(GTK_DIALOG(dialog));
 
@@ -40,18 +40,68 @@ void on_new_account1_activate (GtkMenuItem *menuitem,
 {
        GladeXML *glade_xml;
        GtkWidget *dialog;
-       ModestUIPrivate *priv;
+        ModestUIPrivate *priv;
+        GtkWidget *FinishButton;
+        GtkWidget *BackButton;
+        GtkWidget *NextButton;
+        GtkWidget *CancelButton;
+        GtkWidget *Notebook;
+        gint cp;
        gint result;
 
        priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
 
        glade_xml = glade_xml_new(MODEST_GLADE, "account_wizzard", NULL);
 
-       dialog = glade_xml_get_widget(glade_xml, "account_wizzard");
-
-       gtk_widget_show_all(dialog);
-
-       result=gtk_dialog_run(GTK_DIALOG(dialog));
+        FinishButton=glade_xml_get_widget(glade_xml, "AWFinishButton");
+        BackButton=glade_xml_get_widget(glade_xml, "AWBackButton");
+        NextButton=glade_xml_get_widget(glade_xml, "AWNextButton");
+        CancelButton=glade_xml_get_widget(glade_xml, "AWCancelButton");
+        Notebook=glade_xml_get_widget(glade_xml, "AWNotebook");
+
+        dialog = glade_xml_get_widget(glade_xml, "account_wizzard");
+
+        g_message("Glade-file: %s", MODEST_GLADE);
+
+        gtk_widget_show_all(dialog);
+
+        if (FinishButton==NULL)
+                g_error("Is no notebook");
+
+        do
+        {
+                cp=gtk_notebook_get_current_page(GTK_NOTEBOOK(Notebook));
+                switch (cp)
+                {
+                case 0:
+                        gtk_widget_set_sensitive(BackButton, FALSE);
+                        break;
+                case 1:
+                        gtk_widget_set_sensitive(BackButton, TRUE);
+                        break;
+                case 2:
+                        gtk_widget_set_sensitive(NextButton, TRUE);
+                        break;
+                case 3:
+                        gtk_widget_set_sensitive(NextButton, FALSE);
+                        break;
+                default:
+                        g_error("I'm on page %d of notebook AWNotebook, which shouldn't have happened. Pulling Emeregency breaks.", cp);
+                        break;
+                }
+
+                result=gtk_dialog_run(GTK_DIALOG(dialog));
+                switch (result)
+                {
+                case 1:
+                        gtk_notebook_next_page(GTK_NOTEBOOK(Notebook));
+                        break;
+                case 2:
+                        gtk_notebook_prev_page(GTK_NOTEBOOK(Notebook));
+                        break;
+                }
+        }
+        while(result!=GTK_RESPONSE_DELETE_EVENT && result!=GTK_RESPONSE_ACCEPT && result!=GTK_RESPONSE_CANCEL);
 
        gtk_widget_destroy(dialog);
        g_object_unref(glade_xml);

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index f0da8f1..22553c4 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -79,7 +79,7 @@ typedef enum {
 
 static void quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype);
 
-                                                       
+
 
 /* list my signals */
 enum {
@@ -537,6 +537,8 @@ on_account_settings1_activate (GtkMenuItem *menuitem,
        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);

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 096251f..623b72b 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -3828,46 +3828,46 @@
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkButton" id="FinishButton">
+           <widget class="GtkButton" id="AWFinishButton">
              <property name="visible">True</property>
              <property name="label" translatable="yes" context="yes">Finish</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
+             <property name="response_id">-3</property>
            </widget>
          </child>
 
          <child>
-           <widget class="GtkButton" id="BackButton">
+           <widget class="GtkButton" id="AWBackButton">
              <property name="visible">True</property>
              <property name="label" translatable="yes" context="yes">Back</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
+             <property name="response_id">2</property>
            </widget>
          </child>
 
          <child>
-           <widget class="GtkButton" id="NextButton">
+           <widget class="GtkButton" id="AWNextButton">
              <property name="visible">True</property>
              <property name="label" translatable="yes" context="yes">Next</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
+             <property name="response_id">1</property>
            </widget>
          </child>
 
          <child>
-           <widget class="GtkButton" id="CancelButton">
+           <widget class="GtkButton" id="AWCancelButton">
              <property name="visible">True</property>
              <property name="label" translatable="yes" context="yes">Cancel</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
+             <property name="response_id">-6</property>
            </widget>
          </child>
        </widget>
@@ -3880,7 +3880,7 @@
       </child>
 
       <child>
-       <widget class="GtkNotebook" id="notebook2">
+       <widget class="GtkNotebook" id="AWNotebook">
          <property name="visible">True</property>
          <property name="show_tabs">False</property>
          <property name="show_border">False</property>