From: Andrea Zagli <azagli@libero.it>
Date: Sun, 13 Nov 2016 14:49:14 +0000 (+0100)
Subject: Tolta la combobox tipo recapito in ufficio recapito (refs #645 #646).
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=bfd897f258d6a257a6dfa9a3e39d2a9dc6e3954f;p=solipa%2Forganigramma

Tolta la combobox tipo recapito in ufficio recapito (refs #645 #646).
---

diff --git a/data/organigramma/form/ufficio_recapito.form b/data/organigramma/form/ufficio_recapito.form
index 034a86d..2376f0e 100644
--- a/data/organigramma/form/ufficio_recapito.form
+++ b/data/organigramma/form/ufficio_recapito.form
@@ -15,11 +15,14 @@
 		</field>
 	</widget>
 
-	<widget type="combobox" name="combobox2" label="label39">
-		<column-field>0</column-field>
-		<sql with-empty-entry="t">
-			SELECT id, nome FROM tipi_recapito WHERE status &lt;&gt; 'E' ORDER BY nome
-		</sql>
+	<widget type="decoder" name="gtkformdecoder7" label="label39">
+		<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>
diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index e3045d5..dd907ae 100644
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -10373,23 +10373,6 @@
                 <property name="top_attach">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkComboBox" id="combobox2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext7"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkCheckButton" id="checkbutton8">
                 <property name="visible">True</property>
@@ -10447,6 +10430,16 @@
                 <property name="top_attach">4</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkFormDecoder" id="gtkformdecoder7">
+                <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/ufficiorecapito.c b/src/ufficiorecapito.c
index 70b37f0..43dbba8 100644
--- a/src/ufficiorecapito.c
+++ b/src/ufficiorecapito.c
@@ -25,9 +25,11 @@
 
 #include <libzakautho/autoz.h>
 #include <libgtkform/form.h>
+#include <libgtkformui/gtkformdecoder.h>
 #include <libsolipa/utils.h>
 
 #include "ufficiorecapito.h"
+#include "tipirecapito.h"
 
 static void organigramma_ufficio_recapito_class_init (OrganigrammaUfficioRecapitoClass *klass);
 static void organigramma_ufficio_recapito_init (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
@@ -37,6 +39,8 @@ static void organigramma_ufficio_recapito_salva (OrganigrammaUfficioRecapito *or
 
 static gboolean organigramma_ufficio_recapito_conferma_chiusura (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
 
+static void organigramma_ufficio_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data);
+
 static void organigramma_ufficio_recapito_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
@@ -50,6 +54,9 @@ static gboolean organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito
                                GdkEvent *event,
                                gpointer user_data);
 
+static void organigramma_ufficio_recapito_on_btn_tipo_recapito_clicked (GtkButton *button,
+                      gpointer user_data);
+
 static void organigramma_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
 static void organigramma_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
@@ -159,6 +166,9 @@ OrganigrammaUfficioRecapito
 	g_signal_connect (priv->w,
 	                  "delete-event", G_CALLBACK (organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event), (gpointer)a);
 
+	g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder7"),
+	                  "btn-browse-clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_tipo_recapito_clicked), (gpointer)a);
+
 	g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button48")),
 	                  "clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_annulla_clicked), (gpointer)a);
 	g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button49")),
@@ -324,6 +334,16 @@ organigramma_ufficio_recapito_conferma_chiusura (OrganigrammaUfficioRecapito *or
 }
 
 /* CALLBACK */
+static void
+organigramma_ufficio_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data)
+{
+	OrganigrammaUfficioRecapito *f = (OrganigrammaUfficioRecapito *)user_data;
+	OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (f);
+
+	gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder7"),
+	                                     g_strdup_printf ("%d", id));
+}
+
 static gboolean
 organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
@@ -332,6 +352,25 @@ organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event (G
 	return !organigramma_ufficio_recapito_conferma_chiusura ((OrganigrammaUfficioRecapito *)user_data);
 }
 
+static void
+organigramma_ufficio_recapito_on_btn_tipo_recapito_clicked (GtkButton *button,
+                      gpointer user_data)
+{
+	GtkWidget *w;
+
+	OrganigrammaUfficioRecapito *rf = (OrganigrammaUfficioRecapito *)user_data;
+	OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (rf);
+
+	OrganigrammaTipiRecapito *c = organigramma_tipi_recapito_new (priv->commons, TRUE);
+
+	g_signal_connect (G_OBJECT (c), "selezionato",
+	                  G_CALLBACK (organigramma_ufficio_recapito_on_tipo_recapito_selezionato), user_data);
+
+	w = organigramma_tipi_recapito_get_widget (c);
+	gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
+	gtk_widget_show (w);
+}
+
 static void
 organigramma_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)