Builder4/MainWindow.bjs
authorAlan Knowles <alan@roojs.com>
Thu, 30 Oct 2014 10:19:54 +0000 (18:19 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 30 Oct 2014 10:19:54 +0000 (18:19 +0800)
Builder4/MainWindow.vala

Builder4/MainWindow.bjs
Builder4/MainWindow.vala

index 58f50a9..80dae49 100644 (file)
@@ -25,9 +25,9 @@
             "default_height" : 500,
             "# Xcls_WindowLeftProjects left_projects" : "null",
             "id" : "MainWindow",
-            "|             void showProjectEdit" : " () {\n    // make the browser smaller, and show the edit dialog\n    \n    \n     _this.projectbutton.el.hide();\n     _this.projecteditbutton.el.hide();\n     \n     _this.editfilebutton.el.hide();\n     \n    \n     \n     \n     _this.backbutton.el.show();\n     \n    //this.rooview.el.hide();\n    this.projectsettings.el.show_all();\n    this.projectsettings.show(this.project);\n    _this.projecteditview.el.save_easing_state();\n        \n    var el = _this.rooview.el;\n    el.save_easing_state();\n   \n    \n    el.set_scale(0.5f,0.5f);\n\n    _this.projecteditview.el.set_scale(1.0f,1.0f);\n   \n    _this.state = \"projectedit\";\n     \n \n    //_this.clutterfiles.loadProject(_this.project);\n\n    el.restore_easing_state();\n    _this.projecteditview.el.restore_easing_state();\n  //  print(\"show view browsing\");\n    \n}\n",
-            "|             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}",
+            "|             void showProjectEdit" : " () {\n    // make the browser smaller, and show the edit dialog\n    \n    \n     _this.projectbutton.el.hide();\n     _this.projecteditbutton.el.hide();\n     _this.editfilebutton.el.hide();\n     \n    _this.backbutton.el.show();\n     \n    //this.rooview.el.hide();\n    \n    \n    if (this.project.xtype == \"Roo\") {\n        this.projectsettings.el.show_all();\n        this.projectsettings.show(this.project);\n    } else {\n        this.vala_projectsettings.el.show_all();\n        this.vala_projectsettings.show((Project.Gtk)this.project);\n    }\n    _this.projecteditview.el.save_easing_state();\n        \n    var el = _this.rooview.el;\n    el.save_easing_state();\n   \n    \n    el.set_scale(0.5f,0.5f);\n\n    _this.projecteditview.el.set_scale(1.0f,1.0f);\n   \n    _this.state = \"projectedit\";\n     \n \n    //_this.clutterfiles.loadProject(_this.project);\n\n    el.restore_easing_state();\n    _this.projecteditview.el.restore_easing_state();\n  //  print(\"show view browsing\");\n    \n}\n",
             "# Xcls_WindowRooView window_rooview" : "null",
+            "|             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",
             "$ type" : "Gtk.WindowType.TOPLEVEL",
@@ -55,8 +55,8 @@
             "items" : [
                 {
                     "id" : "vbox",
-                    "xtype" : "VBox",
                     "* pack" : "add",
+                    "xtype" : "VBox",
                     "$ xns" : "Gtk",
                     "$ homogeneous" : false,
                     "items" : [
                             "items" : [
                                 {
                                     "id" : "leftpane",
-                                    "* pack" : "add1",
                                     "xtype" : "VBox",
+                                    "* pack" : "add1",
                                     "$ xns" : "Gtk",
                                     "items" : [
                                         {
                                             "id" : "editpane",
-                                            "* pack" : "pack_start,false,true,0",
                                             "xtype" : "VPaned",
+                                            "* pack" : "pack_start,false,true,0",
                                             "$ xns" : "Gtk",
                                             "items" : [
                                                 {
                                                     "id" : "tree",
-                                                    "* pack" : "add1",
                                                     "xtype" : "VBox",
+                                                    "* pack" : "add1",
                                                     "$ xns" : "Gtk"
                                                 },
                                                 {
                                                     "id" : "props",
-                                                    "* pack" : "add2",
                                                     "xtype" : "VBox",
+                                                    "* pack" : "add2",
                                                     "$ xns" : "Gtk"
                                                 }
                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "* pack" : "add_child",
                                                                     "xtype" : "Actor",
+                                                                    "* pack" : "add_child",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                                 "clicked" : "  ( ) => {\n    switch (_this.state) {\n        case \"edit\":\n        \n            _this.hideViewEditing();\n            break;  \n        case \"files\":\n            // should only occur if there is an active file..\n            _this.showViewEditing();\n            break; \n            \n          case \"addprop\":\n            _this.hideAddProp();\n\n            break;\n        case \"addlistener\":\n            _this.hideAddListener();\n\n            break;\n             \n         case \"object\":\n            _this.hideObject();\n            break;    \n         \n         case \"codeedit\":\n            \n            _this.hideCodeEdit();  \n            break;\n            \n         case  \"projectedit\":\n         // save?\n            _this.hideProjectEdit();\n            break;\n            \n        default:\n            break;\n    }\n    return  ;    \n\n}"
                                                                             },
                                                                             "utf8 tooltip_text" : "Back",
-                                                                            "xtype" : "Button",
                                                                             "* pack" : false,
+                                                                            "xtype" : "Button",
                                                                             "width_request" : 50,
                                                                             "$ xns" : "Gtk",
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "* pack" : "set_image",
                                                                                     "xtype" : "Image",
                                                                                     "utf8 icon_name" : "go-previous",
-                                                                                    "* pack" : "set_image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "$ tooltop_text" : "\"Open File\"",
                                                                             "items" : [
                                                                                 {
+                                                                                    "utf8 icon_name" : "document-open",
                                                                                     "* pack" : "set_image",
                                                                                     "xtype" : "Image",
-                                                                                    "utf8 icon_name" : "document-open",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "xtype" : "Image",
                                                                                     "utf8 icon_name" : "document-properties",
                                                                                     "* pack" : "set_image",
-                                                                                    "xtype" : "Image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "* pack" : "set_image",
                                                                                     "xtype" : "Image",
                                                                                     "utf8 icon_name" : "emblem-system",
-                                                                                    "* pack" : "set_image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "utf8 icon_name" : "list-add",
                                                                                     "* pack" : "set_image",
                                                                                     "xtype" : "Image",
-                                                                                    "utf8 icon_name" : "list-add",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "xtype" : "Image",
                                                                                     "utf8 icon_name" : "format-justify-left",
                                                                                     "* pack" : "set_image",
-                                                                                    "xtype" : "Image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "* pack" : "set_image",
                                                                                     "xtype" : "Image",
                                                                                     "utf8 icon_name" : "appointment-new",
-                                                                                    "* pack" : "set_image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "xtype" : "Image",
                                                                                     "utf8 icon_name" : "folder-new",
                                                                                     "* pack" : "set_image",
-                                                                                    "xtype" : "Image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "utf8 icon_name" : "document-new",
                                                                                     "* pack" : "set_image",
                                                                                     "xtype" : "Image",
-                                                                                    "utf8 icon_name" : "document-new",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "xtype" : "Image",
                                                                                     "utf8 icon_name" : "user-trash",
                                                                                     "* pack" : "set_image",
-                                                                                    "xtype" : "Image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
                                                             "items" : [
                                                                 {
                                                                     "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                                                                    "xtype" : "Actor",
                                                                     "* pack" : "add_child",
+                                                                    "xtype" : "Actor",
                                                                     "$ xns" : "GtkClutter",
                                                                     "items" : [
                                                                         {
                                                                                 "clicked" : "  ( ) => {\n        Xcls_MainWindow.singleton().no_windows++;\n        var w = new Xcls_MainWindow();\n        w.ref();\n\n        w.el.show_all();\n        w.initChildren();\n        w.hideViewEditing();\n}"
                                                                             },
                                                                             "utf8 tooltip_text" : "Open New Window",
-                                                                            "xtype" : "Button",
                                                                             "* pack" : false,
+                                                                            "xtype" : "Button",
                                                                             "width_request" : 50,
                                                                             "$ xns" : "Gtk",
                                                                             "height_request" : 50,
                                                                             "items" : [
                                                                                 {
+                                                                                    "xtype" : "Image",
                                                                                     "utf8 icon_name" : "window-new",
                                                                                     "* pack" : "set_image",
-                                                                                    "xtype" : "Image",
                                                                                     "$ xns" : "Gtk"
                                                                                 }
                                                                             ]
index fb5b977..58bd17e 100644 (file)
@@ -591,17 +591,20 @@ public class Xcls_MainWindow : Object
         
          _this.projectbutton.el.hide();
          _this.projecteditbutton.el.hide();
-         
          _this.editfilebutton.el.hide();
          
-        
-         
-         
-         _this.backbutton.el.show();
+        _this.backbutton.el.show();
          
         //this.rooview.el.hide();
-        this.projectsettings.el.show_all();
-        this.projectsettings.show(this.project);
+        
+        
+        if (this.project.xtype == "Roo") {
+            this.projectsettings.el.show_all();
+            this.projectsettings.show(this.project);
+        } else {
+            this.vala_projectsettings.el.show_all();
+            this.vala_projectsettings.show((Project.Gtk)this.project);
+        }
         _this.projecteditview.el.save_easing_state();
             
         var el = _this.rooview.el;