From dd480152390e60eddab94e12577100b24bd8d33e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 27 Apr 2015 17:05:59 +0800 Subject: [PATCH] src/Builder4/ValaProjectSettings.bjs src/Builder4/ValaProjectSettings.vala --- src/Builder4/ValaProjectSettings.bjs | 2 +- src/Builder4/ValaProjectSettings.vala | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Builder4/ValaProjectSettings.bjs b/src/Builder4/ValaProjectSettings.bjs index c9eca3653..7fc52e32a 100644 --- a/src/Builder4/ValaProjectSettings.bjs +++ b/src/Builder4/ValaProjectSettings.bjs @@ -362,7 +362,7 @@ "id" : "files_tree_store", "* pack" : "set_model", "xtype" : "ListStore", - "| void updateDir" : "(string dname, bool val) {\n\n for(var i =0 ; i < this.el.iter_n_children(null); i++) {\n this.el.iter_nth_child(out citer,null,i);\n\n GLib.Value val;\n this.el.get_value(citer,0, out val);\n var fn = (string) val;\n \n \n var active = false;\n if (_this.set_vbox.cgroup.sources.contains(fn)) {\n active = true;\n }\n \n this.el.set_value(citer, 3, active ); // checked \n }\n\n}\n", + "| void updateDir" : "(string dname, bool val) {\n\n for(var i =0 ; i < this.el.iter_n_children(null); i++) {\n this.el.iter_nth_child(out citer,null,i);\n\n GLib.Value val;\n this.el.get_value(citer,0, out val);\n var fn = (string) val;\n \n if ( Path.get_dirname (fn) == dname) {\n \n this.el.set_value(citer, 3, val ); // checked \n }\n }\n\n}\n", "$ 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 this.el.set_value(citer, 1, \"\" + \n GLib.Markup.escape_text(items.get(i)) + \"\"\n ); // 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.Markup.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 ", diff --git a/src/Builder4/ValaProjectSettings.vala b/src/Builder4/ValaProjectSettings.vala index fb417c329..70ae9ecda 100644 --- a/src/Builder4/ValaProjectSettings.vala +++ b/src/Builder4/ValaProjectSettings.vala @@ -1542,13 +1542,10 @@ public class ValaProjectSettings : Object this.el.get_value(citer,0, out val); var fn = (string) val; + if ( Path.get_dirname (fn) == dname) { - var active = false; - if (_this.set_vbox.cgroup.sources.contains(fn)) { - active = true; + this.el.set_value(citer, 3, val ); // checked } - - this.el.set_value(citer, 3, active ); // checked } } -- 2.39.2