Messo il GtkFormDecoder in ufficio (struttura) (refs #646).

diff --git a/data/organigramma/form/ufficio.form b/data/organigramma/form/ufficio.form
index d7605da25302e07feb45cb56f3dcb53a06021559..eb313039da979df217cc9f0601e9a2fdbda8cb87 100644 (file)
--- a/data/organigramma/form/ufficio.form
+++ b/data/organigramma/form/ufficio.form
@@ -29,21 +29,14 @@
                </field>
        </widget>
 
-       <widget type="entry" name="entry7">
-               <field type="text" name="struttura">
-                       <to-load>f</to-load>
-                       <to-save>f</to-save>
-               </field>
-       </widget>
-
-       <widget type="label" name="label25" label="label18">
-               <on-change what="update" when="after">
-                       <connection-name></connection-name>
-                       <widget-name>entry7</widget-name>
+       <widget type="decoder" name="gtkformdecoder15" label="label18">
+               <decoder>
                        <sql>
-                               SELECT nome FROM strutture WHERE id = ##label25::gint
+                               SELECT a.nome
+                               FROM strutture AS a
+                               WHERE a.id = ##key0::gint
                        </sql>
-               </on-change>
+               </decoder>
                <field type="integer" name="id_strutture">
                </field>
        </widget>

diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index 410efe884d6907dd5e89e6e8623a43bb28a602d5..39df590b6e89d66b17d0390939812ed85154502f 100644 (file)
--- 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="hbox3">
-                <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="entry7">
-                    <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="button31">
-                    <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="label25">
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">lbl_id_strutture</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">3</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox" id="hbox20">
                 <property name="visible">True</property>
@@ -3942,6 +3890,16 @@
                 <property name="top_attach">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkFormDecoder" id="gtkformdecoder15">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>

diff --git a/src/ufficio.c b/src/ufficio.c
index 235705e236886a2db214f70cbf27565a29cb96f2..f4a98ecbed56cf2ca5e280445f9e3589c1392475 100644 (file)
--- a/src/ufficio.c
+++ b/src/ufficio.c
@@ -26,6 +26,7 @@
 #include <libzakautho/autoz.h>
 #include <libgtkform/form.h>
 #include <libgtkform/fielddatetime.h>
+#include <libgtkformui/gtkformdecoder.h>
 #include <libsolipa/utils.h>
 
 #include "ufficio.h"
@@ -385,8 +386,8 @@ OrganigrammaUfficio
        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, "button31"),
-                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_struttura_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);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button28")),
                          "clicked", G_CALLBACK (organigramma_ufficio_on_btn_nodo_nuovo_clicked), (gpointer)a);
@@ -1057,7 +1058,7 @@ organigramma_ufficio_recapito_modifica (OrganigrammaUfficio *ufficio)
                        solipa_message_dialog (priv->w,
                                               GTK_MESSAGE_WARNING,
                                               GTK_BUTTONS_OK,
-                                              "Occorre prima selezionare un nodo");
+                                              "Occorre prima selezionare un nodo.");
                }
 }
 
@@ -1091,7 +1092,7 @@ organigramma_ufficio_orario_modifica (OrganigrammaUfficio *ufficio)
                        solipa_message_dialog (priv->w,
                                               GTK_MESSAGE_WARNING,
                                               GTK_BUTTONS_OK,
-                                              "Occorre prima selezionare un orario");
+                                              "Occorre prima selezionare un orario.");
                }
 }
 
@@ -1242,7 +1243,8 @@ organigramma_ufficio_on_struttura_selezionato (gpointer instance, guint id, gpoi
        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, "label25"), g_strdup_printf ("%d", id));
+       gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder15"),
+                                            g_strdup_printf ("%d", id));
 }
 
 static void