Starting test.

diff --git a/src/Makefile.am b/src/Makefile.am
index f6a23b24a60b214f06050910125cc1086b3adb71..5acf7be23715e2a96a84c993c7564132abed8791 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,13 @@
+if PLATFORM_WIN32
+libmodulesext = -0.dll
+libmodulesdir = $(bindir)
+else
+libmodulesext = .so
+libmodulesdir = $(libdir)
+endif
+
+libzakformmodulesdir = `pkg-config --variable=modulesdir libzakform`
+
 LIBS = $(ZAKFORMGTK_LIBS)
 
 AM_CPPFLAGS = $(ZAKFORMGTK_CFLAGS) \
@@ -30,3 +40,10 @@ libzakformgtk_include_HEADERS = \
                              formelementtextview.h
 
 libzakformgtk_includedir = $(includedir)/libzakformgtk
+
+install-exec-hook:
+       cd $(libzakformmodulesdir) && \
+       ln -s -f $(libmodulesdir)/libzakformgtk$(libmodulesext) .
+
+uninstall-hook:
+       rm -f $(libzakformmodulesdir)/libzakformgtk$(libmodulesext)

diff --git a/src/form.c b/src/form.c
index ddd05789fe4bdeb20035bbb80cd9334e9adf5cd8..64496825db36bdd29bdc1a770089714a0721ab67 100644 (file)
--- a/src/form.c
+++ b/src/form.c
@@ -23,6 +23,7 @@
 #include <syslog.h>
 
 #include "form.h"
+#include "formelement.h"
 
 static void zak_form_gtk_form_class_init (ZakFormGtkFormClass *class);
 static void zak_form_gtk_form_init (ZakFormGtkForm *zak_form_gtk_form);
@@ -39,12 +40,14 @@ static void zak_form_gtk_form_get_property (GObject *object,
 static void zak_form_gtk_form_dispose (GObject *gobject);
 static void zak_form_gtk_form_finalize (GObject *gobject);
 
+static void zak_form_gtk_form_element_added (ZakFormGtkForm *form, ZakFormGtkFormElement *element);
+
 #define ZAK_FORM_GTK_FORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM, ZakFormGtkFormPrivate))
 
 typedef struct _ZakFormGtkFormPrivate ZakFormGtkFormPrivate;
 struct _ZakFormGtkFormPrivate
        {
-               gpointer nothing;
+               GtkBuilder *builder;;
        };
 
 G_DEFINE_TYPE (ZakFormGtkForm, zak_form_gtk_form, ZAK_FORM_TYPE_FORM)
@@ -53,12 +56,15 @@ static void
 zak_form_gtk_form_class_init (ZakFormGtkFormClass *class)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (class);
+       ZakFormFormClass *parent_class = ZAK_FORM_FORM_CLASS (class);
 
        object_class->set_property = zak_form_gtk_form_set_property;
        object_class->get_property = zak_form_gtk_form_get_property;
        object_class->dispose = zak_form_gtk_form_dispose;
        object_class->finalize = zak_form_gtk_form_finalize;
 
+       parent_class->element_added = zak_form_gtk_form_element_added;
+
        g_type_class_add_private (object_class, sizeof (ZakFormGtkFormPrivate));
 }
 
@@ -66,6 +72,8 @@ static void
 zak_form_gtk_form_init (ZakFormGtkForm *zak_form_gtk_form)
 {
        ZakFormGtkFormPrivate *priv = ZAK_FORM_GTK_FORM_GET_PRIVATE (zak_form_gtk_form);
+
+       priv->builder = NULL;
 }
 
 /**
@@ -86,6 +94,22 @@ ZakFormGtkForm
        return zak_form_gtk_form;
 }
 
+/**
+ * zak_form_gtk_form_set_gtkbuilder:
+ * @form:
+ * @builder:
+ *
+ */
+void
+zak_form_gtk_form_set_gtkbuilder (ZakFormGtkForm *form, GtkBuilder *builder)
+{
+       ZakFormGtkFormPrivate *priv;
+
+       priv = ZAK_FORM_GTK_FORM_GET_PRIVATE (form);
+
+       priv->builder = builder;
+}
+
 /* PRIVATE */
 static void
 zak_form_gtk_form_set_property (GObject *object,
@@ -142,3 +166,11 @@ zak_form_gtk_form_finalize (GObject *gobject)
        GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject));
        parent_class->finalize (gobject);
 }
+
+static void
+zak_form_gtk_form_element_added (ZakFormGtkForm *form, ZakFormGtkFormElement *element)
+{
+       ZakFormGtkFormPrivate *priv = ZAK_FORM_GTK_FORM_GET_PRIVATE (form);
+
+       zak_form_gtk_form_element_set_gtkbuilder (element, priv->builder);
+}

diff --git a/src/form.h b/src/form.h
index 73d3d93760c90331e9c046ea03a988597c7b645f..56ee14dffa5f1e43108e152d600b767787677106 100644 (file)
--- a/src/form.h
+++ b/src/form.h
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <gtk/gtk.h>
+
 #include <libzakform/libzakform.h>
 
 
@@ -39,6 +41,8 @@ struct _ZakFormGtkFormClass
 
 ZakFormGtkForm *zak_form_gtk_form_new (void);
 
+void zak_form_gtk_form_set_gtkbuilder (ZakFormGtkForm *form, GtkBuilder *builder);
+
 
 G_END_DECLS
 

diff --git a/src/formelement.c b/src/formelement.c
index 88a26a39cee5bf1adc5b438d8d5908019c9ba98c..57281d8c04e220972672af6e10bfb520d6326f7e 100644 (file)
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -114,7 +114,7 @@ zak_form_gtk_form_element_class_init (ZakFormGtkFormElementClass *class)
                                                                                                                  "Label",
                                                                                                                  "Label",
                                                                                                                  GTK_TYPE_WIDGET,
-                                                                                                                 G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                                                                                 G_PARAM_READWRITE));
 }
 
 static void
@@ -160,14 +160,14 @@ GtkBuilder
 }
 
 /**
- * zak_form_gtk_form_element_widget_set_from_gtkbuilder:
+ * zak_form_gtk_form_element_set_widget_from_gtkbuilder:
  * @element:
  * @gtkbuilder:
  * @widget_name:
  *
  */
 gboolean
-zak_form_gtk_form_element_widget_set_from_gtkbuilder (ZakFormGtkFormElement *element,
+zak_form_gtk_form_element_set_widget_from_gtkbuilder (ZakFormGtkFormElement *element,
                                                                                                          GtkBuilder *gtkbuilder,
                                                                                                          const gchar *widget_name)
 {
@@ -411,7 +411,12 @@ zak_form_gtk_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode
                {
                        if (xmlStrcmp (cur->name, (const xmlChar *)"widget") == 0)
                                {
-                                       zak_form_gtk_form_element_widget_set_from_gtkbuilder (ZAK_FORM_GTK_FORM_ELEMENT (element), priv->builder, (gchar *)xmlNodeGetContent (cur));
+                                       zak_form_gtk_form_element_set_widget_from_gtkbuilder (ZAK_FORM_GTK_FORM_ELEMENT (element), priv->builder, (gchar *)xmlNodeGetContent (cur));
+                               }
+                       else if (xmlStrcmp (cur->name, (const xmlChar *)"label") == 0)
+                               {
+                                       zak_form_gtk_form_element_set_label (ZAK_FORM_GTK_FORM_ELEMENT (element),
+                                                                                                                GTK_WIDGET (gtk_builder_get_object (priv->builder, (gchar *)xmlNodeGetContent (cur))));
                                }
 
                        cur = cur->next;

diff --git a/src/formelement.h b/src/formelement.h
index a9c88c0c315be446bdc78cb007e66d6beabbd3dc..91a71cba7b360d9700e93021ae4456e6a6988d53 100644 (file)
--- a/src/formelement.h
+++ b/src/formelement.h
@@ -47,7 +47,7 @@ struct _ZakFormGtkFormElementClass
 void zak_form_gtk_form_element_set_gtkbuilder (ZakFormGtkFormElement *element, GtkBuilder *gtkbuilder);
 GtkBuilder *zak_form_gtk_form_element_get_gtkbuilder (ZakFormGtkFormElement *element);
 
-gboolean zak_form_gtk_form_element_widget_set_from_gtkbuilder (ZakFormGtkFormElement *element,
+gboolean zak_form_gtk_form_element_set_widget_from_gtkbuilder (ZakFormGtkFormElement *element,
                                                                                                                           GtkBuilder *gtkbuilder,
                                                                                                                           const gchar *widget_name);
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6fa87f6f1fbcf2ca68d0266a6cab274e382bb397..af3533e48c2cf0c048215eb8af86d4a3a7d298a7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,16 @@
 AM_CPPFLAGS = $(WARN_CFLAGS) \
               $(DISABLE_DEPRECATED_CFLAGS) \
               $(ZAKFORMGTK_CFLAGS) \
-              -I$(top_srcdir)/src
+              -I$(top_srcdir)/src \
+              -DGUIDIR="\"@abs_builddir@\""
 
 LIBS = $(ZAKFORMGTK_LIBS) \
        -export-dynamic
 
 LDADD = $(top_builddir)/src/libzakformgtk.la
 
-noinst_PROGRAMS =
+noinst_PROGRAMS = \
+                  test
+
+EXTRA_DIST = \
+             test.xml

diff --git a/tests/test.c b/tests/test.c
new file mode 100644 (file)
index 0000000..ca979c7
--- /dev/null
+++ b/tests/test.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+#include "form.h"
+
+int
+main (int argc, char *argv[])
+{
+       GtkBuilder *builder;
+       GtkWidget *w;
+
+       ZakFormGtkForm *form;
+
+       gtk_init (&argc, &argv);
+
+       builder = gtk_builder_new ();
+       gtk_builder_add_objects_from_file (builder, GUIDIR "/test.ui", g_strsplit ("w_main", "|", -1), NULL);
+
+       w = GTK_WIDGET (gtk_builder_get_object (builder, "w_main"));
+
+       g_signal_connect (w, "delete-event",
+                                         gtk_main_quit, NULL);
+
+       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");
+
+       gtk_widget_show_all (w);
+
+       gtk_main ();
+
+       return 0;
+}

diff --git a/tests/test.ui b/tests/test.ui
new file mode 100644 (file)
index 0000000..505bfe3
--- /dev/null
+++ b/tests/test.ui
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.12"/>
+  <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="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="climb_rate">1</property>
+                <property name="value">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/tests/test.xml b/tests/test.xml
new file mode 100644 (file)
index 0000000..c7a8584
--- /dev/null
+++ b/tests/test.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<zakform>
+
+  <element type="zak_form_gtk_form_element_label">
+       <widget>lbl_id</widget>
+       <label>label8</label>
+  </element>
+
+  <!--<element type="zak_form_gtk_form_element_entry">
+       <widget>txt_name</widget>
+       <label>label1</label>
+  </element>
+
+  <element type="zak_form_gtk_form_element_spin">
+       <widget>spn_age</widget>
+       <label>label4</label>
+  </element>
+
+  <element type="zak_form_gtk_form_element_check">
+       <widget>chk_married</widget>
+       <label>label9</label>
+  </element>
+
+  <element type="zak_form_gtk_form_element_textview">
+       <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">
+       <widget>rbtnNone</widget>
+       <label>label3</label>
+       <return-value></return-value>
+  </element>
+
+  <element type="zak_form_gtk_form_element_radio">
+       <widget>rbtnMale</widget>
+       <label>label3</label>
+       <return-value>M</return-value>
+  </element>
+
+  <element type="zak_form_gtk_form_element_radio">
+       <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>