src/Builder4/DialogTemplateSelect.bjs

src/Builder4/DialogTemplateSelect.vala

diff --git a/src/Builder4/DialogTemplateSelect.bjs b/src/Builder4/DialogTemplateSelect.bjs
index eeeafbb..1777b0e 100644 (file)
--- a/src/Builder4/DialogTemplateSelect.bjs
+++ b/src/Builder4/DialogTemplateSelect.bjs
@@ -16,7 +16,7 @@
    "default_height" : 200,
    "$ modal" : true,
    "$ xns" : "Gtk",
-   "| JsRender.Node? show" : " (Xcls_MainWindow mwindow, Palete.Palete pal, JsRender.Node node, Project.Project project) {\n    \n    this.el.show_all();\n    var opts = pal.listTemplates(node);\n    if (opts.length() < 1) {\n        this.el.hide();\n        return node;\n    }\n    this.el.set_attached_to( mwindow.el);\n     this.el.set_transient_for( mwindow.el);\n    \n    //opts.unshift({ path: '' , name :'Just add Element' });\n     _this.model.loadData(opts);\n     _this.combo.el.set_active(-1);\n     \n     \n     var db =  new Palete.RooDatabase.from_project(project);\n     _this.dbmodel.loadData(db.readTablesGee());\n     \n     \n     _this.dbcombo.el.set_active(-1);\n     \n     \n   \n    var res = this.el.run();\n    this.el.hide();    \n    //var ix = _this.combo.el.get_active();\n    if (res < 1 ) {\n        return null; // 0 = cancel.\n    }\n    if (res < 2 ) {\n        return node; // 1 = just add it..\n    }\n    \n   Gtk.TreeIter iter;\n    if (!_this.combo.el.get_active_iter (out iter)) {\n\n        return node; // nothing selected...\n    }\n    Value vfname;\n    this.model.el.get_value (iter, 0, out vfname);\n    \n    \n    return pal.loadTemplate((string)vfname);\n\n}\n",
+   "| JsRender.Node? show" : " (Xcls_MainWindow mwindow, Palete.Palete pal, JsRender.Node node, Project.Project project) {\n    \n    this.el.show_all();\n    var opts = pal.listTemplates(node);\n    if (opts.length() < 1) {\n        this.el.hide();\n        return node;\n    }\n    this.el.set_attached_to( mwindow.el);\n    this.el.set_transient_for( mwindow.el);\n    \n    //opts.unshift({ path: '' , name :'Just add Element' });\n     _this.model.loadData(opts);\n     _this.combo.el.set_active(-1);\n     \n     \n     var db =  new Palete.RooDatabase.from_project(project);\n     _this.dbmodel.loadData(db.readTablesGee());\n     \n     var plug = mwindow.windowstate.webkit_plugin;\n     \n     _this.dbcombo.el.set_active(-1);\n     \n     \n   \n    var res = this.el.run();\n    this.el.hide();    \n    //var ix = _this.combo.el.get_active();\n    if (res < 1 ) {\n        return null; // 0 = cancel.\n    }\n    if (res < 2 ) {\n        return node; // 1 = just add it..\n    }\n    \n    // have they selected a table??\n    \n   Gtk.TreeIter iter; \n    Value vfname;   \n    if (_this.dbcombo.el.get_active_iter (out iter)) {    \n         this.dbmodel.el.get_value (iter, 0, out vfname);\n         if (plug.has_plugin(node.fqn())) {\n            var json_str = plug.show(mwindow.el, project, node.fqn(), (string)vfname);\n            \n         }\n        \n    }\n\n    if (!_this.combo.el.get_active_iter (out iter)) {\n\n        return node; // nothing selected...\n    }\n   \n    this.model.el.get_value (iter, 0, out vfname);\n    \n    \n    return pal.loadTemplate((string)vfname);\n\n}\n",
    "items" : [
     {
      "xtype" : "VBox",

diff --git a/src/Builder4/DialogTemplateSelect.vala b/src/Builder4/DialogTemplateSelect.vala
index 880aadb..30bf90f 100644 (file)
--- a/src/Builder4/DialogTemplateSelect.vala
+++ b/src/Builder4/DialogTemplateSelect.vala
@@ -64,7 +64,7 @@ public class DialogTemplateSelect : Object
             return node;
         }
         this.el.set_attached_to( mwindow.el);
-         this.el.set_transient_for( mwindow.el);
+        this.el.set_transient_for( mwindow.el);
         
         //opts.unshift({ path: '' , name :'Just add Element' });
          _this.model.loadData(opts);
@@ -74,6 +74,7 @@ public class DialogTemplateSelect : Object
          var db =  new Palete.RooDatabase.from_project(project);
          _this.dbmodel.loadData(db.readTablesGee());
          
+         var plug = mwindow.windowstate.webkit_plugin;
          
          _this.dbcombo.el.set_active(-1);
          
@@ -89,12 +90,24 @@ public class DialogTemplateSelect : Object
             return node; // 1 = just add it..
         }
         
-       Gtk.TreeIter iter;
+        // have they selected a table??
+        
+       Gtk.TreeIter iter; 
+        Value vfname;   
+        if (_this.dbcombo.el.get_active_iter (out iter)) {    
+             this.dbmodel.el.get_value (iter, 0, out vfname);
+             if (plug.has_plugin(node.fqn())) {
+                var json_str = plug.show(mwindow.el, project, node.fqn(), (string)vfname);
+                
+             }
+            
+        }
+    
         if (!_this.combo.el.get_active_iter (out iter)) {
     
             return node; // nothing selected...
         }
-        Value vfname;
+       
         this.model.el.get_value (iter, 0, out vfname);