From 2f9188eddb239bb473caf8c8711bbfcb92b34fe0 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 10 Sep 2014 19:09:38 +0800 Subject: [PATCH] Builder4/GtkView.bjs.PHRIMX Builder4/GtkView.bjs Builder4/GtkView.js.ZZSIMX Builder4/GtkView.js Builder4/GtkView.vala.O3OIMX Builder4/GtkView.vala --- Builder4/GtkView.bjs | 2 +- Builder4/GtkView.js | 15 +++------------ Builder4/GtkView.vala | 15 +++------------ 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Builder4/GtkView.bjs b/Builder4/GtkView.bjs index e238fa919..0bb5eb4a6 100644 --- a/Builder4/GtkView.bjs +++ b/Builder4/GtkView.bjs @@ -10,7 +10,7 @@ "id" : "GtkView", "xtype" : "Viewport", "$ xns" : "Gtk", - "| void addNode" : "(JsRender.JsRender file) { \n{\n \n\n\n // clear existing elements from project?\n \n\n if (file.tree == null) {\n return;\n }\n\n// print(\"%s\\n\",tf.tree.toJsonString());\n\tvar x = new JsRender.NodeToGlade(file.tree, \"\");\n Builder.from_string (x.munge())\n\t \n\tFileIOStream iostream;\n\tvar f = File.new_tmp (\"tpl-XXXXXX.glade\", out iostream);\n\tvar ostream = iostream.output_stream;\n\tvar dostream = new DataOutputStream (ostream);\n\tdostream.put_string (x.munge());\n\tthis.el.show();\n\t print(\"LOADING %s\\n\",f.get_path ());\n p.load_from_file(f.get_path ());\n \n \n\n}\n\n}", + "| void addNode" : "(JsRender.JsRender file) { \n{\n \n\n\n // clear existing elements from project?\n \n\n if (file.tree == null) {\n return;\n }\n\n// print(\"%s\\n\",tf.tree.toJsonString());\n\tvar x = new JsRender.NodeToGlade(file.tree, \"\");\n var builder = Builder.from_string (x.munge());\n \n\tvar obj= builder.get_object(file.tree.uid());\n this.container.add(obj); \n \n\n}\n", "| void addNodeChildren" : "(Object? parent, JsRender.Node node) { \n\n var iter = node.items.list_iterator();\n while (iter.next()) {\n this.addNode(parent, iter.get());\n }\n}\n", "items" : [ { diff --git a/Builder4/GtkView.js b/Builder4/GtkView.js index cbc9873a6..26c468b49 100644 --- a/Builder4/GtkView.js +++ b/Builder4/GtkView.js @@ -27,21 +27,12 @@ GtkView=new XObject({ // print("%s\n",tf.tree.toJsonString()); var x = new JsRender.NodeToGlade(file.tree, ""); - Builder.from_string (x.munge()) - - FileIOStream iostream; - var f = File.new_tmp ("tpl-XXXXXX.glade", out iostream); - var ostream = iostream.output_stream; - var dostream = new DataOutputStream (ostream); - dostream.put_string (x.munge()); - this.el.show(); - print("LOADING %s\n",f.get_path ()); - p.load_from_file(f.get_path ()); + var builder = Builder.from_string (x.munge()); + var obj= builder.get_object(file.tree.uid()); + this.container.add(obj); - } - }, addNodeChildren : (Object? parent, JsRender.Node node) { diff --git a/Builder4/GtkView.vala b/Builder4/GtkView.vala index f4335e64e..66d809a4f 100644 --- a/Builder4/GtkView.vala +++ b/Builder4/GtkView.vala @@ -45,21 +45,12 @@ public class Xcls_GtkView : Object // print("%s\n",tf.tree.toJsonString()); var x = new JsRender.NodeToGlade(file.tree, ""); - Builder.from_string (x.munge()) - - FileIOStream iostream; - var f = File.new_tmp ("tpl-XXXXXX.glade", out iostream); - var ostream = iostream.output_stream; - var dostream = new DataOutputStream (ostream); - dostream.put_string (x.munge()); - this.el.show(); - print("LOADING %s\n",f.get_path ()); - p.load_from_file(f.get_path ()); + var builder = Builder.from_string (x.munge()); + var obj= builder.get_object(file.tree.uid()); + this.container.add(obj); - } - } public void addNodeChildren (Object? parent, JsRender.Node node) { -- 2.39.2