Utilizzo di GdaExGrid in stati.

diff --git a/configure.ac b/configure.ac
index f58eeb0771e58bbbad1db66660eb97134ecd81e1..89790df123b8fe0127c3b0a1064ecfd70785f416 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AC_PROG_RANLIB
 PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.36
                           libgda-ui-5.0 >= 5.0.0
                           libgdaex >= 0.5.0
+                          libgdaexgrid
                           libgtkform >= 0.5.0
                           libgtkformui >= 0.5.0
                           libzakauthe >= 0.2.0

diff --git a/data/territorio/gui/territorio.gui b/data/territorio/gui/territorio.gui
index e933588b7fa58542669c9f7305aaa61cdb26536c..2dcc61a04bc5f6bfb582314cd727c67cc2275bb9 100644 (file)
--- a/data/territorio/gui/territorio.gui
+++ b/data/territorio/gui/territorio.gui
@@ -832,182 +832,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="lstore_stati">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkWindow" id="w_stati">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Stati - Territorio</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">550</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">5</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Stati&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_stati</property>
-                <property name="rules_hint">True</property>
-                <property name="search_column">1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection5"/>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button50">
-                <property name="label" translatable="yes">E_sporta</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-new</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-edit</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button3">
-                <property name="label">gtk-delete</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button4">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button5">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkListStore" id="lstore_tipi_aggregazione_territoriale">
     <columns>
       <!-- column-name id -->
@@ -2996,6 +2820,154 @@
       </object>
     </child>
   </object>
+  <object class="GtkWindow" id="w_stati">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Stati - Territorio</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">550</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Stati&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button50">
+                <property name="label" translatable="yes">E_sporta</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-edit</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button3">
+                <property name="label">gtk-delete</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button4">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button5">
+                <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="w_stato">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Stato - Territorio</property>

diff --git a/libreria/Makefile.am b/libreria/Makefile.am
index 64ee5b1d3b88c9db73964109fe7fd5f35d3d3cd7..784461c320136b9202a34a3a1455b080a1648acf 100644 (file)
--- a/libreria/Makefile.am
+++ b/libreria/Makefile.am
@@ -4,7 +4,8 @@ formdir = $(datadir)/$(PACKAGE)/form
 AM_CPPFLAGS = $(TERRITORIO_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\" \
               -DFORMDIR=\""$(formdir)"\" \
-              -DG_LOG_DOMAIN=\"Territorio\"
+              -DG_LOG_DOMAIN=\"Territorio\" \
+              -DSOLIPA_FOUND=1
 
 LIBS = $(TERRITORIO_LIBS) \
        -export-dynamic

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ae956df9f98720a2f1e044410ee7c68f55b9723..b15e4f86c6b31e576661aa82d3f7ff0aaa69be3c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,8 @@ formdir = $(datadir)/$(PACKAGE)/form
 
 AM_CPPFLAGS = $(TERRITORIO_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\" \
-              -DFORMDIR=\""$(formdir)"\"
+              -DFORMDIR=\""$(formdir)"\" \
+              -DSOLIPA_FOUND=1
 
 LIBS = $(TERRITORIO_LIBS) \
        -export-dynamic

diff --git a/src/stati.c b/src/stati.c
index 57f01c7c78db4a16afdfa4b13f4381d7a527168e..71db18ce2371dd73d280bb35e986e49732fd7ce5 100644 (file)
--- a/src/stati.c
+++ b/src/stati.c
@@ -21,6 +21,7 @@
 
 #include <libzakautho/autoz.h>
 #include <libsolipa/libsolipa.h>
+#include <libgdaexgrid/libgdaexgrid.h>
 
 #include "stati.h"
 #include "stato.h"
@@ -79,6 +80,9 @@ struct _TerritorioStatiPrivate
                TerritorioCommons *commons;
 
                GtkWidget *widget;
+
+               GdaExGrid *grid;
+               GtkWidget *wgrid;
                GtkTreeSelection *selection;
                GtkListStore *lstore_stati;
 
@@ -133,6 +137,8 @@ TerritorioStati
        GError *error;
        ZakAuthoIResource *ires1;
 
+       GdaExGridColumn *gcol;
+
        TerritorioStati *a = TERRITORIO_STATI (g_object_new (territorio_stati_get_type (), NULL));
 
        TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE (a);
@@ -142,9 +148,9 @@ TerritorioStati
 
        error = NULL;
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit (g_strconcat ("lstore_stati|",
-                                          (selezione ? "w_stati" : "vbox2"),
-                                          NULL), "|", -1),
+                                          g_strsplit (g_strconcat ((selezione ? "w_stati" : "vbox2"),
+                                                                                                                               NULL),
+                                                                                                  "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -153,8 +159,24 @@ TerritorioStati
                }
 
        priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, (selezione ? "w_stati" : "vbox2")));
-       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview1")));
-       priv->lstore_stati = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_stati"));
+
+       /* creo la gdaexgrid */
+       priv->grid = gdaex_grid_new ();
+       gdaex_grid_set_solipa (priv->grid, priv->commons->solipa);
+       gdaex_grid_set_title (priv->grid, gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label1"))));
+
+       gcol = gdaex_grid_column_new_defaults ("ID", "id", G_TYPE_INT);
+       gdaex_grid_add_column (priv->grid, gcol);
+
+       gcol = gdaex_grid_column_new_defaults ("Nome", "nome", G_TYPE_STRING);
+       gdaex_grid_add_column (priv->grid, gcol);
+
+       priv->wgrid = gdaex_grid_get_widget (priv->grid);
+       gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->commons->gtkbuilder, "scrolledwindow1")), priv->wgrid);
+       gtk_widget_show (priv->wgrid);
+
+       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->wgrid));
+       priv->lstore_stati = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid)));
 
        if (priv->selezione)
                {
@@ -176,7 +198,7 @@ TerritorioStati
                          "clicked", G_CALLBACK (territorio_stati_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button3"),
                          "clicked", G_CALLBACK (territorio_stati_on_btn_elimina_clicked), (gpointer)a);
-       g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview1"),
+       g_signal_connect (priv->wgrid,
                          "row-activated", G_CALLBACK (territorio_stati_on_trv_stati_row_activated), (gpointer)a);
 
        if (priv->selezione)
@@ -222,42 +244,29 @@ GtkWidget
 static void
 territorio_stati_carica (TerritorioStati *territorio_stati)
 {
-       GtkTreeIter iter;
-       GdaDataModel *dm;
-
-       gint rows;
-       gint row;
+       gchar *sql;
 
        TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE (territorio_stati);
 
        gtk_list_store_clear (priv->lstore_stati);
 
-       dm = gdaex_query (priv->commons->gdaex,
-                         "SELECT c.id, c.nome"
+    sql = g_strdup ("SELECT c.id, c.nome"
                          " FROM stati AS c"
                          " WHERE c.status <> 'E'"
                          " ORDER BY c.nome");
-       if (dm != NULL)
-               {
-                       rows = gda_data_model_get_n_rows (dm);
-                       for (row = 0; row < rows; row++)
-                               {
-                                       gtk_list_store_append (priv->lstore_stati, &iter);
-                                       gtk_list_store_set (priv->lstore_stati, &iter,
-                                                           COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
-                                                           COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
-                                                           -1);
-                               }
 
-                       g_object_unref (dm);
-               }
+       gdaex_grid_fill_from_sql (priv->grid, priv->commons->gdaex,
+                                                         sql,
+                                                         NULL);
+
+       g_free (sql);
 }
 
 static void
 territorio_stati_modifica (TerritorioStati *territorio_stati)
 {
        GtkTreeIter iter;
-       guint id;
+       gchar *id;
 
        TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE (territorio_stati);
 
@@ -269,7 +278,7 @@ territorio_stati_modifica (TerritorioStati *territorio_stati)
                                            COL_ID, &id,
                                            -1);
 
-                       TerritorioStato *c = territorio_stato_new (priv->commons, id);
+                       TerritorioStato *c = territorio_stato_new (priv->commons, strtol (id, NULL, 10));
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
                                          G_CALLBACK (territorio_stati_on_stato_aggiornato), (gpointer)territorio_stati);
@@ -291,7 +300,7 @@ static void
 territorio_stati_selezionato (TerritorioStati *territorio_stati)
 {
        GtkTreeIter iter;
-       guint *id;
+       gchar *id;
 
        TerritorioStatiClass *klass = TERRITORIO_STATI_GET_CLASS (territorio_stati);
        TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE (territorio_stati);
@@ -302,7 +311,7 @@ territorio_stati_selezionato (TerritorioStati *territorio_stati)
                                            COL_ID, &id,
                                            -1);
 
-                       g_signal_emit (G_OBJECT (territorio_stati), klass->selezionato_signal_id, 0, id);
+                       g_signal_emit (G_OBJECT (territorio_stati), klass->selezionato_signal_id, 0, strtol (id, NULL, 10));
 
                        gtk_widget_destroy (priv->widget);
                        g_object_unref (G_OBJECT (territorio_stati));
@@ -457,7 +466,7 @@ territorio_stati_on_btn_elimina_clicked (GtkButton *button,
        ZakAuthoIResource *ires1;
 
        GtkTreeIter iter;
-       guint id;
+       gchar *id;
 
        TerritorioStati *territorio_stati = (TerritorioStati *)user_data;
        TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE (territorio_stati);
@@ -484,7 +493,7 @@ territorio_stati_on_btn_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE stati SET status = 'E' WHERE id = %d", id));
+                                                      g_strdup_printf ("UPDATE stati SET status = 'E' WHERE id = %d", strtol (id, NULL, 10)));
 
                                        territorio_stati_carica (territorio_stati);
                                }