X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=XObject.js;h=05463b0d291ecc904b4f60290696dcd4a8f331ee;hb=603fb40adb3fd20dfb05029bc35557b3d65d40a4;hp=f5c2d4006e9463e13c01202ac72c423e15331e09;hpb=c7f0d2f8ea5f6c928d8ac3b5a3a2fed1f4542e25;p=app.Builder.js diff --git a/XObject.js b/XObject.js index f5c2d4006..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. @@ -58,34 +58,26 @@ function XObject (cfg) { //print ("XObject ctr"); - this.config = {}; - this.constructor = XObject; + 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 = { .... } ] - // xns is not a string!!!? - var gname = false; - if (typeof(cfg.xtype) == 'object') { - gname = GObject.type_name(cfg.xtype.type); - // print("GNAME:" +gname + " GTYPE:"+cfg.xtype.type); - } + if (!this.constructor) { - var base = gname ? imports.XObjectBase[gname][gname] : false; + this.constructor = XObject; + var base = XObject.baseXObject(cfg); if (base) { - // print("Overlaying XOBJBECT-BASE." + cfg.xtype); - XObject.extend(this,base); + XObject.extend(this,base.prototype); } - } catch (e) { - // if debug? - XObject.log("error finding " + gname + " - " + e.toString()); } - // 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]; @@ -134,29 +126,16 @@ function XObject (cfg) { items.push(i); }); this.items = []; + // create XObject for all the children. 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 - - ] - } - */ - var item = (i.constructor == XObject) ? o : new XObject(i); + 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); }); - if (this.onConstruct) { - this.onConstruct.call(this); - } + } @@ -308,7 +287,7 @@ XObject.prototype = { if (typeof(item) == 'undefined') { XObject.error("Invalid Item added to this!"); - imports.console.dump(this); + imports.console.dump(this.cfg); Seed.quit(); } // what about extended items!?!?!? @@ -317,11 +296,11 @@ XObject.prototype = { //print("CTR:PROTO:" + ( item.id ? item.id : '??')); // print("addItem - call init [" + item.pack.join(',') + ']'); if (!item.el) { - XObject.err("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 packing.. various items have this .. return; @@ -372,21 +351,7 @@ XObject.prototype = { args.unshift(item.el); - - /* - THIS IS IN THE GtkTable wrapper now. - if (this.parent && this.parent.xtype == 'GtkTable' && item.pack == 'add') { - var c = n % this.parent.config.n_columns; - var r = Math.floor(pos/_this.parent.config.n_columns); - item.pack = [ 'attach', c, c+1, r, r+1, - typeof(item.x_options) == 'undefined' ? 5 : item.x_options, - typeof(item.y_options) == 'undefined' ? 5 : item.y_options, - typeof(item.x_padding) == 'undefined' ? 0 : item.x_padding, - typeof(item.x_padding) == 'undefined' ? 0 : item.x_padding - - ]; - } - */ + @@ -593,7 +558,7 @@ XObject.extend(XObject, * @property {Boolean} debug XObject debugging. - set to true to debug. * */ - debug : false, + debug : true, /** * @property {Object} cache - cache of object ids * @@ -627,7 +592,19 @@ XObject.extend(XObject, { 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. @@ -734,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