Builder4/ValaProjectSettings.bjs

Builder4/ValaProjectSettings.vala

diff --git a/Builder4/ValaProjectSettings.bjs b/Builder4/ValaProjectSettings.bjs
index fc83303..34314e4 100644 (file)
--- a/Builder4/ValaProjectSettings.bjs
+++ b/Builder4/ValaProjectSettings.bjs
@@ -21,15 +21,15 @@
                     "items" : [
                         {
                             "id" : "label_global",
-                            "xtype" : "Label",
                             "* pack" : false,
+                            "xtype" : "Label",
                             "$ xns" : "Gtk",
                             "utf8 label" : "Global"
                         },
                         {
                             "id" : "label_targets",
-                            "* pack" : false,
                             "xtype" : "Label",
+                            "* pack" : false,
                             "$ xns" : "Gtk",
                             "utf8 label" : "Targets"
                         },
@@ -47,8 +47,8 @@
                                 },
                                 {
                                     "id" : "compile_flags",
-                                    "xtype" : "Entry",
                                     "* pack" : "pack_start,false,false,0",
+                                    "xtype" : "Entry",
                                     "$ xns" : "Gtk"
                                 },
                                 {
@@ -64,15 +64,15 @@
                                     "items" : [
                                         {
                                             "gboolean headers_visible" : false,
-                                            "* pack" : "add",
                                             "xtype" : "TreeView",
+                                            "* pack" : "add",
                                             "string id" : "default_packages_tree",
                                             "$ xns" : "Gtk",
                                             "items" : [
                                                 {
                                                     "id" : "default_packages_tree_store",
-                                                    "* pack" : "set_model",
                                                     "xtype" : "ListStore",
+                                                    "* pack" : "set_model",
                                                     "$ n_columns" : 2,
                                                     "| void load" : "() {\n \n    var def = _this.project.compilegroups.get(\"_default_\");\n     var items  = def.packages;\n    \n    this.el.clear();\n    var pal = (Palete.Gtk) Palete.factory(\"Gtk\");\n    var pkgs = pal.packages();\n    print(\"ValaProjectSettings:packages load %d\\n\", pkgs.size);\n\n    Gtk.TreeIter citer;\n\n    for(var i =0 ; i < pkgs.size; i++) {\n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   pkgs.get(i) ); // title \n        this.el.set_value(citer, 1,   items.contains(pkgs.get(i)) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n",
                                                     "$ columns" : "    typeof(string),  // 0 key type\n      typeof(bool)",
@@ -89,8 +89,8 @@
                                                     "items" : [
                                                         {
                                                             "id" : "packages_render",
-                                                            "* pack" : "pack_start,false",
                                                             "xtype" : "CellRendererText",
+                                                            "* pack" : "pack_start,false",
                                                             "$ xns" : "Gtk"
                                                         }
                                                     ]
@@ -143,8 +143,8 @@
                                             "items" : [
                                                 {
                                                     "id" : "default_directory_tree_store",
-                                                    "* pack" : "set_model",
                                                     "xtype" : "ListStore",
+                                                    "* pack" : "set_model",
                                                     "$ n_columns" : 1,
                                                     "| 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    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,   items.get(i) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n",
                                                     "$ columns" : "    typeof(string)\n     ",
@@ -160,8 +160,8 @@
                                                     "items" : [
                                                         {
                                                             "id" : "directory_render",
-                                                            "* pack" : "pack_start,false",
                                                             "xtype" : "CellRendererText",
+                                                            "* pack" : "pack_start,false",
                                                             "$ xns" : "Gtk"
                                                         }
                                                     ]
@@ -213,20 +213,20 @@
                         },
                         {
                             "gint position" : 300,
-                            "xtype" : "HPaned",
                             "* pack" : "append_page,_this.label_targets.el",
+                            "xtype" : "HPaned",
                             "$ xns" : "Gtk",
                             "items" : [
                                 {
                                     "* init" : "{  \nthis.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n\n}\n",
-                                    "xtype" : "ScrolledWindow",
                                     "* pack" : "add1",
+                                    "xtype" : "ScrolledWindow",
                                     "$ xns" : "Gtk",
                                     "items" : [
                                         {
                                             "id" : "targets_tree_menu",
-                                            "* pack" : "add",
                                             "xtype" : "Menu",
+                                            "* pack" : "add",
                                             "$ xns" : "Gtk",
                                             "items" : [
                                                 {
@@ -267,8 +267,8 @@
                                             "items" : [
                                                 {
                                                     "id" : "targets_tree_store",
-                                                    "xtype" : "ListStore",
                                                     "* pack" : "set_model",
+                                                    "xtype" : "ListStore",
                                                     "$ n_columns" : 2,
                                                     "| void load" : "() {\n \n  this.el.clear();\n  \n    \n     var cg = _this.project.compilegroups;\n     \n   _this.targets_tree.cursor = \"\";\n    Gtk.TreeIter citer;\n    var iter = cg.map_iterator();\n   while(iter.next()) {\n        var key = iter.get_key();\n        if (key == \"_default_\") {\n            continue;\n        }\n    \n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   key ); // title \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 key type\n     typeof(string) // ??\n     ",
@@ -287,8 +287,8 @@
                                                                 "edited" : "  (path, newtext) => {\n     \n     Gtk.TreeIter  iter;\n        _this.targets_tree_store.el.get_iter(out iter, new Gtk.TreePath.from_string(path));\n       GLib.Value gval;\n        _this.targets_tree_store.el.get_value(iter,0, out gval);\n        var oldval = (string)gval;\n       if (oldval == newtext) {\n          return;\n        }\n         var cg = _this.project.compilegroups.get(oldval);\n        cg.name = newtext;\n        _this.project.compilegroups.unset(oldval);\n        _this.project.compilegroups.set(newtext, cg);\n    _this.targets_tree_store.load();\n  }"
                                                             },
                                                             "id" : "targets_render",
-                                                            "xtype" : "CellRendererText",
                                                             "* pack" : "pack_start,false",
+                                                            "xtype" : "CellRendererText",
                                                             "$ xns" : "Gtk",
                                                             "gboolean editable" : true
                                                         }
@@ -316,8 +316,8 @@
                                                 "changed" : "()  => {\n        if (_this.targets_tree.cursor.length < 1) {\n        return;\n    }\n    _this.project.compilegroups.get(_this.targets_tree.cursor).target_bin = this.el.text;\n}"
                                             },
                                             "id" : "build_pack_target",
-                                            "xtype" : "Entry",
                                             "* pack" : "pack_start,false,false,0",
+                                            "xtype" : "Entry",
                                             "$ xns" : "Gtk"
                                         },
                                         {
@@ -331,8 +331,8 @@
                                                 "changed" : "() => {\n    if (_this.targets_tree.cursor.length < 1) {\n        return;\n    }\n    _this.project.compilegroups.get(_this.targets_tree.cursor).compile_flags = this.el.text;\n}"
                                             },
                                             "id" : "build_compile_flags",
-                                            "xtype" : "Entry",
                                             "* pack" : "pack_start,false,false,0",
+                                            "xtype" : "Entry",
                                             "$ xns" : "Gtk"
                                         },
                                         {
@@ -368,8 +368,8 @@
                                                             "items" : [
                                                                 {
                                                                     "id" : "files_render",
-                                                                    "* pack" : "pack_start,false",
                                                                     "xtype" : "CellRendererText",
+                                                                    "* pack" : "pack_start,false",
                                                                     "$ xns" : "Gtk"
                                                                 }
                                                             ]