Builder4/DialogNewComponent.bjs

Builder4/DialogNewComponent.js
Builder4/DialogNewComponent.vala

diff --git a/Builder4/DialogNewComponent.bjs b/Builder4/DialogNewComponent.bjs
index 6643d2c..9858d96 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\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 Project 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 (this.file.name.length > 0 && 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        // 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.file.save();\n            this.el.hide();\n            return;\n        }\n       */\n    \n\t//var dir ='';\n\t//FIXME...\n        //for (var i in this.project.paths) {\n \t//\tdir = i;\n\t//\tbreak;\n\t//}\n\n \n        \n        // what about .js ?\n        if (GLib.FileUtil.test(dir + \"/\" + _this.file.name + \".bjs\", GLib.FileTest.EXISTS)) {\n            StandardErrorDialog.show(\n                \"That file already exists\"\n            ); \n            return;\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        \n        if (DialogNewComponent.success != null) {\n            DialogNewComponent.success(_this.project, nf);\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 Project 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 (_this.file.name.length > 0 && 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        // 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.file.save();\n            this.el.hide();\n            return;\n        }\n\n    \n\tvar dir = _this.project.firstPath();\n\t//FIXME...\n        //for (var i in this.project.paths) {\n \t//\tdir = i;\n\t//\tbreak;\n\t//}\n\n \n        \n        // what about .js ?\n        if (GLib.FileUtil.test(_this.file.name + \".bjs\", GLib.FileTest.EXISTS)) {\n            StandardErrorDialog.show(\n                \"That file already exists\"\n            ); \n            return;\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        \n        if (DialogNewComponent.success != null) {\n            DialogNewComponent.success(_this.project, nf);\n        }\n}",
                 "show": "(self)  => {\n  this.el.show_all();\n}"
             },
             ".JsRender.JsRender:file": "",

diff --git a/Builder4/DialogNewComponent.js b/Builder4/DialogNewComponent.js
index e1ff827..1249800 100644 (file)
--- a/Builder4/DialogNewComponent.js
+++ b/Builder4/DialogNewComponent.js
@@ -31,30 +31,30 @@ DialogNewComponent=new XObject({
                     return;
                 }
                 // what does this do?
-                /*
+                
                 var isNew = _this.file.name.length  > 0 ? false : true;
                 
-                if (this.file.name.length > 0 && this.file.name != _this.name.el.get_text()) {
+                if (_this.file.name.length > 0 && this.file.name != _this.name.el.get_text()) {
                     StandardErrorDialog.show(
                         "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) {
-                    this.file.save();
+                    _this.file.save();
                     this.el.hide();
                     return;
                 }
-               */
+        
             
-               //var dir ='';
+               var dir = _this.project.firstPath();
                //FIXME...
                 //for (var i in this.project.paths) {
                //      dir = i;
@@ -64,7 +64,7 @@ DialogNewComponent=new XObject({
          
                 
                 // what about .js ?
-                if (GLib.FileUtil.test(dir + "/" + _this.file.name + ".bjs", GLib.FileTest.EXISTS)) {
+                if (GLib.FileUtil.test(_this.file.name + ".bjs", GLib.FileTest.EXISTS)) {
                     StandardErrorDialog.show(
                         "That file already exists"
                     ); 
@@ -75,7 +75,7 @@ DialogNewComponent=new XObject({
                 
                 //var tmpl = this.project.loadFileOnly(DialogNewComponent.get('template').getValue());
                  
-                var nf = _this.project.create(dir + "/" + this.file.name + ".bjs");
+                var nf = _this.project.create(dir + "/" + _this.file.name + ".bjs");
                 //for (var i in this.file) {
                 //    nf[i] = this.file[i];
                 //}

diff --git a/Builder4/DialogNewComponent.vala b/Builder4/DialogNewComponent.vala
index d3f7637..3fbc955 100644 (file)
--- a/Builder4/DialogNewComponent.vala
+++ b/Builder4/DialogNewComponent.vala
@@ -77,30 +77,30 @@ public class Xcls_DialogNewComponent
                     return;
                 }
                 // what does this do?
-                /*
+                
                 var isNew = _this.file.name.length  > 0 ? false : true;
                 
-                if (this.file.name.length > 0 && this.file.name != _this.name.el.get_text()) {
+                if (_this.file.name.length > 0 && this.file.name != _this.name.el.get_text()) {
                     StandardErrorDialog.show(
                         "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) {
-                    this.file.save();
+                    _this.file.save();
                     this.el.hide();
                     return;
                 }
-               */
+        
             
-               //var dir ='';
+               var dir = _this.project.firstPath();
                //FIXME...
                 //for (var i in this.project.paths) {
                //      dir = i;
@@ -110,7 +110,7 @@ public class Xcls_DialogNewComponent
          
                 
                 // what about .js ?
-                if (GLib.FileUtil.test(dir + "/" + _this.file.name + ".bjs", GLib.FileTest.EXISTS)) {
+                if (GLib.FileUtil.test(_this.file.name + ".bjs", GLib.FileTest.EXISTS)) {
                     StandardErrorDialog.show(
                         "That file already exists"
                     ); 
@@ -121,7 +121,7 @@ public class Xcls_DialogNewComponent
                 
                 //var tmpl = this.project.loadFileOnly(DialogNewComponent.get('template').getValue());
                  
-                var nf = _this.project.create(dir + "/" + this.file.name + ".bjs");
+                var nf = _this.project.create(dir + "/" + _this.file.name + ".bjs");
                 //for (var i in this.file) {
                 //    nf[i] = this.file[i];
                 //}