From 69866d08815685ea0a004d04eeb956841a49d385 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 1 Jun 2011 18:30:28 +0200 Subject: [PATCH] Started developing of "add all tables" utility. --- data/audit-gui/gui/audit-gui.gui | 57 +++++++++++++++- src/datasource.h | 3 +- src/datasources.c | 114 +++++++++++++++++++++++++++++-- src/datasources.h | 3 +- src/main.c | 20 ++++-- src/openauditds.h | 3 +- src/table.h | 3 +- 7 files changed, 187 insertions(+), 16 deletions(-) diff --git a/data/audit-gui/gui/audit-gui.gui b/data/audit-gui/gui/audit-gui.gui index 83ac71f..af5329b 100644 --- a/data/audit-gui/gui/audit-gui.gui +++ b/data/audit-gui/gui/audit-gui.gui @@ -59,6 +59,26 @@ + + + True + _Utilities + True + + + True + + + True + Add _all tables + True + + + + + + + True @@ -116,7 +136,7 @@ normal Audit GUI 0.0.1 - Andrea Zagli 2010 + Andrea Zagli 2010-2011 Andrea Zagli <azagli@libero.it> @@ -763,4 +783,39 @@ + + Audit GUI + True + center-on-parent + 550 + True + False + + + True + 5 + vertical + 5 + + + True + label + + + False + 0 + + + + + True + + + False + 1 + + + + + diff --git a/src/datasource.h b/src/datasource.h index 32a9998..031d32a 100644 --- a/src/datasource.h +++ b/src/datasource.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,7 +24,6 @@ #include #include -#include #include "commons.h" diff --git a/src/datasources.c b/src/datasources.c index fb6aa7a..9bbf444 100644 --- a/src/datasources.c +++ b/src/datasources.c @@ -114,9 +114,10 @@ Datasources 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), + g_strsplit ("tstore_ds_tables_fields" + "|w_progress" + "|vbox5", + "|", -1), &error); if (error != NULL) { @@ -152,11 +153,116 @@ Datasources GtkWidget *datasources_get_widget (Datasources *datasources) { - DatasourcesPrivate *priv = DATASOURCES_GET_PRIVATE (datasources); + DatasourcesPrivate *priv; + + g_return_val_if_fail (IS_DATASOURCES (datasources), NULL); + + priv = DATASOURCES_GET_PRIVATE (datasources); return priv->widget; } +/** + * datasources_add_all_tables: + * @datasources: + * + */ +void +datasources_add_all_tables (Datasources *datasources) +{ + DatasourcesPrivate *priv; + + GtkWidget *dialog; + GtkTreeIter iter; + + guint id_ds; + guint depth; + GtkTreePath *path; + + g_return_if_fail (IS_DATASOURCES (datasources)); + + priv = DATASOURCES_GET_PRIVATE (datasources); + + if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter)) + { + gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_datasources), &iter, + COL_ID_DS, &id_ds, + -1); + + if (id_ds == 0) + { + path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->tstore_datasources), &iter); + if (path != NULL) + { + depth = gtk_tree_path_get_depth (path); + + if (depth >= 2) gtk_tree_path_up (path); + if (depth >= 3) gtk_tree_path_up (path); + + if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->tstore_datasources), &iter, path)) + { + gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_datasources), &iter, + COL_ID_DS, &id_ds, + -1); + } + } + } + + if (id_ds != 0) + { + dialog = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_progress")); + gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label10")), + "Updating data store"); + gtk_widget_show_all (dialog); + gtk_widget_show_now (dialog); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (gtk_builder_get_object (priv->commons->gtkbuilder, "progressbar1"))); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (gtk_builder_get_object (priv->commons->gtkbuilder, "progressbar1"))); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (gtk_builder_get_object (priv->commons->gtkbuilder, "progressbar1"))); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label10")), + "Adding table «table_name»"); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (gtk_builder_get_object (priv->commons->gtkbuilder, "progressbar1"))); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (gtk_builder_get_object (priv->commons->gtkbuilder, "progressbar1"))); + while (gtk_events_pending ()) gtk_main_iteration (); + g_usleep (3000000); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (gtk_builder_get_object (priv->commons->gtkbuilder, "progressbar1"))); + while (gtk_events_pending ()) gtk_main_iteration (); + gtk_widget_hide_all (dialog); + } + else + { + dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Select a datasource."); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } + } + else + { + dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Select a datasource."); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } +} + /* PRIVATE */ static void datasources_load_fields (Datasources *datasources, guint id_table, GtkTreeIter *iter_parent) diff --git a/src/datasources.h b/src/datasources.h index 92d61d6..4431eec 100644 --- a/src/datasources.h +++ b/src/datasources.h @@ -24,7 +24,6 @@ #include #include -#include #include "commons.h" @@ -58,6 +57,8 @@ Datasources *datasources_new (Commons *commons); GtkWidget *datasources_get_widget (Datasources *datasources); +void datasources_add_all_tables (Datasources *datasources); + G_END_DECLS diff --git a/src/main.c b/src/main.c index ec52227..3de62ab 100644 --- a/src/main.c +++ b/src/main.c @@ -40,6 +40,8 @@ static GtkWidget *w; static GtkWidget *vbx_body; static GtkWidget *vbx_body_child; +static Datasources *datasources; + static void main_set_vbx_body_child (GtkWidget *child) { @@ -62,8 +64,6 @@ main_on_ds_opened (gpointer instance, const gchar *arg1, gpointer user_data) gchar *cnc; gchar *pos; - Datasources *m; - if (arg1 == NULL) { return; @@ -112,12 +112,13 @@ main_on_ds_opened (gpointer instance, const gchar *arg1, gpointer user_data) commons->gdaparser = gda_sql_parser_new (); } - m = datasources_new (commons); + datasources = datasources_new (commons); - vbx = datasources_get_widget (m); + vbx = datasources_get_widget (datasources); main_set_vbx_body_child (vbx); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem2")), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem5")), TRUE); g_free (cnc); } @@ -150,7 +151,17 @@ on_mnu_file_close_activate (GtkMenuItem *menuitem, { gtk_widget_destroy (vbx_body_child); vbx_body_child = NULL; + gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem2")), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem5")), FALSE); + g_object_unref (datasources); +} + +G_MODULE_EXPORT void +on_mnu_utilities_add_all_tables_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + datasources_add_all_tables (datasources); } G_MODULE_EXPORT void @@ -235,6 +246,7 @@ main (int argc, char *argv[]) gtk_widget_show (w); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem2")), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem5")), FALSE); if (argc > 0) { diff --git a/src/openauditds.h b/src/openauditds.h index f5b8385..dced370 100644 --- a/src/openauditds.h +++ b/src/openauditds.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,7 +24,6 @@ #include #include -#include #include "commons.h" diff --git a/src/table.h b/src/table.h index 95130ff..f201723 100644 --- a/src/table.h +++ b/src/table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,7 +24,6 @@ #include #include -#include #include "commons.h" -- 2.49.0