Builder4/DialogNewComponent.bjs

Builder4/DialogNewComponent.js
Builder4/DialogNewComponent.vala

diff --git a/Builder4/DialogNewComponent.bjs b/Builder4/DialogNewComponent.bjs
index 0adf772..ad9f961 100644 (file)
--- a/Builder4/DialogNewComponent.bjs
+++ b/Builder4/DialogNewComponent.bjs
@@ -8,7 +8,7 @@
         {
             "listeners": {
                 "delete_event": "(self, event) => {\n    this.el.hide();\n    return true;   \n}\n ",
-                "response": " (self, response_id) =>  { \n  \n\tif (response_id < 1) { // cancel!\n            this.el.hide();\n            return;\n        }\n\n        if (_this.name.el.get_text().length  < 1) {\n            StandardErrorDialog.show(\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            StandardErrorDialog.show(\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             this.updateFileFromEntry();\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            StandardErrorDialog.show(\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.updateFileFromEntry();\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, nf);\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\tif (response_id < 1) { // cancel!\n            this.el.hide();\n            return;\n        }\n\n        if (_this.name.el.get_text().length  < 1) {\n            StandardErrorDialog.show(\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            StandardErrorDialog.show(\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             this.updateFileFromEntry();\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            StandardErrorDialog.show(\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        this.updateFileFromEntry();\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}",
                 "show": "(self)  => {\n  this.el.show_all();\n  \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}    ",

diff --git a/Builder4/DialogNewComponent.js b/Builder4/DialogNewComponent.js
index 4a3495f..a978e3f 100644 (file)
--- a/Builder4/DialogNewComponent.js
+++ b/Builder4/DialogNewComponent.js
@@ -73,6 +73,9 @@ DialogNewComponent=new XObject({
                         _this.file.project, 
                         dir + "/" + fn + ".bjs");
         
+                _this.file = f;
+                
+                
                 this.updateFileFromEntry();
                 
                 
@@ -87,7 +90,7 @@ DialogNewComponent=new XObject({
                 //for (var i in this.file) {
                 //    nf[i] = this.file[i];
                 //}
-                _this.success(_this.project, nf);
+                _this.success(_this.project, _this.file);
                 /*
         
                 -- fixme -- needs to be a signal..

diff --git a/Builder4/DialogNewComponent.vala b/Builder4/DialogNewComponent.vala
index ac2a8c9..5c84697 100644 (file)
--- a/Builder4/DialogNewComponent.vala
+++ b/Builder4/DialogNewComponent.vala
@@ -129,6 +129,9 @@ public class Xcls_DialogNewComponent : Object
                         _this.file.project, 
                         dir + "/" + fn + ".bjs");
         
+                _this.file = f;
+                
+                
                 this.updateFileFromEntry();
                 
                 
@@ -143,7 +146,7 @@ public class Xcls_DialogNewComponent : Object
                 //for (var i in this.file) {
                 //    nf[i] = this.file[i];
                 //}
-                _this.success(_this.project, nf);
+                _this.success(_this.project, _this.file);
                 /*
         
                 -- fixme -- needs to be a signal..