src/Builder4/MainWindow.bjs

src/Builder4/MainWindow.vala

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index 640f1bc..d50303e 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -36,7 +36,6 @@
    "# 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",
-   "WindowState windowstate" : "null",
    "# 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}",
@@ -50,6 +49,7 @@
    "# Xcls_WindowAddProp add_props" : "null",
    "|             void showObject" : "() {\n\n     \n    // what's the active node on the left hand side..\n    \n    var n = _this.left_tree.getActiveElement();\n\n    if (_this.left_tree.model.file == null) {\n        return;\n    }\n    \n    if (n == null && _this.left_tree.model.file.tree != 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.rightpalete.el.show_all();\n    this.rightpalete.load(_this.left_tree.getActiveFile().palete(), n == null ? \"*top\" : n.fqn());\n\n    \n    //this.rightpalete.show(this.project);\n\n    _this.objectview.el.save_easing_state();\n        \n    var el = _this.rooview.el;\n    el.save_easing_state();\n   \n     _this.clutterembed.setSizesAlloc(\"object\");\n    \n\n    _this.objectview.el.set_scale(1.0f,1.0f);\n   \n   \n \n    //_this.clutterfiles.loadProject(_this.project);\n\n    el.restore_easing_state();\n    _this.objectview.el.restore_easing_state();\n    this.state = \"object\";\n}",
    "* init" : " this.state = \"files\";\n\t  \n    //this.el.show_all();\n    \n    ",
+   "# WindowState windowstate" : "null",
    "|             void hideObject" : "() {\n      // return to editing state..\n       \n          _this.projecteditbutton.el.show();\n      _this.backbutton.el.hide();\n     _this.projectbutton.el.show(); \n         _this.editfilebutton.el.show();   \n     _this.objectview.el.save_easing_state();\n    var el = _this.rooview.el;\n    el.save_easing_state();\n\n    \n    el.set_scale(1.0f,1.0f);\n    _this.objectview.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.objectview.el.restore_easing_state();  \n \n\n}",
    "# Xcls_GtkView window_gladeview" : "null",
    "items" : [

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index 7bfe71e..eb82a3a 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -46,7 +46,6 @@ public class Xcls_MainWindow : Object
     public Xcls_WindowLeftTree left_tree;
     public Editor code_editor;
     public Xcls_DialogNewComponent new_file_dialog;
-    public WindowState windowstate;
     public Xcls_ProjectSettings projectsettings;
     public Xcls_ClutterFiles clutterfiles;
     public Xcls_LeftProps left_props;
@@ -54,6 +53,7 @@ public class Xcls_MainWindow : Object
     public string title;
     public ValaProjectSettings vala_projectsettings;
     public Xcls_WindowAddProp add_props;
+    public WindowState windowstate;
     public Xcls_GtkView window_gladeview;
 
     // ctor 
@@ -71,7 +71,6 @@ public class Xcls_MainWindow : Object
         this.left_tree = null;
         this.code_editor = null;
         this.new_file_dialog = null;
-        this.windowstate = null;
         this.projectsettings = null;
         this.clutterfiles = null;
         this.left_props = null;
@@ -79,6 +78,7 @@ public class Xcls_MainWindow : Object
         this.title = "Application Builder";
         this.vala_projectsettings = null;
         this.add_props = null;
+        this.windowstate = null;
         this.window_gladeview = null;
 
         // set gobject values