src/Builder4/ValaProjectSettings.bjs

src/Builder4/ValaProjectSettings.vala

diff --git a/src/Builder4/ValaProjectSettings.bjs b/src/Builder4/ValaProjectSettings.bjs
index 4ffb8af..3a118fc 100644 (file)
--- a/src/Builder4/ValaProjectSettings.bjs
+++ b/src/Builder4/ValaProjectSettings.bjs
@@ -362,7 +362,7 @@
                "* pack" : "set_model",
                "xtype" : "ListStore",
                "$ n_columns" : 4,
-               "| void load" : "() {\n \n      this.el.clear();\n  \n    \n     var def = _this.project.compilegroups.get(\"_default_\");\n     var items  = def.sources;\n     \n     \n     \n     \n \n    Gtk.TreeIter citer;\n\n    for(var i =0 ; i < items.size; i++) {\n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   items.get(i) ); // title \n        \n        print(\"ADD item %s\", items.get(i));\n        this.el.set_value(citer, 1,   \"dir\"); // type         \n        this.el.set_value(citer, 2,   false ); // checked \n\n        var files = _this.project.files(items.get(i));\n        \n         for(var j =0 ; j < files.size; j++) {\n            this.el.append(out citer);   \n                 print(\"ADD item %s\", files.get(j));\n            this.el.set_value(citer, 0,   files.get(j) ); // title \n            this.el.set_value(citer, 1,   \"file\"); // type         \n            this.el.set_value(citer, 2,   false ); // checked \n\n        }\n        \n        \n        //this.el.set_value(citer, 1,   items.get(i) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n ",
+               "| void load" : "() {\n \n      this.el.clear();\n  \n    \n     var def = _this.project.compilegroups.get(\"_default_\");\n     var items  = def.sources;\n     \n     \n     \n     \n \n    Gtk.TreeIter citer;\n\n    for(var i =0 ; i < items.size; i++) {\n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   items.get(i) ); // title \n        this.el.set_value(citer, 1,   GLib.escape_text(items.get(i)) ); // title \n        print(\"ADD item %s\", items.get(i));\n        this.el.set_value(citer, 2,   \"dir\"); // type         \n        this.el.set_value(citer, 3,   false ); // checked \n\n        var files = _this.project.files(items.get(i));\n        \n         for(var j =0 ; j < files.size; j++) {\n            this.el.append(out citer);   \n                 print(\"ADD item %s\", files.get(j));\n            this.el.set_value(citer, 0,   files.get(j) ); // title \n            this.el.set_value(citer, 1,   GLib.escape_text( Path.get_basename (files.get(j))) ); // title             \n            this.el.set_value(citer, 2,   \"file\"); // type         \n            this.el.set_value(citer, 3,   false ); // checked \n\n        }\n        \n        \n        //this.el.set_value(citer, 1,   items.get(i) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n ",
                "$ columns" : "    typeof(string),  // 0 file name\n        typeof(string),  // 0 basename\n     typeof(string), // type (dir orfile)\n     typeof(bool)  // is checked.\n     ",
                "$ xns" : "Gtk"
               },

diff --git a/src/Builder4/ValaProjectSettings.vala b/src/Builder4/ValaProjectSettings.vala
index 5397a91..27d5374 100644 (file)
--- a/src/Builder4/ValaProjectSettings.vala
+++ b/src/Builder4/ValaProjectSettings.vala
@@ -1548,10 +1548,10 @@ public class ValaProjectSettings : Object
                  this.el.append(out citer);   
                  
                 this.el.set_value(citer, 0,   items.get(i) ); // title 
-                
+                this.el.set_value(citer, 1,   GLib.escape_text(items.get(i)) ); // title 
                 print("ADD item %s", items.get(i));
-                this.el.set_value(citer, 1,   "dir"); // type         
-                this.el.set_value(citer, 2,   false ); // checked 
+                this.el.set_value(citer, 2,   "dir"); // type         
+                this.el.set_value(citer, 3,   false ); // checked 
         
                 var files = _this.project.files(items.get(i));
                 
@@ -1559,8 +1559,9 @@ public class ValaProjectSettings : Object
                     this.el.append(out citer);   
                          print("ADD item %s", files.get(j));
                     this.el.set_value(citer, 0,   files.get(j) ); // title 
-                    this.el.set_value(citer, 1,   "file"); // type         
-                    this.el.set_value(citer, 2,   false ); // checked 
+                    this.el.set_value(citer, 1,   GLib.escape_text( Path.get_basename (files.get(j))) ); // title             
+                    this.el.set_value(citer, 2,   "file"); // type         
+                    this.el.set_value(citer, 3,   false ); // checked 
         
                 }