src/Builder4/PopoverProperty.bjs

src/Builder4/PopoverProperty.vala

diff --git a/src/Builder4/PopoverProperty.bjs b/src/Builder4/PopoverProperty.bjs
index 6af2cfe..176eca0 100644 (file)
--- a/src/Builder4/PopoverProperty.bjs
+++ b/src/Builder4/PopoverProperty.bjs
@@ -15,11 +15,9 @@
    "@ void success" : "(Project.Project pr, JsRender.JsRender file)",
    "| void show" : "(Gtk.Widget btn, JsRender.Node node, string key) \n\t{\n\t\n\tstring kname = \"\", kflag = \"\", ktype = \"\";\n\tif (key.length > 0) {\n\t\tnode.normalize_key( key, out  kname, out  kflag, out ktype);\n\t}\n\n\t_this.kname.el.set_text(kname);\n\t_this.ktype.el.set_text(ktype);\n\t\n\t_this.dbmodel.loadData(kflag);\n\t// does node have this property...\n\n\n\tif (key.length > 0) {\n\t\tthis.save_btn.el.set_label(\"Save\");\n\t} else {\n\t\tthis.save_btn.el.set_label(\"Create\");\n\t}\n\n\t_this.node = node;\n\t//console.log('show all');\n\tthis.el.set_modal(true);\n\tthis.el.set_relative_to(btn);\n\n\tthis.el.set_position(Gtk.PositionType.TOP);\n\n\t// window + header?\n\t print(\"SHOWALL - POPIP\\n\");\n\tthis.el.show_all();\n\tthis.kname.el.grab_focus();\n\n\t//this.success = c.success;\n \n}",
    "bool done" : false,
-   "# Project.Project project" : "",
    "|   void updateNodeFromValues" : "() {\n\n     /*   _this.file.title = _this.title.el.get_text();\n        _this.file.region = _this.region.el.get_text();            \n        _this.file.parent = _this.parent.el.get_text();                        \n        _this.file.permname = _this.permname.el.get_text();                                    \n        _this.file.modOrder = _this.modOrder.el.get_text();\n        \n        if (_this.file.name.length  > 0 && _this.file.name != _this.name.el.get_text()) {\n            _this.file.renameTo(_this.name.el.get_text());\n        }\n        // store the module...\n        _this.file.build_module = \"\";        \n         Gtk.TreeIter iter; \n        if (_this.build_module.el.get_active_iter (out iter)) {\n             Value vfname;\n             this.dbmodel.el.get_value (iter, 0, out vfname);\n             if (((string)vfname).length > 0) {\n                 _this.file.build_module = (string)vfname;\n             }\n    \n        }\n        */\n        \n        \n\n                                                    \n}    ",
    "xtype" : "Popover",
    "Gtk.PositionType position" : "Gtk.PositionType.RIGHT",
-   "# JsRender.JsRender file" : "null",
    "$ xns" : "Gtk",
    "Xcls_MainWindow mainwindow" : "null",
    "bool modal" : true,
@@ -79,7 +77,7 @@
            "$ columns" : "typeof(string),typeof(string)",
            "n_columns" : 2,
            "$ xns" : "Gtk",
-           "| void loadData" : "  (string kflag) {\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n    \n    // vala signal.. '@'\n    // raw value '$'\n    // user defined property '#'\n    // user defined method '|'\n    // special property '*' => prop  |args|ctor|init\n    \n    \n    \n   /// el.append(out iter);\n    \n     \n   // el.set_value(iter, 0, \"\");\n   // el.set_value(iter, 1, \"aaa  - Just add Element - aaa\");\n\n    el.append(out iter);\n    el.set(iter, 0, \"\", 1,   \"Normal Property\", -1);\n\tif (kflag == \"\") {\n\t\t _this.kflag.el.set_active_iter(iter);\n\t }\n\tif (_this.file.xtype == \"Gtk\") {\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"#\", 1,   \"User defined property\", -1);\n\t\tif (kflag == \"#\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\tif (kflag == \"|\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop | args | ctor | init )\", -1);\n\t\tif (kflag == \"*\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t\tel.append(out iter);\n\t    el.set(iter, 0, \"@\", 1,   \"Vala Signal\", -1);\n\t\tif (kflag == \"@\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t} else { \n\t\t// javascript\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\tif (kflag == \"|\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop )\", -1);\n\t\tif (kflag == \"*\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\n\t}\n\t\n\t\n\n                                     \n}\n"
+           "| void loadData" : "  (string kflag) {\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n    \n    // vala signal.. '@'\n    // raw value '$'\n    // user defined property '#'\n    // user defined method '|'\n    // special property '*' => prop  |args|ctor|init\n    \n    \n    \n   /// el.append(out iter);\n    \n     \n   // el.set_value(iter, 0, \"\");\n   // el.set_value(iter, 1, \"aaa  - Just add Element - aaa\");\n\n    el.append(out iter);\n    el.set(iter, 0, \"\", 1,   \"Normal Property\", -1);\n\tif (kflag == \"\") {\n\t\t _this.kflag.el.set_active_iter(iter);\n\t }\n\tif (_this.mainwindow.windowstate.file.xtype == \"Gtk\") {\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"#\", 1,   \"User defined property\", -1);\n\t\tif (kflag == \"#\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\tif (kflag == \"|\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop | args | ctor | init )\", -1);\n\t\tif (kflag == \"*\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t\tel.append(out iter);\n\t    el.set(iter, 0, \"@\", 1,   \"Vala Signal\", -1);\n\t\tif (kflag == \"@\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t} else { \n\t\t// javascript\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\tif (kflag == \"|\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop )\", -1);\n\t\tif (kflag == \"*\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\n\t}\n\t\n\t\n\n                                     \n}\n"
           }
          ]
         },

diff --git a/src/Builder4/PopoverProperty.vala b/src/Builder4/PopoverProperty.vala
index a4cfbb7..1c2b81d 100644 (file)
--- a/src/Builder4/PopoverProperty.vala
+++ b/src/Builder4/PopoverProperty.vala
@@ -22,8 +22,6 @@ public class Xcls_PopoverProperty : Object
         // my vars (def)
     public signal void success (Project.Project pr, JsRender.JsRender file);
     public bool done;
-    public Project.Project project;
-    public JsRender.JsRender file;
     public Xcls_MainWindow mainwindow;
     public JsRender.Node node;
 
@@ -35,7 +33,6 @@ public class Xcls_PopoverProperty : Object
 
         // my vars (dec)
         this.done = false;
-        this.file = null;
         this.mainwindow = null;
 
         // set gobject values
@@ -341,7 +338,7 @@ public class Xcls_PopoverProperty : Object
                if (kflag == "") {
                         _this.kflag.el.set_active_iter(iter);
                 }
-               if (_this.file.xtype == "Gtk") {
+               if (_this.mainwindow.windowstate.file.xtype == "Gtk") {
                        el.append(out iter);
                        el.set(iter, 0, "$", 1,   "Raw Property (not escaped)", -1);
                        if (kflag == "$") {