JsRender/Gtk.vala.c

JsRender/JsRender.vala.c
JsRender/Lang.vala.c
JsRender/Node.vala.c
JsRender/NodeToGlade.vala.c
JsRender/NodeToGtk.vala.c
JsRender/NodeToJs.vala.c
JsRender/NodeToVala.vala.c
JsRender/Roo.vala.c
Project/Gtk.vala.c
Project/Project.vala.c
Project/Roo.vala.c
Palete/Gir.vala.c
Palete/Gtk.vala.c
Palete/Palete.vala.c
Palete/Roo.vala.c
Builder4/Application.vala.c
Builder4/About.vala.c
Builder4/DialogConfirm.vala.c
Builder4/DialogNewComponent.vala.c
Builder4/StandardErrorDialog.vala.c
Builder4/DialogSaveTemplate.vala.c
Builder4/DialogSaveModule.vala.c
Builder4/DialogTemplateSelect.vala.c
Builder4/EditProject.vala.c
Builder4/Editor.vala.c
Builder4/ProjectSettings.vala.c
Builder4/WindowRightPalete.vala.c
Builder4/WindowLeftTree.vala.c
Builder4/WindowRooView.vala.c
Builder4/WindowLeftProps.vala.c
Builder4/ClutterFiles.vala.c
Builder4/WindowLeftProjects.vala.c
Builder4/WindowAddProp.vala.c
Builder4/GtkView.vala.c
Builder4/MainWindow.vala.c
Builder4/Main.vala.c

diff --git a/Builder4/WindowRooView.bjs b/Builder4/WindowRooView.bjs
index b2789da..40f5eb6 100644 (file)
--- a/Builder4/WindowRooView.bjs
+++ b/Builder4/WindowRooView.bjs
@@ -87,7 +87,7 @@
                                     "# int redraws" : 0,
                                     "| void runRefresh" : " () \n{\n    // this is run every 2 seconds from the init..\n\n  \n    \n    if (!this.refreshRequired) {\n       // print(\"no refresh required\");\n        return;\n    }\n\n    if (this.lastRedraw != null) {\n       // do not redraw if last redraw was less that 5 seconds ago.\n       if ((int64)(new DateTime.now_local()).difference(this.lastRedraw) < 5000 ) {\n            return;\n        }\n    }\n    \n    if (_this.file == null) {\n        return;\n    }\n    \n    \n     this.refreshRequired = false;\n   //  print(\"HTML RENDERING\");\n     \n     \n     //this.get('/BottomPane').el.show();\n     //this.get('/BottomPane').el.set_current_page(2);// webkit inspector\n    _this.file.webkit_page_id  = this.el.get_page_id();\n    \n    var js = _this.file.toSourcePreview();\n\n    if (js.length < 1) {\n        print(\"no data\");\n        return;\n    }\n//    var  data = js[0];\n    this.redraws++;\n  \n    var project = _this.file.project;  \n\n     //print (project.fn);\n     // set it to non-empty.\n     \n//     runhtml = runhtml.length ?  runhtml : '<script type=\"text/javascript\"></script>'; \n\n\n//   this.runhtml  = this.runhtml || '';\n \n \n    // then we need to reload the browser using\n    // load_html_string..\n\n    // then trigger a redraw once it's loaded..\n    this.pendingRedraw = true;\n\n    var runhtml = \"<script type=\\\"text/javascript\\\">\\n\" ;\n    string builderhtml;\n    \n    \n    GLib.FileUtils.get_contents(Builder4.Application.configDirectory() + \"/resources/roo.builder.js\", out builderhtml);\n\n    runhtml += builderhtml + \"\\n\";\n    runhtml += \"</script>\\n\" ;\n\n    // fix to make sure they are the same..\n    this.runhtml = project.runhtml;\n    // need to modify paths\n\n    string inhtml;\n    var base_template = _this.file.project.base_template;\n    \n    if (base_template.length > 0 && !FileUtils.test(\n        Builder4.Application.configDirectory() + \"/resources/\" +  base_template, FileTest.EXISTS)  \n        ) {\n           print(\"invalid base_template name - using default:  %s\\n\", base_template);\n           base_template = \"\";\n    \n    }\n    \n    GLib.FileUtils.get_contents(\n        Builder4.Application.configDirectory() + \"/resources/\" + \n            (base_template.length > 0 ? base_template :  \"roo.builder.html\")\n            , out inhtml);\n    \n    \n    this.renderedData = js;\n\n\n    string js_src = js + \"\\n\" +\n\t\"Roo.onReady(function() {\\n\" +\n\t\"if (\" + _this.file.name +\".show) \" +  _this.file.name +\".show({});\\n\" +\n\t\"Roo.XComponent.build();\\n\" +\n\t\"});\\n\";\n\t\n   // print(\"render js: \" + js);\n    //if (!this.ready) {\n  //      console.log('not loaded yet');\n    //}\n    this.lastRedraw = new DateTime.now_local();\n\n        var html = inhtml.replace(\"</head>\", runhtml + this.runhtml + \n        \n                \"<script type=\\\"text/javascript\\\">\\n\" +\n                js_src + \"\\n\" + \n                \"</script>\" + \n                        \n        \"</head>\");\n        //print(\"LOAD HTML \" + html);\n        \n         var rootURL = _this.file.project.rootURL;\n   \n        \n        \n        this.el.load_html( html , \n            //fixme - should be a config option!\n            (rootURL.length > 0 ? rootURL : \"http://localhost/app.Builder/\")\n        );\n        \n    // force the inspector...        \n          this.initInspector();\n        \n        // - no need for this, the builder javascript will call it when build is complete\n        //GLib.Timeout.add_seconds(1, () => {\n        //    this.el.run_javascript(\"Builder.saveHTML()\",null);\n        //    return false;\n        //});\n//     print( \"before render\" +    this.lastRedraw);\n//    print( \"after render\" +    (new Date()));\n    \n}\n",
                                     "$ xns" : "WebKit",
-                                    "| void initInspector" : "() {\n    \n    if (this.inspector == this.el.get_inspector()) {\n        this.inspector.show();\n        this.inspector.open_window();        \n        print(\"init inspecter called, and inspector is the same as existing\\n\");\n        return;\n    }\n    print(\"new inspector?\\n\");\n\n    this.inspector = this.el.get_inspector();\n    this.inspector.ref();\n    \n    // got a new inspector...\n        \n    this.inspector.open_window.connect(() => {\n         this.inspector = this.el.get_inspector();\n        print(\"inspector attach\\n\");\n        var wv = this.inspector.get_web_view();\n        if (wv != null) {\n            print(\"got inspector web view\\n\");\n            _this.inspectorcontainer.el.add(wv);\n            wv.show();\n        } else {\n            //this.inspector.close();\n            \n            //this.inspector = null;\n           for (var i = 0 ; i < 1000; i++) {\n                 print(\"no web view yet?!?!?\\n\");\n           }  \n \n        }\n        return true;\n       \n    });\n    this.inspector.closed.connect(() => {\n         print(\"inspector closed?!?\");\n         // if this happens destroy the webkit..\n         // recreate it..\n        _this.viewbox.el.remove(_this.viewcontainer.el);\n        _this.viewbox.el.remove(_this.inspectorcontainer.el);        \n         this.el.destroy();\n         var nv =new Xcls_viewcontainer(_this);\n         nv.ref();\n         _this.viewbox.el.pack_end(nv.el,true,true,0);\n         \n          var  inv =new Xcls_inspectorcontainer(_this);\n          inv.ref();\n          _this.viewbox.el.pack2(inv.el,true,true);\n         \n         \n\n         _this.view.renderJS(true); \n         \n       \n    }); \n    \n    this.inspector.show();\n}\n",
+                                    "| void initInspector" : "() {\n    \n    if (this.inspector == this.el.get_inspector()) {\n        this.inspector.show();\n        this.inspector.open_window();        \n        print(\"init inspecter called, and inspector is the same as existing\\n\");\n        return;\n    }\n    print(\"new inspector?\\n\");\n\n    this.inspector = this.el.get_inspector();\n    this.inspector.ref();\n    \n    // got a new inspector...\n        \n    this.inspector.open_window.connect(() => {\n         this.inspector = this.el.get_inspector();\n        print(\"inspector attach\\n\");\n        var wv = this.inspector.get_web_view();\n        if (wv != null) {\n            print(\"got inspector web view\\n\");\n            _this.inspectorcontainer.el.add(wv);\n            wv.show();\n        } else {\n            //this.inspector.close();\n            \n            //this.inspector = null;\n           for (var i = 0 ; i < 1000; i++) {\n                 print(\"no web view yet?!?!?\\n\");\n           }  \n \n        }\n        return true;\n       \n    });\n    this.inspector.closed.connect(() => {\n         print(\"inspector closed?!?\");\n         // if this happens destroy the webkit..\n         // recreate it..\n        _this.viewbox.el.remove(_this.viewcontainer.el);\n        _this.el.remove(_this.inspectorcontainer.el);        \n         this.el.destroy();\n         var nv =new Xcls_viewcontainer(_this);\n         nv.ref();\n         _this.viewbox.el.pack_end(nv.el,true,true,0);\n         \n          var  inv =new Xcls_inspectorcontainer(_this);\n          inv.ref();\n          _this.el.pack2(inv.el,true,true);\n         \n         \n\n         _this.view.renderJS(true); \n         \n       \n    }); \n    \n    this.inspector.show();\n}\n",
                                     "# GLib.DateTime lastRedraw" : "null",
                                     "# string runhtml" : "\"\"",
                                     "# bool pendingRedraw" : false,

diff --git a/Builder4/WindowRooView.js b/Builder4/WindowRooView.js
index 9edb4ed..c7888d4 100644 (file)
--- a/Builder4/WindowRooView.js
+++ b/Builder4/WindowRooView.js
@@ -332,7 +332,7 @@ WindowRooView=new XObject({
                                      // if this happens destroy the webkit..
                                      // recreate it..
                                     _this.viewbox.el.remove(_this.viewcontainer.el);
-                                    _this.viewbox.el.remove(_this.inspectorcontainer.el);        
+                                    _this.el.remove(_this.inspectorcontainer.el);        
                                      this.el.destroy();
                                      var nv =new Xcls_viewcontainer(_this);
                                      nv.ref();
@@ -340,7 +340,7 @@ WindowRooView=new XObject({
                                      
                                       var  inv =new Xcls_inspectorcontainer(_this);
                                       inv.ref();
-                                      _this.viewbox.el.pack2(inv.el,true,true);
+                                      _this.el.pack2(inv.el,true,true);
                                      
                                      
                             

diff --git a/Builder4/WindowRooView.vala b/Builder4/WindowRooView.vala
index a8d90bb..4c857b6 100644 (file)
--- a/Builder4/WindowRooView.vala
+++ b/Builder4/WindowRooView.vala
@@ -594,7 +594,7 @@ public class Xcls_WindowRooView : Object
                  // if this happens destroy the webkit..
                  // recreate it..
                 _this.viewbox.el.remove(_this.viewcontainer.el);
-                _this.viewbox.el.remove(_this.inspectorcontainer.el);        
+                _this.el.remove(_this.inspectorcontainer.el);        
                  this.el.destroy();
                  var nv =new Xcls_viewcontainer(_this);
                  nv.ref();
@@ -602,7 +602,7 @@ public class Xcls_WindowRooView : Object
                  
                   var  inv =new Xcls_inspectorcontainer(_this);
                   inv.ref();
-                  _this.viewbox.el.pack2(inv.el,true,true);
+                  _this.el.pack2(inv.el,true,true);