Migrato l'elenco ruoli a GdaExGrid (refs #833).

diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index 7690238b6940303f90dcb14f83b52c17c38eb753..1fd104d373a55ae2c5d1a5d43e0f9d428de3594a 100644 (file)
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -2166,164 +2166,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="lstore_ruoli">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkWindow" id="w_ruoli">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Ruoli - 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_ruoli">
-        <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="label86">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Ruoli&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="scrolledwindow42">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview8">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_ruoli</property>
-                <property name="headers_clickable">False</property>
-                <property name="rules_hint">True</property>
-                <property name="search_column">1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection"/>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn41">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext52"/>
-                      <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="hbuttonbox13">
-            <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="button52">
-                <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="button53">
-                <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="button168">
-                <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="button169">
-                <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="button170">
-                <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_struttura_allegati">
     <columns>
       <!-- column-name id -->
@@ -7768,6 +7610,135 @@
       </object>
     </child>
   </object>
+  <object class="GtkWindow" id="w_ruoli">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Ruoli - 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_ruoli">
+        <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="label86">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Ruoli&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="scrolledwindow42">
+            <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="hbuttonbox13">
+            <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="button52">
+                <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="button53">
+                <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="button168">
+                <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="button169">
+                <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="button170">
+                <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_ruolo">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Ruolo - Gestione organigramma</property>

diff --git a/src/ruoli.c b/src/ruoli.c
index 10c6e849770c592f5a32c1d6f727f5bc548c76e0..2999dadd6cfc01eabc911fdd20446042cb7933c0 100644 (file)
--- a/src/ruoli.c
+++ b/src/ruoli.c
@@ -17,6 +17,11 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+       #include <config.h>
+#endif
+
+#include <libgdaexgrid/libgdaexgrid.h>
 #include <libzakautho/autoz.h>
 #include <libsolipa/utils.h>
 
@@ -71,8 +76,10 @@ struct _OrganigrammaRuoliPrivate
                OrganigrammaCommons *commons;
 
                GtkWidget *widget;
+               GdaExGrid *grid;
+               GtkWidget *wgrid;
                GtkTreeSelection *selection;
-               GtkListStore *lstore_ruoli;
+               GtkTreeStore *tstore_ruoli;
 
                gboolean selezione;
                GtkWindow *wtransient;
@@ -125,6 +132,8 @@ OrganigrammaRuoli
        GError *error;
        ZakAuthoIResource *ires1;
 
+       GdaExGridColumn *gcol;
+
        OrganigrammaRuoli *a = ORGANIGRAMMA_RUOLI (g_object_new (organigramma_ruoli_get_type (), NULL));
 
        OrganigrammaRuoliPrivate *priv = ORGANIGRAMMA_RUOLI_GET_PRIVATE (a);
@@ -134,9 +143,8 @@ OrganigrammaRuoli
 
        error = NULL;
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit (g_strconcat ("lstore_ruoli|",
-                                          (selezione ? "w_ruoli" : "vbx_ruoli"),
-                                          NULL), "|", -1),
+                                          g_strsplit ((selezione ? "w_ruoli" : "vbx_ruoli"),
+                                                                                                  "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -145,8 +153,6 @@ OrganigrammaRuoli
                }
 
        priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, (selezione ? "w_ruoli" : "vbx_ruoli")));
-       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview8")));
-       priv->lstore_ruoli = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_ruoli"));
 
        if (priv->selezione)
                {
@@ -157,13 +163,33 @@ OrganigrammaRuoli
                        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, "label86"))));
+
+       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, "scrolledwindow42")), priv->wgrid);
+       gtk_widget_show (priv->wgrid);
+
+       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->wgrid));
+       priv->tstore_ruoli = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid)));
+
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button52"),
                          "clicked", G_CALLBACK (organigramma_ruoli_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button53"),
                          "clicked", G_CALLBACK (organigramma_ruoli_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button168"),
                          "clicked", G_CALLBACK (organigramma_ruoli_on_btn_elimina_clicked), (gpointer)a);
-       g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview8"),
+       g_signal_connect (priv->wgrid,
                          "row-activated", G_CALLBACK (organigramma_ruoli_on_trv_organigramma_ruoli_row_activated), (gpointer)a);
 
        if (priv->selezione)
@@ -219,28 +245,15 @@ organigramma_ruoli_carica (OrganigrammaRuoli *ruoli)
 
        OrganigrammaRuoliPrivate *priv = ORGANIGRAMMA_RUOLI_GET_PRIVATE (ruoli);
 
-       gtk_list_store_clear (priv->lstore_ruoli);
+       gtk_tree_store_clear (priv->tstore_ruoli);
 
        sql = g_strdup_printf ("SELECT c.id, c.nome"
                               " FROM ruoli 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_ruoli), 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_ruoli, &iter);
-                                       gtk_list_store_set (priv->lstore_ruoli, &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 +268,7 @@ organigramma_ruoli_modifica (OrganigrammaRuoli *ruoli)
                {
                        GtkWidget *w;
 
-                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_ruoli), &iter,
+                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_ruoli), &iter,
                                            COL_ID, &id,
                                            -1);
 
@@ -288,7 +301,7 @@ organigramma_ruoli_selezionato (OrganigrammaRuoli *ruoli)
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
-                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_ruoli), &iter,
+                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_ruoli), &iter,
                                            COL_ID, &id,
                                            -1);
 
@@ -384,7 +397,7 @@ organigramma_ruoli_on_btn_elimina_clicked (GtkButton *button,
                                                   GTK_BUTTONS_YES_NO,
                                                   "Sicuro di voler eliminare il ruolo selezionato?") == GTK_RESPONSE_YES)
                                {
-                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_ruoli), &iter,
+                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_ruoli), &iter,
                                                            COL_ID, &id,
                                                            -1);
 
@@ -421,7 +434,6 @@ organigramma_ruoli_on_trv_organigramma_ruoli_row_activated (GtkTreeView *tree_vi
                }
 }
 
-
 static void
 organigramma_ruoli_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)