src/Builder4/Editor.bjs

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

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index c21b3c4..8ddf909 100644 (file)
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -24,6 +24,7 @@ public class Editor : Object
     public int pos_root_x;
     public int pos_root_y;
     public string ptype;
+    public string fname;
     public string key;
     public JsRender.JsRender file;
     public bool pos;
@@ -41,6 +42,7 @@ public class Editor : Object
         this.window = null;
         this.activeEditor = "";
         this.ptype = "";
+        this.fname = "";
         this.key = "";
         this.file = null;
         this.pos = false;
@@ -61,7 +63,9 @@ public class Editor : Object
     public   bool saveContents ()  {
         
         
-        
+        if (_this.file == null) {
+            return true;
+        }
         
         
         
@@ -101,24 +105,55 @@ public class Editor : Object
         
         return true;
     
+    }
+    public void showPlainFile (string fname)
+    {
+        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;
+        this.file = file;    
+        this.ptype = "";
+        this.key  = "";
+        this.node = null;
+    
         
-       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);
+            this.key_edit.el.text = key;  
         
         } else {
-            val = node.props.get(key);
+            this.view.load(        file.toSource() );
         }
-        this.view.load(val);
-        this.key_edit.el.text = key;    
+    
+        
+        
     
     }
     public class Xcls_Box2 : Object
@@ -333,8 +368,10 @@ public class Editor : Object
             buf.set_undo_manager(null);
             
             var lm = Gtk.SourceLanguageManager.get_default();
-            
-            var lang = _this.file.language;
+            var lang = "vala";
+            if (_this.file != null) {
+                 lang = _this.file.language;
+            }
             //?? is javascript going to work as js?
             
             ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lm.get_language(lang));
@@ -387,6 +424,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) {
@@ -404,7 +442,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;
             }
@@ -452,19 +490,23 @@ public class Editor : Object
                 print("checkSyntax - empty string?\n");
                 return true;
             }
-            if (_this.file == null) {
+            
+            if (_this.file == null && _this.fname.length > 0) {
             
                 // assume it's gtk...
                    this.check_running = true;
         
                  _this.window.windowstate.valasource.checkPlainFileSpawn(
+                    _this.window.project,
                    _this.fname,
                    str
                 );
-                return;
+                return true;
             
             }
-           
+           if (_this.file == null) {
+               return true;
+           }
             var p = Palete.factory(_this.file.xtype);   
             
         
@@ -528,34 +570,40 @@ public class Editor : Object
                 return true;
             } 
             
-            if (_this.file == null) {
-                return true;
-            }
             
             var err = obj.get_object_member(type);
-            
-            
-            var valafn = "";
-              try {             
-                   var  regex = new Regex("\\.bjs$");
+            var valafn = _this.fname;
+            if (_this.file != null) {
+        
+        
                 
-                 
-                    valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
-                 } catch (GLib.RegexError e) {
-                    return true;
-                }   
+                
+                 valafn = "";
+                  try {             
+                       var  regex = new Regex("\\.bjs$");
+                    
+                     
+                        valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
+                     } catch (GLib.RegexError e) {
+                        return true;
+                    }   
+        
         
-           if (!err.has_member(valafn)) {
-                print("File path has no errors\n");
-                return  true;
-            }
         
-            var lines = err.get_object_member(valafn);
+              }
+               if (!err.has_member(valafn)) {
+                    print("File path has no errors\n");
+                    return  true;
+                }
+        
+                var lines = err.get_object_member(valafn);
+                
+                var offset = 1;
+                if (obj.has_member("line_offset")) {
+                    offset = (int)obj.get_int_member("line_offset") + 1;
+                }
             
-            var offset = 1;
-            if (obj.has_member("line_offset")) {
-                offset = (int)obj.get_int_member("line_offset") + 1;
-            }
+        
              
             
             var tlines = this.el.get_line_count () +1;