Builder4/MainWindow.bjs

Builder4/MainWindow.vala

diff --git a/Builder4/MainWindow.bjs b/Builder4/MainWindow.bjs
index df95936..4083450 100644 (file)
--- a/Builder4/MainWindow.bjs
+++ b/Builder4/MainWindow.bjs
@@ -29,13 +29,13 @@
             "|             void showAddListener" : "() {\n\n     \n     \n    var ae =      this.left_tree.getActiveElement();\n    if (ae == null) {\n        return;\n    }\n     \n   _this.backbutton.el.show();\n    _this.projectbutton.el.hide();\n    _this.editfilebutton.el.hide();\n    _this.projecteditbutton.el.hide();    \n    \n    \n    //this.rooview.el.hide();\n    this.add_props.el.show_all();\n    this.add_props.show(\n        Palete.factory(this.project.xtype), \n        \"signals\",\n        ae.fqn()\n    );\n    //this.rightpalete.show(this.project);\n\n    _this.addpropsview.el.save_easing_state();\n        \n    var el = _this.rooview.el;\n    el.save_easing_state();\n   \n      _this.clutterembed.setSizesAlloc(\"addlistener\");\n\n    \n  \n\n    _this.addpropsview.el.set_scale(1.0f,1.0f);\n   \n   \n \n    //_this.clutterfiles.loadProject(_this.project);\n\n    el.restore_easing_state();\n    _this.addpropsview.el.restore_easing_state();\n    this.state = \"addlistener\";\n}",
             "default_width" : 800,
             "xtype" : "Window",
-            "# boolean is_top_window" : true,
             "$ type" : "Gtk.WindowType.TOPLEVEL",
             "|             void hideAddProp" : "() {\n      _this.backbutton.el.hide();\n     _this.projectbutton.el.show(); \n          _this.projecteditbutton.el.show();\n         _this.editfilebutton.el.show();   \n     _this.addpropsview.el.save_easing_state();\n     \n    var el = _this.rooview.el;\n    el.save_easing_state();\n\n    \n    el.set_scale(1.0f,1.0f);\n    _this.addpropsview.el.set_scale(0.0f,0.0f);\n    _this.state = \"edit\";\n\n \n    //_this.clutterfiles.loadProject(_this.project);\n\n    el.restore_easing_state();\n     _this.addpropsview.el.restore_easing_state();  \n }",
             "# Xcls_WindowLeftTree left_tree" : "null",
             "# Editor code_editor" : "null",
             "|             void showCodeEdit" : "(JsRender.JsRender file, JsRender.Node node, string ptype, string key)\n{\n    // this is a bit different,\n    // it's not called via a button - but triggered by the prop edit class signal.\n    // so it has to hide any other state..\n    \n    switch(this.state) {\n        case \"object\":\n            this.hideObject();\n            break;\n        case \"addprop\":\n            this.hideAddProp();\n            break;\n        case \"addlistener\":\n            this.hideAddListener();\n            break;\n    }\n \n   _this.backbutton.el.show();\n   \n    _this.projectbutton.el.hide();\n    _this.editfilebutton.el.hide();\n    _this.projecteditbutton.el.hide();    \n   // more?? \n     \n    //this.rooview.el.hide();\n    this.code_editor.el.show_all();\n    this.code_editor.show(\n        file,\n        node,\n        ptype,\n        key\n    );\n\n    _this.codeeditview.el.save_easing_state();\n        \n    var el = _this.rooview.el;\n    el.save_easing_state();\n    _this.clutterembed.setSizesAlloc(\"codedit\");\n   \n    _this.codeeditview.el.set_scale(1.0f,1.0f);\n   \n   \n \n    //_this.clutterfiles.loadProject(_this.project);\n\n    el.restore_easing_state();\n    _this.codeeditview.el.restore_easing_state();\n    this.state = \"codeedit\";\n}\n",
             "# Xcls_DialogNewComponent new_file_dialog" : "null",
+            "# bool is_top_window" : true,
             "# Xcls_ProjectSettings projectsettings" : "null",
             "|             void setTitle" : " (string str) {\n    this.el.set_title(this.title + \" - \" + str);\n}\n",
             "|             void show" : "() {\n    this.left_tree =new Xcls_WindowLeftTree();\n    _this.vbox.el.pack_start(this.left_tree.el,true, true,0);\n    this.el.show_all();\n\n}",

diff --git a/Builder4/MainWindow.vala b/Builder4/MainWindow.vala
index 6b1e480..0bfd582 100644 (file)
--- a/Builder4/MainWindow.vala
+++ b/Builder4/MainWindow.vala
@@ -42,10 +42,10 @@ public class Xcls_MainWindow : Object
     public bool children_loaded;
     public Xcls_WindowLeftProjects left_projects;
     public Xcls_WindowRooView window_rooview;
-    public boolean is_top_window;
     public Xcls_WindowLeftTree left_tree;
     public Editor code_editor;
     public Xcls_DialogNewComponent new_file_dialog;
+    public bool is_top_window;
     public Xcls_ProjectSettings projectsettings;
     public Xcls_ClutterFiles clutterfiles;
     public Xcls_LeftProps left_props;
@@ -66,10 +66,10 @@ public class Xcls_MainWindow : Object
         this.children_loaded = false;
         this.left_projects = null;
         this.window_rooview = null;
-        this.is_top_window = true;
         this.left_tree = null;
         this.code_editor = null;
         this.new_file_dialog = null;
+        this.is_top_window = true;
         this.projectsettings = null;
         this.clutterfiles = null;
         this.left_props = null;