X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=Builder3%2FWindow.js;h=c72c8cf6141e55233f2f68fceac10cc3e4d1909e;hp=9ace6d8f1a369fdca63cf00f8e4101f9650788b0;hb=119290bc3234e9ece1c64dbd72ca486d9633b5b7;hpb=8f4f725267bfa5737b010b4d8853e49b8e0d05f0 diff --git a/Builder3/Window.js b/Builder3/Window.js index 9ace6d8f1..c72c8cf61 100644 --- a/Builder3/Window.js +++ b/Builder3/Window.js @@ -1,4 +1,4 @@ -Gtk = imports.gi.Gtk; + Gtk = imports.gi.Gtk; Gdk = imports.gi.Gdk; Pango = imports.gi.Pango; GLib = imports.gi.GLib; @@ -354,7 +354,7 @@ Window=new XObject({ } return true; - }, + } /*, enter_notify_event : function (self, event) { return true; this.el.expanded = !this.el.expanded; @@ -364,6 +364,7 @@ Window=new XObject({ return true; } + */ }, id : "expander", label : "Select Project or File", @@ -381,6 +382,7 @@ Window=new XObject({ var model = this.get('/LeftProjectTree.combomodel'); // print ("loading Projects?") + //print(JSON.stringify(pm.projects, null,4));Seed.quit(); //console.dump(pm.projects); model.loadData(pm.projects); @@ -398,11 +400,7 @@ Window=new XObject({ id : "notebook", pack : "pack_start,true,true", current_page : 0, - init : function() { - XObject.prototype.init.call(this); - this.el.set_current_page(0); - - }, + show_border : false, show_tabs : false, items : [ @@ -449,12 +447,10 @@ Window=new XObject({ case 'Gtk': return this.get('/RightGtkView'); } + return false; }, - 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'); @@ -486,7 +482,9 @@ Window=new XObject({ var res = {}; this.get('/LeftTree.view').el.get_path_at_pos(ev.button.x,ev.button.y, res); - if (!this.get('/LeftTreeMenu').el) { this.get('/LeftTreeMenu').init(); } + if (!this.get('/LeftTreeMenu').el) { + this.get('/LeftTreeMenu').init(); + } this.get('/LeftTreeMenu').el.set_screen(Gdk.Screen.get_default()); this.get('/LeftTreeMenu').el.show_all(); @@ -609,7 +607,7 @@ Window=new XObject({ Gdk.drag_status(ctx, 0, time); return true; } - print(JSON.stringify(tg,null,4)); + // print(JSON.stringify(tg,null,4)); //console.dump(tg); this.targetData = tg; @@ -768,7 +766,7 @@ Window=new XObject({ }, init : function() { - XObject.prototype.init.call(this); + XObject.prototype.init.call(this); var description = new Pango.FontDescription.c_new(); description.set_size(8000); this.el.modify_font(description); @@ -1064,14 +1062,14 @@ Window=new XObject({ }, - init : function() { - XObject.prototype.init.call(this); - this.el.set_column_types ( 3, [ + columns : [ 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() ); @@ -1246,7 +1244,7 @@ Window=new XObject({ s.get_selected( oret); var node = this.nodeToJS(oret.iter,false); //console.dump(node); - print(JSON.stringify(node, null,4)); + //print(JSON.stringify(node, null,4)); // needs to drop first, otherwise the target_data // treepath will be invalid. @@ -1559,29 +1557,25 @@ Window=new XObject({ xtype: Gtk.ListStore, id : "combomodel", pack : "set_model", - init : function() { - XObject.prototype.init.call(this); - this.el.set_column_types ( 2, [ - GObject.TYPE_STRING, // real key - GObject.TYPE_STRING // real type - - - ] ); - // this.el.set_sort_column_id(1,Gtk.SortType.ASCENDING); - var pm = imports.ProjectManager.ProjectManager; - var _this = this; - pm.on('changed', function() { - print("caught changed hook on project manager - reloading data"); - _this.loadData(pm.projects); + + columns : [ + GObject.TYPE_STRING, + GObject.TYPE_STRING + ], + + - }); - }, loadData : function(data) { - var ov = this.get('/LeftProjectTree.combo').getValue(); + //print("load data called");Seed.quit(); + //print(data);Seed.quit(); + + var ov = this.get('/LeftProjectTree.combo').getValue(); this.el.clear(); var el = this.el; var na = {}; - data.forEach(function(p) { + + + data.forEach(function(p) { el.append(na); //print(JSON.stringify(XObject.keys(na))); @@ -1603,10 +1597,7 @@ Window=new XObject({ xtype: Gtk.ScrolledWindow, pack : "add", shadow_type : Gtk.ShadowType.IN, - init : function() { - XObject.prototype.init.call(this); - this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC ); - }, + items : [ { xtype: Gtk.TreeView, @@ -1674,16 +1665,14 @@ Window=new XObject({ xtype: Gtk.TreeStore, pack : "set_model", id : "model", - loading : false, - init : function() { - XObject.prototype.init.call(this); - this.el.set_column_types ( 3, [ + loading : false, + columns : [ GObject.TYPE_STRING, // title GObject.TYPE_STRING, // tip GObject.TYPE_STRING // id.. - ] ); - - }, + ] , + + loadProject : function(pr) { print("LOAD PROJECT"); var model = this.get('/LeftProjectTree.model'); @@ -2011,10 +2000,7 @@ Window=new XObject({ editing : false, id : "LeftPanel", pack : "add", - init : function() { - XObject.prototype.init.call(this); - this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); - }, + shadow_type : Gtk.ShadowType.IN, items : [ { @@ -2199,7 +2185,7 @@ Window=new XObject({ this.el.set_value(ret.iter, 5, type + ' : ' + str); // update the tree... - print("new data: " + JSON.stringify(this.toJS() , null,4)); + //print("new data: " + JSON.stringify(this.toJS() , null,4)); this.get('/LeftTree.model').setFromNode(false,this.toJS()); this.get('/LeftTree.model').changed(doRefresh); @@ -2278,9 +2264,7 @@ Window=new XObject({ } }, - init : function() { - XObject.prototype.init.call(this); - this.el.set_column_types ( 6, [ + columns : [ GObject.TYPE_STRING, // 0 real key GObject.TYPE_STRING, // 1 real value GObject.TYPE_STRING, // 2 visable key @@ -2288,9 +2272,9 @@ Window=new XObject({ GObject.TYPE_STRING, // 4 need to store type of!!! GObject.TYPE_STRING // 5 tooltip - ]); - }, - load : function(ar) { + ], + + load : function(ar) { // might casue problesm.. // this.get('/Editor.RightEditor').save(); @@ -4038,7 +4022,7 @@ Window=new XObject({ this.get('buttonbar').el.hide(); this.get('viewbox').el.show(); var ce = this.get('/Window.centereast').el; - print(JSON.stringify(XObject.keys(ce) ,null,4)); + //print(JSON.stringify(XObject.keys(ce) ,null,4)); ce.set_position(ce.get_allocated_width() - 150); // this.get('model').expanded();