From 19bd0ae61477b36996fbc238b16d92caa61dde1a Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Wed, 14 Dec 2016 17:48:01 +0100
Subject: [PATCH] Migrazione a libzakform di persona nodo recapito.
---
.../form/persona_nodo_recapito.form | 94 +++++++++----------
data/organigramma/gui/organigramma.gui | 2 +-
src/personanodorecapito.c | 82 ++++++++++++----
3 files changed, 109 insertions(+), 69 deletions(-)
diff --git a/data/organigramma/form/persona_nodo_recapito.form b/data/organigramma/form/persona_nodo_recapito.form
index 3418851..88cc36d 100644
--- a/data/organigramma/form/persona_nodo_recapito.form
+++ b/data/organigramma/form/persona_nodo_recapito.form
@@ -1,51 +1,45 @@
<?xml version="1.0"?>
-<gtkform>
-
- <table>persona_nodo_recapiti</table>
-
- <widget type="label" name="label122">
- <field type="integer" name="id">
- <is-key>t</is-key>
- <auto-increment>t</auto-increment>
- </field>
- </widget>
-
- <widget type="label" name="label126">
- <field type="integer" name="id_persone">
- </field>
- </widget>
-
- <widget type="label" name="label123">
- <field type="integer" name="id_nodi">
- </field>
- </widget>
-
- <widget type="decoder" name="gtkformdecoder9" label="label121">
- <decoder>
- <sql>
- SELECT a.nome
- FROM tipi_recapito AS a
- WHERE a.id = ##key0::gint
- </sql>
- </decoder>
- <field type="integer" name="id_tipi_recapito">
- <obligatory>t</obligatory>
- </field>
- </widget>
-
- <widget type="entry" name="entry33" label="label124">
- <field type="text" name="recapito">
- <obligatory>t</obligatory>
- </field>
- </widget>
-
- <widget type="textview" name="textview13" label="label120">
- <field type="text" name="note" />
- </widget>
-
- <widget type="checkbox" name="checkbutton11" label="label125">
- <field type="boolean" name="privato">
- </field>
- </widget>
-
-</gtkform>
+<zakform>
+ <element type="zak_form_gtk_form_element_label">
+ <name>id</name>
+ <type>integer</type>
+ <is-key>TRUE</is-key>
+ <widget>label122</widget>
+ </element>
+ <element type="zak_form_gtk_form_element_label">
+ <name>id_persone</name>
+ <type>integer</type>
+ <widget>label126</widget>
+ </element>
+ <element type="zak_form_gtk_form_element_label">
+ <name>id_nodi</name>
+ <type>integer</type>
+ <widget>label123</widget>
+ </element>
+ <element type="zak_form_gtk_form_element_decoder">
+ <name>id_tipi_recapito</name>
+ <type>integer</type>
+ <label>label121</label>
+ <widget>zakgtkdecoder16</widget>
+ <validator type="zak_form_element_validator_notempty">0</validator>
+ </element>
+ <element type="zak_form_gtk_form_element_entry">
+ <name>recapito</name>
+ <type>string</type>
+ <label>label124</label>
+ <widget>entry33</widget>
+ <validator type="zak_form_element_validator_notempty"/>
+ </element>
+ <element type="zak_form_gtk_form_element_textview">
+ <name>note</name>
+ <type>string</type>
+ <label>label120</label>
+ <widget>textview13</widget>
+ </element>
+ <element type="zak_form_gtk_form_element_check">
+ <name>privato</name>
+ <type>boolean</type>
+ <label>label125</label>
+ <widget>checkbutton11</widget>
+ </element>
+</zakform>
diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index ca927dd..675c747 100644
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -5416,7 +5416,7 @@
</packing>
</child>
<child>
- <object class="GtkFormDecoder" id="gtkformdecoder9">
+ <object class="ZakGtkDecoder" id="zakgtkdecoder16">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
diff --git a/src/personanodorecapito.c b/src/personanodorecapito.c
index 06cca71..a57275f 100644
--- a/src/personanodorecapito.c
+++ b/src/personanodorecapito.c
@@ -24,8 +24,11 @@
#include <glib/gprintf.h>
#include <libzakautho/autoz.h>
-#include <libgtkform/form.h>
-#include <libgtkformui/gtkformdecoder.h>
+#include <libzakgtkdecoder/libzakgtkdecoder.h>
+#include <libzakform/libzakform.h>
+#include <libzakformgtk/libzakformgtk.h>
+#include <libzakformgdaex/libzakformgdaex.h>
+#include <libzakformgtkdecoder/libzakformgtkdecoder.h>
#include <libsolipa/utils.h>
#include "personanodorecapito.h"
@@ -38,6 +41,7 @@ static void organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRe
static void organigramma_persona_nodo_recapito_salva (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito, gboolean chiudi);
static void organigramma_persona_nodo_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data);
+static gchar *organigramma_persona_nodo_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data);
static gboolean organigramma_persona_nodo_recapito_conferma_chiusura (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito);
@@ -79,7 +83,8 @@ struct _OrganigrammaPersonaNodoRecapitoPrivate
{
OrganigrammaCommons *commons;
- GtkForm *form;
+ ZakFormGtkForm *form;
+ ZakFormGdaexProvider *form_provider;
GtkWidget *w;
@@ -154,13 +159,15 @@ OrganigrammaPersonaNodoRecapito
return NULL;
}
- priv->form = gtk_form_new ();
- g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
- gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_nodo_recapito.form", NULL), priv->commons->gtkbuilder);
+ priv->form = zak_form_gtk_form_new ();
+ zak_form_gtk_form_set_gtkbuilder (priv->form, priv->commons->gtkbuilder);
+ zak_form_form_load_from_file (ZAK_FORM_FORM (priv->form), g_build_filename (priv->commons->formdir, "persona_nodo_recapito.form", NULL));
+
+ priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "persona_nodo_recapiti");
priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_nodo_recapito"));
- priv->objects = gtk_form_get_objects_by_name (priv->form,
+ priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form,
"label122",
"label126",
"label123",
@@ -169,8 +176,10 @@ OrganigrammaPersonaNodoRecapito
g_signal_connect (priv->w,
"delete-event", G_CALLBACK (organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event), (gpointer *)a);
- g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder9"),
+ g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder16"),
"btn-browse-clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_tipo_recapito_clicked), (gpointer)a);
+ g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder16"),
+ "decode", G_CALLBACK (organigramma_persona_nodo_recapito_on_tipo_recapito_decode), (gpointer)a);
g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button93")),
"clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_annulla_clicked), (gpointer *)a);
@@ -179,7 +188,7 @@ OrganigrammaPersonaNodoRecapito
g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button160")),
"clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_salvaechiudi_clicked), (gpointer *)a);
- gtk_form_clear (priv->form);
+ zak_form_form_clear (ZAK_FORM_FORM (priv->form));
priv->id = id;
if (priv->id == 0)
@@ -188,7 +197,7 @@ OrganigrammaPersonaNodoRecapito
gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID_PERSONE]), g_strdup_printf ("%d", id_persone));
gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID_NODI]), g_strdup_printf ("%d", id_nodi));
- gtk_form_set_as_origin (priv->form);
+ zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form));
}
else
{
@@ -229,7 +238,7 @@ organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRecapito *orga
OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
- if (gtk_form_fill_from_table (priv->form))
+ if (zak_form_form_load (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider)))
{
}
}
@@ -237,27 +246,38 @@ organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRecapito *orga
static void
organigramma_persona_nodo_recapito_salva (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito, gboolean chiudi)
{
- gchar *sql;
+ gboolean success;
OrganigrammaPersonaNodoRecapitoClass *klass = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_CLASS (organigramma_persona_nodo_recapito);
OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
- if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
+ if (!zak_form_gtk_form_is_valid (priv->form, priv->w))
{
return;
}
+ success = FALSE;
+
if (priv->id == 0)
{
- sql = gtk_form_get_sql (priv->form, GTK_FORM_SQL_INSERT);
+ guint new_id;
+
+ new_id = gdaex_get_new_id (priv->commons->gdaex,
+ "persona_nodo_recapiti",
+ "id",
+ NULL);
+
+ gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", new_id));
+
+ success = zak_form_form_insert (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider));
}
else
{
- sql = gtk_form_get_sql (priv->form, GTK_FORM_SQL_UPDATE);
+ success = zak_form_form_update (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider));
}
- if (gdaex_execute (priv->commons->gdaex, sql) == 1)
+ if (success)
{
g_signal_emit (organigramma_persona_nodo_recapito, klass->aggiornato_signal_id, 0);
@@ -325,7 +345,7 @@ organigramma_persona_nodo_recapito_conferma_chiusura (OrganigrammaPersonaNodoRec
ret = TRUE;
- if (gtk_form_is_changed (priv->form))
+ if (zak_form_form_is_changed (ZAK_FORM_FORM (priv->form)))
{
if (solipa_message_dialog (priv->w,
GTK_MESSAGE_QUESTION,
@@ -346,10 +366,36 @@ organigramma_persona_nodo_recapito_on_tipo_recapito_selezionato (gpointer instan
OrganigrammaPersonaNodoRecapito *f = (OrganigrammaPersonaNodoRecapito *)user_data;
OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (f);
- gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder9"),
+ zak_gtk_decoder_set_key (ZAK_GTK_DECODER (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder16")),
g_strdup_printf ("%d", id));
}
+static gchar
+*organigramma_persona_nodo_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data)
+{
+ GString *ret;
+ gchar *sql;
+ GdaDataModel *dm;
+
+ OrganigrammaPersonaNodoRecapito *f = (OrganigrammaPersonaNodoRecapito *)user_data;
+ OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (f);
+
+ ret = g_string_new ("");
+
+ sql = g_strdup_printf ("SELECT nome"
+ " FROM tipi_recapito"
+ " WHERE id = %d",
+ strtol (key, NULL, 10));
+ dm = gdaex_query (priv->commons->gdaex, sql);
+ g_free (sql);
+ if (!gdaex_data_model_is_empty (dm))
+ {
+ g_string_append (ret, gdaex_data_model_get_value_stringify_at (dm, 0, 0));
+ }
+
+ return ret->str;
+}
+
static gboolean
organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event (GtkWidget *widget,
GdkEvent *event,
--
2.49.0