Sample/Window.js
authorAlan Knowles <alan@akbkhome.com>
Mon, 7 Jun 2010 06:38:08 +0000 (14:38 +0800)
committerAlan Knowles <alan@akbkhome.com>
Mon, 7 Jun 2010 06:38:08 +0000 (14:38 +0800)
Sample/Window.js

index 3b61b8d..9376691 100644 (file)
@@ -157,6 +157,7 @@ Window=new XObject({
                             xtype: Gtk.MenuItem,
                             label : "_Edit",
                             use_underline : true,
+                            pack : "add",
                             items : [
                                 {
                                     xtype: Gtk.Menu,
@@ -182,6 +183,113 @@ Window=new XObject({
                                             label : "File _Properties",
                                             pack : "add",
                                             use_underline : true
+                                        },
+                                        {
+                                            xtype: Gtk.MenuItem,
+                                            listeners : {
+                                                activate : function (self, event) {
+                                                    this.get('/RooProjectProperties').show();
+                                                    return false;
+                                                }
+                                            },
+                                            label : "Modify Project HTML ",
+                                            pack : "add",
+                                            use_underline : true
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: Gtk.MenuItem,
+                            label : "_View",
+                            use_underline : true,
+                            items : [
+                                {
+                                    xtype: Gtk.Menu,
+                                    pack : "set_submenu",
+                                    listeners : {
+                                        
+                                    },
+                                    items : [
+                                        {
+                                            xtype: Gtk.MenuItem,
+                                            listeners : {
+                                                activate : function (self, event) {
+                                                      var js = this.get('/LeftTree.model').toJS();
+                                                    if (js && js[0]) {
+                                                        this.get('/RightBrowser.view').renderJS(js[0]);
+                                                    } 
+                                                    return false;
+                                                }
+                                            },
+                                            label : "_Redraw (Roo)",
+                                            pack : "add",
+                                            use_underline : true
+                                        },
+                                        {
+                                            xtype: Gtk.MenuItem,
+                                            listeners : {
+                                                activate : 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" + 
+                                                            " Builder.render(" + jsstr + ");\n" +
+                                                            '</script>';
+                                                        
+                                                        html = html.replace('</body>', runbuilder + '</body>');
+                                                
+                                                       File.write( target+ '/builder.html', html);
+                                                       
+                                                        this.get('/Terminal').feed("RUN DIR:" + target);
+                                                    
+                                                    this.get('/Terminal').el.fork_command( null , [], [], target
+                                                       , false,false,false); 
+                                                    var cmd = "firefox file://" + target + "/builder.html  \n";
+                                                    this.get('/Terminal').el.feed_child(cmd, cmd.length);
+                                                     return false;
+                                                }
+                                            },
+                                            label : "_Test in Firefox (Roo)",
+                                            pack : "add",
+                                            use_underline : true
                                         }
                                     ]
                                 }
@@ -294,27 +402,41 @@ Window=new XObject({
                                                     items : [
                                                         {
                                                             xtype: Gtk.ScrolledWindow,
+                                                            id : "LeftTree",
                                                             pack : "add",
-                                                            shadow_type : Gtk.ShadowType.IN,
-                                                            init : function() {
-                                                                XObject.prototype.init.call(this);
-                                                                this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+                                                            getActiveElement : function() { // return path to actie node.
+                                                            
+                                                                 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);
+                                                            },
+                                                            getActiveFile : function() {
+                                                                return this.get('model').file;
+                                                            },
+                                                            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();
                                                             },
-                                                            id : "LeftTree",
                                                             getPaleteProvider : function() {
                                                                 var model = this.get('model');
                                                                 var pm = imports.Builder.Provider.ProjectManager.ProjectManager;
                                                                 return pm.getPalete(model.file.getType());
                                                             },
-                                                            renderView : function() {
-                                                                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()) {
@@ -325,34 +447,20 @@ Window=new XObject({
                                                                }
                                                             
                                                             },
-                                                            getActivePath : function() {
+                                                            init : function() {
+                                                                XObject.prototype.init.call(this);
+                                                                this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+                                                            },
+                                                            renderView : function() {
+                                                                var render = this.getRenderer();
                                                                 var model = this.get('model');
-                                                                var view = this.get('view');
-                                                                if (view.selection.count_selected_rows() < 1) {
-                                                                    return false;
+                                                                if (render) {
+                                                                    render.renderJS(model.toJS(false,true)[0]);
+                                                                } else {
+                                                                    print("NO RENDER JS METHOD?");
                                                                 }
-                                                                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);
                                                             },
+                                                            shadow_type : Gtk.ShadowType.IN,
                                                             items : [
                                                                 {
                                                                     xtype: Gtk.TreeView,
@@ -677,17 +785,10 @@ Window=new XObject({
                                                                     items : [
                                                                         {
                                                                             xtype: Gtk.TreeStore,
-                                                                            pack : "set_model",
-                                                                            id : "model",
-                                                                            init : function() {
-                                                                                XObject.prototype.init.call(this);
-                                                                             this.el.set_column_types ( 3, [
-                                                                                        GObject.TYPE_STRING, // title 
-                                                                                        GObject.TYPE_STRING, // tip
-                                                                                        GObject.TYPE_STRING // source..
-                                                                                        ] );
-                                                                            },
                                                                             activePath : false,
+                                                                            currentTree : false,
+                                                                            id : "model",
+                                                                            pack : "set_model",
                                                                             changed : function(n, refresh) {
                                                                                      print("MODEL CHANGED CALLED" + this.activePath);
                                                                                      if (this.activePath) {
@@ -722,78 +823,125 @@ Window=new XObject({
                                                                                     }
                                                                                          
                                                                             },
-                                                                            loadFile : function(f) {
-                                                                                //console.dump(f);
-                                                                                        this.el.clear();
-                                                                                        this.file = f;
+                                                                            deleteSelected : function() {
+                                                                                        this.get('/LeftTree.view').blockChanges = true;
+                                                                                        var old_iter = new Gtk.TreeIter();
+                                                                                        var s = this.get('/LeftTree.view').selection;
+                                                                                        s.get_selected(this.el, old_iter);
+                                                                                        var path = this.el.get_path(old_iter).to_string();
+                                                                            
+                                                                                        this.activePath= false;      
+                                                                                        s.unselect_all();
+                                                                            
+                                                                                        this.activePath= false;      
+                                                                                   var iter = new Gtk.TreeIter();
+                                                                                        this.el.get_iter_from_string(iter, path);
+                                                                                        this.el.remove(iter);
                                                                                         
-                                                                                        if (!f) {
-                                                                                            console.log('missing file');
-                                                                                            return;
+                                                                                        // rebuild treemap. -- depreciated.!!
+                                                                                        this.map = {};
+                                                                                        this.treemap = { };
+                                                                                        //this.toJS(null, true) // does not do anything?
+                                                                                    this.activePath= false;      
+                                                                                        this.changed(false,true);
+                                                                                      this.get('/LeftTree.view').blockChanges = false;
+                                                                            },
+                                                                            dropNode : function(target_data, node) {
+                                                                              print("drop Node");
+                                                                                 console.dump(node);
+                                                                                 console.dump(target_data);
+                                                                                        var tp = target_data[0].length ? new  Gtk.TreePath.from_string( target_data[0] ) : false;
+                                                                                        
+                                                                                        print("add " + tp + "@" + target_data[1]  );
+                                                                                        var parent = tp;
+                                                                                        var after = false;
+                                                                                        if (tp && target_data[1]  < 2) { // before or after..
+                                                                                            var ar = target_data[0].split(':');
+                                                                                            ar.pop();
+                                                                                            parent  = new  Gtk.TreePath.from_string( ar.join(':') );
+                                                                                            after = tp;
+                                                                                        }
+                                                                                        var n_iter = new Gtk.TreeIter();
+                                                                                        var iter_par = new Gtk.TreeIter();
+                                                                                        var iter_after = after ? new Gtk.TreeIter() : false;
+                                                                                        
+                                                                                        
+                                                                                        
+                                                                                        if (parent !== false) {
+                                                                                            this.el.get_iter(iter_par, parent);
+                                                                                        } else {
+                                                                                            iter_par = null;
                                                                                         }
                                                                                         
-                                                                                        // load the file if not loaded..
-                                                                                        if (f.items === false) {
-                                                                                            var _this = this;
-                                                                                            f.loadItems(function() {
-                                                                                                _this.loadFile(f);
-                                                                                            });
-                                                                                            return;
+                                                                                        
+                                                                                        if (tp && after) {
+                                                                                            print(target_data[1]  > 0 ? 'insert_after' : 'insert_before');
+                                                                                            this.el.get_iter(iter_after, after);
+                                                                                            this.el[ target_data[1]  > 0 ? 'insert_after' : 'insert_before'](
+                                                                                                    n_iter, iter_par, iter_after);
+                                                                                            
+                                                                                        } else {
+                                                                                            this.el.append(n_iter, iter_par);
                                                                                             
                                                                                         }
-                                                                                        this.get('/Window').setTitle(f.project.getName() + ' - ' + f.name);
-                                                                                        
-                                                                                        if (f.items.length && typeof(f.items[0]) == 'string') {
                                                                                         
-                                                                                            this.get('/RightEditor').el.show();
-                                                                                            this.get('/RightEditor.view').load( f.items[0]);
-                                                                                            return;
+                                                                                        if (typeof(node) == 'string') {
+                                                                                            var ar = node.split('.');
+                                                                                            var xtype = ar.pop();
+                                                                                            
+                                                                                            node = {
+                                                                                                '|xns' : ar.join('.'),
+                                                                                                'xtype' : xtype
+                                                                                            };
+                                                                                            if (target_data.length == 3 && target_data[2].length) {
+                                                                                                node['*prop'] = target_data[2];
+                                                                                            }
+                                                                                            
                                                                                         }
-                                                                                        print("LOAD");
-                                                                                        //console.dump(f.items);
-                                                                                        this.load(f.items);
-                                                                                        this.get('/LeftTree.view').el.expand_all();
-                                                                            
-                                                                                        if (!f.items.length) {
-                                                                                            // single item..
+                                                                                        // work out what kind of packing to use..
+                                                                                        if (typeof(node.pack) == 'undefined'  && parent !== false) {
+                                                                                            var pal = this.get('/LeftTree').getPaleteProvider();
                                                                                             
-                                                                                            this.get('/Window.leftvpaned').el.set_position(80);
-                                                                                            // select first...
-                                                                                            this.get('/LeftTree.view').el.set_cursor( 
-                                                                                                new  Gtk.TreePath.from_string('0'), null, false);
+                                                                                            var pname = pal.guessName(this.singleNodeToJS(parent.to_string()));
+                                                                                            print ("PNAME : "  + pname);
+                                                                                            var cname = pal.guessName(node);
+                                                                                            print ("CNAME : "  + cname);
+                                                                                            node.pack = pal.getDefaultPack(pname, cname);
                                                                                             
                                                                                             
-                                                                                        } else {
-                                                                                              this.get('/Window.leftvpaned').el.set_position(200);
                                                                                         }
                                                                                         
                                                                                         
-                                                                                        //print("hide right editior");
-                                                                                        this.get('/RightEditor').el.hide();
-                                                                                        //print("set current tree");
-                                                                                        this.currentTree = this.toJS(false, false)[0];
-                                                                                        //console.dump(this.currentTree);
-                                                                                        this.currentTree = this.currentTree || { items: [] };
-                                                                                        this.get('/LeftTree').renderView();
-                                                                                        //console.dump(this.map);
-                                                                                        //var RightPalete     = imports.Builder.RightPalete.RightPalete;
-                                                                                        var pm = this.get('/RightPalete.model');
-                                                                                        // set up provider..
+                                                                                        var xitems = [];
+                                                                                        if (node.items) {
+                                                                                            xitems = node.items;
+                                                                                            delete node.items;
+                                                                                        }
+                                                                            // load children - if it has any..
+                                                                            
+                                                                                        if (xitems) {
+                                                                                            this.load(xitems, n_iter);
+                                                                                        }
+                                                                                        if (tp && (xitems || after)) {
+                                                                                            this.get('/LeftTree.view').el.expand_row(this.el.get_path(iter_par), true);
+                                                                                        }
+                                                                                        // wee need to get the empty proptypes from somewhere..
                                                                                         
-                                                                                        this.get('/RightPalete').provider = this.get('/LeftTree').getPaleteProvider();
+                                                                                        //var olditer = this.activeIter;
+                                                                                        this.activePath = this.el.get_path(n_iter).to_string();
+                                                                            
+                                                                                 // changed actually set's the node data..
+                                                                                        this.changed(node, true);
                                                                                         
-                                                                                        if (!this.get('/RightPalete').provider) {
-                                                                                            print ("********* PALETE PROVIDER MISSING?!!");
-                                                                                        }
-                                                                                        this.get('/LeftTree').renderView();
                                                                                         
-                                                                                        pm.load( this.get('/LeftTree').getPaleteProvider().gatherList(this.listAllTypes()));
+                                                                                        
+                                                                                        this.get('/LeftTree.view').el.set_cursor(this.el.get_path(n_iter), null, false);
+                                                                                        
+                                                                                        //Builder.MidPropTree._model.load(node);
+                                                                                        //Builder.MidPropTree._win.hideWin();
+                                                                                        //Builder.LeftPanel._model.load( node);
                                                                                         
                                                                                         
-                                                                                                
-                                                                                        this.get('/Window.view-notebook').el.set_current_page(
-                                                                                            this.get('/LeftTree.model').file.getType()== 'Roo' ? 0 : -1);
-                                                                                                
                                                                             },
                                                                             findDropNode : function(treepath_str, targets) {
                                                                             
@@ -866,102 +1014,169 @@ Window=new XObject({
                                                                                 return [];
                                                                                         
                                                                             },
-                                                                            dropNode : function(target_data, node) {
-                                                                              print("drop Node");
-                                                                                 console.dump(node);
-                                                                                 console.dump(target_data);
-                                                                                        var tp = target_data[0].length ? new  Gtk.TreePath.from_string( target_data[0] ) : false;
-                                                                                        
-                                                                                        print("add " + tp + "@" + target_data[1]  );
-                                                                                        var parent = tp;
-                                                                                        var after = false;
-                                                                                        if (tp && target_data[1]  < 2) { // before or after..
-                                                                                            var ar = target_data[0].split(':');
-                                                                                            ar.pop();
-                                                                                            parent  = new  Gtk.TreePath.from_string( ar.join(':') );
-                                                                                            after = tp;
-                                                                                        }
-                                                                                        var n_iter = new Gtk.TreeIter();
-                                                                                        var iter_par = new Gtk.TreeIter();
-                                                                                        var iter_after = after ? new Gtk.TreeIter() : false;
-                                                                                        
-                                                                                        
+                                                                            getIterValue : function (iter, col) {
+                                                                                var gval = new GObject.Value('');
+                                                                                this.el.get_value(iter, col ,gval);
+                                                                                return  gval.value;
+                                                                                
+                                                                                
+                                                                            },
+                                                                            init : function() {
+                                                                                XObject.prototype.init.call(this);
+                                                                             this.el.set_column_types ( 3, [
+                                                                                        GObject.TYPE_STRING, // title 
+                                                                                        GObject.TYPE_STRING, // tip
+                                                                                        GObject.TYPE_STRING // source..
+                                                                                        ] );
+                                                                            },
+                                                                            listAllTypes : function() {
+                                                                                var s = this.get('/LeftTree.view').selection;
+                                                                                print ("LIST ALL TYPES: " + s.count_selected_rows() );
+                                                                                
+                                                                                if (s.count_selected_rows() > 0) {
+                                                                                    var iter = new Gtk.TreeIter();    
+                                                                                    s.get_selected(this.el, iter);
+                                                                            
+                                                                                    // set some properties of the tree for use by the dropped element.
+                                                                                    var value = new GObject.Value('');
+                                                                                    this.el.get_value(iter, 2, value);
+                                                                                    var data = JSON.parse(value.value);
+                                                                                    
+                                                                                    
+                                                                                    var xname = this.get('/LeftTree.model').file.guessName(data);
+                                                                                    console.log('selected:' + xname);
+                                                                                    if (xname.length) {
+                                                                                        return [ xname ];
+                                                                                    }
+                                                                                    return []; // could not find it..
+                                                                                }
+                                                                                
+                                                                                var ret = [ ];
+                                                                                
+                                                                               var _this = this;
+                                                                                function addall(li)
+                                                                                {
+                                                                                    li.forEach(function(el) {
+                                                                                        // this is specific to roo!!!?
                                                                                         
-                                                                                        if (parent !== false) {
-                                                                                            this.el.get_iter(iter_par, parent);
-                                                                                        } else {
-                                                                                            iter_par = null;
+                                                                                        var fullpath =  _this.file.guessName(el);
+                                                                                        if (fullpath.length && ret.indexOf(fullpath) < 0) {
+                                                                                            ret.push(fullpath);
                                                                                         }
                                                                                         
                                                                                         
-                                                                                        if (tp && after) {
-                                                                                            print(target_data[1]  > 0 ? 'insert_after' : 'insert_before');
-                                                                                            this.el.get_iter(iter_after, after);
-                                                                                            this.el[ target_data[1]  > 0 ? 'insert_after' : 'insert_before'](
-                                                                                                    n_iter, iter_par, iter_after);
-                                                                                            
-                                                                                        } else {
-                                                                                            this.el.append(n_iter, iter_par);
-                                                                                            
+                                                                                        if (el.items && el.items.length) {
+                                                                                            addall(el.items);
                                                                                         }
                                                                                         
-                                                                                        if (typeof(node) == 'string') {
-                                                                                            var ar = node.split('.');
-                                                                                            var xtype = ar.pop();
-                                                                                            
-                                                                                            node = {
-                                                                                                '|xns' : ar.join('.'),
-                                                                                                'xtype' : xtype
-                                                                                            };
-                                                                                            if (target_data.length == 3 && target_data[2].length) {
-                                                                                                node['*prop'] = target_data[2];
+                                                                                    });
+                                                                                    
+                                                                                    
+                                                                                }
+                                                                                
+                                                                                addall([this.currentTree]);
+                                                                                
+                                                                                // only if we have nothing, should we add '*top'
+                                                                                if (!ret.length) {
+                                                                                    ret = [ '*top' ];
+                                                                                }
+                                                                                //console.log('all types in tree');
+                                                                                //console.dump(ret);
+                                                                                
+                                                                                return ret;
+                                                                                                        
+                                                                            },
+                                                                            load : function(tr,iter)
+                                                                                    {
+                                                                                        var citer = new Gtk.TreeIter();
+                                                                                        //this.insert(citer,iter,0);
+                                                                                        for(var i =0 ; i < tr.length; i++) {
+                                                                                            if (iter) {
+                                                                                                this.el.insert(citer,iter,-1);
+                                                                                            } else {
+                                                                                                this.el.append(citer);
                                                                                             }
                                                                                             
+                                                                                            this.el.set_value(citer, 0, [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);
+                                                                                            }
+                                                                                        }     
+                                                                                    },
+                                                                            loadFile : function(f) {
+                                                                                //console.dump(f);
+                                                                                        this.el.clear();
+                                                                                        this.file = f;
+                                                                                        
+                                                                                        if (!f) {
+                                                                                            console.log('missing file');
+                                                                                            return;
                                                                                         }
-                                                                                        // work out what kind of packing to use..
-                                                                                        if (typeof(node.pack) == 'undefined'  && parent !== false) {
-                                                                                            var pal = this.get('/LeftTree').getPaleteProvider();
-                                                                                            
-                                                                                            var pname = pal.guessName(this.singleNodeToJS(parent.to_string()));
-                                                                                            print ("PNAME : "  + pname);
-                                                                                            var cname = pal.guessName(node);
-                                                                                            print ("CNAME : "  + cname);
-                                                                                            node.pack = pal.getDefaultPack(pname, cname);
-                                                                                            
+                                                                                        
+                                                                                        // load the file if not loaded..
+                                                                                        if (f.items === false) {
+                                                                                            var _this = this;
+                                                                                            f.loadItems(function() {
+                                                                                                _this.loadFile(f);
+                                                                                            });
+                                                                                            return;
                                                                                             
                                                                                         }
+                                                                                        this.get('/Window').setTitle(f.project.getName() + ' - ' + f.name);
                                                                                         
+                                                                                        if (f.items.length && typeof(f.items[0]) == 'string') {
                                                                                         
-                                                                                        var xitems = [];
-                                                                                        if (node.items) {
-                                                                                            xitems = node.items;
-                                                                                            delete node.items;
+                                                                                            this.get('/RightEditor').el.show();
+                                                                                            this.get('/RightEditor.view').load( f.items[0]);
+                                                                                            return;
                                                                                         }
-                                                                            // load children - if it has any..
+                                                                                        print("LOAD");
+                                                                                        //console.dump(f.items);
+                                                                                        this.load(f.items);
+                                                                                        this.get('/LeftTree.view').el.expand_all();
                                                                             
-                                                                                        if (xitems) {
-                                                                                            this.load(xitems, n_iter);
-                                                                                        }
-                                                                                        if (tp && (xitems || after)) {
-                                                                                            this.get('/LeftTree.view').el.expand_row(this.el.get_path(iter_par), true);
+                                                                                        if (!f.items.length) {
+                                                                                            // single item..
+                                                                                            
+                                                                                            this.get('/Window.leftvpaned').el.set_position(80);
+                                                                                            // select first...
+                                                                                            this.get('/LeftTree.view').el.set_cursor( 
+                                                                                                new  Gtk.TreePath.from_string('0'), null, false);
+                                                                                            
+                                                                                            
+                                                                                        } else {
+                                                                                              this.get('/Window.leftvpaned').el.set_position(200);
                                                                                         }
-                                                                                        // wee need to get the empty proptypes from somewhere..
                                                                                         
-                                                                                        //var olditer = this.activeIter;
-                                                                                        this.activePath = this.el.get_path(n_iter).to_string();
-                                                                            
-                                                                                 // changed actually set's the node data..
-                                                                                        this.changed(node, true);
                                                                                         
+                                                                                        //print("hide right editior");
+                                                                                        this.get('/RightEditor').el.hide();
+                                                                                        //print("set current tree");
+                                                                                        this.currentTree = this.toJS(false, false)[0];
+                                                                                        //console.dump(this.currentTree);
+                                                                                        this.currentTree = this.currentTree || { items: [] };
+                                                                                        this.get('/LeftTree').renderView();
+                                                                                        //console.dump(this.map);
+                                                                                        //var RightPalete     = imports.Builder.RightPalete.RightPalete;
+                                                                                        var pm = this.get('/RightPalete.model');
+                                                                                        // set up provider..
                                                                                         
+                                                                                        this.get('/RightPalete').provider = this.get('/LeftTree').getPaleteProvider();
                                                                                         
-                                                                                        this.get('/LeftTree.view').el.set_cursor(this.el.get_path(n_iter), null, false);
+                                                                                        if (!this.get('/RightPalete').provider) {
+                                                                                            print ("********* PALETE PROVIDER MISSING?!!");
+                                                                                        }
+                                                                                        this.get('/LeftTree').renderView();
                                                                                         
-                                                                                        //Builder.MidPropTree._model.load(node);
-                                                                                        //Builder.MidPropTree._win.hideWin();
-                                                                                        //Builder.LeftPanel._model.load( node);
+                                                                                        pm.load( this.get('/LeftTree').getPaleteProvider().gatherList(this.listAllTypes()));
                                                                                         
                                                                                         
+                                                                                                
+                                                                                        this.get('/Window.view-notebook').el.set_current_page(
+                                                                                            this.get('/LeftTree.model').file.getType()== 'Roo' ? 0 : -1);
+                                                                                                
                                                                             },
                                                                             moveNode : function(target_data, action) {
                                                                                  //print("MOVE NODE");
@@ -986,101 +1201,80 @@ Window=new XObject({
                                                                                         this.activePath= false;
                                                                                         this.changed(false,true);
                                                                             },
-                                                                            deleteSelected : function() {
-                                                                                        this.get('/LeftTree.view').blockChanges = true;
-                                                                                        var old_iter = new Gtk.TreeIter();
-                                                                                        var s = this.get('/LeftTree.view').selection;
-                                                                                        s.get_selected(this.el, old_iter);
-                                                                                        var path = this.el.get_path(old_iter).to_string();
-                                                                            
-                                                                                        this.activePath= false;      
-                                                                                        s.unselect_all();
+                                                                            nodeTip : function(c) {
+                                                                                var ret = this.nodeTitle(c,true);
+                                                                                var funcs = '';
                                                                             
-                                                                                        this.activePath= false;      
-                                                                                   var iter = new Gtk.TreeIter();
-                                                                                        this.el.get_iter_from_string(iter, path);
-                                                                                        this.el.remove(iter);
-                                                                                        
-                                                                                        // rebuild treemap. -- depreciated.!!
-                                                                                        this.map = {};
-                                                                                        this.treemap = { };
-                                                                                        //this.toJS(null, true) // does not do anything?
-                                                                                    this.activePath= false;      
-                                                                                        this.changed(false,true);
-                                                                                      this.get('/LeftTree.view').blockChanges = false;
-                                                                            },
-                                                                            currentTree : false,
-                                                                            listAllTypes : function() {
-                                                                                var s = this.get('/LeftTree.view').selection;
-                                                                                print ("LIST ALL TYPES: " + s.count_selected_rows() );
                                                                                 
-                                                                                if (s.count_selected_rows() > 0) {
-                                                                                    var iter = new Gtk.TreeIter();    
-                                                                                    s.get_selected(this.el, iter);
+                                                                                for( var i in c) {
                                                                             
-                                                                                    // set some properties of the tree for use by the dropped element.
-                                                                                    var value = new GObject.Value('');
-                                                                                    this.el.get_value(iter, 2, value);
-                                                                                    var data = JSON.parse(value.value);
-                                                                                    
-                                                                                    
-                                                                                    var xname = this.get('/LeftTree.model').file.guessName(data);
-                                                                                    console.log('selected:' + xname);
-                                                                                    if (xname.length) {
-                                                                                        return [ xname ];
+                                                                                    if (!i.length || i[0] != '|') {
+                                                                                        continue;
                                                                                     }
-                                                                                    return []; // could not find it..
-                                                                                }
-                                                                                
-                                                                                var ret = [ ];
-                                                                                
-                                                                               var _this = this;
-                                                                                function addall(li)
-                                                                                {
-                                                                                    li.forEach(function(el) {
-                                                                                        // this is specific to roo!!!?
-                                                                                        
-                                                                                        var fullpath =  _this.file.guessName(el);
-                                                                                        if (fullpath.length && ret.indexOf(fullpath) < 0) {
-                                                                                            ret.push(fullpath);
-                                                                                        }
-                                                                                        
-                                                                                        
-                                                                                        if (el.items && el.items.length) {
-                                                                                            addall(el.items);
-                                                                                        }
+                                                                                    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;
                                                                                 
-                                                                                addall([this.currentTree]);
+                                                                            },
+                                                                            nodeTitle : function(c, renderfull) {
+                                                                                  var txt = [];
+                                                                                c = c || {};
+                                                                                var sr = (typeof(c['+buildershow']) != 'undefined') &&  !c['+buildershow'] ? true : false;
+                                                                                if (sr) txt.push('<s>');
+                                                                                if (typeof(c['*prop']) != 'undefined')   { txt.push(c['*prop']+ ':'); }
                                                                                 
-                                                                                // only if we have nothing, should we add '*top'
-                                                                                if (!ret.length) {
-                                                                                    ret = [ '*top' ];
+                                                                                if (renderfull && c['|xns']) {
+                                                                                    txt.push(c['|xns']);
                                                                                 }
-                                                                                //console.log('all types in tree');
-                                                                                //console.dump(ret);
                                                                                 
-                                                                                return ret;
-                                                                                                        
+                                                                                if (c.xtype)      { txt.push(c.xtype); }
+                                                                                if (c.id)      { txt.push('<b>[id=' + c.id + ']</b>'); }
+                                                                                if (c.fieldLabel) { txt.push('[' + c.fieldLabel + ']'); }
+                                                                                if (c.boxLabel)   { txt.push('[' + c.boxLabel + ']'); }
+                                                                                
+                                                                                
+                                                                                if (c.layout)     { txt.push('<i>' + c.layout + '</i>'); }
+                                                                                if (c.title)      { txt.push('<b>' + c.title + '</b>'); }
+                                                                                if (c.label)      { txt.push('<b>' + c.label+ '</b>'); }
+                                                                                if (c.header)    { txt.push('<b>' + c.header + '</b>'); }
+                                                                                if (c.legend)      { txt.push('<b>' + c.legend + '</b>'); }
+                                                                                if (c.text)       { txt.push('<b>' + c.text + '</b>'); }
+                                                                                if (c.name)       { txt.push('<b>' + c.name+ '</b>'); }
+                                                                                if (c.region)     { txt.push('<i>(' + c.region + ')</i>'); }
+                                                                                if (c.dataIndex) { txt.push('[' + c.dataIndex+ ']'); }
+                                                                                
+                                                                                // for flat classes...
+                                                                                if (typeof(c['*class']) != 'undefined')  { txt.push('<b>' +  c['*class']+  '</b>'); }
+                                                                                if (typeof(c['*extends']) != 'undefined')  { txt.push(': <i>' +  c['*extends']+  '</i>'); }
+                                                                                
+                                                                                
+                                                                                if (sr) txt.push('</s>');
+                                                                                return (txt.length == 0 ? "Element" : txt.join(" "));
                                                                             },
-                                                                            singleNodeToJS : function (treepath) 
-                                                                                    {
-                                                                                        var iter = new Gtk.TreeIter(); 
-                                                                                        if (!this.el.get_iter(iter, new Gtk.TreePath.from_string(treepath))) {
-                                                                                            return false;
-                                                                                        }
-                                                                                        
-                                                                                        var iv = this.getIterValue(iter, 2);
-                                                                                       
-                                                                                        return JSON.parse(iv);
-                                                                                        
-                                                                                    },
-                                                                            nodeToJS : function (iter, with_id) 
+                                                                            nodeToJS : function (treepath, with_id) 
                                                                             {
+                                                                                
+                                                                                var iter = treepath;  // API used to be iter here..
+                                                                                if (typeof(iter) == 'string') {
+                                                                                    iter = new Gtk.TreeIter(); 
+                                                                                    if (!this.el.get_iter(iter, new Gtk.TreePath.from_string(treepath))) {
+                                                                                        return false;
+                                                                                    }
+                                                                                } 
                                                                                 var par = new Gtk.TreeIter(); 
                                                                                 var iv = this.getIterValue(iter, 2);
                                                                                // print("IV" + iv);
@@ -1108,6 +1302,28 @@ Window=new XObject({
                                                                                 }
                                                                                 return k;
                                                                             },
+                                                                            nodeToJSON : function(c) {
+                                                                                var o  = {}
+                                                                                for (var i in c) {
+                                                                                    if (i == 'items') {
+                                                                                         continue;
+                                                                                    }
+                                                                                    o[i] = c[i];
+                                                                                }
+                                                                                return JSON.stringify(o);
+                                                                            },
+                                                                            singleNodeToJS : function (treepath) 
+                                                                                    {
+                                                                                        var iter = new Gtk.TreeIter(); 
+                                                                                        if (!this.el.get_iter(iter, new Gtk.TreePath.from_string(treepath))) {
+                                                                                            return false;
+                                                                                        }
+                                                                                        
+                                                                                        var iv = this.getIterValue(iter, 2);
+                                                                                       
+                                                                                        return JSON.parse(iv);
+                                                                                        
+                                                                                    },
                                                                             toJS : function(iter, with_id)
                                                                             {
                                                                                 //Seed.print("WITHID: "+ with_id);
@@ -1141,107 +1357,7 @@ Window=new XObject({
                                                                                 // convert the list into a json string..
                                                                             
                                                                                 
-                                                                                },
-                                                                            getIterValue : function (iter, col) {
-                                                                                var gval = new GObject.Value('');
-                                                                                this.el.get_value(iter, col ,gval);
-                                                                                return  gval.value;
-                                                                                
-                                                                                
-                                                                            },
-                                                                            nodeTitle : function(c, renderfull) {
-                                                                                  var txt = [];
-                                                                                c = c || {};
-                                                                                var sr = (typeof(c['+buildershow']) != 'undefined') &&  !c['+buildershow'] ? true : false;
-                                                                                if (sr) txt.push('<s>');
-                                                                                if (typeof(c['*prop']) != 'undefined')   { txt.push(c['*prop']+ ':'); }
-                                                                                
-                                                                                if (renderfull && c['|xns']) {
-                                                                                    txt.push(c['|xns']);
-                                                                                }
-                                                                                
-                                                                                if (c.xtype)      { txt.push(c.xtype); }
-                                                                                if (c.id)      { txt.push('<b>[id=' + c.id + ']</b>'); }
-                                                                                if (c.fieldLabel) { txt.push('[' + c.fieldLabel + ']'); }
-                                                                                if (c.boxLabel)   { txt.push('[' + c.boxLabel + ']'); }
-                                                                                
-                                                                                
-                                                                                if (c.layout)     { txt.push('<i>' + c.layout + '</i>'); }
-                                                                                if (c.title)      { txt.push('<b>' + c.title + '</b>'); }
-                                                                                if (c.label)      { txt.push('<b>' + c.label+ '</b>'); }
-                                                                                if (c.header)    { txt.push('<b>' + c.header + '</b>'); }
-                                                                                if (c.legend)      { txt.push('<b>' + c.legend + '</b>'); }
-                                                                                if (c.text)       { txt.push('<b>' + c.text + '</b>'); }
-                                                                                if (c.name)       { txt.push('<b>' + c.name+ '</b>'); }
-                                                                                if (c.region)     { txt.push('<i>(' + c.region + ')</i>'); }
-                                                                                if (c.dataIndex) { txt.push('[' + c.dataIndex+ ']'); }
-                                                                                
-                                                                                // for flat classes...
-                                                                                if (typeof(c['*class']) != 'undefined')  { txt.push('<b>' +  c['*class']+  '</b>'); }
-                                                                                if (typeof(c['*extends']) != 'undefined')  { txt.push(': <i>' +  c['*extends']+  '</i>'); }
-                                                                                
-                                                                                
-                                                                                if (sr) txt.push('</s>');
-                                                                                return (txt.length == 0 ? "Element" : txt.join(" "));
-                                                                            },
-                                                                            nodeToJSON : function(c) {
-                                                                                var o  = {}
-                                                                                for (var i in c) {
-                                                                                    if (i == 'items') {
-                                                                                         continue;
-                                                                                    }
-                                                                                    o[i] = c[i];
-                                                                                }
-                                                                                return JSON.stringify(o);
-                                                                            },
-                                                                            load : function(tr,iter)
-                                                                                    {
-                                                                                        var citer = new Gtk.TreeIter();
-                                                                                        //this.insert(citer,iter,0);
-                                                                                        for(var i =0 ; i < tr.length; i++) {
-                                                                                            if (iter) {
-                                                                                                this.el.insert(citer,iter,-1);
-                                                                                            } else {
-                                                                                                this.el.append(citer);
-                                                                                            }
-                                                                                            
-                                                                                            this.el.set_value(citer, 0, [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,true);
-                                                                                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,
@@ -1274,6 +1390,22 @@ Window=new XObject({
                                                                                      this.get('/LeftTree.model').deleteSelected();
                                                                                 }
                                                                             }
+                                                                        },
+                                                                        {
+                                                                            xtype: Gtk.MenuItem,
+                                                                            listeners : {
+                                                                                activate : function (self) {
+                                                                                
+                                                                                     var tree = this.get('/LeftTree');
+                                                                                      var model = this.get('/LeftTree.model');
+                                                                                     var el = tree.getActivePath();
+                                                                                     var js = model.toJS(el, false);
+                                                                                     print(JSON.stringify(js));
+                                                                                    
+                                                                                }
+                                                                            },
+                                                                            label : "Save as Template",
+                                                                            pack : "add"
                                                                         }
                                                                     ]
                                                                 }
@@ -2589,100 +2721,6 @@ Window=new XObject({
                                                                         
                                                                     },
                                                                     items : [
-                                                                        {
-                                                                            xtype: Gtk.HBox,
-                                                                            pack : "pack_start,false,true,0",
-                                                                            items : [
-                                                                                {
-                                                                                    xtype: Gtk.Button,
-                                                                                    pack : "pack_start,false,false,0",
-                                                                                    label : "Redraw",
-                                                                                    listeners : {
-                                                                                        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,
-                                                                                    listeners : {
-                                                                                        button_press_event : function (self, event) {
-                                                                                            this.get('/RooProjectProperties').show();
-                                                                                            return false;
-                                                                                        }
-                                                                                    },
-                                                                                    label : "Set extra HTML in renderer",
-                                                                                    pack : "pack_start,false,false,0"
-                                                                                },
-                                                                                {
-                                                                                    xtype: Gtk.Button,
-                                                                                    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" + 
-                                                                                                    " Builder.render(" + jsstr + ");\n" +
-                                                                                                    '</script>';
-                                                                                                
-                                                                                                html = html.replace('</body>', runbuilder + '</body>');
-                                                                                        
-                                                                                               File.write( target+ '/builder.html', html);
-                                                                                               
-                                                                                                this.get('/Terminal').feed("RUN DIR:" + target);
-                                                                                            
-                                                                                            this.get('/Terminal').el.fork_command( null , [], [], target
-                                                                                               , false,false,false); 
-                                                                                            var cmd = "firefox file://" + target + "/builder.html  \n";
-                                                                                            this.get('/Terminal').el.feed_child(cmd, cmd.length);
-                                                                                             return false;
-                                                                                        }
-                                                                                    },
-                                                                                    label : "Test in Firefox",
-                                                                                    pack : "pack_start,false,false,0"
-                                                                                }
-                                                                            ]
-                                                                        },
                                                                         {
                                                                             xtype: Gtk.ScrolledWindow,
                                                                             pack : "add",