fix line numbering issues with vala generator - hopefully fixes completion in node...

[roobuilder] / src / Builder4 / ValaProjectSettingsPopover.bjs

diff --git a/src/Builder4/ValaProjectSettingsPopover.bjs b/src/Builder4/ValaProjectSettingsPopover.bjs
index 7eb6815..923c380 100644 (file)
--- a/src/Builder4/ValaProjectSettingsPopover.bjs
+++ b/src/Builder4/ValaProjectSettingsPopover.bjs
@@ -8,7 +8,6 @@
    "Project.Gtk project" : "null",
    "Project.GtkValaSettings? selected_target" : "null",
    "Xcls_MainWindow window" : "null",
-   "bool cg_loading" : false,
    "bool done" : false,
    "bool modal" : true,
    "items" : [
@@ -164,7 +163,7 @@
                   "bind" : [
                    "(listitem) => {",
                    " ",
-                   "\tvar lbl = (Gtk.Label)  ((Gtk.ListItem)listitem).get_child();",
+                   "\tvar lbl = (Gtk.Box)  ((Gtk.ListItem)listitem).get_child();",
                    "\t   ",
                    "\tvar item = (Project.VapiSelection)  ((Gtk.ListItem)listitem).get_item();",
                    "",
@@ -450,7 +449,7 @@
                      "    expand.set_hide_expander(  jr.childfiles.n_items < 1);",
                      " \texpand.set_list_row(lr);",
                      " ",
-                     "  \texpand.set_hide_expander(  jr.xtype != \"Dir\" );",
+                     "   expand.set_hide_expander(  jr.xtype != \"Dir\" );",
                      " \t expand.set_list_row(lr);",
                      " ",
                      " \t// bind image...",
@@ -509,17 +508,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//jr.bind_property(\"compile_group_selected\",",
-                     "    //                btn, \"active\",",
-                     "    //               GLib.BindingFlags.BIDIRECTIONAL); ",
+                     "\t ",
+                     " \tjr.bind_property(\"compile_group_selected\",",
+                     "                    btn, \"active\",",
+                     "                   GLib.BindingFlags.SYNC_CREATE); ",
                      " \t// bind image...",
                      " \t",
                      "}"
                     ],
                     "setup" : [
+                     "",
                      "(listitem) => {",
                      "",
                      "\tvar btn = new Gtk.CheckButton();",
@@ -527,9 +526,7 @@
                      "\t((Gtk.ListItem)listitem).set_child(btn);",
                      "\t",
                      "\tbtn.toggled.connect(() =>  {",
-                     "\t \tif (_this.cg_loading) {",
-                     "\t \t\treturn;",
-                     " \t\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;",
@@ -703,21 +700,20 @@
                   "\t ",
                   "\t GLib.debug(\"loading dirs into project list\");",
                   "\t cg.loading_ui = true;",
-                  "\t _this.cg_loading = true;",
+                  "\t ",
                   "",
                   "\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 );",
+                  "",
                   " ",
                   "}",
                   ""
@@ -735,7 +731,7 @@
                     "bind" : [
                      "(listitem) => {",
                      " ",
-                     "\tvar lbl = (Gtk.Label)  ((Gtk.ListItem)listitem).get_child();",
+                     "\tvar lbl = (Gtk.Box)  ((Gtk.ListItem)listitem).get_child();",
                      "\t   ",
                      "\tvar item = (Project.GtkValaSettings)  ((Gtk.ListItem)listitem).get_item();",
                      "",
@@ -909,7 +905,6 @@
      "\t\treturn true;",
      "\t}",
      "\treturn false;",
-     "\t",
      "}",
      ""
     ],
@@ -917,6 +912,7 @@
      "() => {",
      "\t  if (!this.done) {",
      "    _this.el.show();",
+     "  ",
      "  }",
      "}"
     ]