X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FBuilder4%2FValaProjectSettingsPopover.bjs;h=7eb6815972629278fe2e297259f31376fdc8ad9d;hb=eccffa50a972ff9cefeab353a5fede2d3f75564c;hp=923c38020aea6e2d2ef8d05c5b5f569c4df833c1;hpb=e83f8479386654b6d22c7b4e4d7e8b0484df3132;p=roobuilder

diff --git a/src/Builder4/ValaProjectSettingsPopover.bjs b/src/Builder4/ValaProjectSettingsPopover.bjs
index 923c38020..7eb681597 100644
--- a/src/Builder4/ValaProjectSettingsPopover.bjs
+++ b/src/Builder4/ValaProjectSettingsPopover.bjs
@@ -8,6 +8,7 @@
    "Project.Gtk project" : "null",
    "Project.GtkValaSettings? selected_target" : "null",
    "Xcls_MainWindow window" : "null",
+   "bool cg_loading" : false,
    "bool done" : false,
    "bool modal" : true,
    "items" : [
@@ -163,7 +164,7 @@
                   "bind" : [
                    "(listitem) => {",
                    " ",
-                   "\tvar lbl = (Gtk.Box)  ((Gtk.ListItem)listitem).get_child();",
+                   "\tvar lbl = (Gtk.Label)  ((Gtk.ListItem)listitem).get_child();",
                    "\t   ",
                    "\tvar item = (Project.VapiSelection)  ((Gtk.ListItem)listitem).get_item();",
                    "",
@@ -449,7 +450,7 @@
                      "    expand.set_hide_expander(  jr.childfiles.n_items < 1);",
                      " \texpand.set_list_row(lr);",
                      " ",
-                     "   expand.set_hide_expander(  jr.xtype != \"Dir\" );",
+                     "  \texpand.set_hide_expander(  jr.xtype != \"Dir\" );",
                      " \t expand.set_list_row(lr);",
                      " ",
                      " \t// bind image...",
@@ -508,17 +509,17 @@
                      "\tvar jr = (JsRender.JsRender) lr.get_item();",
                      "\t//GLib.debug(\"change  %s to %s\", lbl.label, np.name);",
                      "",
+                     "\t//btn.active = jr.compile_group_selected;",
+                     "\tbtn.active = _this.selected_target.has_file(jr);",
                      "\t",
-                     "\t ",
-                     " \tjr.bind_property(\"compile_group_selected\",",
-                     "                    btn, \"active\",",
-                     "                   GLib.BindingFlags.SYNC_CREATE); ",
+                     " \t//jr.bind_property(\"compile_group_selected\",",
+                     "    //                btn, \"active\",",
+                     "    //               GLib.BindingFlags.BIDIRECTIONAL); ",
                      " \t// bind image...",
                      " \t",
                      "}"
                     ],
                     "setup" : [
-                     "",
                      "(listitem) => {",
                      "",
                      "\tvar btn = new Gtk.CheckButton();",
@@ -526,7 +527,9 @@
                      "\t((Gtk.ListItem)listitem).set_child(btn);",
                      "\t",
                      "\tbtn.toggled.connect(() =>  {",
-                     "\t ",
+                     "\t \tif (_this.cg_loading) {",
+                     "\t \t\treturn;",
+                     " \t\t}",
                      "\t\tvar lr = (Gtk.TreeListRow)((Gtk.ListItem)listitem).get_item();",
                      "\t\tvar jr = (JsRender.JsRender) lr.get_item();",
                      "\t\tjr.compile_group_selected = btn.active;",
@@ -700,20 +703,21 @@
                   "\t ",
                   "\t GLib.debug(\"loading dirs into project list\");",
                   "\t cg.loading_ui = true;",
-                  "\t ",
+                  "\t _this.cg_loading = true;",
                   "",
                   "\t  _this.treeview.el.set_model(new Gtk.SingleSelection(null));",
                   "\t  _this.project.loadDirsIntoStore(_this.treemodel.el);",
                   " \t  _this.treeview.el.set_model(_this.treeselmodel.el);",
                   "\t  ",
                   "\t cg.loading_ui = false;",
+                  "\t ",
+                  "\t _this.cg_loading = false;",
                   "\t GLib.debug(\"Set name to %s\", cg.name);",
                   "\t ",
                   " \t_this.build_name.el.buffer.set_text(cg.name.data);",
                   " ",
                   " ",
                   "\t_this.build_execute_args.el.buffer.set_text(  cg.execute_args.data );",
-                  "",
                   " ",
                   "}",
                   ""
@@ -731,7 +735,7 @@
                     "bind" : [
                      "(listitem) => {",
                      " ",
-                     "\tvar lbl = (Gtk.Box)  ((Gtk.ListItem)listitem).get_child();",
+                     "\tvar lbl = (Gtk.Label)  ((Gtk.ListItem)listitem).get_child();",
                      "\t   ",
                      "\tvar item = (Project.GtkValaSettings)  ((Gtk.ListItem)listitem).get_item();",
                      "",
@@ -905,6 +909,7 @@
      "\t\treturn true;",
      "\t}",
      "\treturn false;",
+     "\t",
      "}",
      ""
     ],
@@ -912,7 +917,6 @@
      "() => {",
      "\t  if (!this.done) {",
      "    _this.el.show();",
-     "  ",
      "  }",
      "}"
     ]