src/Builder4/WindowState.vala

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

diff --git a/src/Builder4/WindowState.vala b/src/Builder4/WindowState.vala
index 56aff30..84e3c94 100644 (file)
--- a/src/Builder4/WindowState.vala
+++ b/src/Builder4/WindowState.vala
@@ -15,7 +15,7 @@ public class WindowState : Object
                OBJECT,
                PROP,
                LISTENER,
-               CODE,
+               CODE,    // code editor.
                CODEONLY,
                FILES,
                PROJECT, // project settings..
@@ -95,7 +95,7 @@ public class WindowState : Object
                
                
                this.valasource = new Palete.ValaSource();
-               this.valasource.compiled.connect(this.valaCompiled);
+               this.valasource.compiled.connect(this.showCompileResult);
                
                this.compile_results = new  Xcls_ValaCompileResults();
                this.compile_results.window = this.win;
@@ -120,6 +120,10 @@ public class WindowState : Object
                this.left_tree.el.show_all();
                   
                this.left_tree.before_node_change.connect(() => {
+                       // if the node change is caused by the editor (code preview)
+                       if (this.left_tree.view.lastEventSource == "editor") {
+                               return true;
+                       }
                        return this.leftTreeBeforeChange();
 
                });
@@ -135,12 +139,12 @@ public class WindowState : Object
                        }
                });
                
-               this.left_tree.node_selected.connect((sel) => {
-                       this.leftTreeNodeSelected(sel);
+               this.left_tree.node_selected.connect((sel, source) => {
+                       this.leftTreeNodeSelected(sel, source);
                });
         
                this.left_tree.changed.connect(() => {
-                       
+                       print("LEFT TREE: Changed fired\n");
                        this.file.save();
                        if (this.left_tree.getActiveFile().xtype == "Roo" ) {
                                   this.window_rooview.requestRedraw();
@@ -164,7 +168,7 @@ public class WindowState : Object
                return false;
        }
        
-       public void leftTreeNodeSelected(JsRender.Node? sel)
+       public void leftTreeNodeSelected(JsRender.Node? sel, string source)
        {
 
                print("node_selected called %s\n", (sel == null) ? "NULL" : "a value");
@@ -1131,7 +1135,7 @@ public class WindowState : Object
        }
        
        
-       public void valaCompiled(Json.Object obj)
+       public void showCompileResult(Json.Object obj)
                {
                        // vala has finished compiling...
                        print("vala compiled");
@@ -1163,10 +1167,11 @@ public class WindowState : Object
                        } else {
                                this.win.statusbar_depricated.setNotices( new Json.Object(),0);
                        }
-                       
-                       buf.highlightErrorsJson("ERR", obj);
-                       buf.highlightErrorsJson("WARN", obj);
-                       buf.highlightErrorsJson("DEPR", obj);
+                       if (this.state = State.CODE:) {
+                               buf.highlightErrorsJson("ERR", obj);
+                               buf.highlightErrorsJson("WARN", obj);
+                               buf.highlightErrorsJson("DEPR", obj);
+                       }
                        
                        this.win.statusbar_compilestatus_label.el.hide();
                        this.win.statusbar_run.el.hide();
@@ -1182,6 +1187,16 @@ public class WindowState : Object
                                gbuf.highlightErrorsJson("DEPR", obj);                  
                        
                   }
+                  
+                  if (this.file.xtype == "Gtk") {
+                               // not sure how this is working ok? - as highlighting is happening on the vala files at present..
+                               var gbuf =   this.window_rooview.sourceview;
+                               gbuf.highlightErrorsJson("ERR", obj);
+                               gbuf.highlightErrorsJson("WARN", obj);
+                               gbuf.highlightErrorsJson("DEPR", obj);                  
+                       
+                  }
+                  
                        this.last_compile_result = obj;