From 19daef127f90a4e457cb09c0c32b196a6b0c8915 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 28 Nov 2015 13:35:08 +0100
Subject: [PATCH] Tested default-value.

---
 src/formelement.c      |  2 ++
 src/formelementcheck.c |  2 +-
 src/formelementradio.c |  7 ++++---
 tests/test.c           |  5 ++++-
 tests/test.ui          |  9 +++++++--
 tests/test.xml         | 15 +++++++++++++--
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/formelement.c b/src/formelement.c
index 57281d8..6c2dec1 100644
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -406,6 +406,8 @@ zak_form_gtk_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode
 
 	ZakFormGtkFormElementPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE ((ZakFormGtkFormElement *)element);
 
+	ZAK_FORM_ELEMENT_GET_CLASS (element)->xml_parsing (element, xmlnode);
+
 	cur = xmlnode->children;
 	while (cur != NULL)
 		{
diff --git a/src/formelementcheck.c b/src/formelementcheck.c
index b345f89..da2ea53 100644
--- a/src/formelementcheck.c
+++ b/src/formelementcheck.c
@@ -195,7 +195,7 @@ zak_form_gtk_form_element_check_set_value (ZakFormGtkFormElementCheck *element,
 
 	w = zak_form_gtk_form_element_get_widget (ZAK_FORM_GTK_FORM_ELEMENT (element));
 
-	str_value = g_strstrip (g_strdup (zak_form_gtk_form_element_check_get_value (element)));
+	str_value = g_strstrip (g_strdup (value));
 
 	if (strcmp (str_value, "0") == 0
 	    || strcasecmp (str_value, "f") == 0
diff --git a/src/formelementradio.c b/src/formelementradio.c
index eeea2ad..c0e6796 100644
--- a/src/formelementradio.c
+++ b/src/formelementradio.c
@@ -77,7 +77,7 @@ zak_form_gtk_form_element_radio_class_init (ZakFormGtkFormElementRadioClass *kla
 	                                                      "Return value",
 	                                                      "Return value",
 	                                                      "",
-	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                                      G_PARAM_READWRITE));
 }
 
 static void
@@ -85,6 +85,7 @@ zak_form_gtk_form_element_radio_init (ZakFormGtkFormElementRadio *zak_form_gtk_f
 {
 	ZakFormGtkFormElementRadioPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_RADIO_GET_PRIVATE (zak_form_gtk_form_element_radio);
 
+	priv->return_value = g_strdup ("");
 }
 
 /**
@@ -179,7 +180,7 @@ zak_form_gtk_form_element_radio_set_property (GObject *object,
 	switch (property_id)
 		{
 		case PROP_RETURN_VALUE:
-			zak_form_gtk_form_element_radio_set_value (zak_form_gtk_form_element_radio, g_value_get_string (value));
+			zak_form_gtk_form_element_radio_set_return_value (zak_form_gtk_form_element_radio, g_value_get_string (value));
 			break;
 
 		default:
@@ -200,7 +201,7 @@ zak_form_gtk_form_element_radio_get_property (GObject *object,
 	switch (property_id)
 		{
 		case PROP_RETURN_VALUE:
-			g_value_set_string (value, zak_form_gtk_form_element_radio_get_value (zak_form_gtk_form_element_radio));
+			g_value_set_string (value, zak_form_gtk_form_element_radio_get_return_value (zak_form_gtk_form_element_radio));
 			break;
 
 		default:
diff --git a/tests/test.c b/tests/test.c
index ca979c7..2f3cffc 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -31,7 +31,9 @@ main (int argc, char *argv[])
 	gtk_init (&argc, &argv);
 
 	builder = gtk_builder_new ();
-	gtk_builder_add_objects_from_file (builder, GUIDIR "/test.ui", g_strsplit ("w_main", "|", -1), NULL);
+	gtk_builder_add_objects_from_file (builder, GUIDIR "/test.ui",
+									   g_strsplit ("w_main"
+												   "|adjustment1", "|", -1), NULL);
 
 	w = GTK_WIDGET (gtk_builder_get_object (builder, "w_main"));
 
@@ -41,6 +43,7 @@ main (int argc, char *argv[])
 	form = zak_form_gtk_form_new ();
 	zak_form_gtk_form_set_gtkbuilder (form, builder);
 	zak_form_form_load_from_file (ZAK_FORM_FORM (form), GUIDIR "/test.xml");
+	zak_form_form_clear (ZAK_FORM_FORM (form));
 
 	gtk_widget_show_all (w);
 
diff --git a/tests/test.ui b/tests/test.ui
index 505bfe3..4befde9 100644
--- a/tests/test.ui
+++ b/tests/test.ui
@@ -2,6 +2,11 @@
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkWindow" id="w_main">
     <property name="can_focus">False</property>
     <child>
@@ -86,12 +91,12 @@
               <object class="GtkSpinButton" id="spn_age">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="max_length">6</property>
                 <property name="text" translatable="yes">1</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
-                <property name="adjustment">adjustment2</property>
+                <property name="adjustment">adjustment1</property>
                 <property name="climb_rate">1</property>
-                <property name="value">1</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/tests/test.xml b/tests/test.xml
index c7a8584..bcce5b1 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -2,26 +2,34 @@
 <zakform>
 
   <element type="zak_form_gtk_form_element_label">
+	<default-value>999</default-value>
 	<widget>lbl_id</widget>
 	<label>label8</label>
   </element>
 
-  <!--<element type="zak_form_gtk_form_element_entry">
+  <element type="zak_form_gtk_form_element_entry">
+	<default-value>John Doe</default-value>
 	<widget>txt_name</widget>
 	<label>label1</label>
   </element>
 
   <element type="zak_form_gtk_form_element_spin">
+	<default-value>33</default-value>
 	<widget>spn_age</widget>
 	<label>label4</label>
   </element>
 
   <element type="zak_form_gtk_form_element_check">
+	<default-value>TRUE</default-value>
 	<widget>chk_married</widget>
 	<label>label9</label>
   </element>
 
   <element type="zak_form_gtk_form_element_textview">
+	<default-value>dafault value for textview
+with line break
+and					 some 		 tabs
+	and ' ' ' ' ' ' ' ' ?? ? ? ? ?? * * * * </default-value>
 	<widget>txtv_description</widget>
 	<label>label10</label>
   </element>
@@ -32,18 +40,21 @@
   </element>
 
   <element type="zak_form_gtk_form_element_radio">
+	<default-value>M</default-value>
 	<widget>rbtnNone</widget>
 	<label>label3</label>
 	<return-value></return-value>
   </element>
 
   <element type="zak_form_gtk_form_element_radio">
+	<default-value>M</default-value>
 	<widget>rbtnMale</widget>
 	<label>label3</label>
 	<return-value>M</return-value>
   </element>
 
   <element type="zak_form_gtk_form_element_radio">
+	<default-value>M</default-value>
 	<widget>rbtnFemale</widget>
 	<label>label3</label>
 	<return-value>F</return-value>
@@ -52,6 +63,6 @@
   <element type="zak_form_gtk_form_element_entry">
 	<widget>txt_income</widget>
 	<label>label5</label>
-  </element>-->
+  </element>
 
 </zakform>
-- 
2.49.0