X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=XObject.js;h=05463b0d291ecc904b4f60290696dcd4a8f331ee;hp=ffa41ea40bb48b80fd0b39a724df6b9ba467f5e2;hb=refs%2Fheads%2Forigin.gitlive;hpb=dcb51ea47a7681494a19fd68a897667aa89afa64 diff --git a/XObject.js b/XObject.js index ffa41ea40..05463b0d2 100644 --- a/XObject.js +++ b/XObject.js @@ -30,7 +30,7 @@ GObject = imports.gi.GObject; * * use XObject.debug = 1 to turn on debugging * - * If XObject/[xns]/[xtype].js exists, it will use this to override properties.. + * If XObjectBase/[xns]/[xtype].js exists, it will use this to override properties.. * * * He's some questions. @@ -55,25 +55,29 @@ GObject = imports.gi.GObject; function XObject (cfg) { // first apply cfg if set. //print("new XOBJECT!!!"); - this.config = {}; - this.constructor = XObject; + + //print ("XObject ctr"); + + this.config = {}; // used to initialize GObject + this.cfg = XObject.extend({}, cfg); // used to store original configuration.. for referencing.. + // we could use this to determine if + // we are actually inside a inherited class... + // as define() should actually set this up.. - // start by seeing if we have a base class.... - try { - // loocks for XObject/Gtk/TreeView.js [ TreeView = { .... } ] - var base = imports.XObject[cfg.xns][cfg.xtype][cfg.xtype]; - for (var i in base) { - this[i] = base[i]; - } + if (!this.constructor) { - } catch (e) { + this.constructor = XObject; + var base = XObject.baseXObject(cfg); + if (base) { + XObject.extend(this,base.prototype); + } } - // copy down all elements into self.. + // make an extra copy in this.config?? - which is the one used in the constructor later for (var i in cfg) { this[i] = cfg[i]; @@ -113,10 +117,25 @@ function XObject (cfg) { } + // interesting question should we call constructor on items here... + // as the real work is done in init anyway.. + var _this= this; - - - + var items = []; + this.items.forEach(function(i) { + items.push(i); + }); + this.items = []; + // create XObject for all the children. + items.forEach(function(i,n) { + var base = XObject.baseXObject(i); + base = base || XObject; + var item = (i.constructor == XObject) ? i : new base(i); + item.parent = _this; + _this.items.push(item); + //_this.addItem(i); + }); + } @@ -150,13 +169,13 @@ XObject.prototype = { init : function() { - var items = []; - this.items.forEach(function(i) { - items.push(i); - }); + // var items = []; + //this.items.forEach(function(i) { + // items.push(i); + //}); // remove items. this.listeners = this.listeners || {}; - this.items = []; + //this.items = []; // do we need to call 'beforeInit here?' @@ -167,14 +186,14 @@ XObject.prototype = { var isSeed = typeof(Seed) != 'undefined'; // xtype= Gtk.Menu ?? what about c_new stuff? - if (XObject.debug) print("init: ID:"+ this.id +" typeof(xtype): " + typeof(this.xtype)); + XObject.log("init: ID:"+ this.id +" typeof(xtype): " + typeof(this.xtype)); if (!this.el && typeof(this.xtype) == 'function') { - if (XObject.debug) print("func?" + XObject.keys(this.config).join(',')); + XObject.log("func?" + XObject.keys(this.config).join(',')); this.el = this.xtype(this.config); } if (!this.el && typeof(this.xtype) == 'object') { - if (XObject.debug) print("obj?" + XObject.keys(this.config).join(',')); + XObject.log("obj?" + XObject.keys(this.config).join(',')); this.el = new (this.xtype)(this.config); } @@ -183,16 +202,16 @@ XObject.prototype = { var NS = imports.gi[this.xns]; if (!NS) { - Seed.print('Invalid xns: ' + this.xns); + XObject.error('Invalid xns: ' + this.xns, true); } constructor = NS[this.xtype]; if (!constructor) { - Seed.print('Invalid xtype: ' + this.xns + '.' + this.xtype); + XObject.error('Invalid xtype: ' + this.xns + '.' + this.xtype); } this.el = isSeed ? new constructor(this.config) : new constructor(); } - if (XObject.debug) print("init: ID:"+ this.id +" typeof(el):" + this.el); + XObject.log("init: ID:"+ this.id +" typeof(el):" + this.el); // always overlay props.. // check for 'write' on object.. @@ -236,25 +255,11 @@ XObject.prototype = { //} var type = this.xtype.type ? GObject.type_name(this.xtype.type) : ''; - print("MAKE " + type); - + XObject.log("add children to " + type); var _this=this; - items.forEach(function(i,n) { - - if (type == 'GtkTable' && i.pack == 'add') { - var c = n % _this.config.n_columns; - var r = Math.floor(n/_this.config.n_columns); - i.pack = [ 'attach', c, c+1, r, r+1, - typeof(i.x_options) == 'undefined' ? 5 : i.x_options, - typeof(i.y_options) == 'undefined' ? 5 : i.y_options, - typeof(i.x_padding) == 'undefined' ? 0 : i.x_padding, - typeof(i.x_padding) == 'undefined' ? 0 : i.x_padding - - ] - } - - _this.addItem(i); + this.items.forEach(function(i,n) { + _this.addItem(i,n); }) @@ -262,6 +267,8 @@ XObject.prototype = { this.addListener(i, this.listeners[i]); } + this.init = XObject.emptyFn; + // delete this.listeners ? // do again so child props work! @@ -275,35 +282,38 @@ XObject.prototype = { * uses pack property to determine how to add it. * @arg cfg {Object} same as XObject constructor. */ - addItem : function(o) { - if (typeof(o) == 'undefined') { - print("Invalid Item added to this!"); - imports.console.dump(this); + addItem : function(item, pos) + { + + if (typeof(item) == 'undefined') { + XObject.error("Invalid Item added to this!"); + imports.console.dump(this.cfg); Seed.quit(); } // what about extended items!?!?!? - var item = (o.constructor == XObject) ? o : new XObject(o); - item.parent = this; - this.items.push(item); + item.init(); //print("CTR:PROTO:" + ( item.id ? item.id : '??')); // print("addItem - call init [" + item.pack.join(',') + ']'); if (!item.el) { - print("NO EL!"); + XObject.error("NO EL!"); imports.console.dump(item); Seed.quit(); } - + print(XObject.type(this.xtype) + ":pack=" + item.pack); - if (item.pack===false) { // no + if (item.pack===false) { // no packing.. various items have this .. return; } - if (typeof(item.pack) == 'function') { + + if (typeof(item.pack) == 'function') { // pack is a function.. // parent, child item.pack.apply(item, [ this , item ]); item.parent = this; return; } + + // pack = 'add,x,y' var args = []; var pack_m = false; if (typeof(item.pack) == 'string') { @@ -332,17 +342,20 @@ XObject.prototype = { } - - - return; } + // finally call the pack method //Seed.print('Pack ' + this.el + '.'+ pack_m + '(' + item.el + ')'); - + args.unshift(item.el); - if (XObject.debug) print(pack_m + '[' + args.join(',') +']'); + + + + + + XObject.log(pack_m + '[' + args.join(',') +']'); //Seed.print('args: ' + args.length); if (pack_m) { this.el[pack_m].apply(this.el, args); @@ -361,7 +374,7 @@ XObject.prototype = { addListener : function(sig, fn) { - if (XObject.debug) Seed.print("Add signal " + sig); + XObject.log("Add signal " + sig); fn.id= sig; var _li = XObject.createDelegate(fn,this); // private listeners that are not copied to GTk. @@ -387,7 +400,7 @@ XObject.prototype = { */ get : function(xid) { - if (XObject.debug) print("SEARCH FOR " + xid + " in " + this.id); + XObject.log("SEARCH FOR " + xid + " in " + this.id); var ret= false; var oid = '' + xid; if (!xid.length) { @@ -483,7 +496,7 @@ XObject.prototype = { return; } if (!ch.get) { - print("invalid item..."); + XObject.error("invalid item..."); imports.console.dump(_this); Seed.quit(); } @@ -551,7 +564,48 @@ XObject.extend(XObject, * */ cache: { }, - + /** + * Empty function + * + */ + emptyFn : function () { }, + + + + /** + * Debug Logging + * @param {String|Object} output String to print. + */ + log : function(output) + { + if (!this.debug) { + return; + } + print("LOG:" + output); + }, + + /** + * Error Logging + * @param {String|Object} output String to print. + */ + error : function(output) + { + print("ERROR: " + output); + }, + /** + * fatal error + * @param {String|Object} output String to print. + */ + fatal : function(output) + { + + throw { + name: "ArgumentError", + message : output + + } + }, + /** * Copies all the properties of config to obj, if the do not exist. * @param {Object} obj The receiver of the properties @@ -609,14 +663,14 @@ XObject.extend(XObject, }; return function(constructor, parentClass, overrides) { if (typeof(parentClass) == 'undefined') { - print("XObject.define: Missing parentClass: when applying: " ); - print(new String(constructor)); + XObject.error("XObject.define: Missing parentClass: when applying: " ); + XObject.error(new String(constructor)); Seed.quit(); } if (typeof(parentClass.prototype) == 'undefined') { - print("Missing protype: when applying: " ); - print(new String(constructor)); - print(new String(parentClass)); + XObject.error("Missing protype: when applying: " ); + XObject.error(new String(constructor)); + XObject.error(new String(parentClass)); Seed.quit(); } var F = function(){}; @@ -657,7 +711,52 @@ XObject.extend(XObject, } return ret; }, - + /** + * return the Gobject name of a constructor - does not appear to work on structs.. + * @param {Object} gobject ctr + * @return {String} returns name + * @member XObject type + */ + type : function(o) + { + if (typeof(o) == 'object') { + return GObject.type_name(o.type); + // print("GNAME:" +gname + " GTYPE:"+cfg.xtype.type); + } + return 'unknown'; + }, + /** + * return the XObjectBase class for a cfg (which includes an xtype) + * @param {Object} configuration. + * @return {function} constructor + * @member XObject baseXObject + */ + baseXObject : function(cfg) + { + try { + // loocks for XObject/Gtk/TreeView.js [ TreeView = { .... } ] + // xns is not a string!!!? + var gname = false; + if (typeof(cfg.xtype) == 'object') { + gname = XObject.type(cfg.xtype); + + } + print("TRYING BASE OBJECT : " + gname); + // in the situation where we have been called and there is a base object + // defining the behavior.. + // then we should copy the prototypes from the base object into this.. + var base = gname ? imports.XObjectBase[gname][gname] : false; + return base; + + } catch (e) { + // if debug? + XObject.log("error finding " + gname + " - " + e.toString()); + return false; + } + + + }, + /** * @member XObject createDelegate * creates a delage metdhod @@ -671,7 +770,7 @@ XObject.extend(XObject, createDelegate : function(method, obj, args, appendArgs){ return function() { - if (XObject.debug) print("CALL: " + obj.id + ':'+ method.id); + XObject.log("CALL: " + obj.id + ':'+ method.id); var callArgs = args || arguments; if(appendArgs === true){