* corrected some more typos
authorSilvan Marco Fin <silvan@kernelconcepts.de>
Wed, 7 Jun 2006 13:31:50 +0000 (13:31 +0000)
committerSilvan Marco Fin <silvan@kernelconcepts.de>
Wed, 7 Jun 2006 13:31:50 +0000 (13:31 +0000)
pmo-trunk-r169

src/gtk-glade/Makefile.am
src/gtk-glade/modest-ui-wizard.c [new file with mode: 0644]
src/gtk-glade/modest-ui-wizard.h [new file with mode: 0644]
src/gtk-glade/modest-ui-wizzard.c [deleted file]
src/gtk-glade/modest-ui-wizzard.h [deleted file]
src/gtk-glade/modest.glade

index 7f6f074..f37dddc 100644 (file)
@@ -24,7 +24,7 @@ PIXMAP_FILES=\
 libmodest_ui_la_SOURCES=\
        modest-ui.c\
        modest-icon-names.h\
-       modest-ui-wizzard.c
+       modest-ui-wizard.c
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
diff --git a/src/gtk-glade/modest-ui-wizard.c b/src/gtk-glade/modest-ui-wizard.c
new file mode 100644 (file)
index 0000000..9ec2514
--- /dev/null
@@ -0,0 +1,165 @@
+/* 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-wizard.h"
+
+void wizard_missing_notification(GtkWindow *parent, gchar *info_message)
+{
+        GtkWidget *DenyDialog;
+
+        DenyDialog=gtk_message_dialog_new(parent,
+                                          GTK_DIALOG_MODAL,
+                                          GTK_MESSAGE_INFO,
+                                          GTK_BUTTONS_OK,
+                                          "%s",
+                                          info_message);
+
+        gtk_dialog_run(GTK_DIALOG(DenyDialog));
+
+        gtk_widget_destroy(DenyDialog);
+}
+
+gchar *gtk_combo_box_get_entry_text (GtkWidget *combobox)
+{
+        /* Remember to free the returned variable after usage! */
+
+       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox));
+       GtkTreeIter iter;
+
+       gchar *value;
+
+       if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter))
+       {
+               gtk_tree_model_get(GTK_TREE_MODEL(model),
+                                  &iter,
+                                  0, &value,
+                                  -1);
+       }
+
+        return value;
+}
+
+
+gboolean advance_sanity_check(GtkWindow *parent, GladeXML *glade_xml, gint cp)
+{
+        GtkDialog *DenyDialog;
+        gchar *bla;
+
+        switch (cp)
+        {
+        case 0:
+                if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWMailboxnameEntry"))))==0)
+                {
+                        /* FIXME:
+                         * all calls to wizard_missing_notification lack the parent window.
+                         */
+                        wizard_missing_notification(NULL, "Please enter mailbox name");
+                        return FALSE;
+                }
+                bla=gtk_combo_box_get_active_text(GTK_COMBO_BOX(glade_xml_get_widget(glade_xml, "AWMailboxtypeComboBox")));
+                if (bla==NULL)
+                {
+                        wizard_missing_notification(NULL, "Please select mailbox type");
+                        return FALSE;
+                }
+                return TRUE;
+                break;
+
+        }
+
+        return FALSE;
+}
+
+void on_new_account1_activate (GtkMenuItem *menuitem,
+                               gpointer user_data)
+{
+       GladeXML *glade_xml;
+       GtkWidget *dialog;
+        ModestUIPrivate *priv;
+        GtkWidget *FinishButton;
+        GtkWidget *BackButton;
+        GtkWidget *NextButton;
+        GtkWidget *CancelButton;
+        GtkWidget *Notebook;
+        GtkWidget *awidget;
+        gint cp;
+        gint result;
+        gint finishallowed=0;
+
+       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
+
+       glade_xml = glade_xml_new(MODEST_GLADE, "account_wizard", NULL);
+
+        dialog = glade_xml_get_widget(glade_xml, "account_wizard");
+
+        gtk_widget_show_all(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");
+
+        gtk_widget_set_sensitive(FinishButton, FALSE);
+
+        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(FinishButton, FALSE);
+                        gtk_widget_set_sensitive(NextButton, TRUE);
+                        break;
+                case 3:
+                        gtk_widget_set_sensitive(FinishButton, TRUE);
+                        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:
+                        if (advance_sanity_check(NULL, glade_xml, cp)==TRUE)
+                                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);
+
+        if (result==GTK_RESPONSE_ACCEPT)
+        {
+                /* Do someting with the DATA from the widget */
+        }
+
+       gtk_widget_destroy(dialog);
+       g_object_unref(glade_xml);
+}
+
diff --git a/src/gtk-glade/modest-ui-wizard.h b/src/gtk-glade/modest-ui-wizard.h
new file mode 100644 (file)
index 0000000..9d0b829
--- /dev/null
@@ -0,0 +1,11 @@
+/* modest-ui-wizzard.h */
+/* insert (c)/licensing information) */
+
+#ifndef __MODEST_UI_WIZZARD_H__
+#define __MODEST_UI_WIZZARD_H__
+
+void on_new_account1_activate (GtkMenuItem *,
+                               gpointer);
+
+#endif /* __MODEST_UI_WIZZARD_H__ */
+
diff --git a/src/gtk-glade/modest-ui-wizzard.c b/src/gtk-glade/modest-ui-wizzard.c
deleted file mode 100644 (file)
index 9ec2514..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/* 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-wizard.h"
-
-void wizard_missing_notification(GtkWindow *parent, gchar *info_message)
-{
-        GtkWidget *DenyDialog;
-
-        DenyDialog=gtk_message_dialog_new(parent,
-                                          GTK_DIALOG_MODAL,
-                                          GTK_MESSAGE_INFO,
-                                          GTK_BUTTONS_OK,
-                                          "%s",
-                                          info_message);
-
-        gtk_dialog_run(GTK_DIALOG(DenyDialog));
-
-        gtk_widget_destroy(DenyDialog);
-}
-
-gchar *gtk_combo_box_get_entry_text (GtkWidget *combobox)
-{
-        /* Remember to free the returned variable after usage! */
-
-       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox));
-       GtkTreeIter iter;
-
-       gchar *value;
-
-       if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter))
-       {
-               gtk_tree_model_get(GTK_TREE_MODEL(model),
-                                  &iter,
-                                  0, &value,
-                                  -1);
-       }
-
-        return value;
-}
-
-
-gboolean advance_sanity_check(GtkWindow *parent, GladeXML *glade_xml, gint cp)
-{
-        GtkDialog *DenyDialog;
-        gchar *bla;
-
-        switch (cp)
-        {
-        case 0:
-                if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWMailboxnameEntry"))))==0)
-                {
-                        /* FIXME:
-                         * all calls to wizard_missing_notification lack the parent window.
-                         */
-                        wizard_missing_notification(NULL, "Please enter mailbox name");
-                        return FALSE;
-                }
-                bla=gtk_combo_box_get_active_text(GTK_COMBO_BOX(glade_xml_get_widget(glade_xml, "AWMailboxtypeComboBox")));
-                if (bla==NULL)
-                {
-                        wizard_missing_notification(NULL, "Please select mailbox type");
-                        return FALSE;
-                }
-                return TRUE;
-                break;
-
-        }
-
-        return FALSE;
-}
-
-void on_new_account1_activate (GtkMenuItem *menuitem,
-                               gpointer user_data)
-{
-       GladeXML *glade_xml;
-       GtkWidget *dialog;
-        ModestUIPrivate *priv;
-        GtkWidget *FinishButton;
-        GtkWidget *BackButton;
-        GtkWidget *NextButton;
-        GtkWidget *CancelButton;
-        GtkWidget *Notebook;
-        GtkWidget *awidget;
-        gint cp;
-        gint result;
-        gint finishallowed=0;
-
-       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
-
-       glade_xml = glade_xml_new(MODEST_GLADE, "account_wizard", NULL);
-
-        dialog = glade_xml_get_widget(glade_xml, "account_wizard");
-
-        gtk_widget_show_all(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");
-
-        gtk_widget_set_sensitive(FinishButton, FALSE);
-
-        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(FinishButton, FALSE);
-                        gtk_widget_set_sensitive(NextButton, TRUE);
-                        break;
-                case 3:
-                        gtk_widget_set_sensitive(FinishButton, TRUE);
-                        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:
-                        if (advance_sanity_check(NULL, glade_xml, cp)==TRUE)
-                                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);
-
-        if (result==GTK_RESPONSE_ACCEPT)
-        {
-                /* Do someting with the DATA from the widget */
-        }
-
-       gtk_widget_destroy(dialog);
-       g_object_unref(glade_xml);
-}
-
diff --git a/src/gtk-glade/modest-ui-wizzard.h b/src/gtk-glade/modest-ui-wizzard.h
deleted file mode 100644 (file)
index 9d0b829..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-/* modest-ui-wizzard.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_UI_WIZZARD_H__
-#define __MODEST_UI_WIZZARD_H__
-
-void on_new_account1_activate (GtkMenuItem *,
-                               gpointer);
-
-#endif /* __MODEST_UI_WIZZARD_H__ */
-
index 6dfaa48..c36cd3f 100644 (file)
   </child>
 </widget>
 
-<widget class="GtkDialog" id="account_wizzard">
+<widget class="GtkDialog" id="account_wizard">
   <property name="border_width">10</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
              <child>
                <widget class="GtkTable" id="table3">
                  <property name="visible">True</property>
-                 <property name="n_rows">2</property>
+<!--             <property name="n_rows">2</property> -->
+                 <property name="n_rows">1</property>
                  <property name="n_columns">2</property>
                  <property name="homogeneous">False</property>
                  <property name="row_spacing">10</property>
                  <property name="column_spacing">10</property>
-
+<!--
                  <child>
                    <widget class="GtkLabel" id="label14">
                      <property name="visible">True</property>
                      <property name="x_options">fill</property>
                    </packing>
                  </child>
-
+-->
                  <child>
                    <widget class="GtkLabel" id="label15">
                      <property name="visible">True</property>
                    </packing>
                  </child>
 
+<!--
                  <child>
                    <widget class="GtkEntry" id="AWMailboxnameEntry">
                      <property name="visible">True</property>
                      <property name="bottom_attach">1</property>
                    </packing>
                  </child>
-
+-->
                  <child>
                    <widget class="GtkComboBox" id="AWMailboxtypeComboBox">
                      <property name="visible">True</property>
@@ -4038,10 +4040,8 @@ LOCAL</property>
                    <packing>
                      <property name="left_attach">1</property>
                      <property name="right_attach">2</property>
-                     <property name="top_attach">1</property>
-                     <property name="bottom_attach">2</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options">fill</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
                    </packing>
                  </child>
                </widget>