Added function GtkForm::get_values_as_xml (refs #305).

diff --git a/.cproject b/.cproject
index 609c77647ff448b746aa22cd7510b8b779268af6..b7d8ef04794853349719d7ef7d29f9b555125b34 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -3,8 +3,8 @@
 
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
        <storageModule moduleId="org.eclipse.cdt.core.settings">
-               <cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1787576894">
-                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1787576894" moduleId="org.eclipse.cdt.core.settings" name="Default">
+               <cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.2062724017">
+                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.2062724017" moduleId="org.eclipse.cdt.core.settings" name="Default">
                                <externalSettings/>
                                <extensions>
                                        <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -14,31 +14,30 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="libgtkform" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1787576894" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-                                       <folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1787576894.1102004166" name="/" resourcePath="">
-                                               <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.133199640" name="cdt.managedbuild.toolchain.gnu.mingw.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
-                                                       <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.136826476" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-                                                       <builder buildPath="${workspace_loc:/libgtkform/Default}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.758991837" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.461920277" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1114600826" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                               <configuration artifactName="libgtkform" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.2062724017" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+                                       <folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.2062724017.62298528" name="/" resourcePath="">
+                                               <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.1602367879" name="cdt.managedbuild.toolchain.gnu.mingw.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
+                                                       <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.298069357" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
+                                                       <builder buildPath="${workspace_loc:/libgtkform/Default}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1817131754" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.707934779" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
+                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.243887709" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1003588714" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.895849839" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.750743053" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1636861940" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.1801393322" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
+                                                               <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1534144287" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.574440126" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                                                               <option id="gnu.c.compiler.option.include.paths.1394559870" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+                                                       <tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1110736935" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                                                               <option id="gnu.c.compiler.option.include.paths.467981111" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\glib-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libgda-4.0\libgda&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\gtk-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libgda-4.0&quot;"/>
                                                                </option>
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.639758280" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.120046929" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1760160466" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.855393552" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1670186231" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+                                                       <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1013554253" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.109625869" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
+                                                               <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1375777822" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
@@ -50,10 +49,11 @@
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
                </cconfiguration>
        </storageModule>
-       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-               <project id="libgtkform.null.964343723" name="libgtkform"/>
-       </storageModule>
        <storageModule moduleId="scannerConfiguration">
                <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </storageModule>
+       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+               <project id="libgtkform.null.143602593" name="libgtkform"/>
+       </storageModule>
+       <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 </cproject>

diff --git a/libgtkform/form.c b/libgtkform/form.c
index a35f9ce5aa0acc23b8247eb97536df73e159c8d4..de8765cf792bcfc91f61ba3fab1c6ecaf82af49c 100644 (file)
--- a/libgtkform/form.c
+++ b/libgtkform/form.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2012 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -2373,6 +2373,54 @@ gtk_form_fill_from_hashtable (GtkForm *form, GHashTable *hashtable)
        return ret;
 }
 
+/**
+ * gtk_form_get_original_values_as_xml:
+ * @form:
+ *
+ */
+xmlNode
+*gtk_form_get_values_as_xml (GtkForm *form)
+{
+       GtkFormPrivate *priv;
+       GSList *fields;
+       GtkFormField *field;
+       gchar *field_name;
+       gchar *str;
+       xmlNode *xnode;
+       xmlNode *xnode_field;
+
+       g_return_val_if_fail (IS_GTK_FORM (form), NULL);
+
+       priv = GTK_FORM_GET_PRIVATE (form);
+
+       fields = priv->fields;
+
+       if (fields != NULL)
+               {
+                       xnode = xmlNewNode (NULL, "values");
+               }
+
+       while (fields != NULL)
+               {
+                       field = (GtkFormField *)fields->data;
+
+                       field_name = gtk_form_field_get_field_name (field);
+
+                       str = gtk_form_field_get_value_stringify (field);
+                       if (str != NULL)
+                               {
+                                       /* TODO check if the field already exists */
+                                       xnode_field = xmlNewNode (NULL, field_name);
+                                       xmlNodeAddContent (xnode_field, str);
+                                       xmlAddChild (xnode, xnode_field);
+                               }
+
+                       fields = g_slist_next (fields);
+               }
+
+       return xnode;
+}
+
 /**
  * gtk_form_add_group:
  * @form:

diff --git a/libgtkform/form.h b/libgtkform/form.h
index 2dca1c6956aaf0478dd2c718ae1f52fef8ba56de..c8e0a1daf61d77fc3cfc112c73942bdea0db1271 100644 (file)
--- a/libgtkform/form.h
+++ b/libgtkform/form.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2012 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -132,6 +132,8 @@ GHashTable *gtk_form_get_values_as_hashtable (GtkForm *form);
 GHashTable *gtk_form_get_original_values_as_hashtable (GtkForm *form);
 gboolean gtk_form_fill_from_hashtable (GtkForm *form, GHashTable *hashtable);
 
+xmlNode *gtk_form_get_values_as_xml (GtkForm *form);
+
 gboolean gtk_form_add_group (GtkForm *form, GtkFormGroup *group);
 GtkFormGroup *gtk_form_get_group_by_name (GtkForm *form, const gchar *group_name);
 

diff --git a/test/from_xml.c b/test/from_xml.c
index edb72a6723fbc8de12802118a21919e5d00fd11b..4666882a168ce3415eb6cd6ca789561d0be09cdb 100644 (file)
--- a/test/from_xml.c
+++ b/test/from_xml.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2012 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -137,6 +137,24 @@ on_btnSqlDelete_clicked (GtkButton *button,
        gtk_text_buffer_set_text (buf, sql, strlen (sql));
 }
 
+G_MODULE_EXPORT void
+on_btnXml_clicked (GtkButton *button,
+                         gpointer user_data)
+{
+       gint size;
+       xmlChar *str;
+
+       GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (txtvSql));
+       xmlNode *xnode = gtk_form_get_values_as_xml (form);
+
+       xmlDoc *xdoc = xmlNewDoc ("1.0");
+       xmlDocSetRootElement (xdoc, xnode);
+
+       xmlDocDumpMemory (xdoc, &str, &size);
+
+       gtk_text_buffer_set_text (buf, str, strlen (str));
+}
+
 void
 create_cb_nation (GtkWidget *w)
 {

diff --git a/test/main.c b/test/main.c
index d614182086787f3836b87ed4820f06d3f5e30a29..7b2f42de625f713b20c00fec32dd59ac3a5eef21 100644 (file)
--- a/test/main.c
+++ b/test/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2012 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 #include <libgtkform/widgetcombobox.h>
 #include <libgtkform/widgetentry.h>
 #include <libgtkform/widgetlabel.h>
+#include <libgtkform/widgetradio.h>
 #include <libgtkform/widgetspin.h>
 #include <libgtkform/widgettextview.h>
 
@@ -50,6 +51,7 @@ GtkFormWidget *wtxtv;
 GtkFormWidget *wspin;
 GtkFormWidget *wcheck;
 GtkFormWidget *wcombobox;
+GtkFormWidget *wradio;
 
 GtkWidget *w;
 GtkWidget *txtvSql;
@@ -151,6 +153,24 @@ on_btnSqlDelete_clicked (GtkButton *button,
        gtk_text_buffer_set_text (buf, sql, strlen (sql));
 }
 
+G_MODULE_EXPORT void
+on_btnXml_clicked (GtkButton *button,
+                         gpointer user_data)
+{
+       gint size;
+       xmlChar *str;
+
+       GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (txtvSql));
+       xmlNode *xnode = gtk_form_get_values_as_xml (form);
+
+       xmlDoc *xdoc = xmlNewDoc ("1.0");
+       xmlDocSetRootElement (xdoc, xnode);
+
+       xmlDocDumpMemory (xdoc, &str, &size);
+
+       gtk_text_buffer_set_text (buf, str, strlen (str));
+}
+
 void
 create_cb_nation (GtkWidget *w)
 {
@@ -342,11 +362,57 @@ main (int argc, char **argv)
                      "field", "now",
                      "form-widget", wlabel,
                      "type", GTK_FORM_FIELD_DATETIME_TYPE_DATE,
-                     "default", now,
+                     "default", g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d",
+                                                 now->tm_year + 1900,
+                                                 now->tm_mon + 1,
+                                                 now->tm_mday,
+                                                 now->tm_hour,
+                                                 now->tm_min,
+                                                 now->tm_sec),
                      "display-format", "%d/%m/%Y",
                      NULL);
        gtk_form_add_field (form, fdatetime);
 
+       /* RADIO - TEXT */
+       wradio = gtk_form_widget_radio_new ();
+       gtk_form_widget_set_from_gtkbuilder (wradio, gtkbuilder, "rbtnNone");
+       g_object_set (wradio,
+                     "return-value", "",
+                     NULL);
+
+       ftext = gtk_form_field_text_new ();
+       g_object_set (ftext,
+                     "field", "sex",
+                     "form-widget", wradio,
+                     NULL);
+       gtk_form_add_field (form, ftext);
+
+       wradio = gtk_form_widget_radio_new ();
+       gtk_form_widget_set_from_gtkbuilder (wradio, gtkbuilder, "rbtnMale");
+       g_object_set (wradio,
+                     "return-value", "M",
+                     NULL);
+
+       ftext = gtk_form_field_text_new ();
+       g_object_set (ftext,
+                     "field", "sex",
+                     "form-widget", wradio,
+                     NULL);
+       gtk_form_add_field (form, ftext);
+
+       wradio = gtk_form_widget_radio_new ();
+       gtk_form_widget_set_from_gtkbuilder (wradio, gtkbuilder, "rbtnFemale");
+       g_object_set (wradio,
+                     "return-value", "F",
+                     NULL);
+
+       ftext = gtk_form_field_text_new ();
+       g_object_set (ftext,
+                     "field", "sex",
+                     "form-widget", wradio,
+                     NULL);
+       gtk_form_add_field (form, ftext);
+
        txtvSql = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txtvSql"));
 
        gtk_builder_connect_signals (gtkbuilder, NULL);

diff --git a/test/test.gui b/test/test.gui
index f56655880784dccf4b50b9aa4c8bd357702d4627..6183e43d15b5976c10dc0ce00959a6ccc6aef9ad 100644 (file)
--- a/test/test.gui
+++ b/test/test.gui
@@ -1,21 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkWindow" id="wMain">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">test libform</property>
     <property name="default_width">600</property>
     <property name="default_height">440</property>
-    <signal name="delete_event" handler="gtk_main_quit"/>
+    <signal name="delete-event" handler="gtk_main_quit" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">3</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">3</property>
             <property name="n_rows">10</property>
             <property name="n_columns">2</property>
@@ -24,6 +38,7 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Label (id)</property>
               </object>
@@ -35,6 +50,7 @@
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">GtkEntry (name)</property>
               </object>
@@ -48,6 +64,7 @@
             <child>
               <object class="GtkLabel" id="lblID">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -61,6 +78,10 @@
               <object class="GtkEntry" id="txtName">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -73,6 +94,7 @@
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">GtkSpinButton (Integer) (age)</property>
               </object>
@@ -87,6 +109,10 @@
               <object class="GtkSpinButton" id="spnAge">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">adjustment2</property>
                 <property name="climb_rate">1</property>
               </object>
@@ -101,6 +127,7 @@
             <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">GtkSpinButton (Float) (amount)</property>
               </object>
@@ -115,6 +142,10 @@
               <object class="GtkSpinButton" id="spnAmount">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="climb_rate">1</property>
                 <property name="digits">2</property>
@@ -130,6 +161,7 @@
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">GtkComboBox (integer) (id_nation)</property>
               </object>
@@ -143,6 +175,7 @@
             <child>
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Label (?) (text)</property>
               </object>
@@ -156,6 +189,7 @@
             <child>
               <object class="GtkLabel" id="lblText">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -170,6 +204,7 @@
             <child>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">GtkCheckButton (married)</property>
               </object>
@@ -182,6 +217,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="chkMarried">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -200,6 +236,7 @@
             <child>
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">GtkTextView (description)</property>
               </object>
@@ -234,6 +271,7 @@
             <child>
               <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Label (DateTime) (now)</property>
               </object>
@@ -247,6 +285,7 @@
             <child>
               <object class="GtkLabel" id="lblDateTime">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -261,6 +300,7 @@
             <child>
               <object class="GtkComboBox" id="cbNation">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -274,6 +314,7 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Radio (sex)</property>
               </object>
@@ -285,9 +326,11 @@
             <child>
               <object class="GtkHBox" id="hbox2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkRadioButton" id="rbtnNone">
                     <property name="label" translatable="yes">None</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -295,12 +338,15 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="rbtnMale">
                     <property name="label" translatable="yes">Male</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -309,12 +355,15 @@
                     <property name="group">rbtnNone</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="rbtnFemale">
                     <property name="label" translatable="yes">Female</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -323,6 +372,8 @@
                     <property name="group">rbtnNone</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -337,21 +388,24 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">4</property>
             <child>
               <object class="GtkButton" id="btnClear">
                 <property name="label">gtk-clear</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btnClear_clicked"/>
+                <signal name="clicked" handler="on_btnClear_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -362,11 +416,12 @@
             <child>
               <object class="GtkButton" id="btnCheck">
                 <property name="label" translatable="yes">Check</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_btnCheck_clicked"/>
+                <signal name="clicked" handler="on_btnCheck_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -377,11 +432,12 @@
             <child>
               <object class="GtkToggleButton" id="tbtnEditable">
                 <property name="label" translatable="yes">Editable</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="toggled" handler="on_tbtnEditable_toggled"/>
+                <signal name="toggled" handler="on_tbtnEditable_toggled" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -392,11 +448,12 @@
             <child>
               <object class="GtkToggleButton" id="tbtnSensitive">
                 <property name="label" translatable="yes">Sensitive</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="toggled" handler="on_tbtnSensitive_toggled"/>
+                <signal name="toggled" handler="on_tbtnSensitive_toggled" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -407,22 +464,25 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="btnSqlUpdate">
                 <property name="label" translatable="yes">Sql _UPDATE</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_btnSqlUpdate_clicked"/>
+                <signal name="clicked" handler="on_btnSqlUpdate_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -433,12 +493,13 @@
             <child>
               <object class="GtkButton" id="btnSqlInsert">
                 <property name="label" translatable="yes">Sql _INSERT INTO</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_btnSqlInsert_clicked"/>
+                <signal name="clicked" handler="on_btnSqlInsert_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -449,12 +510,13 @@
             <child>
               <object class="GtkButton" id="btnSqlDelete">
                 <property name="label" translatable="yes">Sql _DELETE</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_btnSqlDelete_clicked"/>
+                <signal name="clicked" handler="on_btnSqlDelete_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -465,12 +527,13 @@
             <child>
               <object class="GtkButton" id="btnSqlSelect">
                 <property name="label" translatable="yes">Sql _SELECT</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_btnSqlSelect_clicked"/>
+                <signal name="clicked" handler="on_btnSqlSelect_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -478,21 +541,41 @@
                 <property name="position">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label" translatable="yes">_XML</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_btnXml_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkTable" id="table2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_columns">2</property>
             <child>
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">SQL</property>
+                <property name="label" translatable="yes">SQL
+XML</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
@@ -519,22 +602,12 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">1</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="value">1</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>