src/Builder4/Editor.bjs

[app.Builder.js] / src / Builder4 / Editor.vala

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 56ae416..057db6e 100644 (file)
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -74,31 +74,25 @@ public class Editor : Object
          
          var str = _this.buffer.toString();
          
-          
+         _this.buffer.checkSyntax();
          
          
-         if (!_this.buffer.checkSyntax()) {
-             print("check syntax failed");
-             //this.get('/StandardErrorDialog').show("Fix errors in code and save.."); 
-             //return false;
-         }
          
          // LeftPanel.model.changed(  str , false);
          _this.dirty = false;
          _this.save_button.el.sensitive = false;
          
-         
-            
-         
         // find the text for the node..
-        if (ptype == "listener") {
-            this.node.listeners.set(key,str);
-        
+        if (_this.file.xtype != "PlainFile") {
+            if (ptype == "listener") {
+                this.node.listeners.set(key,str);
+            
+            } else {
+                 this.node.props.set(key,str);
+            }
         } else {
-             this.node.props.set(key,str);
-        }
-    
-         
+            _this.file.setSource(  str );
+         }
         
         // call the signal..
         this.save();
@@ -106,42 +100,36 @@ public class Editor : Object
         return true;
     
     }
-    public void showPlainFile (string fname)
+    public   void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key)
     {
+        this.file = file;    
         this.ptype = "";
         this.key  = "";
         this.node = null;
-        this.file = null;
-        this.fname = fname;
-        string str;
-        try {
-            GLib.FileUtils.get_contents(fname, out str);
-        } catch (Error e) {
-            str = ""; // a tad dangerios... - perhaps we should block editing...
-        }
-        
-        this.view.load(str);
-        this.key_edit.el.text = "";    
     
-    }
-    public   void show (JsRender.JsRender file, JsRender.Node node, string ptype, string key)
-    {
-        this.ptype = ptype;
-        this.key  = key;
-        this.node = node;
-        this.file = file;
         
-       string val = "";
-        // find the text for the node..
-        if (ptype == "listener") {
-            val = node.listeners.get(key);
+        if (file.xtype != "PlainFile") {
+        
+            this.ptype = ptype;
+            this.key  = key;
+            this.node = node;
+             string val = "";
+            // find the text for the node..
+            if (ptype == "listener") {
+                val = node.listeners.get(key);
+            
+            } else {
+                val = node.props.get(key);
+            }
+            this.view.load(val);
+    
         
         } else {
-            val = node.props.get(key);
-        }
-        this.view.load(val);
-        this.key_edit.el.text = key;    
+            this.view.load(        file.toSource() );
     
+        }
+        this.key_edit.el.text = key;  
+          
     }
     public class Xcls_Box2 : Object
     {
@@ -411,6 +399,7 @@ public class Editor : Object
 
         // user defined functions
         public bool highlightErrors ( Gee.HashMap<int,string> validate_res) {
+                 
                 this.error_line = validate_res.size;
         
                 if (this.error_line < 1) {
@@ -428,7 +417,7 @@ public class Editor : Object
                     }
                     this.el.get_iter_at_line( out iter, eline);
                     //print("mark line\n");
-                    this.el.create_source_mark(valiter.get_value(), "error", iter);
+                    this.el.create_source_mark(valiter.get_value(), "ERR", iter);
                 }   
                 return false;
             }
@@ -477,21 +466,20 @@ public class Editor : Object
                 return true;
             }
             
-            if (_this.file == null && _this.fname.length > 0) {
+            if (_this.file.xtype == "PlainFile") {
             
                 // assume it's gtk...
                    this.check_running = true;
         
                  _this.window.windowstate.valasource.checkPlainFileSpawn(
-                    _this.window.project,
-                   _this.fname,
+                  _this.file,
                    str
                 );
                 return true;
             
             }
            if (_this.file == null) {
-               return;
+               return true;
            }
             var p = Palete.factory(_this.file.xtype);   
             
@@ -559,7 +547,7 @@ public class Editor : Object
             
             var err = obj.get_object_member(type);
             var valafn = _this.fname;
-            if (_this.file != null) {
+            if (_this.file.xtype == "PlainFile") {