Many changes to align autedb to the new feature.

diff --git a/configure.ac b/configure.ac
index d53ff4fb7b985786539fa036f38d5b3688d24c34..bed2e656f2e5a6abca14207a5df1af96560dd39c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([libaute-db], [0.0.2], [azagli@libero.it])
+AC_INIT([libaute-db], [0.1.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/aute_db.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -19,8 +19,8 @@ AC_PROG_LIBTOOL
 
 # Checks for libraries.
 PKG_CHECK_MODULES(LIBAUTEDB, [gtk+-2.0 >= 2.16.0
-                              libgdaex >= 0.1.0
-                              libaute >= 0.0.2])
+                              libaute >= 0.0.2
+                              libgtkform >= 0.1.4])
 
 AC_SUBST(LIBAUTEDB_CFLAGS)
 AC_SUBST(LIBAUTEDB_LIBS)
@@ -50,6 +50,7 @@ AC_CONFIG_FILES([
   tools/Makefile
   data/Makefile
   data/libaute-db/Makefile
-  data/libaute-db/glade/Makefile
+  data/libaute-db/form/Makefile
+  data/libaute-db/gui/Makefile
 ])
 AC_OUTPUT

diff --git a/data/autedb.sql b/data/autedb.sql
index 2efe6ab5cc8ca0c056d2ab5e176c3da0d4d0841c..7d10fa9cc2d69c165980f587db3f54eacf5a94b9 100644 (file)
--- a/data/autedb.sql
+++ b/data/autedb.sql
@@ -6,11 +6,11 @@ CREATE TABLE users (
        enabled bool,
        last_access time,
        password_expiration time,
-       description text DEFAULT '',
+       notes text DEFAULT '',
        status varchar(1) DEFAULT '',
        CONSTRAINT users_pkey PRIMARY KEY (code)
 );
 
 /* initial user with password 'root' */
-INSERT INTO utenti (codice, password, cognome, abilitato, status)
+INSERT INTO users (code, password, surnam, enabled, status)
 VALUES ('root', '63a9f0ea7bb98050796b649e85481845', 'Root', TRUE, '');

diff --git a/data/libaute-db/Makefile.am b/data/libaute-db/Makefile.am
index 21cc77bf4bdbec8e66cf5fe1f0cccc82781f610c..45a80458ea8c6627d20c4234046721b8a710307f 100644 (file)
--- a/data/libaute-db/Makefile.am
+++ b/data/libaute-db/Makefile.am
@@ -1 +1 @@
-SUBDIRS = glade
+SUBDIRS = gui form

diff --git a/data/libaute-db/form/Makefile.am b/data/libaute-db/form/Makefile.am
new file mode 100644 (file)
index 0000000..cb45d2a
--- /dev/null
+++ b/data/libaute-db/form/Makefile.am
@@ -0,0 +1,5 @@
+formdir = $(datadir)/libaute-db/form
+
+form_DATA = autedb.form
+
+EXTRA_DIST = $(form_DATA)

diff --git a/data/libaute-db/form/autedb.form b/data/libaute-db/form/autedb.form
new file mode 100644 (file)
index 0000000..1e4fba3
--- /dev/null
+++ b/data/libaute-db/form/autedb.form
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<gtkform>
+
+       <table>users</table>
+
+       <widget type="entry" name="entry1" label="label6">
+               <field type="text" name="code">
+                       <is-key>t</is-key>
+                       <obligatory>t</obligatory>
+               </field>
+       </widget>
+
+       <widget type="label" name="label114">
+               <field type="text" name="password">
+               </field>
+       </widget>
+
+       <widget type="entry" name="entry2" label="label7">
+               <field type="text" name="surname">
+                       <obligatory>t</obligatory>
+               </field>
+       </widget>
+
+       <widget type="entry" name="entry3" label="label8">
+               <field type="text" name="name" />
+       </widget>
+
+       <widget type="checkbox" name="checkbutton1" label="label9">
+               <field type="boolean" name="enabled">
+                       <default>t</default>
+               </field>
+       </widget>
+
+       <widget type="label" name="label113" label="label10">
+               <field type="datetime" name="last_access">
+                       <datetime-type>datetime</datetime-type>
+                       <display-format>%d/%m/%Y %H.%M.%S</display-format>
+               </field>
+       </widget>
+
+       <widget type="entry" name="entry4" label="label11">
+               <field type="datetime" name="password_expiration">
+                       <datetime-type>datetime</datetime-type>
+                       <display-format>%d/%m/%Y %H.%M.%S</display-format>
+               </field>
+       </widget>
+
+       <widget type="textview" name="textview1" label="label12">
+               <field type="text" name="notes" />
+       </widget>
+
+</gtkform>

diff --git a/data/libaute-db/glade/Makefile.am b/data/libaute-db/glade/Makefile.am
deleted file mode 100644 (file)
index 3c3e458..0000000
--- a/data/libaute-db/glade/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-gladedir = $(datadir)/libaute-db/glade
-
-glade_DATA = autedb.glade
-
-EXTRA_DIST = $(glade_DATA)

diff --git a/data/libaute-db/glade/autedb.glade b/data/libaute-db/glade/autedb.glade
deleted file mode 100644 (file)
index d68387e..0000000
--- a/data/libaute-db/glade/autedb.glade
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkDialog" id="diag_main">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">Autenticazione</property>
-    <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkTable" id="table1">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Utente</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Password</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="txt_utente">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="txt_password">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
-                <property name="activates_default">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkExpander" id="exp_cambio">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <object class="GtkTable" id="table2">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">5</property>
-                    <property name="row_spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Nuova</property>
-                      </object>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Conferma</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txt_password_nuova">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="visibility">False</property>
-                        <property name="activates_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txt_password_conferma">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="visibility">False</property>
-                        <property name="activates_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Cambia password</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</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="okbutton1">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</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>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">cancelbutton1</action-widget>
-      <action-widget response="-5">okbutton1</action-widget>
-    </action-widgets>
-  </object>
-</interface>

diff --git a/data/libaute-db/gui/Makefile.am b/data/libaute-db/gui/Makefile.am
new file mode 100644 (file)
index 0000000..30dc744
--- /dev/null
+++ b/data/libaute-db/gui/Makefile.am
@@ -0,0 +1,5 @@
+guidir = $(datadir)/libaute-db/gui
+
+gui_DATA = autedb.glade
+
+EXTRA_DIST = $(gui_DATA)

diff --git a/data/libaute-db/gui/autedb.glade b/data/libaute-db/gui/autedb.glade
new file mode 100644 (file)
index 0000000..cb111e2
--- /dev/null
+++ b/data/libaute-db/gui/autedb.glade
@@ -0,0 +1,643 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkDialog" id="diag_main">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Autenticazione</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Utente</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Password</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="txt_utente">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="activates_default">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="txt_password">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="activates_default">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkExpander" id="exp_cambio">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <object class="GtkTable" id="table2">
+                    <property name="visible">True</property>
+                    <property name="border_width">5</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Nuova</property>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Conferma</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="txt_password_nuova">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="visibility">False</property>
+                        <property name="activates_default">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="txt_password_conferma">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="visibility">False</property>
+                        <property name="activates_default">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Cambia password</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelbutton1">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</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="okbutton1">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">False</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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="lstore_users">
+    <columns>
+      <!-- column-name status -->
+      <column type="gchararray"/>
+      <!-- column-name code -->
+      <column type="gchararray"/>
+      <!-- column-name surname_name -->
+      <column type="gchararray"/>
+      <!-- column-name last_access -->
+      <column type="gchararray"/>
+      <!-- column-name password_expiration -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="w_users_list">
+    <child>
+      <object class="GtkVBox" id="vbx_users_list">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</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_users</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                    <property name="title">Status</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                    <property name="title">Code</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                    <property name="title">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                    <property name="title">Last access</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext4"/>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+                    <property name="title">Password expiration</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext5"/>
+                      <attributes>
+                        <attribute name="text">4</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <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="button2">
+                <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="button3">
+                <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="button4">
+                <property name="label">gtk-find</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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_user">
+    <property name="title" translatable="yes">User</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table3">
+            <property name="visible">True</property>
+            <property name="n_rows">8</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Code</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label7">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Surname</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label8">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Name</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Enabled</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Last access</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Password expiration</property>
+              </object>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label12">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Description</property>
+              </object>
+              <packing>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label13">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_last_access</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkbutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">19</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label14">
+                <property name="label" translatable="yes">lbl_password</property>
+              </object>
+              <packing>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox2">
+            <property name="visible">True</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button5">
+                <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">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button6">
+                <property name="label">gtk-save</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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

diff --git a/src/Makefile.am b/src/Makefile.am
index bc837dc93654229b2c7b457352e12630f3805354..dc8bd35964b32015376da75e1b2324204da5c12f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
-gladedir = $(datadir)/libaute-db/glade
+guidir = $(datadir)/libaute-db/gui
 
 AM_CPPFLAGS = $(LIBAUTEDB_CFLAGS) \
               $(LIBGCRYPT_CFLAGS) \
               $(LIBCONFI_CFLAGS) \
-              -DGLADEDIR=\""$(gladedir)"\"
+              -DGUIDIR=\""$(guidir)"\"
 
 LIBS = $(LIBAUTEDB_LIBS) \
        $(LIBGCRYPT_LIBS) \

diff --git a/src/aute_db.c b/src/aute_db.c
index e00aa4ed06495519e3bcd4d2e7c51c8a3833c7af..fe32796fafab80975eed69d1a254a68033b5e25f 100644 (file)
--- a/src/aute_db.c
+++ b/src/aute_db.c
@@ -28,6 +28,9 @@
        #include <libconfi.h>
 #endif
 
+static GtkBuilder *gtkbuilder;
+static GdaEx *gdaex;
+
 static GtkWidget *txt_utente;
 static GtkWidget *txt_password;
 static GtkWidget *exp_cambio;
@@ -53,45 +56,10 @@ get_connection_parameters_from_confi (Confi *confi, gchar **cnc_string)
 }
 #endif
 
-/**
- * cifra_password:
- * @password: una stringa da cifrare.
- *
- * Return: la @password cifrata.
- */
-static gchar
-*cifra_password (const gchar *password)
-{
-       gchar digest[17] = "";
-       gchar pwd_gcrypt[33] = "";
-       gint i;
-
-       if (strcmp (password, "") != 0)
-               {
-                       gcry_md_hash_buffer (GCRY_MD_MD5, &digest, password, strlen (password));
-                       for (i = 0; i < 16; i++)
-                               {
-                                       g_sprintf (pwd_gcrypt + (i * 2), "%02x", digest[i] & 0xFF);
-                               }
-                       pwd_gcrypt[32] = '\0';
-               }
-
-       return g_strdup (&pwd_gcrypt[0]);
-}
-
-static gchar
-*controllo (GSList *parameters)
+void
+get_gdaex (GSList *parameters)
 {
-       gchar *sql;
-       gchar *utente = "";
-       gchar *password;
-       gchar *password_nuova;
        gchar *cnc_string;
-       GdaEx *gdaex;
-       GdaDataModel *dm;
-
-       utente = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_utente))));
-       password = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_password))));
 
        cnc_string = NULL;
 
@@ -125,12 +93,54 @@ static gchar
 
        if (cnc_string == NULL)
                {
-                       return NULL;
+                       return;
                }
 
        /* creo un oggetto GdaEx */
        gdaex = gdaex_new_from_string (cnc_string);
-       if (gdaex == NULL) return NULL;
+       if (gdaex == NULL)
+               {
+                       g_warning ("Unable to establish a db connection.");
+               }
+}
+
+/**
+ * cifra_password:
+ * @password: una stringa da cifrare.
+ *
+ * Return: la @password cifrata.
+ */
+static gchar
+*cifra_password (const gchar *password)
+{
+       gchar digest[17] = "";
+       gchar pwd_gcrypt[33] = "";
+       gint i;
+
+       if (strcmp (password, "") != 0)
+               {
+                       gcry_md_hash_buffer (GCRY_MD_MD5, &digest, password, strlen (password));
+                       for (i = 0; i < 16; i++)
+                               {
+                                       g_sprintf (pwd_gcrypt + (i * 2), "%02x", digest[i] & 0xFF);
+                               }
+                       pwd_gcrypt[32] = '\0';
+               }
+
+       return g_strdup (&pwd_gcrypt[0]);
+}
+
+static gchar
+*controllo ()
+{
+       gchar *sql;
+       gchar *utente = "";
+       gchar *password;
+       gchar *password_nuova;
+       GdaDataModel *dm;
+
+       utente = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_utente))));
+       password = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_password))));
 
        sql = g_strdup_printf ("SELECT code"
                             " FROM users"
@@ -182,6 +192,36 @@ static gchar
        return utente;
 }
 
+static void
+autedb_load_users_list ()
+{
+
+}
+
+static void
+autedb_on_btn_new_clicked (GtkButton *button,
+                           gpointer user_data)
+{
+}
+  
+static void
+autedb_on_btn_edit_clicked (GtkButton *button,
+                           gpointer user_data)
+{
+}
+  
+static void
+autedb_on_btn_delete_clicked (GtkButton *button,
+                           gpointer user_data)
+{
+}
+  
+static void
+autedb_on_btn_find_clicked (GtkButton *button,
+                           gpointer user_data)
+{
+}
+  
 /* PUBLIC */
 gchar
 *autentica (GSList *parameters)
@@ -191,19 +231,28 @@ gchar
 
        error = NULL;
 
-       GtkBuilder *gtkbuilder = gtk_builder_new ();
+       get_gdaex (parameters);
+       if (gdaex == NULL)
+               {
+                       return NULL;
+               }
+
+       gtkbuilder = gtk_builder_new ();
 
 #ifdef G_OS_WIN32
-#undef GLADEDIR
+#undef GUIDIR
 
-       gchar *GLADEDIR;
+       gchar *GUIDIR;
 
-       GLADEDIR = g_build_filename (g_win32_get_package_installation_directory_of_module (NULL), "share", "libaute-db", "glade", NULL);
+       GUIDIR = g_build_filename (g_win32_get_package_installation_directory_of_module (NULL), "share", "libaute-db", "gui", NULL);
 #endif
 
-       if (!gtk_builder_add_from_file (gtkbuilder, g_build_filename (GLADEDIR, "autedb.glade", NULL), &error))
+       if (!gtk_builder_add_objects_from_file (gtkbuilder, g_build_filename (GUIDIR, "autedb.gui", NULL),
+                                               g_strsplit ("diag_main", "|", -1),
+                                               &error))
                {
-                       g_error ("Impossibile trovare il file di definizione dell'interfaccia utente.");
+                       g_warning ("Impossibile trovare il file di definizione dell'interfaccia utente: %s.",
+                                error != NULL && error->message != NULL ? error->message : "no details");
                        return NULL;
                }
 
@@ -223,7 +272,7 @@ gchar
                {
                        case GTK_RESPONSE_OK:
                                /* controllo dell'utente e della password */
-                               ret = controllo (parameters);
+                               ret = controllo ();
                                break;
 
                        case GTK_RESPONSE_CANCEL:
@@ -242,6 +291,53 @@ gchar
        return ret;
 }
 
+GtkWidget
+*manage_user_gui (GSList *parameters)
+{
+       GtkWidget *w;
+
+       GError *error;
+
+       error = NULL;
+
+       gtkbuilder = gtk_builder_new ();
+
+#ifdef G_OS_WIN32
+#undef GUIDIR
+
+       gchar *GUIDIR;
+
+       GUIDIR = g_build_filename (g_win32_get_package_installation_directory_of_module (NULL), "share", "libaute-db", "gu", NULL);
+#endif
+
+       if (!gtk_builder_add_from_file (gtkbuilder, g_build_filename (GUIDIR, "autedb.gui", NULL), &error))
+               {
+                       g_error ("Impossibile trovare il file di definizione dell'interfaccia utente.");
+                       return NULL;
+               }
+
+       w = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "vbx_users_list"));
+
+       if (w == NULL)
+               {
+                       g_warning ("Unable to find the widget vbx_users_list.");
+                       return NULL;
+               }
+
+       g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button1")), "clicked",
+                         G_CALLBACK (autedb_on_btn_new_clicked), NULL);
+       g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button2")), "clicked",
+                         G_CALLBACK (autedb_on_btn_edit_clicked), NULL);
+       g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button3")), "clicked",
+                         G_CALLBACK (autedb_on_btn_delete_clicked), NULL);
+       g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button4")), "clicked",
+                         G_CALLBACK (autedb_on_btn_find_clicked), NULL);
+
+       autedb_load_users_list ();
+
+       return w;
+}
+
 /**
  * crea_utente:
  * @parameters: