Adding config.

diff --git a/data/zak-confi-gui/ui/zak-confi-gui.ui b/data/zak-confi-gui/ui/zak-confi-gui.ui
index 095f20a811ac88a6903516801dfdebe33b36b84f..f09a7dbf71827ae971fca4f0c459201a55928b2a 100644 (file)
--- a/data/zak-confi-gui/ui/zak-confi-gui.ui
+++ b/data/zak-confi-gui/ui/zak-confi-gui.ui
@@ -386,8 +386,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">3</property>
-            <property name="row_spacing">3</property>
-            <property name="column_spacing">3</property>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">5</property>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
@@ -451,65 +451,58 @@
       <action-widget response="-5">okbutton1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkTextBuffer" id="textbuffer1"/>
   <object class="GtkDialog" id="wConfiguration">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Configuration - ZakConfiGUI</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="default_width">320</property>
+    <property name="default_height">260</property>
     <property name="type_hint">dialog</property>
     <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="visible">True</property>
+      <object class="GtkBox">
         <property name="can_focus">False</property>
         <property name="margin_left">5</property>
         <property name="margin_right">5</property>
         <property name="margin_top">5</property>
         <property name="margin_bottom">5</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
         <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
+          <object class="GtkButtonBox">
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="btnCancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-undo</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="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="btnOk">
+              <object class="GtkButton" id="button1">
                 <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="receives_default">False</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="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -517,35 +510,8 @@
           <object class="GtkGrid" id="table2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">3</property>
-            <property name="row_spacing">3</property>
-            <property name="column_spacing">3</property>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">ID</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="txtID">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="editable">False</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">5</property>
             <child>
               <object class="GtkEntry" id="txtName">
                 <property name="visible">True</property>
@@ -555,7 +521,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -570,13 +536,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="wrap_mode">word</property>
-                    <property name="buffer">textbuffer1</property>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -588,7 +553,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -601,24 +566,23 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">btnCancel</action-widget>
-      <action-widget response="-5">btnOk</action-widget>
+      <action-widget response="-6">button2</action-widget>
+      <action-widget response="-5">button1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkTextBuffer" id="textbuffer2"/>
   <object class="GtkDialog" id="wKey">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -628,6 +592,7 @@
     <property name="type_hint">dialog</property>
     <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
+    <signal name="response" handler="gtk_widget_hide" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -681,8 +646,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">3</property>
-            <property name="row_spacing">3</property>
-            <property name="column_spacing">3</property>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">5</property>
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
@@ -695,19 +660,6 @@
                 <property name="top_attach">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkEntry" id="txtID1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="editable">False</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkEntry" id="txtName1">
                 <property name="visible">True</property>
@@ -717,7 +669,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
@@ -729,7 +681,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -744,89 +696,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="wrap_mode">word</property>
-                    <property name="buffer">textbuffer2</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="hbox1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkEntry" id="txtIDParent">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="txtParent">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="hbox2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkEntry" id="txtIDConfig">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="txtConfig">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
@@ -838,7 +713,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -850,7 +725,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
@@ -862,7 +737,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -875,18 +750,32 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label7">
+              <object class="GtkEntry" id="txtConfig">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">ID</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="txtParent">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
               </packing>
             </child>

diff --git a/src/main.c b/src/main.c
index 8d842fcc15ecddd6811356627232dfcf75a382a8..d775f870c35f60ab77516bcebbcaf2be72e9917f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -533,6 +533,7 @@ on_mnuDbOpen_activate (GtkMenuItem *menuitem,
                        gpointer user_data)
 {
        GError *error = NULL;
+
        gtk_builder_add_objects_from_file (glaMain,
                                           uifilename,
                                           g_strsplit_set ("diagOpenDbCfg", "|", -1),
@@ -540,11 +541,11 @@ on_mnuDbOpen_activate (GtkMenuItem *menuitem,
 
        GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "diagOpenDbCfg"));
 
-       GtkWidget *txtCncString = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtCncString"));
-       GtkWidget *txtConfigsFilter = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtConfigsFilter"));
-
        if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK)
                {
+                       GtkWidget *txtCncString = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtCncString"));
+                       GtkWidget *txtConfigsFilter = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtConfigsFilter"));
+
                        cnc_string = g_strdup (gtk_entry_get_text (GTK_ENTRY (txtCncString)));
                        if (cnc_string != NULL)
                                {
@@ -579,9 +580,6 @@ on_mnuDbClose_activate (GtkMenuItem *menuitem,
 
        cnc_string = g_strdup ("");
 
-       /* TO DO */
-       /* deallocate first every Confi object */
-
        gtk_tree_store_clear (storeFolders);
 
        gtk_widget_set_sensitive (mnuDbClose, FALSE);
@@ -604,6 +602,7 @@ on_mnuConfigsNew_activate (GtkMenuItem *menuitem,
                            gpointer user_data)
 {
        GError *error = NULL;
+
        gtk_builder_add_objects_from_file (glaMain,
                                           uifilename,
                                           g_strsplit_set ("wConfiguration", "|", -1),
@@ -613,13 +612,14 @@ on_mnuConfigsNew_activate (GtkMenuItem *menuitem,
 
        if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK)
                {
+                       GtkTreeIter iter;
                        GtkWidget *txtName;
                        GtkWidget *txtvDescription;
                        GtkTextBuffer *buffer;
                        GtkTextIter iter1, iter2;
                        gchar *name;
                        gchar *description;
-                       ZakConfi *confi;
+                       ZakConfiConfi *conficonfi;
 
                        txtName = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtName"));
                        txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtvDescription"));
@@ -630,20 +630,9 @@ on_mnuConfigsNew_activate (GtkMenuItem *menuitem,
                        gtk_text_buffer_get_bounds (buffer, &iter1, &iter2);
                        description = gtk_text_buffer_get_text (buffer, &iter1, &iter2, FALSE);
 
-                       confi = zak_confi_new (cnc_string);
-                       if (confi != NULL)
+                       conficonfi = zak_confi_add_config (confi, name, description);
+                       if (conficonfi != NULL)
                                {
-                                       GtkTreeIter iter;
-                                       gint id;
-
-                                       g_object_set (G_OBJECT (confi),
-                                                     "description", description,
-                                                     NULL);
-
-                                       g_object_get (G_OBJECT (confi),
-                                                     "id_config", &id,
-                                                     NULL);
-
                                        gtk_tree_store_append (storeFolders, &iter, NULL);
                                        gtk_tree_store_set (storeFolders, &iter,
                                                            FOLDERS_COL_KEY, name,
@@ -669,6 +658,7 @@ on_mnuConfigsEdit_activate (GtkMenuItem *menuitem,
                                        ZakConfi *confi;
 
                                        GError *error = NULL;
+
                                        gtk_builder_add_objects_from_file (glaMain,
                                                                           uifilename,
                                                                           g_strsplit_set ("wConfiguration", "|", -1),
@@ -1104,7 +1094,8 @@ on_trFolders_button_press_event (GtkWidget *widget,
                                  gpointer user_data)
 {
        /* single click with the right mouse button? */
-       if (event->type == GDK_BUTTON_PRESS  &&  event->button == 3)
+       if (event->type == GDK_BUTTON_PRESS
+               && event->button == 3)
                {
                        /* select row if no row is selected */
                        if (gtk_tree_selection_count_selected_rows (selFolders) <= 1)