Filled keys columns info config and path.

diff --git a/data/zak-confi-gui/ui/zak-confi-gui.ui b/data/zak-confi-gui/ui/zak-confi-gui.ui
index f09a7dbf71827ae971fca4f0c459201a55928b2a..2e37ba52b80c19f65ac51a51a30e57a1edbe3e5d 100644 (file)
--- a/data/zak-confi-gui/ui/zak-confi-gui.ui
+++ b/data/zak-confi-gui/ui/zak-confi-gui.ui
@@ -709,7 +709,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Parent</property>
+                <property name="label" translatable="yes">Path</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>

diff --git a/src/main.c b/src/main.c
index 97da1c215682f9cd5c5c5f8ef3e66472d4926013..a1ceb73beaec0c0ec7ad0f5b84f47ceaef3e72b9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -123,15 +123,43 @@ fill_trFolders_Keys (GNode *node, GtkTreeIter parent)
        GtkTreeIter child;
        ZakConfiKey *ck;
 
+       GtkTreePath *tpath;
+
+       gchar *config;
+       gchar *path;
+       gchar *parent_name;
+
        if (node == NULL) return;
 
+       tpath = gtk_tree_model_get_path (GTK_TREE_MODEL (storeFolders), &parent);
+
        node = node->children;
        while (node != NULL)
                {
                        ck = (ZakConfiKey *)node->data;
 
+                       gtk_tree_model_get (GTK_TREE_MODEL (storeFolders), &parent,
+                                                               FOLDERS_COL_CONFIG, &config,
+                                                               FOLDERS_COL_PATH, &path,
+                                                               FOLDERS_COL_KEY, &parent_name,
+                                                               -1);
+
+
+                       if (gtk_tree_path_get_depth (tpath) == 0
+                               || g_strcmp0 (path, "") == 0)
+                               {
+                                       g_free (path);
+                                       path = g_strdup ("/");
+                               }
+                       else
+                               {
+                                       path = g_strdup_printf ("%s%s/", path, parent_name);
+                               }
+
                        gtk_tree_store_append (storeFolders, &child, &parent);
                        gtk_tree_store_set (storeFolders, &child,
+                                                               FOLDERS_COL_CONFIG, config,
+                                                               FOLDERS_COL_PATH, path,
                                            FOLDERS_COL_KEY, ck->key,
                                            FOLDERS_COL_DESCRIPTION, ck->description,
                                            FOLDERS_COL_VALUE, ck->value,
@@ -165,6 +193,8 @@ fill_trFolders (const gchar *filter)
 
                                        gtk_tree_store_append (storeFolders, &iter, NULL);
                                        gtk_tree_store_set (storeFolders, &iter,
+                                                           FOLDERS_COL_CONFIG, conficonfi->name,
+                                                                               FOLDERS_COL_PATH, "",
                                                            FOLDERS_COL_KEY, conficonfi->name,
                                                            FOLDERS_COL_DESCRIPTION, conficonfi->description,
                                                            -1);