From: Alan Knowles Date: Tue, 30 Oct 2018 08:44:10 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=1078adf69cd290a3e887d72c3910cd0ade14b887 NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index 6a7be2e9..d724810e 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -10,7 +10,7 @@ { "listeners" : { "delete_event" : "(self, event) => {\n this.el.hide();\n return true; \n //test \n}\n ", - "response" : " (self, response_id) => { \n \n\tif (response_id < 1) { // cancel!\n this.el.hide();\n return;\n }\n\n\n\n if (_this.name.el.get_text().length < 1) {\n StandardErrorDialog.show(\n this.el,\n \"You have to set Component name \"\n );\n \n return;\n }\n // what does this do?\n \n var isNew = _this.file.name.length > 0 ? false : true;\n /*\n if (!isNew && this.file.name != _this.name.el.get_text()) {\n Xcls_StandardErrorDialog.singleton().show(\n this.el,\n \"Sorry changing names does not work yet. \"\n );\n \n return;\n }\n */\n \n \n \n // FIXME - this may be more complicated...\n //for (var i in this.def) {\n // this.file[i] = this.get(i).el.get_text();\n //}\n\n if (!isNew) {\n try {\n this.updateFileFromEntry();\n } catch( JsRender.Error.RENAME_FILE_EXISTS er) {\n Xcls_StandardErrorDialog.singleton().show(\n this.el,\n \"The name you used already exists \"\n );\n return;\n \n }\n \n \n _this.file.save();\n this.el.hide();\n return;\n }\n var fn = this.name.el.get_text();\n var dir = _this.project.firstPath();\n \n if (GLib.FileUtils.test(dir + \"/\" + fn + \".bjs\", GLib.FileTest.EXISTS)) {\n Xcls_StandardErrorDialog.singleton().show(\n this.el,\n \"That file already exists\"\n ); \n return;\n }\n \n var f = JsRender.JsRender.factory(\n _this.file.project.xtype, \n _this.file.project, \n dir + \"/\" + fn + \".bjs\");\n\n _this.file = f;\n \n\n \n this.updateFileFromEntry();\n _this.file.save();\n _this.file.project.addFile(_this.file);\n \n\t \n // what about .js ?\n \n this.el.hide();\n \n \n //var tmpl = this.project.loadFileOnly(DialogNewComponent.get('template').getValue());\n \n //var nf = _this.project.create(dir + \"/\" + _this.file.name + \".bjs\");\n //for (var i in this.file) {\n // nf[i] = this.file[i];\n //}\n _this.success(_this.project, _this.file);\n /*\n\n -- fixme -- needs to be a signal..\n if (DialogNewComponent.success != null) {\n DialogNewComponent.success(_this.project, nf);\n }\n */\n}", + "response" : " (self, response_id) => { \n \n\t \n}", "show" : "(self) => {\n this.el.show_all();\n //test\n}" }, "| void updateFileFromEntry" : "() {\n\n _this.file.title = _this.title.el.get_text();\n _this.file.region = _this.region.el.get_text(); \n _this.file.parent = _this.parent.el.get_text(); \n _this.file.permname = _this.permname.el.get_text(); \n _this.file.modOrder = _this.modOrder.el.get_text();\n \n if (_this.file.name.length > 0 && _this.file.name != _this.name.el.get_text()) {\n _this.file.renameTo(_this.name.el.get_text());\n }\n // store the module...\n _this.file.build_module = \"\"; \n Gtk.TreeIter iter; \n if (_this.build_module.el.get_active_iter (out iter)) {\n Value vfname;\n this.dbmodel.el.get_value (iter, 0, out vfname);\n if (((string)vfname).length > 0) {\n _this.file.build_module = (string)vfname;\n }\n \n }\n \n \n\n \n} ", diff --git a/NewBranch.vala b/NewBranch.vala index 48a1c918..26efceea 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -60,103 +60,7 @@ public class Xcls_DialogNewComponent : Object }); this.el.response.connect( (self, response_id) => { - if (response_id < 1) { // cancel! - this.el.hide(); - return; - } - - - - if (_this.name.el.get_text().length < 1) { - StandardErrorDialog.show( - this.el, - "You have to set Component name " - ); - - return; - } - // what does this do? - - var isNew = _this.file.name.length > 0 ? false : true; - /* - if (!isNew && this.file.name != _this.name.el.get_text()) { - Xcls_StandardErrorDialog.singleton().show( - this.el, - "Sorry changing names does not work yet. " - ); - - return; - } - */ - - - - // FIXME - this may be more complicated... - //for (var i in this.def) { - // this.file[i] = this.get(i).el.get_text(); - //} - - if (!isNew) { - try { - this.updateFileFromEntry(); - } catch( JsRender.Error.RENAME_FILE_EXISTS er) { - Xcls_StandardErrorDialog.singleton().show( - this.el, - "The name you used already exists " - ); - return; - - } - - - _this.file.save(); - this.el.hide(); - return; - } - var fn = this.name.el.get_text(); - var dir = _this.project.firstPath(); - - if (GLib.FileUtils.test(dir + "/" + fn + ".bjs", GLib.FileTest.EXISTS)) { - Xcls_StandardErrorDialog.singleton().show( - this.el, - "That file already exists" - ); - return; - } - - var f = JsRender.JsRender.factory( - _this.file.project.xtype, - _this.file.project, - dir + "/" + fn + ".bjs"); - - _this.file = f; - - - - this.updateFileFromEntry(); - _this.file.save(); - _this.file.project.addFile(_this.file); - - // what about .js ? - - this.el.hide(); - - - //var tmpl = this.project.loadFileOnly(DialogNewComponent.get('template').getValue()); - - //var nf = _this.project.create(dir + "/" + _this.file.name + ".bjs"); - //for (var i in this.file) { - // nf[i] = this.file[i]; - //} - _this.success(_this.project, _this.file); - /* - - -- fixme -- needs to be a signal.. - if (DialogNewComponent.success != null) { - DialogNewComponent.success(_this.project, nf); - } - */ }); this.el.show.connect( (self) => { this.el.show_all();