From 37256c652b90b1a2f9dfe1c2e338d4e58544d815 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Thu, 8 Dec 2016 12:51:21 +0100
Subject: [PATCH] Messo il GtkFormDecoder in ufficio (ufficio) (refs #646).

---
 data/organigramma/form/ufficio.form    | 19 +++-----
 data/organigramma/gui/organigramma.gui | 63 +++++---------------------
 src/ufficio.c                          | 23 ++--------
 3 files changed, 21 insertions(+), 84 deletions(-)

diff --git a/data/organigramma/form/ufficio.form b/data/organigramma/form/ufficio.form
index eb31303..1dfa967 100644
--- a/data/organigramma/form/ufficio.form
+++ b/data/organigramma/form/ufficio.form
@@ -10,21 +10,14 @@
 		</field>
 	</widget>
 
-	<widget type="entry" name="entry48">
-		<field type="text" name="ufficio_superiore">
-			<to-load>f</to-load>
-			<to-save>f</to-save>
-		</field>
-	</widget>
-
-	<widget type="label" name="label169" label="label170">
-	  <on-change what="update" when="after">
-			<connection-name></connection-name>
-			<widget-name>entry48</widget-name>
+	<widget type="decoder" name="gtkformdecoder16" label="label170">
+		<decoder>
 			<sql>
-				SELECT nome FROM uffici WHERE id = ##label169::gint
+				SELECT a.nome
+				FROM uffici AS a
+				WHERE a.id = ##key0::gint
 			</sql>
-		</on-change>
+		</decoder>
 		<field type="integer" name="id_uffici">
 		</field>
 	</widget>
diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index 39df590..4ce751b 100644
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -3120,58 +3120,6 @@
                 <property name="width">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkBox" id="hbox20">
-                <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="entry48">
-                    <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="secondary_icon_stock">gtk-clear</property>
-                    <property name="primary_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="button164">
-                    <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="label169">
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">lbl_id_uffici</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">2</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkNotebook" id="notebook2">
                 <property name="visible">True</property>
@@ -3900,6 +3848,17 @@
                 <property name="top_attach">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkFormDecoder" id="gtkformdecoder16">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="show_btn_clean">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/src/ufficio.c b/src/ufficio.c
index f4a98ec..e31ca96 100644
--- a/src/ufficio.c
+++ b/src/ufficio.c
@@ -381,11 +381,8 @@ OrganigrammaUfficio
 	g_signal_connect (priv->w,
 	                  "delete-event", G_CALLBACK (organigramma_ufficio_on_w_ufficio_delete_event), (gpointer)a);
 
-	g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "entry48"),
-	                  "icon-press", G_CALLBACK (organigramma_ufficio_on_ufficio_pulisci), (gpointer)a);
-	g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button164"),
-	                  "clicked", G_CALLBACK (organigramma_ufficio_on_btn_ufficio_clicked), (gpointer)a);
-
+	g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder16"),
+	                  "btn-browse-clicked", G_CALLBACK (organigramma_ufficio_on_btn_ufficio_clicked), (gpointer)a);
 	g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder15"),
 	                  "btn-browse-clicked", G_CALLBACK (organigramma_ufficio_on_btn_struttura_clicked), (gpointer)a);
 
@@ -1221,20 +1218,8 @@ organigramma_ufficio_on_ufficio_selezionato (gpointer instance, guint id, gpoint
 	OrganigrammaUfficio *f = (OrganigrammaUfficio *)user_data;
 	OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (f);
 
-	gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label169"), g_strdup_printf ("%d", id));
-}
-
-static void
-organigramma_ufficio_on_ufficio_pulisci (GtkEntry *entry,
-                          GtkEntryIconPosition icon_pos,
-                          GdkEvent *event,
-                          gpointer user_data)
-{
-	OrganigrammaUfficio *f = (OrganigrammaUfficio *)user_data;
-	OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (f);
-
-	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label169")), "");
-	gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry48")), "");
+	gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder16"),
+	                                     g_strdup_printf ("%d", id));
 }
 
 static void
-- 
2.49.0