sync
[app.Builder.js] / Sample / Window.js
index b6f1644..022dd00 100644 (file)
@@ -47,6 +47,7 @@ Window=new XObject({
         imports.Builder.Provider.ProjectManager.ProjectManager.loadConfig();
                this.get('/MidPropTree').hideWin();
             this.get('/RightPalete').hide();
+            this.get('/BottomPane').el.hide();
         
         }
     },
@@ -116,9 +117,14 @@ Window=new XObject({
                                                        var fn =  this.get('/LeftProjectTree').get('combo').getValue();
                                                        if (!fn.length) {
                                                                this.get('/StandardErrorDialog').show("Select a project")
+                                                               return;
                                                         }
+                                                       var pm = imports.Builder.Provider.ProjectManager.ProjectManager;
+                                                       var pr  = pm.getByFn(fn);
+                                                
                                                        // confirm..
-                                                       this.get('/DialogConfirm').show("Do you want to delete ????", function() {
+                                                       this.get('/DialogConfirm').show("Are you sure you want to delete project '" + pr.name + "'", function() {
+                                                               pm.deleteProject(fn);
                                                                print("DELETE?");
                                                        });
                                                 
@@ -237,14 +243,51 @@ Window=new XObject({
                                                                 return pm.getPalete(model.file.getType());
                                                             },
                                                             renderView : function() {
-                                                                        var model = this.get('model');
-                                                               print("RENDER VIEW?" + model.file.getType());
-                                                               switch( model.file.getType()) {
+                                                                var render = this.getRenderer();
+                                                                var model = this.get('model');
+                                                                if (render) {
+                                                                    render.renderJS(model.toJS(false,true)[0]);
+                                                                } else {
+                                                                    print("NO RENDER JS METHOD?");
+                                                                }
+                                                            },
+                                                            getRenderer : function() {
+                                                            
+                                                               switch( this.getActiveFile().getType()) {
                                                                        case 'Roo':
-                                                                           this.get('/RightBrowser.view').renderJS(model.toJS(false,true)[0]);
+                                                                           return this.get('/RightBrowser.view');
                                                                        case 'Gtk':
-                                                                           this.get('/RightGtkView').renderJS(model.toJS(false,true)[0]);
+                                                                           return this.get('/RightGtkView');
                                                                }
+                                                            
+                                                            },
+                                                            getActivePath : function() {
+                                                                var model = this.get('model');
+                                                                var view = this.get('view');
+                                                                if (view.selection.count_selected_rows() < 1) {
+                                                                    return false;
+                                                                }
+                                                                var iter = new Gtk.TreeIter();
+                                                            
+                                                                view.selection.get_selected(model.el, iter);
+                                                                return model.el.get_path(iter).to_string();
+                                                            },
+                                                            getActiveFile : function() {
+                                                                return this.get('model').file;
+                                                            },
+                                                            getActiveElement : function() {
+                                                            
+                                                                 var path = this.getActivePath();
+                                                                 if (!path) {
+                                                                    return false;
+                                                                 }
+                                                                 var iter = new Gtk.TreeIter();
+                                                                 this.get('model').el.get_iter_from_string(iter, path);
+                                                                 
+                                                                 var value = new GObject.Value('');
+                                                                 this.get('model').el.get_value(iter, 2, value);
+                                                                    
+                                                                 return JSON.parse(value.value);
                                                             },
                                                             items : [
                                                                 {
@@ -253,7 +296,7 @@ Window=new XObject({
                                                                     id : "view",
                                                                     headers_visible : false,
                                                                     enable_tree_lines : true,
-                                                                    tooltip_column : 0,
+                                                                    tooltip_column : 1,
                                                                     init : function() {
                                                                                XObject.prototype.init.call(this);
                                                                        var description = new Pango.FontDescription.c_new();
@@ -263,6 +306,8 @@ Window=new XObject({
                                                                        this.selection = this.el.get_selection();
                                                                        this.selection.set_mode( Gtk.SelectionMode.SINGLE);
                                                                        var _this = this;
+                                                                    
+                                                                       // is this really needed??
                                                                        this.selection.signal['changed'].connect(function() {
                                                                                _this.get('/LeftTree.view').listeners.cursor_changed.apply(
                                                                                    _this.get('/LeftTree.view'), [ _this.get('/LeftTree.view'), '']
@@ -293,8 +338,10 @@ Window=new XObject({
                                                                        Gtk.drag_dest_add_text_targets(this.el);
                                                                     },
                                                                     highlight : function(treepath_ar) {
-                                                                                        if (treepath_ar.length && treepath_ar[0].length ) {
-                                                                                    this.el.set_drag_dest_row( 
+                                                                    
+                                                                            // highlighting for drag/drop
+                                                                            if (treepath_ar.length && treepath_ar[0].length ) {
+                                                                                this.el.set_drag_dest_row( 
                                                                                         new  Gtk.TreePath.from_string( treepath_ar[0] ),  treepath_ar[1]);
                                                                                 } else {
                                                                                     this.el.set_drag_dest_row(null, Gtk.TreeViewDropPosition.INTO_OR_AFTER);
@@ -310,22 +357,22 @@ Window=new XObject({
                                                                     listeners : {
                                                                         "button_press_event":function (self, ev) {
                                                                                console.log("button press?");
-                                                                                        if (ev.type != Gdk.EventType.BUTTON_PRESS  || ev.button.button != 3) {
-                                                                                            print("click" + ev.type);
-                                                                                            return false;
-                                                                                        }
-                                                                                      
-                                                                                    
-                                                                                        var res = {}; 
-                                                                                        this.get('/LeftTree.view').el.get_path_at_pos(ev.button.x,ev.button.y, res);
-                                                                                        
-                                                                                        if (!this.get('/LeftTreeMenu').el)  this.get('/LeftTreeMenu').init();
-                                                                                        
-                                                                                        this.get('/LeftTreeMenu').el.set_screen(Gdk.Screen.get_default());
-                                                                                        this.get('/LeftTreeMenu').el.show_all();
-                                                                                        this.get('/LeftTreeMenu').el.popup(null, null, null, null, 3, ev.button.time);
-                                                                                        print("click:" + res.path.to_string());
-                                                                                        return false;
+                                                                                if (ev.type != Gdk.EventType.BUTTON_PRESS  || ev.button.button != 3) {
+                                                                                    print("click" + ev.type);
+                                                                                    return false;
+                                                                                }
+                                                                              
+                                                                            
+                                                                                var res = {}; 
+                                                                                this.get('/LeftTree.view').el.get_path_at_pos(ev.button.x,ev.button.y, res);
+                                                                                
+                                                                                if (!this.get('/LeftTreeMenu').el)  this.get('/LeftTreeMenu').init();
+                                                                                
+                                                                                this.get('/LeftTreeMenu').el.set_screen(Gdk.Screen.get_default());
+                                                                                this.get('/LeftTreeMenu').el.show_all();
+                                                                                this.get('/LeftTreeMenu').el.popup(null, null, null, null, 3, ev.button.time);
+                                                                                print("click:" + res.path.to_string());
+                                                                                return false;
                                                                         },
                                                                         "drag_begin":function (self, drag_context) {
                                                                                print('SOURCE: drag-begin');
@@ -506,54 +553,60 @@ Window=new XObject({
                                                                                         return true;
                                                                         },
                                                                         "cursor_changed":function (self) {
-                                                                         if (this.blockChanges) {
-                                                                           return true;
-                                                                         }
-                                                                         var iter = new Gtk.TreeIter();
-                                                                                        
-                                                                                        if (this.selection.count_selected_rows() < 1) {
-                                                                                            this.get('/LeftPanel.model').load( false);
-                                                                                            this.get('/MidPropTree').activeElement =  false;
-                                                                                            this.get('/MidPropTree').hideWin();
-                                                                        
-                                                                                            var pm = this.get('/RightPalete.model');
-                                                                                            if (!this.get('/LeftTree').getPaleteProvider()) {
-                                                                                                // it may not be loaded yet..
-                                                                                                return  true;
-                                                                                            }
-                                                                                            pm.load( this.get('/LeftTree').getPaleteProvider().gatherList(
-                                                                                                this.get('/LeftTree.model').listAllTypes()));
-                                                                                           
-                                                                                            return true;
-                                                                                        }
-                                                                                        
-                                                                                        //console.log('changed');
-                                                                                        var s = this.selection;
-                                                                                        s.get_selected(this.get('/LeftTree.model').el, iter);
-                                                                                        
-                                                                                        
-                                                                                        // var val = "";
-                                                                                        value = new GObject.Value('');
-                                                                                        this.get('/LeftTree.model').el.get_value(iter, 2, value);
-                                                                                        this.get('/LeftTree.model').activePath = this.get('/LeftTree.model').el.get_path(iter).to_string();
-                                                                                        
-                                                                                        var data = JSON.parse(value.value);
-                                                                                        this.get('/MidPropTree').activeElement =  data;
-                                                                                        this.get('/MidPropTree').hideWin();
-                                                                                        this.get('/LeftPanel.model').load( data);
-                                                                                        
-                                                                                        console.log(value.value);
-                                                                                       // _g.button.set_label(''+value.get_string());
+                                                                             if (this.blockChanges) { // probably not needed.. 
+                                                                               return true;
+                                                                             }
+                                                                             var render = this.get('/LeftTree').getRenderer();                
+                                                                           
+                                                                            
+                                                                            if (this.selection.count_selected_rows() < 1) {
+                                                                                this.get('/LeftPanel.model').load( false);
+                                                                                this.get('/MidPropTree').activeElement =  false;
+                                                                                this.get('/MidPropTree').hideWin();
+                                                                        
+                                                                                var pm = this.get('/RightPalete.model');
+                                                                                if (!this.get('/LeftTree').getPaleteProvider()) {
+                                                                                    // it may not be loaded yet..
+                                                                                    return  true;
+                                                                                }
+                                                                                pm.load( this.get('/LeftTree').getPaleteProvider().gatherList(
+                                                                                    this.get('/LeftTree.model').listAllTypes()));
+                                                                                if (render && render.redraw) {
+                                                                                    render.redraw();
+                                                                                }
+                                                                                return true;
+                                                                            }
+                                                                                    
+                                                                                    //console.log('changed');
+                                                                                var s = this.selection;
+                                                                                  var iter = new Gtk.TreeIter();
+                                                                                s.get_selected(this.get('/LeftTree.model').el, iter);
+                                                                                
+                                                                                
+                                                                                // var val = "";
+                                                                                var value = new GObject.Value('');
+                                                                                this.get('/LeftTree.model').el.get_value(iter, 2, value);
+                                                                                this.get('/LeftTree.model').activePath = this.get('/LeftTree.model').el.get_path(iter).to_string();
+                                                                                
+                                                                                var data = JSON.parse(value.value);
+                                                                                this.get('/MidPropTree').activeElement =  data;
+                                                                                this.get('/MidPropTree').hideWin();
+                                                                                this.get('/LeftPanel.model').load( data);
+                                                                                
+                                                                                console.log(value.value);
+                                                                               // _g.button.set_label(''+value.get_string());
                                                                         
-                                                                                        var pm =this.get('/RightPalete.model');
-                                                                                        pm.load( this.get('/RightPalete').provider.gatherList(
-                                                                                             this.get('/LeftTree.model').listAllTypes()));
-                                                                                       
-                                                                                        
-                                                                                       
-                                                                                       
-                                                                                        //Seed.print( value.get_string());
-                                                                                        return true;
+                                                                                var pm =this.get('/RightPalete.model');
+                                                                                pm.load( this.get('/RightPalete').provider.gatherList(
+                                                                                     this.get('/LeftTree.model').listAllTypes()));
+                                                                               
+                                                                                
+                                                                                   if (render && render.redraw) {
+                                                                                    render.redraw();
+                                                                                }
+                                                                                   
+                                                                                    //Seed.print( value.get_string());
+                                                                                    return true;
                                                                                         
                                                                         }
                                                                     },
@@ -574,35 +627,35 @@ Window=new XObject({
                                                                             changed : function(n, refresh) {
                                                                                      print("MODEL CHANGED CALLED" + this.activePath);
                                                                                      if (this.activePath) {
-                                                                                            var iter = new Gtk.TreeIter();
-                                                                                            this.el.get_iter(iter, new Gtk.TreePath.from_string(this.activePath))
-                                                                                            this.el.set_value(iter, 0, [GObject.TYPE_STRING, this.nodeTitle(n)]);
-                                                                                            this.el.set_value(iter, 1, [GObject.TYPE_STRING, this.nodeTitle(n)]);
-                                                                                            
-                                                                                            this.el.set_value(iter, 2, [GObject.TYPE_STRING, this.nodeToJSON(n)]);
-                                                                                        }
-                                                                                            //this.currentTree = this.toJS(false, true)[0];
-                                                                                        this.file.items = this.toJS(false, false);
-                                                                                        print("AFTER CHANGED");
-                                                                                        //console.dump(this.file.items);
-                                                                                        this.file.save();
-                                                                                        this.currentTree = this.file.items[0];
-                                                                                        //console.log(this.file.toSource());
-                                                                                        
-                                                                                        if (refresh) {
-                                                                                            print("REDNER BROWSER?!");
-                                                                                            this.get('/LeftTree').renderView();
+                                                                                        var iter = new Gtk.TreeIter();
+                                                                                        this.el.get_iter(iter, new Gtk.TreePath.from_string(this.activePath))
+                                                                                        this.el.set_value(iter, 0, [GObject.TYPE_STRING, this.nodeTitle(n)]);
+                                                                                        this.el.set_value(iter, 1, [GObject.TYPE_STRING, this.nodeTitle(n)]);
+                                                                                        
+                                                                                        this.el.set_value(iter, 2, [GObject.TYPE_STRING, this.nodeToJSON(n)]);
+                                                                                    }
+                                                                                        //this.currentTree = this.toJS(false, true)[0];
+                                                                                    this.file.items = this.toJS(false, false);
+                                                                                    print("AFTER CHANGED");
+                                                                                    //console.dump(this.file.items);
+                                                                                    this.file.save();
+                                                                                    this.currentTree = this.file.items[0];
+                                                                                    //console.log(this.file.toSource());
+                                                                                    
+                                                                                    if (refresh) {
+                                                                                        print("REDNER BROWSER?!");
+                                                                                        this.get('/LeftTree').renderView();
                                                                             
-                                                                                            var pm = this.get('/RightPalete.model');
-                                                                                            if (!this.get('/RightPalete').provider) {
-                                                                                                pm.load([]);
-                                                                                                return;
-                                                                                            }
-                                                                                            
-                                                                                            
-                                                                                            pm.load( this.get('/RightPalete').provider.gatherList(this.listAllTypes()));
-                                                                                            //imports['Builder/RightBrowser.js'].renderJS(this.toJS());
+                                                                                        var pm = this.get('/RightPalete.model');
+                                                                                        if (!this.get('/RightPalete').provider) {
+                                                                                            pm.load([]);
+                                                                                            return;
                                                                                         }
+                                                                                        
+                                                                                        
+                                                                                        pm.load( this.get('/RightPalete').provider.gatherList(this.listAllTypes()));
+                                                                                        //imports['Builder/RightBrowser.js'].renderJS(this.toJS());
+                                                                                    }
                                                                                          
                                                                             },
                                                                             loadFile : function(f) {
@@ -1082,13 +1135,42 @@ Window=new XObject({
                                                                                             }
                                                                                             
                                                                                             this.el.set_value(citer, 0, [GObject.TYPE_STRING, this.nodeTitle(tr[i]) ]);
-                                                                                            this.el.set_value(citer, 1, [GObject.TYPE_STRING, this.nodeTitle(tr[i]) ]);
+                                                                                            this.el.set_value(citer, 1, [GObject.TYPE_STRING, this.nodeTip(tr[i]) ]);
                                                                                             this.el.set_value(citer, 2, [GObject.TYPE_STRING, this.nodeToJSON(tr[i])]);
                                                                                             if (tr[i].items && tr[i].items.length) {
                                                                                                 this.load(tr[i].items, citer);
                                                                                             }
                                                                                         }     
+                                                                                    },
+                                                                            nodeTip : function(c) {
+                                                                                var ret = this.nodeTitle(c);
+                                                                                var funcs = '';
+                                                                            
+                                                                                
+                                                                                for( var i in c) {
+                                                                            
+                                                                                    if (!i.length || i[0] != '|') {
+                                                                                        continue;
+                                                                                    }
+                                                                                    if (i == '|init') { 
+                                                                                        continue;
+                                                                                    }
+                                                                                    if (typeof(c[i]) != 'string') {
+                                                                                       continue;
+                                                                                    }
+                                                                                    //print("prop : " + i + ':' + c[i]);
+                                                                                    if (!c[i].match(new RegExp('function'))) {
+                                                                                        continue;
                                                                                     }
+                                                                                    funcs += "\n<b>" + i.substring(1) + '</b> : ' + c[i].split(/\n/).shift();
+                                                                                        
+                                                                                }
+                                                                                if (funcs.length) {
+                                                                                    ret+="\n\nMethods:" + funcs;
+                                                                                }
+                                                                                return ret;
+                                                                                
+                                                                            }
                                                                         },
                                                                         {
                                                                             xtype: Gtk.TreeViewColumn,
@@ -1159,6 +1241,9 @@ Window=new XObject({
                                                                                     return false;
                                                                                 }
                                                                                 var data = imports.Builder.Provider.ProjectManager.ProjectManager.projects;
+                                                                                if (typeof(data[ix]) == 'undefined') {
+                                                                               return false; 
+                                                                                }
                                                                                 return data[ix].fn;
                                                                             },
                                                                             setValue : function(fn)
@@ -1197,7 +1282,13 @@ Window=new XObject({
                                                                                             
                                                                                             
                                                                                         ] );
-                                                                                            
+                                                                                       var pm = imports.Builder.Provider.ProjectManager.ProjectManager;
+                                                                                       var _this = this;
+                                                                                       pm.on('changed', function() {
+                                                                                           print("caught changed hook on project manager - reloading data");
+                                                                                       _this.loadData(pm.projects);
+                                                                                    
+                                                                                       });
                                                                                     },
                                                                                     loadData : function(data) {
                                                                                          var ov = this.get('/LeftProjectTree.combo').getValue();
@@ -1298,16 +1389,18 @@ Window=new XObject({
                                                                                        
                                                                                     },
                                                                                     loadProject : function(pr) {
+                                                                                    print("LOAD PROJECT");
                                                                                                this.el.clear();
                                                                                                 if (!pr) {
                                                                                                     return;
                                                                                                 }
+                                                                                                
                                                                                                 this.get('/LeftProjectTree').project = pr;
                                                                                                 this.load(pr.toTree());
                                                                                                 this.get('/LeftProjectTree.view').el.expand_all();
                                                                                     },
                                                                                     load : function(tr,iter) {
-                                                                                        console.dump(tr);
+                                                                                      //  console.dump(tr);
                                                                                                 console.log('Project tree load: ' + tr.length);
                                                                                                 var citer = new Gtk.TreeIter();
                                                                                                 //this.insert(citer,iter,0);
@@ -1963,6 +2056,8 @@ Window=new XObject({
                                                                             case 'number':
                                                                             case 'uint':
                                                                             case 'int':
+                                                                            case 'float':
+                                                                            case 'gfloat':
                                                                                 return parseFloat(val); // Nan ?? invalid!!?
                                                                             case 'boolean':
                                                                                 return val == 'true' ? true : false;
@@ -1973,57 +2068,58 @@ Window=new XObject({
                                                                     },
                                                                     editSelected : function(e) {
                                                                         print("EDIT SELECTED?");
-                                                                                var iter = new Gtk.TreeIter();
-                                                                                var s = this.get('/LeftPanel.view').selection;
-                                                                                s.get_selected(this.get('/LeftPanel.model').el, iter);
-                                                                                var m = this.get('/LeftPanel.model')
-                                                                               
-                                                                                var gval = new GObject.Value('');
-                                                                                this.el.get_value(iter, 0 ,gval);
-                                                                                var val = '' + gval.value;
-                                                                                
-                                                                                gval = new GObject.Value('');
-                                                                                this.el.get_value(iter, 1 ,gval);
-                                                                                var rval = gval.value;
-                                                                                var activePath = this.el.get_path(iter).to_string(); 
-                                                                                this.activePath = activePath ;
-                                                                                // was activeIter...
-                                                                                //  not listener...
-                                                                                
-                                                                                var showEditor = false;
-                                                                                
-                                                                                if (val[0] == '!') {
-                                                                                    showEditor = true;
-                                                                                }
-                                                                                if (val[0] == '|') {
-                                                                                    if (rval.match(/function/g) || rval.match(/\n/g)) {
-                                                                                        showEditor = true;
-                                                                                    }
-                                                                                }
-                                                                                
-                                                                                if (showEditor) {
-                                                                                    var _this = this;
-                                                                                    this.activePath = false;
-                                                                                    GLib.timeout_add(0, 1, function() {
-                                                                                        //   Gdk.threads_enter();
-                                                                                        _this.get('/RightEditor').el.show();
-                                                                                  _this.get('/RightEditor.view').load( rval );
-                                                                                        
-                                                                                        e.editing_done();
-                                                                                        e.remove_widget();
-                                                                                        _this.activePath = activePath ;
-                                                                                        
-                                                                                 //       Gdk.threads_leave();
-                                                                                        return false;
-                                                                                    });
-                                                                                    return;
-                                                                                }
-                                                                                 
-                                                                                this.get('/RightEditor').el.hide();
+                                                                        var iter = new Gtk.TreeIter();
+                                                                        var s = this.get('/LeftPanel.view').selection;
+                                                                        s.get_selected(this.get('/LeftPanel.model').el, iter);
+                                                                        var m = this.get('/LeftPanel.model')
+                                                                       
+                                                                        var gval = new GObject.Value('');
+                                                                        this.el.get_value(iter, 0 ,gval);
+                                                                        var val = '' + gval.value;
+                                                                        
+                                                                        gval = new GObject.Value('');
+                                                                        this.el.get_value(iter, 1 ,gval);
+                                                                        var rval = gval.value;
+                                                                        var activePath = this.el.get_path(iter).to_string(); 
+                                                                        this.activePath = activePath ;
+                                                                        // was activeIter...
+                                                                        //  not listener...
                                                                     
-                                                                                //var type = this.getValue(this.el.get_path(iter).to_string(),4);
+                                                                        var showEditor = false;
+                                                                        
+                                                                        if (val[0] == '!') {
+                                                                            showEditor = true;
+                                                                        }
+                                                                        if (val[0] == '|') {
+                                                                            if (rval.match(/function/g) || rval.match(/\n/g)) {
+                                                                                showEditor = true;
+                                                                            }
+                                                                        }
+                                                                        
+                                                                        if (showEditor) {
+                                                                            var _this = this;
+                                                                            this.activePath = false;
+                                                                            GLib.timeout_add(0, 1, function() {
+                                                                                //   Gdk.threads_enter();
+                                                                                _this.get('/BottomPane').el.show();
+                                                                                _this.get('/RightEditor').el.show();
+                                                                       _this.get('/RightEditor.view').load( rval );
                                                                                 
+                                                                                e.editing_done();
+                                                                                e.remove_widget();
+                                                                                _this.activePath = activePath ;
                                                                                 
+                                                                         //       Gdk.threads_leave();
+                                                                                return false;
+                                                                            });
+                                                                            return;
+                                                                        }
+                                                                          this.get('/BottomPane').el.hide();
+                                                                        this.get('/RightEditor').el.hide();
+                                                                    
+                                                                            //var type = this.getValue(this.el.get_path(iter).to_string(),4);
+                                                                            
+                                                                            
                                                                     }
                                                                 },
                                                                 {
@@ -2395,6 +2491,9 @@ Window=new XObject({
                                                                     xtype: Gtk.VBox,
                                                                     pack : "add",
                                                                     id : "RightBrowser",
+                                                                    listeners : {
+                                                                        
+                                                                    },
                                                                     items : [
                                                                         {
                                                                             xtype: Gtk.HBox,
@@ -2403,13 +2502,83 @@ Window=new XObject({
                                                                                 {
                                                                                     xtype: Gtk.Button,
                                                                                     pack : "pack_start,false,false,0",
-                                                                                    label : "Dump HTML to console",
+                                                                                    label : "Redraw",
                                                                                     listeners : {
-                                                                                        "activate":function (self) {
-                                                                                               this.get('/RightBrowser.view').el.execute_script(
-                                                                                                    "console.log(document.body.innerHTML);");
-                                                                                                this.get('/RightBrowser.view').el.execute_script(
-                                                                                                   "console.log(Builder.dump(Builder));");   
+                                                                                        "button_press_event":function (self, event) {
+                                                                                              var js = this.get('/LeftTree.model').toJS();
+                                                                                            if (js && js[0]) {
+                                                                                                this.get('/RightBrowser.view').renderJS(js[0]);
+                                                                                            } 
+                                                                                            return false;
+                                                                                        }
+                                                                                    }
+                                                                                },
+                                                                                {
+                                                                                    xtype: Gtk.Button,
+                                                                                    pack : "pack_start,false,false,0",
+                                                                                    label : "Set extra HTML in render",
+                                                                                    listeners : {
+                                                                                        "button_press_event":function (self, event) {
+                                                                                            this.get('/RooProjectProperties').show();
+                                                                                            return false;
+                                                                                        }
+                                                                                    }
+                                                                                },
+                                                                                {
+                                                                                    xtype: Gtk.Button,
+                                                                                    pack : "pack_start,false,false,0",
+                                                                                    label : "test in Firefox",
+                                                                                    listeners : {
+                                                                                        "button_press_event":function (self, event) 
+                                                                                        {
+                                                                                                /* Firefox testing for debugging..
+                                                                                                  - we can create a /tmp directory, and put.
+                                                                                                    builder.html, builder.html.js, link roojs1 
+                                                                                                    add at the end of builder.html Roo.onload(function() {
+                                                                                                 */
+                                                                                                if (!this.get('/Window.LeftTree').getActiveFile()) {
+                                                                                                    return;
+                                                                                                }
+                                                                                                
+                                                                                                var js = this.get('/LeftTree.model').toJS();
+                                                                                                 if (!js ||  !js[0]) {
+                                                                                                    return;
+                                                                                                }
+                                                                                                var project = this.get('/Window.LeftTree').getActiveFile().project;
+                                                                                                //print (project.fn);
+                                                                                                
+                                                                                                project.runhtml  = project.runhtml || '';
+                                                                                        
+                                                                                        
+                                                                                               var File = imports.File.File;
+                                                                                               
+                                                                                               var target = "/tmp/firetest"; // fixme..
+                                                                                               if (!File.isDirectory(target)) {
+                                                                                                   File.mkdir(target);
+                                                                                                }
+                                                                                               File.copy(__script_path__ + '/../builder.html.js', target+ '/builder.html.js', Gio.FileCopyFlags.OVERWRITE);
+                                                                                               if (!File.exists( target+ '/roojs1')) {
+                                                                                                    File.link( target+ '/roojs1', __script_path__ + '/../roojs1');
+                                                                                               }
+                                                                                                
+                                                                                                
+                                                                                                
+                                                                                                var html = imports.File.File.read(__script_path__ + '/../builder.html');
+                                                                                                html = html.replace('</head>', project.runhtml + '</head>');
+                                                                                                
+                                                                                               
+                                                                                                var     jsstr = JSON.stringify(js[0]);
+                                                                                               
+                                                                                                var runbuilder = '<script type="text/javascript">' + "\n" + 
+                                                                                                    "Roo.onReady(function() { Builder.render(" + jsstr + "); });\n" +
+                                                                                                    '</script>';
+                                                                                                
+                                                                                                html = html.replace('</body>', runbuilder + '</body>');
+                                                                                        
+                                                                                               File.write( target+ '/builder.html', html);
+                                                                                               
+                                                                                               
+                                                                                             return false;
                                                                                         }
                                                                                     }
                                                                                 }
@@ -2432,7 +2601,7 @@ Window=new XObject({
                                                                                         XObject.prototype.init.call(this);
                                                                                         // this may not work!?
                                                                                         this.el.open('file:///' + __script_path__ + '/../builder.html');
-                                                                                                                
+                                                                                                              
                                                                                         Gtk.drag_dest_set
                                                                                         (
                                                                                                 this.el,              /* widget that will accept a drop */
@@ -2446,24 +2615,70 @@ Window=new XObject({
                                                                                         Gtk.drag_dest_set_target_list(this.el, this.get('/Window').targetList);
                                                                                     },
                                                                                     renderJS : function(data) {
+                                                                                        print("HTML RENDERING");
+                                                                                        /// prevent looping..
+                                                                                        //if (this.pendingRedraw) {
+                                                                                        //   print("pending redraw active?!");
+                                                                                         //   return;
+                                                                                        //}
+                                                                                        
+                                                                                        
+                                                                                        if (!this.get('/Window.LeftTree').getActiveFile()) {
+                                                                                            return;
+                                                                                        }
+                                                                                        
+                                                                                        var project = this.get('/Window.LeftTree').getActiveFile().project;
+                                                                                        //print (project.fn);
+                                                                                        
+                                                                                        project.runhtml  = project.runhtml || '';
+                                                                                        
+                                                                                    
+                                                                                        this.runhtml  = this.runhtml || '';
+                                                                                        
+                                                                                        if (project.runhtml != this.runhtml) {
+                                                                                            // then we need to reload the browser using
+                                                                                            // load_html_string..
+                                                                                            
+                                                                                            // then trigger a redraw once it's loaded..
+                                                                                            this.pendingRedraw = true;
+                                                                                     
+                                                                                            this.runhtml = project.runhtml;
+                                                                                            
+                                                                                            var html = imports.File.File.read(__script_path__ + '/../builder.html');
+                                                                                            html = html.replace('</head>', this.runhtml + '</head>');
+                                                                                            print("LOAD HTML " + html);
+                                                                                            this.el.load_html_string( html , 'file:///' + __script_path__ + '/../builder.html');
+                                                                                            // should trigger load_finished!
+                                                                                            return;
+                                                                                        
+                                                                                        }
+                                                                                        
+                                                                                        this.pendingRedraw = false;    
+                                                                                         
+                                                                                        
                                                                                         this.renderedData = data;
                                                                                         var str = JSON.stringify(data) ;
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
-                                                                                        Seed.print("RENDER:" + str);
-                                                                                        imports.File.File.write('/tmp/builder.debug.js', "Builder.render(" + JSON.stringify(data) + ");");
+                                                                                        //Seed.print("RENDER:" + str);
+                                                                                        //imports.File.File.write('/tmp/builder.debug.js', "Builder.render(" + JSON.stringify(data) + ");");
+                                                                                     
                                                                                         this.el.execute_script("Builder.render(" + JSON.stringify(data) + ");");
                                                                                     },
                                                                                     listeners : {
                                                                                         "load_finished":function (self, object) {
-                                                                                                if (this.ready) { // dont do it twice!
-                                                                                                   return; 
-                                                                                               }
+                                                                                               // if (this.ready) { // dont do it twice!
+                                                                                                //   return; 
+                                                                                               //}
                                                                                                this.ready = true;
+                                                                                                this.pendingRedraw = false;
+                                                                                                var js = this.get('/LeftTree.model').toJS();
+                                                                                                if (js && js[0]) {
+                                                                                                       this.renderJS(js[0]);
+                                                                                               }
                                                                                         
-                                                                                               this.renderJS(this.get('/LeftTree.model').toJS()[0]);
                                                                                         },
                                                                                         "script_alert":function (self, object, p0) {
                                                                                                print(p0);
@@ -2471,11 +2686,13 @@ Window=new XObject({
                                                                                                 return true; // do not display anything...
                                                                                         },
                                                                                         "console_message":function (self, object, p0, p1) {
-                                                                                             console.log(object);
+                                                                                           //  console.log(object);
                                                                                                 if (!object.match(/^\{/)) {
-                                                                                                    return false; // do not handle!!! -> later maybe in console..
+                                                                                                
+                                                                                                    this.get('/Terminal').feed(object);
+                                                                                                    return true; // do not handle!!! -> later maybe in console..
                                                                                                 }
-                                                                                                console.log(object);
+                                                                                               // console.log(object);
                                                                                                 var val =  JSON.parse(object);
                                                                                         
                                                                                                 if (typeof(val['hover-node']) != 'undefined') {
@@ -2616,6 +2833,7 @@ Window=new XObject({
                                                                     id : "RightGtkView",
                                                                     renderJS : function(data, withDebug)
                                                                     {
+                                                                          this.highlightWidget = false;
                                                                          if (!data) {
                                                                                      return; 
                                                                         }
@@ -2740,14 +2958,17 @@ Window=new XObject({
                                                                                } catch(e) {    continue; }
                                                                                     
                                                                                k = k.substring(1);
-                                                                                  print(k + '=' + kv);
+                                                                                 // print(k + '=' + kv);
                                                                        }
                                                                             if (k[0] == '|') { // should be boolean or number..
                                                                                k = k.substring(1);
+                                                                               //print(k + '=' + kv);
                                                                             }
+                                                                             
                                                                        if (k == 'show_tabs') { // force tab showing for notebooks.
                                                                                kv = true;
                                                                             }
+                                                                            print(k + '=' + typeof(kv) + " : " + kv);
                                                                             ctr_args[k] = kv;
                                                                             
                                                                         } 
@@ -2829,8 +3050,73 @@ Window=new XObject({
                                                                         return el;
                                                                         
                                                                     },
-                                                                    widgetExposeEvent : function() {
-                                                                       ///   print("WIDGET EXPOSE"); // draw highlight??
+                                                                    widgetExposeEvent : function(w, evt, ud, item) {
+                                                                        var widget = w;
+                                                                         if (this.inRender) {
+                                                                             return false;
+                                                                         }
+                                                                         
+                                                                         if ( this.highlightWidget) {
+                                                                              this.inRender = true;
+                                                                              if (item.xtreepath.substring(0, this.activePath.length) == this.activePath) {
+                                                                                     Gdk.draw_rectangle(this.highlightWidget.window, this.gc, false, this.box.x , this.box.y, this.box.w, this.box.h);
+                                                                                }
+                                                                               this.inRender = false;
+                                                                               return false;
+                                                                         }
+                                                                         
+                                                                         
+                                                                         if (this.activePath != item.xtreepath) {
+                                                                            return false;
+                                                                         }
+                                                                         
+                                                                       //  print("HIGHLIGHT: " + item.xtreepath ); // draw highlight??
+                                                                         // work out the coords of the window..
+                                                                         if (!this.gc) {
+                                                                          var dr = widget.window;
+                                                                          this.gc = (new Gdk.GC.c_new(dr));
+                                                                          this.gc.set_rgb_fg_color(new Gdk.Color({ red: 0xFFFF, green: 0, blue : 0 }));
+                                                                          this.gc.set_line_attributes(4,  Gdk.LineStyle.SOLID, Gdk.CapStyle.ROUND , Gdk.JoinStyle.ROUND);
+                                                                        }
+                                                                    
+                                                                        
+                                                                         var r  = evt.expose.area;
+                                                                         // console.dump([r.x, r.y, r.width, r.height ] );
+                                                                         //return false;
+                                                                    //     print(widget.get_parent().toString().match(/GtkScrolledWindow/);
+                                                                         if (widget.get_parent().toString().match(/GtkScrolledWindow/)) { // eak
+                                                                             // happens with gtkscrollview embedded stuff..
+                                                                             var np =this.activePath.split(':');
+                                                                             np.pop();
+                                                                             this.activePath = np.join(':');
+                                                                             this.renderedEl.queue_draw();
+                                                                             return true;
+                                                                    
+                                                                            
+                                                                         }
+                                                                    
+                                                                           
+                                                                         
+                                                                         
+                                                                          this.box = {
+                                                                            x : r.x - 2,
+                                                                            y : r.y - 2,
+                                                                            w: r.width + 4,
+                                                                            h: r.height + 4
+                                                                          }; 
+                                                                          // let's draw it..
+                                                                          this.inRender = true;
+                                                                    
+                                                                          
+                                                                          this.highlightWidget = widget;
+                                                                        
+                                                                        
+                                                                     
+                                                                    
+                                                                        //  print("DRAW BOX");
+                                                                           //console.dump(this.box);
+                                                                          Gdk.draw_rectangle(widget.window, this.gc, false, this.box.x , this.box.y, this.box.w,this.box.h);
+                                                                                this.inRender = false;
                                                                                 return false;
                                                                     },
                                                                     widgetDragMotionEvent : function() {
@@ -2854,6 +3140,15 @@ Window=new XObject({
                                                                         this.get('view').pressed = false;
                                                                        return false;
                                                                     },
+                                                                    redraw : function() {
+                                                                       this.highlightWidget = false;
+                                                                        print("REDRAW CALLED");
+                                                                        this.activePath = this.get('/LeftTree').getActivePath();
+                                                                        if (this.renderedEl) {
+                                                                          print("QUEUE DRAW CALLING");
+                                                                          this.renderedEl.queue_draw();
+                                                                       }
+                                                                    },
                                                                     items : [
                                                                         {
                                                                             xtype: Gtk.HBox,
@@ -2865,22 +3160,19 @@ Window=new XObject({
                                                                                     label : "Run The Application",
                                                                                     listeners : {
                                                                                         "button_press_event":function (self, event) {
-                                                                                          // call render on left tree - with special option!?!
+                                                                                            // call render on left tree - with special option!?!
                                                                                          
-                                                                                        
-                                                                                        
-                                                                                               print("GET PROEJCT");
-                                                                                               var pr = this.get('/LeftProjectTree').getActiveProject();
+                                                                                            //print("GET PROEJCT");
+                                                                                            var pr = this.get('/LeftProjectTree').getActiveProject();
                                                                                           
-                                                                                        var dir = '';
-                                                                                         for (var i in pr.paths) { 
-                                                                                              dir = i;
-                                                                                              break;
-                                                                                          }
-                                                                                           var runner = GLib.path_get_dirname (__script_path__) + '/gtkrun.js'; 
-                                                                                           print ("RUN DIR:" + dir);
-                                                                                           
-                                                                                           this.get('/BottomPane').el.set_current_page(1);
+                                                                                            var dir = '';
+                                                                                            for (var i in pr.paths) { 
+                                                                                                dir = i;
+                                                                                                break;
+                                                                                            }
+                                                                                            var runner = GLib.path_get_dirname (__script_path__) + '/gtkrun.js'; 
+                                                                                            this.get('/Terminal').feed("RUN DIR:" + dir);
+                                                                                            
                                                                                             this.get('/Terminal').el.fork_command( null , [], [], GLib.path_get_dirname (__script_path__) 
                                                                                                , false,false,false); 
                                                                                             var cmd = "/usr/bin/seed " + runner + " " + dir + "\n";
@@ -3064,6 +3356,25 @@ Window=new XObject({
                                                             xtype: Gtk.ScrolledWindow,
                                                             pack : "add",
                                                             id : "Help",
+                                                            show : function() {
+                                                                
+                                                                var file = this.get('/LeftTree').getActiveFile();
+                                                                if (!file) {
+                                                                    return;
+                                                                }
+                                                                var activeEl = this.get('/LeftTree').getActiveElement();
+                                                                var xtype = file.guessName( activeEl )
+                                                                if (!xtype || !xtype.length) {
+                                                                    return;
+                                                                }
+                                                                this.get('/Window.view-help-nb').el.set_current_page(1);
+                                                                
+                                                                // get the active element being edited.
+                                                                var helpurl = file.getHelpUrl(xtype);       
+                                                                
+                                                                // now load the help info in the page..
+                                                                this.get('help-view').el.open(helpurl);
+                                                            },
                                                             items : [
                                                                 {
                                                                     xtype: WebKit.WebView,
@@ -3074,7 +3385,8 @@ Window=new XObject({
                                                                        this.get('/Window.help-view').el.open(
                                                                          "http://devel.akbkhome.com/seed/");
                                                                     
-                                                                    }
+                                                                    },
+                                                                    zoom_level : 0.8
                                                                 }
                                                             ]
                                                         }
@@ -3111,14 +3423,7 @@ Window=new XObject({
                                                             load : function(str) {
                                                             
                                                             // show the help page for the active node..
-                                                               this.get('/Window.view-help-nb').el.set_current_page(1);
-                                                            
-                                                            // get the active element being edited.
-                                                               var xtype = this.get('/LeftTree.model').file.guessName(
-                                                               this.get('/MidPropTree').activeElement);
-                                                            // now load the help info in the page..
-                                                               this.get('/Window.help-view').el.open(
-                                                                 "http://devel.akbkhome.com/seed/" + xtype + ".html");
+                                                               this.get('/Help').show();
                                                             
                                                             
                                                                this.get('/BottomPane').el.set_current_page(0);
@@ -3144,6 +3449,10 @@ Window=new XObject({
                                                                  
                                                                 this.el.grab_focus();
                                                             },
+                                                            insert_spaces_instead_of_tabs : true,
+                                                            indent_width : 4,
+                                                            auto_indent : true,
+                                                            show_line_numbers : true,
                                                             items : [
                                                                 {
                                                                     xtype: GtkSource.Buffer,
@@ -3186,9 +3495,20 @@ Window=new XObject({
                                                             xtype: Vte.Terminal,
                                                             pack : "add",
                                                             id : "Terminal",
-                                                            feed : function(str) {
-                                                                this.el.feed(str,str.length);
-                                                            }
+                                                            feed : function(istr) {
+                                                                var str = istr.replace(/\n/g, "\r\n") + "\r\n";
+                                                                // we should make ourselves visable!!!
+                                                                this.get('/BottomPane').el.show();
+                                                                this.get('/BottomPane').el.set_current_page(1);
+                                                            
+                                                                this.el.feed(str ,str.length);
+                                                            },
+                                                            scroll_on_output : true,
+                                                            init : function() {
+                                                                XObject.prototype.init.call(this);
+                                                                this.el.set_size (80, 1000);
+                                                            },
+                                                            scrollback_lines : 1000
                                                         }
                                                     ]
                                                 }