src/Builder4/PopoverProperty.bjs

src/Builder4/PopoverProperty.vala

diff --git a/src/Builder4/PopoverProperty.bjs b/src/Builder4/PopoverProperty.bjs
index bc8cb29..8a875d2 100644 (file)
--- a/src/Builder4/PopoverProperty.bjs
+++ b/src/Builder4/PopoverProperty.bjs
@@ -14,7 +14,7 @@
    "|   void updateFileFromEntry" : "() {\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}    ",
    "@ void success" : "(Project.Project pr, JsRender.JsRender file)",
    "id" : "PopoverProperty",
-   "| void show" : "(Gtk.Widget btn, JsRender.Node node, string key) \n{\n    \n    //if (!this.el) {\n        //this.init();\n     //}\n    \n    _this.name.el.set_text(c.name);\n    _this.title.el.set_text(c.title);\n    _this.parent.el.set_text(c.parent);    \n    _this.region.el.set_text(c.region);\n    _this.modOrder.el.set_text(c.modOrder);\n     _this.permname.el.set_text(c.permname);\n    \n    if (c.path.length > 0) {\n    \n        this.save_btn.el.set_label(\"Save\");\n    } else {\n        this.save_btn.el.set_label(\"Create\");\n    }\n    \n     var ar = new Gee.ArrayList<string>();\n     _this.dbmodel.loadData(ar,\"\");\n    // load the modules... if relivant..\n    if (this.project.xtype == \"Gtk\") {\n        var p = (Project.Gtk)c.project;\n          var cg = p.compilegroups;\n\n        var iter = cg.map_iterator();\n       while(iter.next()) {\n            var key = iter.get_key();\n            if (key == \"_default_\") {\n                continue;\n            }\n            ar.add(key);\n        };\n        _this.dbmodel.loadData(ar, c.build_module);\n\n    }\n    \n     \n    _this.file = c;\n    //console.log('show all');\n   this.el.set_modal(true);\n    this.el.set_relative_to(btn);\n\n    this.el.set_position(Gtk.PositionType.RIGHT);\n    \n    // window + header?\n     print(\"SHOWALL - POPIP\\n\");\n    this.el.show_all();\n    this.name.el.grab_focus();\n    \n    //this.success = c.success;\n    \n    \n}",
+   "| void show" : "(Gtk.Widget btn, JsRender.Node node, string key) \n{\n    \n    string kname = \"\", kflag = \"\", ktype = \"\";\n    if (key.length > 0) {\n\t    node.normalize_key( key, out  kname, out  kflag, out ktype)\n    }\n    \n    _this.kname.el.set_text(kname);\n    _this.ktype.el.set_text(ktype);\n\n\t// does node have this property...\n\t\n\t\n    if (key.length > 0) {\n        this.save_btn.el.set_label(\"Save\");\n    } else {\n        this.save_btn.el.set_label(\"Create\");\n    }\n    \n    _this.node = node;\n    //console.log('show all');\n   this.el.set_modal(true);\n    this.el.set_relative_to(btn);\n\n    this.el.set_position(Gtk.PositionType.TOP);\n    \n    // window + header?\n     print(\"SHOWALL - POPIP\\n\");\n    this.el.show_all();\n    this.name.el.grab_focus();\n    \n    //this.success = c.success;\n    \n    \n}",
    "bool done" : false,
    "# Project.Project project" : "",
    "xtype" : "Popover",

diff --git a/src/Builder4/PopoverProperty.vala b/src/Builder4/PopoverProperty.vala
index 2105cc8..585c00b 100644 (file)
--- a/src/Builder4/PopoverProperty.vala
+++ b/src/Builder4/PopoverProperty.vala
@@ -85,50 +85,29 @@ public class Xcls_PopoverProperty : Object
     public void show (Gtk.Widget btn, JsRender.Node node, string key) 
     {
         
-        //if (!this.el) {
-            //this.init();
-         //}
-        
-        _this.name.el.set_text(c.name);
-        _this.title.el.set_text(c.title);
-        _this.parent.el.set_text(c.parent);    
-        _this.region.el.set_text(c.region);
-        _this.modOrder.el.set_text(c.modOrder);
-         _this.permname.el.set_text(c.permname);
-        
-        if (c.path.length > 0) {
+        string kname = "", kflag = "", ktype = "";
+        if (key.length > 0) {
+           node.normalize_key( key, out  kname, out  kflag, out ktype)
+        }
         
+        _this.kname.el.set_text(kname);
+        _this.ktype.el.set_text(ktype);
+    
+       // does node have this property...
+       
+       
+        if (key.length > 0) {
             this.save_btn.el.set_label("Save");
         } else {
             this.save_btn.el.set_label("Create");
         }
         
-         var ar = new Gee.ArrayList<string>();
-         _this.dbmodel.loadData(ar,"");
-        // load the modules... if relivant..
-        if (this.project.xtype == "Gtk") {
-            var p = (Project.Gtk)c.project;
-              var cg = p.compilegroups;
-    
-            var iter = cg.map_iterator();
-           while(iter.next()) {
-                var key = iter.get_key();
-                if (key == "_default_") {
-                    continue;
-                }
-                ar.add(key);
-            };
-            _this.dbmodel.loadData(ar, c.build_module);
-    
-        }
-        
-         
-        _this.file = c;
+        _this.node = node;
         //console.log('show all');
        this.el.set_modal(true);
         this.el.set_relative_to(btn);
     
-        this.el.set_position(Gtk.PositionType.RIGHT);
+        this.el.set_position(Gtk.PositionType.TOP);
         
         // window + header?
          print("SHOWALL - POPIP\n");