Migrazione a GdaExGrid di elenco strutture (refs #833).

diff --git a/configure.ac b/configure.ac
index e37313f7d7839ac253e5915177d6d1fed8afd793..2003879cb1b98e4450ae658d3a5bfb49669f7acd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 PKG_CHECK_MODULES(ORGANIGRAMMA, [gio-2.0 >= 2.36
                                  gtk+-3.0 >= 3.0
                                  libzakutils
+                                 libgdaexgrid
                                  libgtkform >= 0.5.0
                                  libzakconfi >= 0.10.0
                                  libzakauthe >= 0.5.99

diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index e79be266fcdfc6a053b38f04eac8e40c23e1f2d6..a09be9e7886a4e360a2cfc248d09fda1a7cd7386 100644 (file)
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -2004,163 +2004,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="lstore_strutture">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkWindow" id="w_strutture">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Strutture - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkBox" id="vbx_strutture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Strutture&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="scrolledwindow7">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview5">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_strutture</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection"/>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn5">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext6"/>
-                      <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="GtkButtonBox" id="hbuttonbox9">
-            <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="button32">
-                <property name="label">gtk-new</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">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button33">
-                <property name="label">gtk-edit</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="button34">
-                <property name="label">gtk-delete</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="button35">
-                <property name="label">gtk-cancel</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="button36">
-                <property name="label">gtk-ok</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>
-          </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_nodo">
     <columns>
       <!-- column-name id -->
@@ -9358,6 +9201,135 @@
       </object>
     </child>
   </object>
+  <object class="GtkWindow" id="w_strutture">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Strutture - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkBox" id="vbx_strutture">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label26">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Strutture&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="scrolledwindow7">
+            <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="GtkButtonBox" id="hbuttonbox9">
+            <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="button32">
+                <property name="label">gtk-new</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">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button33">
+                <property name="label">gtk-edit</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="button34">
+                <property name="label">gtk-delete</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="button35">
+                <property name="label">gtk-cancel</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="button36">
+                <property name="label">gtk-ok</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>
+          </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_tipo_nodo">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Tipo nodo - Gestione organigramma</property>

diff --git a/libreria/Makefile.am b/libreria/Makefile.am
index 8ccdba65074364209aabc2763c7aec7b44ba14fd..34b27a3994369dd24c1eaaf969a0eece05cc05e4 100644 (file)
--- a/libreria/Makefile.am
+++ b/libreria/Makefile.am
@@ -4,7 +4,8 @@ formdir = $(datadir)/$(PACKAGE)/form
 AM_CPPFLAGS = $(ORGANIGRAMMA_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\" \
               -DFORMDIR=\""$(formdir)"\" \
-              -DG_LOG_DOMAIN=\"Organigramma\"
+              -DG_LOG_DOMAIN=\"Organigramma\" \
+              -DSOLIPA_FOUND=1
 
 LIBS = $(ORGANIGRAMMA_LIBS) \
        -export-dynamic

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

diff --git a/src/strutture.c b/src/strutture.c
index 2ce6524b6603dc390e87782c9c770226f404fb46..2a6d09272a7360e8fb61049adde152c1fd02a234 100644 (file)
--- a/src/strutture.c
+++ b/src/strutture.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include <libgdaexgrid/libgdaexgrid.h>
 #include <libzakautho/autoz.h>
 #include <libsolipa/utils.h>
 
@@ -71,8 +72,10 @@ struct _OrganigrammaStrutturePrivate
                OrganigrammaCommons *commons;
 
                GtkWidget *widget;
+               GdaExGrid *grid;
+               GtkWidget *wgrid;
                GtkTreeSelection *selection;
-               GtkListStore *lstore_strutture;
+               GtkTreeStore *tstore_strutture;
 
                gboolean selezione;
                GtkWindow *wtransient;
@@ -125,6 +128,8 @@ OrganigrammaStrutture
        GError *error;
        ZakAuthoIResource *ires1;
 
+       GdaExGridColumn *gcol;
+
        OrganigrammaStrutture *a = ORGANIGRAMMA_STRUTTURE (g_object_new (organigramma_strutture_get_type (), NULL));
 
        OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (a);
@@ -134,9 +139,8 @@ OrganigrammaStrutture
 
        error = NULL;
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit (g_strconcat ("lstore_strutture|",
-                                          (selezione ? "w_strutture" : "vbx_strutture"),
-                                          NULL), "|", -1),
+                                          g_strsplit (g_strconcat ((selezione ? "w_strutture" : "vbx_strutture"),
+                                                                                                                               NULL), "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -145,8 +149,6 @@ OrganigrammaStrutture
                }
 
        priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, (selezione ? "w_strutture" : "vbx_strutture")));
-       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview5")));
-       priv->lstore_strutture = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_strutture"));
 
        if (priv->selezione)
                {
@@ -157,13 +159,33 @@ OrganigrammaStrutture
                        priv->wtransient = GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main"));
                }
 
+       /* 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, "label26"))));
+
+       gcol = gdaex_grid_column_new ("ID", "id", G_TYPE_INT, TRUE, TRUE, TRUE, FALSE, -1);
+       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_tree_view_set_search_column (GTK_TREE_VIEW (priv->wgrid), 1);
+       gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->commons->gtkbuilder, "scrolledwindow7")), priv->wgrid);
+       gtk_widget_show (priv->wgrid);
+
+       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->wgrid));
+       priv->tstore_strutture = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid)));
+
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button32"),
                          "clicked", G_CALLBACK (organigramma_strutture_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button33"),
                          "clicked", G_CALLBACK (organigramma_strutture_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button34"),
                          "clicked", G_CALLBACK (organigramma_strutture_on_btn_elimina_clicked), (gpointer)a);
-       g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview5"),
+       g_signal_connect (priv->wgrid,
                          "row-activated", G_CALLBACK (organigramma_strutture_on_trv_organigramma_strutture_row_activated), (gpointer)a);
 
        if (priv->selezione)
@@ -219,28 +241,14 @@ organigramma_strutture_carica (OrganigrammaStrutture *strutture)
 
        OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
-       gtk_list_store_clear (priv->lstore_strutture);
+       gtk_tree_store_clear (priv->tstore_strutture);
 
        sql = g_strdup_printf ("SELECT c.id, c.nome"
                               " FROM strutture AS c"
                               " WHERE c.status <> 'E'"
                               " ORDER BY c.nome");
-       dm = gdaex_query (priv->commons->gdaex, sql);
+       gdaex_fill_treemodel_from_sql (priv->commons->gdaex, GTK_TREE_MODEL (priv->tstore_strutture), sql, NULL, NULL);
        g_free (sql);
-       if (dm != NULL)
-               {
-                       rows = gda_data_model_get_n_rows (dm);
-                       for (row = 0; row < rows; row++)
-                               {
-                                       gtk_list_store_append (priv->lstore_strutture, &iter);
-                                       gtk_list_store_set (priv->lstore_strutture, &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);
-               }
 }
 
 static void
@@ -255,7 +263,7 @@ organigramma_strutture_modifica (OrganigrammaStrutture *strutture)
                {
                        GtkWidget *w;
 
-                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_strutture), &iter,
+                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_strutture), &iter,
                                            COL_ID, &id,
                                            -1);
 
@@ -288,7 +296,7 @@ organigramma_strutture_selezionato (OrganigrammaStrutture *strutture)
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
-                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_strutture), &iter,
+                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_strutture), &iter,
                                            COL_ID, &id,
                                            -1);
 
@@ -384,7 +392,7 @@ organigramma_strutture_on_btn_elimina_clicked (GtkButton *button,
                                                   GTK_BUTTONS_YES_NO,
                                                   "Sicuro di voler eliminare la struttura selezionata?") == GTK_RESPONSE_YES)
                                {
-                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_strutture), &iter,
+                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_strutture), &iter,
                                                            COL_ID, &id,
                                                            -1);
 
@@ -399,7 +407,7 @@ organigramma_strutture_on_btn_elimina_clicked (GtkButton *button,
                        solipa_message_dialog (GTK_WIDGET (priv->wtransient),
                                               GTK_MESSAGE_WARNING,
                                               GTK_BUTTONS_OK,
-                                              "Occorre prima selezionare una struttura");
+                                              "Occorre prima selezionare una struttura.");
                }
 }