From: Andrea Zagli Date: Fri, 13 Aug 2010 11:08:09 +0000 (+0200) Subject: Started opening datasources. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=3201b9f631cf644179200dfa911775c0c42d2c63;p=zakaudit%2Fgui Started opening datasources. --- diff --git a/data/audit-gui/gui/audit-gui.gui b/data/audit-gui/gui/audit-gui.gui index 82fefe3..1b02b8d 100644 --- a/data/audit-gui/gui/audit-gui.gui +++ b/data/audit-gui/gui/audit-gui.gui @@ -358,4 +358,157 @@ + + + + + + + + + + + + + + + + + + + + + + Datasources - Audit GUI + True + center-on-parent + True + + + True + 5 + vertical + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + tstore_ds_tables_fields + False + 0 + + + Datasource + + + + 1 + + + + + + 2 + + + + + + + Table + + + + 4 + + + + + + + Field + + + + 6 + + + + + + 7 + + + + + + + + + 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 + + + + + False + 1 + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 966bcfb..c24d390 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,8 @@ bin_PROGRAMS = audit-gui audit_gui_SOURCES = \ commons.h \ + datasources.c \ + datasources.h \ main.c \ openauditds.c \ openauditds.h \ No newline at end of file diff --git a/src/datasources.c b/src/datasources.c new file mode 100644 index 0000000..2203b10 --- /dev/null +++ b/src/datasources.c @@ -0,0 +1,338 @@ +/* + * Copyright (C) 2010 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "datasources.h" + +static void datasources_class_init (DatasourcesClass *klass); +static void datasources_init (Datasources *datasources); + +static void datasources_load (Datasources *datasources); +static void datasources_edit (Datasources *datasources); + +static void datasources_on_costo_aggiornato (gpointer instance, gpointer user_data); + +static void datasources_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void datasources_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void datasources_on_btn_new_clicked (GtkButton *button, + gpointer user_data); +static void datasources_on_btn_edit_clicked (GtkButton *button, + gpointer user_data); +static void datasources_on_btn_delete_clicked (GtkButton *button, + gpointer user_data); +static void datasources_on_trv_datasources_row_activated (GtkTreeView *tree_view, + GtkTreePath *tree_path, + GtkTreeViewColumn *column, + gpointer user_data); + +#define DATASOURCES_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_DATASOURCES, DatasourcesPrivate)) + +enum +{ + COL_ID, + COL_NOME +}; + +typedef struct _DatasourcesPrivate DatasourcesPrivate; +struct _DatasourcesPrivate + { + Commons *commons; + + GtkWidget *widget; + GtkTreeSelection *selection; + GtkTreeStore *tstore_datasources; + }; + +G_DEFINE_TYPE (Datasources, datasources, G_TYPE_OBJECT) + +static void +datasources_class_init (DatasourcesClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (DatasourcesPrivate)); + + object_class->set_property = datasources_set_property; + object_class->get_property = datasources_get_property; +} + +static void +datasources_init (Datasources *datasources) +{ + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); +} + +/** + * datasources_new: + * @commons: + * + * Returns: the newly created #Datasources object. + */ +Datasources +*datasources_new (Commons *commons) +{ + GError *error; + + Datasources *a = DATASOURCES (g_object_new (datasources_get_type (), NULL)); + + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (a); + + priv->commons = commons; + + error = NULL; + gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile, + g_strsplit (g_strconcat ("tstore_ds_tables_fields|", + "vbox5", + NULL), "|", -1), + &error); + if (error != NULL) + { + g_warning ("Errore: %s.", error->message); + return NULL; + } + + priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "vbox5")); + priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview2"))); + priv->tstore_datasources = GTK_TREE_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "tstore_ds_tables_fields")); + + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button7"), + "clicked", G_CALLBACK (datasources_on_btn_new_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button9"), + "clicked", G_CALLBACK (datasources_on_btn_edit_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button8"), + "clicked", G_CALLBACK (datasources_on_btn_delete_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview2"), + "row-activated", G_CALLBACK (datasources_on_trv_datasources_row_activated), (gpointer)a); + + datasources_load (a); + + return a; +} + +/** + * datasources_get_widget: + * @datasources: + * + */ +GtkWidget +*datasources_get_widget (Datasources *datasources) +{ + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + return priv->widget; +} + +/* PRIVATE */ +static void +datasources_load (Datasources *datasources) +{ + /*GtkTreeIter iter; + GdaDataModel *dm; + + gint rows; + gint row; + + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + gtk_list_store_clear (priv->lstore_datasources); + + dm = gdaex_query (priv->commons->gdaex, + "SELECT c.id, c.nome" + " FROM datasources AS c" + " WHERE c.status <> 'E'" + " ORDER BY c.nome"); + if (dm != NULL) + { + rows = gda_data_model_get_n_rows (dm); + for (row = 0; row < rows; row++) + { + gtk_list_store_append (priv->lstore_datasources, &iter); + + gtk_list_store_set (priv->lstore_datasources, &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 +datasources_edit (Datasources *datasources) +{ + /*GtkTreeIter iter; + guint id; + + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter)) + { + GtkWidget *w; + + gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_datasources), &iter, + COL_ID, &id, + -1); + + Datasourceso *c = datasourceso_new (priv->commons, id); + + g_signal_connect (G_OBJECT (c), "aggiornato", + G_CALLBACK (datasources_on_costo_aggiornato), (gpointer)datasources); + + w = datasourceso_get_widget (c); + gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient); + gtk_widget_show (w); + } + else + { + GtkWidget *dialog = gtk_message_dialog_new (priv->wtransient, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Occorre prima selezionare un datasourceso"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + }*/ +} + +static void +datasources_on_costo_aggiornato (gpointer instance, gpointer user_data) +{ + datasources_load ((Datasources *)user_data); +} + +static void +datasources_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + Datasources *datasources = DATASOURCES (object); + + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +datasources_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + Datasources *datasources = DATASOURCES (object); + + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +/* CALLBACK */ +static void +datasources_on_btn_new_clicked (GtkButton *button, + gpointer user_data) +{ + /*GtkWidget *w; + + Datasources *datasources = (Datasources *)user_data; + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + Datasourceso *c = datasourceso_new (priv->commons, 0); + + g_signal_connect (G_OBJECT (c), "aggiornato", + G_CALLBACK (datasources_on_costo_aggiornato), (gpointer)datasources); + + w = datasourceso_get_widget (c); + gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient); + gtk_widget_show (w);*/ +} + +static void +datasources_on_btn_edit_clicked (GtkButton *button, + gpointer user_data) +{ + datasources_edit ((Datasources *)user_data); +} + +static void +datasources_on_btn_delete_clicked (GtkButton *button, + gpointer user_data) +{ + /*GtkWidget *dialog; + gboolean risp; + + GtkTreeIter iter; + guint id; + + Datasources *datasources = (Datasources *)user_data; + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + + if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter)) + { + dialog = gtk_message_dialog_new (priv->wtransient, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "Sicuro di voler eliminare l'datasourceso selezionato?"); + risp = gtk_dialog_run (GTK_DIALOG (dialog)); + if (risp == GTK_RESPONSE_YES) + { + gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_datasources), &iter, + COL_ID, &id, + -1); + + gdaex_execute (priv->commons->gdaex, + g_strdup_printf ("UPDATE datasources SET status = 'E' WHERE id = %d", id)); + + datasources_carica (datasources); + } + gtk_widget_destroy (dialog); + } + else + { + dialog = gtk_message_dialog_new (priv->wtransient, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Occorre prima selezionare un datasourceso"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + }*/ +} + +static void +datasources_on_trv_datasources_row_activated (GtkTreeView *tree_view, + GtkTreePath *tree_path, + GtkTreeViewColumn *column, + gpointer user_data) +{ + DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE ((Datasources *)user_data); + + datasources_edit ((Datasources *)user_data); +} \ No newline at end of file diff --git a/src/datasources.h b/src/datasources.h new file mode 100644 index 0000000..92d61d6 --- /dev/null +++ b/src/datasources.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2010 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __DATASOURCES_H__ +#define __DATASOURCES_H__ + +#include +#include + +#include +#include + +#include "commons.h" + +G_BEGIN_DECLS + + +#define TYPE_DATASOURCES (datasources_get_type ()) +#define DATASOURCES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATASOURCES, Datasources)) +#define DATASOURCES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATASOURCES, DatasourcesClass)) +#define IS_DATASOURCES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATASOURCES)) +#define IS_DATASOURCES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATASOURCES)) +#define DATASOURCES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATASOURCES, DatasourcesClass)) + + +typedef struct _Datasources Datasources; +typedef struct _DatasourcesClass DatasourcesClass; + +struct _Datasources + { + GObject parent; + }; + +struct _DatasourcesClass + { + GObjectClass parent_class; + }; + +GType datasources_get_type (void) G_GNUC_CONST; + +Datasources *datasources_new (Commons *commons); + +GtkWidget *datasources_get_widget (Datasources *datasources); + + +G_END_DECLS + +#endif /* __DATASOURCES_H__ */ diff --git a/src/main.c b/src/main.c index 1820dd6..252a3ff 100644 --- a/src/main.c +++ b/src/main.c @@ -28,6 +28,7 @@ #include #include "commons.h" +#include "datasources.h" #include "openauditds.h" static Commons *commons; @@ -52,7 +53,32 @@ main_set_vbx_body_child (GtkWidget *child) static void main_on_ds_opened (gpointer instance, const gchar *arg1, gpointer user_data) { - g_message ("OPENED"); + GtkWidget *vbx; + GError *error; + + error = NULL; + commons->gdacon = gda_connection_open_from_string (NULL, arg1, NULL, + GDA_CONNECTION_OPTIONS_NONE, + &error); + if (!commons->gdacon) + { + GtkWidget *dialog; + dialog = gtk_message_dialog_new (GTK_WINDOW (w), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Unable to connect to the choosen audit db.\n\n%s", + (error != NULL && error->message != NULL ? error->message : "No details.")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return; + } + + Datasources *m = datasources_new (commons); + + vbx = datasources_get_widget (m); + + main_set_vbx_body_child (vbx); } G_MODULE_EXPORT void diff --git a/src/openauditds.c b/src/openauditds.c index f99a67b..e55a252 100644 --- a/src/openauditds.c +++ b/src/openauditds.c @@ -224,10 +224,16 @@ open_audit_ds_on_btn_open_clicked (GtkButton *button, OpenAuditDSPrivate *priv = OPEN_AUDIT_DS_GET_PRIVATE (open_audit_ds); OpenAuditDSClass *klass = OPEN_AUDIT_DS_GET_CLASS (open_audit_ds); + gchar *cncstring; + const GdaDsnInfo *info; info = gdaui_login_get_connection_information (GDAUI_LOGIN (priv->wlogin)); - g_signal_emit (open_audit_ds, klass->opened_signal_id, 0, info->cnc_string); + cncstring = g_strconcat (info->provider, "://", + (info->auth_string != NULL ? g_strdup_printf ("%s;", info->auth_string) : ""), + info->cnc_string, NULL); + + g_signal_emit (open_audit_ds, klass->opened_signal_id, 0, cncstring); gtk_widget_destroy (priv->w); }