Added datadir with gui and xml.

diff --git a/Makefile.am b/Makefile.am
index 5c25a37cd3c67c0bfe12e1ad7987426e51afb1bd..6c7bd630f3ed1701f1376747619b04817ea42d80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src data
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/configure.ac b/configure.ac
index 732af6809582c902c6b5540d7b5f7f8a2f66cb70..794b7c38acf8b2622b75feade5b5e360eee9d962 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,5 +68,9 @@ AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes])
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
+       data/Makefile
+       data/zakformtests/Makefile
+       data/zakformtests/gui/Makefile
+       data/zakformtests/xml/Makefile
 ])
 AC_OUTPUT

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644 (file)
index 0000000..f92ab06
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = zakformtests

diff --git a/data/zakformtests/Makefile.am b/data/zakformtests/Makefile.am
new file mode 100644 (file)
index 0000000..24edb2f
--- /dev/null
+++ b/data/zakformtests/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = gui xml

diff --git a/data/zakformtests/gui/Makefile.am b/data/zakformtests/gui/Makefile.am
new file mode 100644 (file)
index 0000000..8f1c55b
--- /dev/null
+++ b/data/zakformtests/gui/Makefile.am
@@ -0,0 +1 @@
+noinst_DATA = main.ui

diff --git a/data/zakformtests/gui/main.ui b/data/zakformtests/gui/main.ui
new file mode 100644 (file)
index 0000000..4befde9
--- /dev/null
+++ b/data/zakformtests/gui/main.ui
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">5</property>
+        <property name="margin_right">5</property>
+        <property name="margin_top">5</property>
+        <property name="margin_bottom">5</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">True</property>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label8">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">ID</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lbl_id">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Name</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="txt_name">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">200</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Age</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <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">adjustment1</property>
+                <property name="climb_rate">1</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Married</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="chk_married">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Description</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <child>
+                  <object class="GtkTextView" id="txtv_description">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Birthday</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="txt_birthday">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Sex</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box2">
+                <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="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <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="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <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="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">rbtnNone</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Income</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">7</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="txt_income">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">7</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

diff --git a/data/zakformtests/xml/Makefile.am b/data/zakformtests/xml/Makefile.am
new file mode 100644 (file)
index 0000000..157b096
--- /dev/null
+++ b/data/zakformtests/xml/Makefile.am
@@ -0,0 +1 @@
+noinst_DATA = main.xml

diff --git a/data/zakformtests/xml/main.xml b/data/zakformtests/xml/main.xml
new file mode 100644 (file)
index 0000000..bcce5b1
--- /dev/null
+++ b/data/zakformtests/xml/main.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<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">
+       <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>
+
+  <element type="zak_form_gtk_form_element_entry">
+       <widget>txt_birthday</widget>
+       <label>label11</label>
+  </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>
+  </element>
+
+  <element type="zak_form_gtk_form_element_entry">
+       <widget>txt_income</widget>
+       <label>label5</label>
+  </element>
+
+</zakform>