From 347a2a0c58ed335825c2ac71cdd7c870b1a9e32c Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 6 Aug 2014 12:31:24 +0800 Subject: [PATCH] Builder4/MainWindow.bjs Builder4/MainWindow.js Builder4/MainWindow.vala --- Builder4/MainWindow.bjs | 2 +- Builder4/MainWindow.js | 2 +- Builder4/MainWindow.vala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Builder4/MainWindow.bjs b/Builder4/MainWindow.bjs index e6ec9de76..00735156d 100644 --- a/Builder4/MainWindow.bjs +++ b/Builder4/MainWindow.bjs @@ -38,7 +38,7 @@ "|void:hideObject": "() {\n // return to editing state..\n \n \n\n\n \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}", "|void:hideProjectEdit": " () {\n // return to editing state..\n \n _this.projectbutton.el.show();\n _this.projecteditbutton.el.show();\n \n \n //this.rooview.el.hide();\n //this.edit_project.el.show();\n _this.projecteditview.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.projecteditview.el.set_scale(1.0f,0.0f);\n _this.state = \"edit\";\n\n \n //_this.clutterfiles.loadProject(_this.project);\n\n el.restore_easing_state();\n _this.projecteditview.el.restore_easing_state(); \n \n}\n", "|void:hideViewEditing": " ( ) {\n \n if (this.left_tree.getActiveFile() != null) {\n if (this.left_tree.getActiveFile().xtype == \"Roo\" ) {\n this.window_rooview.createThumb();\n } else {\n this.window_gladeview.createThumb();\n }\n }\n _this.projecteditbutton.el.hide();\n this.editpane.el.hide();\n //this.rooview.el.hide();\n this.left_projects.el.show();\n \n var el = _this.rooview.el;\n el.save_easing_state();\n el.set_easing_duration(1000);\n // show project / file view..\n //_this.mainpane.lastWidth = _this.leftpane.el.get_position();\n //_this.mainpane.el.set_position(0);\n // rotate y 180..\n el.set_rotation_angle(Clutter.RotateAxis.Y_AXIS, 360.0f);\n el.set_scale(0.0f,0.0f);\n \n _this.state = \"files\";\n\n _this.left_projects.selectProject(_this.project);\n //_this.clutterfiles.loadProject(_this.project);\n\n el.restore_easing_state();\n \n print(\"show view browsing\");\n}", - "|void:initChildren": " () {\n // this needs putting in a better place..\n \n print(\"init children\");\n this.left_tree = new Xcls_WindowLeftTree();\n this.left_tree.ref();\n this.tree.el.pack_start(this.left_tree.el,true, true,0);\n this.left_tree.el.show_all();\n \n this.left_tree.before_node_change.connect(() => {\n if (this.state != \"codeedit\") {\n this.left_props.finish_editing();\n return true;\n }\n if (!this.code_editor.saveContents()) {\n return false;\n }\n return false;\n \n });\n \n this.left_tree.node_selected.connect((sel) => {\n \n print(\"node_selected called %s\\n\", (sel == null) ? \"NULL\" : \"a value\");\n \n if (sel == null) {\n this.left_props.el.hide();\n } \n this.left_props.el.show();\n this.left_props.load(this.left_tree.getActiveFile(), sel);\n switch (this.state) {\n case \"object\": \n \n if (sel == null) {\n this.rightpalete.clear();\n break;\n }\n this.rightpalete.load(_this.left_tree.getActiveFile().palete(), sel.fqn());\n break;\n \n \n case \"addprop\":\n if (sel == null) {\n this.add_props.clear();\n break;\n }\n this.add_props.show(_this.left_tree.getActiveFile().palete(), \"props\", sel.fqn());\n break;\n \n case \"addlistener\":\n if (sel == null) {\n this.add_props.clear();\n break;\n }\n this.add_props.show(_this.left_tree.getActiveFile().palete(), \"signals\", sel.fqn());\n break;\n\n case \"codeedit\":\n \n this.hideCodeEdit();\n break;\n \n \n }\n return ;\n \n });\n \n this.left_tree.changed.connect(() => {\n this.window_rooview.requestRedraw();\n });\n \n \n\n // left properties\n\n this.left_props =new Xcls_LeftProps();\n this.left_props.ref();\n this.props.el.pack_start(this.left_props.el,true, true,0);\n this.left_props.el.show_all();\n \n this.left_props.show_editor.connect( (file, node, type, key) => {\n this.showCodeEdit(node, type, key);\n });\n this.left_props.stop_editor.connect( () => {\n if (this.state != \"codeedit\") {\n return true;\n }\n \n var ret = this.code_editor.saveContents();\n if (!ret) {\n return false;\n }\n this.hideCodeEdit();\n return ret;\n });\n this.left_props.changed.connect(() => {\n if (this.left_tree.getActiveFile().xtype == \"Roo\" ) {\n this.window_rooview.requestRedraw();\n } else {\n this.window_gladeview.loadFile(this.left_tree.getActiveFile());\n }\n });\n \n\n\n\n // left projects..\n this.left_projects = new Xcls_WindowLeftProjects();\n this.left_projects.ref();\n this.leftpane.el.pack_start(this.left_projects.el,true, true,0);\n //this.left_projects.el.show_all();\n this.left_projects.project_selected.connect((proj) => {\n proj.scanDirs();\n _this.clutterfiles.loadProject(proj);\n \n });\n \n \n // project edit..\n this.projectsettings =new Xcls_ProjectSettings();\n this.projectsettings.ref(); /// really?\n ((Gtk.Container)(this.projecteditview.el.get_widget())).add(this.projectsettings.el);\n //this.projectsettings.el.show_all();\n\n var stage = _this.projecteditview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n this.projectsettings.buttonPressed.connect((btn) => {\n if (this.left_tree.getActiveFile().xtype == \"Roo\" ) {\n \n if (btn == \"save\") {\n _this.window_rooview.view.renderJS(true);\n }\n if (btn == \"apply\") {\n _this.window_rooview.view.renderJS(true);\n return;\n }\n } else {\n // do nothing for gtk..\n }\n this.hideProjectEdit();\n \n });\n \n \n // objects (palate..)\n this.rightpalete = new Xcls_RightPalete();\n this.rightpalete.ref(); /// really?\n ((Gtk.Container)(this.objectview.el.get_widget())).add(this.rightpalete.el);\n //this.projectsettings.el.show_all();\n\n stage = _this.objectview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n /*this.projectsettings.buttonPressed.connect((btn) => {\n if (btn == \"save\") {\n _this.window_rooview.view.renderJS(true);\n }\n if (btn == \"apply\") {\n _this.window_rooview.view.renderJS(true);\n return;\n }\n this.hideProjectEdit();\n \n });\n */\n \n \n \n // Add properties\n this.add_props = new Xcls_WindowAddProp();\n this.add_props.ref(); /// really?\n ((Gtk.Container)(this.addpropsview.el.get_widget())).add(this.add_props.el);\n //this.projectsettings.el.show_all();\n\n stage = _this.addpropsview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n \n _this.add_props.select.connect( (key,type,skel, etype) => {\n this.left_props.addProp(etype, key, skel, type);\n });\n \n // editor\n \n \n this.code_editor = new Xcls_Editor();\n this.code_editor.ref(); /// really?\n ((Gtk.Container)(this.codeeditview.el.get_widget())).add(this.code_editor.el);\n //this.projectsettings.el.show_all();\n\n stage = _this.codeeditview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n // editor.save...\n\n \n \n \n \n \n // roo view\n \n this.window_rooview =new Xcls_WindowRooView();\n this.window_rooview.ref();\n ((Gtk.Container)(this.rooview.el.get_widget())).add(this.window_rooview.el);\n this.window_rooview.el.show_all();\n\n stage = _this.rooview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n \n // glade view\n \n this.window_gladeview =new Xcls_GladeView();\n this.window_gladeview.ref();\n\n //((Gtk.Container)(this.rooview.el.get_widget())).add(this.window_gladeview.el);\n ///this.window_gladeview.el.hide();\n\n \n \n // clutter files\n \n \n this.clutterfiles = new Xcls_ClutterFiles();\n this.clutterfiles.ref();\n stage.add_child(this.clutterfiles.el);\n this.clutterfiles.el.show_all();\n\n\n this.clutterfiles.open.connect((file) => { \n _this.project = file.project;\n _this.showViewEditing();\n this.left_tree.model.loadFile(file);\n var ctr= ((Gtk.Container)(this.rooview.el.get_widget()));\n if (file.xtype == \"Roo\" ) { \n ctr.foreach( (w) => { ctr.remove(w); });\n ctr.add(this.window_rooview.el);\n this.window_rooview.loadFile(file);\n \n this.window_rooview.el.show_all();\n } else {\n ctr.foreach( (w) => { ctr.remove(w); });\n ctr.add(this.window_gladeview.el);\n this.window_gladeview.loadFile(file);\n this.window_gladeview.el.show_all();\n }\n print(\"OPEN : \" + file.name);\n\n });\n\n\n\n\n\n\n //w.el.show_all();\n var tl = new Clutter.Timeline(6000);\n tl.set_repeat_count(-1);\n tl.start();\n tl.ref();\n\n this.children_loaded = true;\n\n\n\n\n}\n", + "|void:initChildren": " () {\n // this needs putting in a better place..\n \n print(\"init children\");\n this.left_tree = new Xcls_WindowLeftTree();\n this.left_tree.ref();\n this.tree.el.pack_start(this.left_tree.el,true, true,0);\n this.left_tree.el.show_all();\n \n this.left_tree.before_node_change.connect(() => {\n if (this.state != \"codeedit\") {\n this.left_props.finish_editing();\n return true;\n }\n if (!this.code_editor.saveContents()) {\n return false;\n }\n return false;\n \n });\n \n this.left_tree.node_selected.connect((sel) => {\n \n print(\"node_selected called %s\\n\", (sel == null) ? \"NULL\" : \"a value\");\n \n if (sel == null) {\n this.left_props.el.hide();\n } \n this.left_props.el.show();\n this.left_props.load(this.left_tree.getActiveFile(), sel);\n switch (this.state) {\n case \"object\": \n \n if (sel == null) {\n this.rightpalete.clear();\n break;\n }\n this.rightpalete.load(_this.left_tree.getActiveFile().palete(), sel.fqn());\n break;\n \n \n case \"addprop\":\n if (sel == null) {\n this.add_props.clear();\n break;\n }\n this.add_props.show(_this.left_tree.getActiveFile().palete(), \"props\", sel.fqn());\n break;\n \n case \"addlistener\":\n if (sel == null) {\n this.add_props.clear();\n break;\n }\n this.add_props.show(_this.left_tree.getActiveFile().palete(), \"signals\", sel.fqn());\n break;\n\n case \"codeedit\":\n \n this.hideCodeEdit();\n break;\n \n \n }\n return ;\n \n });\n \n this.left_tree.changed.connect(() => {\n this.window_rooview.requestRedraw();\n });\n \n \n\n // left properties\n\n this.left_props =new Xcls_LeftProps();\n this.left_props.ref();\n this.props.el.pack_start(this.left_props.el,true, true,0);\n this.left_props.el.show_all();\n \n this.left_props.show_editor.connect( (file, node, type, key) => {\n this.showCodeEdit(node, type, key);\n });\n this.left_props.stop_editor.connect( () => {\n if (this.state != \"codeedit\") {\n return true;\n }\n \n var ret = this.code_editor.saveContents();\n if (!ret) {\n return false;\n }\n this.hideCodeEdit();\n return ret;\n });\n this.left_props.changed.connect(() => {\n if (this.left_tree.getActiveFile().xtype == \"Roo\" ) {\n this.window_rooview.requestRedraw();\n } else {\n this.window_gladeview.loadFile(this.left_tree.getActiveFile());\n }\n });\n \n\n\n\n // left projects..\n this.left_projects = new Xcls_WindowLeftProjects();\n this.left_projects.ref();\n this.leftpane.el.pack_start(this.left_projects.el,true, true,0);\n this.left_projects.el.show_all();\n this.left_projects.project_selected.connect((proj) => {\n proj.scanDirs();\n _this.clutterfiles.loadProject(proj);\n \n });\n \n \n // project edit..\n this.projectsettings =new Xcls_ProjectSettings();\n this.projectsettings.ref(); /// really?\n ((Gtk.Container)(this.projecteditview.el.get_widget())).add(this.projectsettings.el);\n //this.projectsettings.el.show_all();\n\n var stage = _this.projecteditview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n this.projectsettings.buttonPressed.connect((btn) => {\n if (this.left_tree.getActiveFile().xtype == \"Roo\" ) {\n \n if (btn == \"save\") {\n _this.window_rooview.view.renderJS(true);\n }\n if (btn == \"apply\") {\n _this.window_rooview.view.renderJS(true);\n return;\n }\n } else {\n // do nothing for gtk..\n }\n this.hideProjectEdit();\n \n });\n \n \n // objects (palate..)\n this.rightpalete = new Xcls_RightPalete();\n this.rightpalete.ref(); /// really?\n ((Gtk.Container)(this.objectview.el.get_widget())).add(this.rightpalete.el);\n //this.projectsettings.el.show_all();\n\n stage = _this.objectview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n /*this.projectsettings.buttonPressed.connect((btn) => {\n if (btn == \"save\") {\n _this.window_rooview.view.renderJS(true);\n }\n if (btn == \"apply\") {\n _this.window_rooview.view.renderJS(true);\n return;\n }\n this.hideProjectEdit();\n \n });\n */\n \n \n \n // Add properties\n this.add_props = new Xcls_WindowAddProp();\n this.add_props.ref(); /// really?\n ((Gtk.Container)(this.addpropsview.el.get_widget())).add(this.add_props.el);\n //this.projectsettings.el.show_all();\n\n stage = _this.addpropsview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n \n _this.add_props.select.connect( (key,type,skel, etype) => {\n this.left_props.addProp(etype, key, skel, type);\n });\n \n // editor\n \n \n this.code_editor = new Xcls_Editor();\n this.code_editor.ref(); /// really?\n ((Gtk.Container)(this.codeeditview.el.get_widget())).add(this.code_editor.el);\n //this.projectsettings.el.show_all();\n\n stage = _this.codeeditview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n // editor.save...\n\n \n \n \n \n \n // roo view\n \n this.window_rooview =new Xcls_WindowRooView();\n this.window_rooview.ref();\n ((Gtk.Container)(this.rooview.el.get_widget())).add(this.window_rooview.el);\n this.window_rooview.el.show_all();\n\n stage = _this.rooview.el.get_stage();\n stage.set_background_color( Clutter.Color.from_string(\"#000\"));\n \n \n // glade view\n \n this.window_gladeview =new Xcls_GladeView();\n this.window_gladeview.ref();\n\n //((Gtk.Container)(this.rooview.el.get_widget())).add(this.window_gladeview.el);\n ///this.window_gladeview.el.hide();\n\n \n \n // clutter files\n \n \n this.clutterfiles = new Xcls_ClutterFiles();\n this.clutterfiles.ref();\n stage.add_child(this.clutterfiles.el);\n this.clutterfiles.el.show_all();\n\n\n this.clutterfiles.open.connect((file) => { \n _this.project = file.project;\n _this.showViewEditing();\n this.left_tree.model.loadFile(file);\n var ctr= ((Gtk.Container)(this.rooview.el.get_widget()));\n if (file.xtype == \"Roo\" ) { \n ctr.foreach( (w) => { ctr.remove(w); });\n ctr.add(this.window_rooview.el);\n this.window_rooview.loadFile(file);\n \n this.window_rooview.el.show_all();\n } else {\n ctr.foreach( (w) => { ctr.remove(w); });\n ctr.add(this.window_gladeview.el);\n this.window_gladeview.loadFile(file);\n this.window_gladeview.el.show_all();\n }\n print(\"OPEN : \" + file.name);\n\n });\n\n\n\n\n\n\n //w.el.show_all();\n var tl = new Clutter.Timeline(6000);\n tl.set_repeat_count(-1);\n tl.start();\n tl.ref();\n\n this.children_loaded = true;\n\n\n\n\n}\n", "|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}", "|void:showAddListener": "() {\n\n \n \n var ae = this.left_tree.getActiveElement();\n if (ae == null) {\n return;\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 \n el.set_scale(0.5f,0.5f);\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}", diff --git a/Builder4/MainWindow.js b/Builder4/MainWindow.js index 1eed135ed..3d5097cc3 100644 --- a/Builder4/MainWindow.js +++ b/Builder4/MainWindow.js @@ -273,7 +273,7 @@ MainWindow=new XObject({ this.left_projects = new Xcls_WindowLeftProjects(); this.left_projects.ref(); this.leftpane.el.pack_start(this.left_projects.el,true, true,0); - //this.left_projects.el.show_all(); + this.left_projects.el.show_all(); this.left_projects.project_selected.connect((proj) => { proj.scanDirs(); _this.clutterfiles.loadProject(proj); diff --git a/Builder4/MainWindow.vala b/Builder4/MainWindow.vala index b196f6342..d537a0ef0 100644 --- a/Builder4/MainWindow.vala +++ b/Builder4/MainWindow.vala @@ -356,7 +356,7 @@ public class Xcls_MainWindow : Object this.left_projects = new Xcls_WindowLeftProjects(); this.left_projects.ref(); this.leftpane.el.pack_start(this.left_projects.el,true, true,0); - //this.left_projects.el.show_all(); + this.left_projects.el.show_all(); this.left_projects.project_selected.connect((proj) => { proj.scanDirs(); _this.clutterfiles.loadProject(proj); -- 2.39.2