dbgenerate.js

[app.Builder.js] / Sample / Editor.js

diff --git a/Sample/Editor.js b/Sample/Editor.js
index 3c12391..38006d3 100644 (file)
--- a/Sample/Editor.js
+++ b/Sample/Editor.js
@@ -7,18 +7,20 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
-GtkClutter = imports.gi.GtkClutter;
+////GtkClutter = imports.gi.GtkClutter;
+////Gdl = imports.gi.Gdl;
 console = imports.console;
 XObject = imports.XObject.XObject;
 Editor=new XObject({
     xtype: Gtk.Window,
     listeners : {
-        destroy_event : function (self, event) {
-            this.el.hide();
-            return true;
-        },
         delete_event : function (self, event) {
-              this.el.hide();
+            if (!this.get('/Editor.RightEditor').save()) {
+                // no hiding with errors.
+                return true;
+            }
+            this.el.hide();
+            this.get('/Editor').activePath = false;
             return true;
         },
         configure_event : function (self, object) {
@@ -37,6 +39,15 @@ Editor=new XObject({
     id : "EditorWindow",
     title : "Application Builder - Editor",
     width_request : 500,
+    save : function (self, event) {
+        if (!this.get('/Editor.RightEditor').save()) {
+            // no hiding with errors.
+            return true;
+        }
+        this.get('/Editor').activePath = false;
+        this.el.hide();
+        return true;
+    },
     init : function() {
         XObject.prototype.init.call(this);
        // this.show_all();
@@ -53,7 +64,8 @@ Editor=new XObject({
                         {
                             xtype: Gtk.Button,
                             listeners : {
-                                activate : function (self) {
+                                clicked : function (self) {
+                                
                                   this.get('/Editor.RightEditor').save();
                                 }
                             },
@@ -67,21 +79,35 @@ Editor=new XObject({
                     id : "RightEditor",
                     pack : "add",
                     save : function() {
-                        var str = this.get('/LeftPanel.buffer').toString();
+                        // make sure we have an active path..
+                         if (!this.get('/Editor').activePath) {
+                            return true;
+                         }
+                         
+                         var str = this.get('/Editor.buffer').toString();
+                         if (!this.get('/Editor.buffer').checkSyntax()) {
+                             this.get('/StandardErrorDialog').show("Fix errors in code and save.."); 
+                             return false;
+                         }
+                         
                          this.get('/LeftPanel.model').changed(  str , false);
                          this.get('/Editor').dirty = false;
                          this.get('/Editor.save_button').el.sensitive = false;
+                         return true;
                     },
                     items : [
                         {
                             xtype: GtkSource.View,
                             listeners : {
                                 key_release_event : function (self, event) {
-                                    if (event.key.keyval != 115 || !(Gdk.ModifierType.CONTROL_MASK & 4) ) {
-                                        return;
+                                    
+                                    if (event.key.keyval == 115 && (event.key.state & Gdk.ModifierType.CONTROL_MASK ) ) {
+                                        print("SAVE: ctrl-S  pressed");
+                                        this.save();
+                                        return false;
                                     }
-                                    print(event.key.keyval)
-                                    this.save();
+                                   // print(event.key.keyval)
+                                    
                                     return false;
                                 }
                             },
@@ -129,7 +155,7 @@ Editor=new XObject({
                             },
                             save : function() {
                                 
-                                this.get('/Editor.RightEditor').save();
+                                return this.get('/Editor.RightEditor').save();
                             },
                             show_line_numbers : true,
                             items : [
@@ -157,11 +183,7 @@ Editor=new XObject({
                                           //  print('var res = ' + str);
                                             Seed.check_syntax('var res = ' + str);
                                             
-                                            this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({
-                                                red: 0xFFFF, green: 0xFFFF , blue : 0xFFFF
-                                               }));
-                                            
-                                            return true;
+                                           
                                         } catch (e) {
                                             
                                             this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({
@@ -173,6 +195,11 @@ Editor=new XObject({
                                             //console.dump(e);
                                             return false;
                                         }
+                                         this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({
+                                            red: 0xFFFF, green: 0xFFFF , blue : 0xFFFF
+                                           }));
+                                        
+                                        return true;
                                     },
                                     toString : function() {