From: Andrea Zagli <azagli@libero.it>
Date: Thu, 8 Dec 2016 09:49:24 +0000 (+0100)
Subject: Messo il GtkFormDecoder in persona nodo (refs #646).
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=ff67cc3a97ed31b934ace4c362e002089792b130;p=solipa%2Forganigramma

Messo il GtkFormDecoder in persona nodo (refs #646).
---

diff --git a/data/organigramma/form/persona_nodo.form b/data/organigramma/form/persona_nodo.form
index 96c84c3..63f196e 100644
--- a/data/organigramma/form/persona_nodo.form
+++ b/data/organigramma/form/persona_nodo.form
@@ -15,21 +15,14 @@
 		</field>
 	</widget>
 
-	<widget type="entry" name="entry30">
-		<field type="text" name="nodo">
-			<to-load>f</to-load>
-			<to-save>f</to-save>
-		</field>
-	</widget>
-
-	<widget type="label" name="label115" label="label114">
-		<on-change what="update" when="after">
-			<connection-name></connection-name>
-			<widget-name>entry30</widget-name>
+	<widget type="decoder" name="gtkformdecoder12" label="label114">
+		<decoder>
 			<sql>
-				SELECT nome FROM nodi WHERE id = ##label115::gint
+				SELECT a.nome
+				FROM nodi AS a
+				WHERE a.id = ##key0::gint
 			</sql>
-		</on-change>
+		</decoder>
 		<field type="integer" name="id_nodi">
 			<obligatory>t</obligatory>
 		</field>
diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index bd8e87a..415d777 100644
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -5196,58 +5196,6 @@
                 <property name="top_attach">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkBox" id="hbox18">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry30">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">●</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button90">
-                    <property name="label" translatable="yes">...</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label115">
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">lbl_id_nodi</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</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">0</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkLabel" id="label117">
                 <property name="can_focus">False</property>
@@ -5322,6 +5270,16 @@
                 <property name="top_attach">4</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkFormDecoder" id="gtkformdecoder12">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/src/personanodo.c b/src/personanodo.c
index 9d62fe2..e340d45 100644
--- a/src/personanodo.c
+++ b/src/personanodo.c
@@ -25,6 +25,7 @@
 
 #include <libzakautho/autoz.h>
 #include <libgtkform/form.h>
+#include <libgtkformui/gtkformdecoder.h>
 #include <libsolipa/utils.h>
 
 #include "personanodo.h"
@@ -54,7 +55,7 @@ static gboolean organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_
                                GdkEvent *event,
                                gpointer user_data);
 
-static void organigramma_persona_nodo_on_btn_ricerca_via_clicked (GtkButton *button,
+static void organigramma_persona_nodo_on_btn_nodo_clicked (GtkButton *button,
                                     gpointer user_data);
 static void organigramma_persona_nodo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
@@ -165,8 +166,8 @@ OrganigrammaPersonaNodo
 	g_signal_connect (priv->w,
 	                  "delete-event", G_CALLBACK (organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_event), (gpointer)a);
 
-	g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button90")),
-	                  "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_ricerca_via_clicked), (gpointer)a);
+	g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder12")),
+	                  "btn-browse-clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_nodo_clicked), (gpointer)a);
 
 	g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button91")),
 	                  "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_annulla_clicked), (gpointer)a);
@@ -290,7 +291,8 @@ organigramma_persona_nodo_on_nodo_selezionato (gpointer instance, guint id, gpoi
 
 	OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (ia);
 
-	gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label115"), g_strdup_printf ("%d", id));
+	gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder12"),
+	                                     g_strdup_printf ("%d", id));
 }
 
 static void
@@ -354,7 +356,7 @@ organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_event (GtkWidget
 }
 
 static void
-organigramma_persona_nodo_on_btn_ricerca_via_clicked (GtkButton *button,
+organigramma_persona_nodo_on_btn_nodo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
 	GtkWidget *w;