Added menu item file -> close.

diff --git a/autogen.sh b/autogen.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/data/audit-gui/gui/audit-gui.gui b/data/audit-gui/gui/audit-gui.gui
index 9f4412f745a109fcf04b9b131cc65a7a2a2bcfd1..2f99d0ed6e99bb8bbfc24b8045ec23d829d6cc1d 100644 (file)
--- a/data/audit-gui/gui/audit-gui.gui
+++ b/data/audit-gui/gui/audit-gui.gui
@@ -32,6 +32,15 @@
                         <signal name="activate" handler="on_mnu_file_open_audit_ds_activate"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem2">
+                        <property name="label">gtk-close</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_mnu_file_close_activate"/>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                         <property name="visible">True</property>
@@ -244,6 +253,42 @@
       </object>
     </child>
   </object>
+  <object class="GtkTreeStore" id="tstore_tables_fields">
+    <columns>
+      <!-- column-name id_table -->
+      <column type="guint"/>
+      <!-- column-name name_table -->
+      <column type="gchararray"/>
+      <!-- column-name id_field -->
+      <column type="guint"/>
+      <!-- column-name name_field -->
+      <column type="gchararray"/>
+      <!-- column-name choosen -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="tstore_ds_tables_fields">
+    <columns>
+      <!-- column-name id_ds -->
+      <column type="guint"/>
+      <!-- column-name name_ds -->
+      <column type="gchararray"/>
+      <!-- column-name cncstring_ds -->
+      <column type="gchararray"/>
+      <!-- column-name id_table -->
+      <column type="guint"/>
+      <!-- column-name name_table -->
+      <column type="gchararray"/>
+      <!-- column-name id_field -->
+      <column type="guint"/>
+      <!-- column-name name_field -->
+      <column type="gchararray"/>
+      <!-- column-name choosen -->
+      <column type="gboolean"/>
+      <!-- column-name choosen_visible -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="w_table">
     <property name="title" translatable="yes">Table - Audit GUI</property>
     <property name="modal">True</property>
@@ -344,42 +389,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="tstore_tables_fields">
-    <columns>
-      <!-- column-name id_table -->
-      <column type="guint"/>
-      <!-- column-name name_table -->
-      <column type="gchararray"/>
-      <!-- column-name id_field -->
-      <column type="guint"/>
-      <!-- column-name name_field -->
-      <column type="gchararray"/>
-      <!-- column-name choosen -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkTreeStore" id="tstore_ds_tables_fields">
-    <columns>
-      <!-- column-name id_ds -->
-      <column type="guint"/>
-      <!-- column-name name_ds -->
-      <column type="gchararray"/>
-      <!-- column-name cncstring_ds -->
-      <column type="gchararray"/>
-      <!-- column-name id_table -->
-      <column type="guint"/>
-      <!-- column-name name_table -->
-      <column type="gchararray"/>
-      <!-- column-name id_field -->
-      <column type="guint"/>
-      <!-- column-name name_field -->
-      <column type="gchararray"/>
-      <!-- column-name choosen -->
-      <column type="gboolean"/>
-      <!-- column-name choosen_visible -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
   <object class="GtkWindow" id="w_datasources">
     <property name="title" translatable="yes">Datasources - Audit GUI</property>
     <property name="modal">True</property>

diff --git a/src/main.c b/src/main.c
index 968faf8ca8bab3df8e72e8d80bcaee2e6b91b320..d28ed6d9a727f570d6190f79efc0b8adc3d909ef 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,9 @@
 #include "datasources.h"
 #include "openauditds.h"
 
+G_MODULE_EXPORT void on_mnu_file_close_activate (GtkMenuItem *menuitem,
+                            gpointer user_data);
+
 static Commons *commons;
 
 static GtkWidget *w;
@@ -84,6 +87,7 @@ main_on_ds_opened (gpointer instance, const gchar *arg1, gpointer user_data)
        vbx = datasources_get_widget (m);
 
        main_set_vbx_body_child (vbx);
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem2")), TRUE);
 }
 
 G_MODULE_EXPORT void
@@ -92,6 +96,11 @@ on_mnu_file_open_audit_ds_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
+       if (vbx_body_child != NULL)
+               {
+                       on_mnu_file_close_activate (NULL, user_data);
+               }
+
        OpenAuditDS *m = open_audit_ds_new (commons);
 
        vbx = open_audit_ds_get_widget (m);
@@ -103,6 +112,15 @@ on_mnu_file_open_audit_ds_activate (GtkMenuItem *menuitem,
        gtk_widget_show_all (vbx);
 }
 
+G_MODULE_EXPORT void
+on_mnu_file_close_activate (GtkMenuItem *menuitem,
+                            gpointer user_data)
+{
+       gtk_widget_destroy (vbx_body_child);
+       vbx_body_child = NULL;
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem2")), FALSE);
+}
+
 G_MODULE_EXPORT void
 on_mnu_help_about_activate (GtkMenuItem *menuitem,
                             gpointer user_data)
@@ -184,6 +202,8 @@ main (int argc, char *argv[])
 
        gtk_widget_show (w);
 
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "menuitem2")), FALSE);
+
        if (argc > 0)
                {
                        /* try to user the first argument of command line as a cnc_string */