From 8466675767f02e558424eb65b5fadcc1df73e8ce Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 7 Aug 2010 18:52:56 +0200 Subject: [PATCH] Many changes to align autedb to the new feature. --- configure.ac | 9 +- data/autedb.sql | 4 +- data/libaute-db/Makefile.am | 2 +- data/libaute-db/form/Makefile.am | 5 + data/libaute-db/form/autedb.form | 52 +++ data/libaute-db/glade/Makefile.am | 5 - data/libaute-db/glade/autedb.glade | 208 ---------- data/libaute-db/gui/Makefile.am | 5 + data/libaute-db/gui/autedb.glade | 643 +++++++++++++++++++++++++++++ src/Makefile.am | 4 +- src/aute_db.c | 188 ++++++--- 11 files changed, 857 insertions(+), 268 deletions(-) create mode 100644 data/libaute-db/form/Makefile.am create mode 100644 data/libaute-db/form/autedb.form delete mode 100644 data/libaute-db/glade/Makefile.am delete mode 100644 data/libaute-db/glade/autedb.glade create mode 100644 data/libaute-db/gui/Makefile.am create mode 100644 data/libaute-db/gui/autedb.glade diff --git a/configure.ac b/configure.ac index d53ff4f..bed2e65 100644 --- 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 2efe6ab..7d10fa9 100644 --- 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 21cc77b..45a8045 100644 --- 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 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 index 0000000..1e4fba3 --- /dev/null +++ b/data/libaute-db/form/autedb.form @@ -0,0 +1,52 @@ + + + + users
+ + + + t + t + + + + + + + + + + + t + + + + + + + + + + t + + + + + + datetime + %d/%m/%Y %H.%M.%S + + + + + + datetime + %d/%m/%Y %H.%M.%S + + + + + + + + diff --git a/data/libaute-db/glade/Makefile.am b/data/libaute-db/glade/Makefile.am deleted file mode 100644 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 index d68387e..0000000 --- a/data/libaute-db/glade/autedb.glade +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - True - Autenticazione - True - dialog - - - True - vertical - - - True - 5 - 3 - 2 - 5 - 5 - - - True - 0 - Utente - - - GTK_FILL - - - - - - True - 0 - Password - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - True - 5 - 2 - 2 - 5 - 5 - - - True - 0 - Nuova - - - GTK_FILL - - - - - - True - 0 - Conferma - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - - - True - _Cambia password - True - - - - - 2 - 2 - 3 - GTK_FILL - - - - - 2 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancelbutton1 - okbutton1 - - - diff --git a/data/libaute-db/gui/Makefile.am b/data/libaute-db/gui/Makefile.am new file mode 100644 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 index 0000000..cb111e2 --- /dev/null +++ b/data/libaute-db/gui/autedb.glade @@ -0,0 +1,643 @@ + + + + + + True + Autenticazione + True + dialog + + + True + vertical + + + True + 5 + 3 + 2 + 5 + 5 + + + True + 0 + Utente + + + GTK_FILL + + + + + + True + 0 + Password + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + True + 5 + 2 + 2 + 5 + 5 + + + True + 0 + Nuova + + + GTK_FILL + + + + + + True + 0 + Conferma + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + + + True + _Cambia password + True + + + + + 2 + 2 + 3 + GTK_FILL + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + + + + + + + + + + + + + + + + + + True + 5 + vertical + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_users + + + Status + + + + 0 + + + + + + + Code + + + + 1 + + + + + + + Name + + + + 2 + + + + + + + Last access + + + + 3 + + + + + + + Password expiration + + + + 4 + + + + + + + + + 0 + + + + + True + 5 + end + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + gtk-find + True + True + True + True + + + False + False + 3 + + + + + False + 1 + + + + + + + User + True + center-on-parent + True + + + True + 5 + vertical + 5 + + + True + 8 + 2 + 5 + 5 + + + True + 0 + Code + + + GTK_FILL + GTK_FILL + + + + + True + 0 + Surname + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Name + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 0 + Enabled + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + Last access + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + 0 + Password expiration + + + 5 + 6 + GTK_FILL + GTK_FILL + + + + + True + 0 + 0 + Description + + + 6 + 7 + GTK_FILL + GTK_FILL + + + + + True + 0 + lbl_last_access + + + 1 + 2 + 4 + 5 + + + + + True + True + False + True + + + 1 + 2 + 3 + 4 + + + + + True + True + 10 + ● + + + 1 + 2 + + + + + True + True + 100 + ● + + + 1 + 2 + 1 + 2 + + + + + True + True + 100 + ● + + + 1 + 2 + 2 + 3 + + + + + True + True + 19 + ● + + + 1 + 2 + 5 + 6 + + + + + True + True + automatic + automatic + etched-in + + + True + True + + + + + 1 + 2 + 6 + 7 + + + + + + + + lbl_password + + + 7 + 8 + GTK_FILL + GTK_FILL + + + + + 0 + + + + + True + 5 + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-save + True + True + True + True + + + False + False + 1 + + + + + False + 1 + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index bc837dc..dc8bd35 100644 --- 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 e00aa4e..fe32796 100644 --- a/src/aute_db.c +++ b/src/aute_db.c @@ -28,6 +28,9 @@ #include #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: -- 2.49.0