install_gir.sh

[app.Builder.js] / XObject.js

diff --git a/XObject.js b/XObject.js
index 3155dba..ffa41ea 100644 (file)
--- a/XObject.js
+++ b/XObject.js
@@ -28,23 +28,27 @@ GObject = imports.gi.GObject;
  *  Xyz.init(); // create and show.
  * 
  * 
+ * use XObject.debug = 1 to turn on debugging
  * 
- * @arg xtype {String|Function} constructor or string.
- * @arg id {String}  (optional) id for registry
- * @arg xns {String|Object}   (optional) namespace eg. Gtk or 'Gtk' - used with xtype.
- * @arg items {Array}   (optional) list of child elements which will be constructed.. using XObject
- * @arg listeners {Object}   (optional) map Gobject signals to functions
- * @arg pack {Function|String|Array}   (optional) how this object gets added to it's parent
- * @arg el {Object}   (optional) premade GObject
- * 
- *  --- needs a xdebug option!
+ * If XObject/[xns]/[xtype].js exists, it will use this to override properties..
  * 
  * 
  * He's some questions.
- * - should we generate ID's for all elements? (if so we probably need to garbage collect)
  * - should we have a special property to use as the constructor / gobject.properties rather
  *   than sending all basic types to this?
  * 
+ * @cfg xtype {String|Function} constructor or string.
+ * @cfg id {String}  (optional) id for registry
+ * @cfg xns {String|Object}   (optional) namespace eg. Gtk or 'Gtk' - used with xtype.
+ * @cfg items {Array}   (optional) list of child elements which will be constructed.. using XObject
+ * @cfg listeners {Object}   (optional) map Gobject signals to functions
+ * @cfg pack {Function|String|Array}   (optional) how this object gets added to it's parent
+ * @cfg el {Object}   (optional) premade GObject
+ * 
+ * 
+ * 
+ * 
+ * 
  * 
  */
 
@@ -54,6 +58,21 @@ function XObject (cfg) {
     this.config = {};
     this.constructor = XObject;
     
+    
+    
+    // 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];
+        }
+        
+    } catch (e) {
+        
+    }
+    
+    
     // copy down all elements into self..
     
     for (var i in cfg) {
@@ -74,7 +93,11 @@ function XObject (cfg) {
         
         this.config[i] = cfg[i];
     }
+    
+    
     this.items = this.items || [];
+    
+    
     // pack can be false!
     if (typeof(this.pack) == 'undefined') {
         
@@ -92,6 +115,9 @@ function XObject (cfg) {
     
     
     
+    
+    
+    
 }
 
 
@@ -196,6 +222,9 @@ XObject.prototype = {
             if (i == 'buttons') { // problem with Gtk.MessageDialog..
                 continue;
             }
+            if (i[0] == '.') { // parent? - 
+                continue;
+            }
             this.el[i] = this.config[i];
         }
         
@@ -205,8 +234,26 @@ XObject.prototype = {
          //   XObject.registry[o.xnsid] = XObject.registry[o.xnsid] || {}; 
          //   XObject.registry[o.xnsid][o.id] = this;
         //}
+        
+        var type = this.xtype.type ? GObject.type_name(this.xtype.type) : '';
+        print("MAKE " + type);
+        
+        
         var _this=this;
-        items.forEach(function(i) {
+        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);
         })
             
@@ -214,9 +261,10 @@ XObject.prototype = {
         for (var i in this.listeners) {
             this.addListener(i, this.listeners[i]);
         }
-        // delete this.listeners ?
-        
         
+        // delete this.listeners ?
+        // do again so child props work!
+       
         // do we need to call 'init here?'
     },
       
@@ -353,8 +401,21 @@ XObject.prototype = {
             return this.parent.get(xid.substring(1));
         }
         if (xid[0] == '/') {
+            
             if (typeof(XObject.cache[xid]) != 'undefined') {
                 return XObject.cache[xid]; 
+            }
+            if (xid.indexOf('.') > -1) {
+                
+                var child = xid.split('.');
+                var nxid = child.shift();
+                    
+                child = child.join('.');
+                if (typeof(XObject.cache[nxid]) != 'undefined') {
+                    return XObject.cache[nxid].get(child);
+                }
+                
+                
             }
             var e = this;
             while (e.parent) {
@@ -381,8 +442,6 @@ XObject.prototype = {
             xid = child.shift();
             
             child = child.join('.');
-           
-            
             
         }
         if (xid == this.id) {
@@ -457,7 +516,7 @@ XObject.prototype = {
 /**
  * Copies all the properties of config to obj.
  *
- * Pretty much the same as JQuery/Prototype..
+ * Pretty much the same as JQuery/Prototype.. or Roo.apply
  * @param {Object} obj The receiver of the properties
  * @param {Object} config The source of the properties
  * @param {Object} defaults A different object that will also be applied for default values
@@ -486,7 +545,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
      * 
@@ -502,7 +561,8 @@ XObject.extend(XObject,
      */
 
 
-    extendIf : function(o, c){
+    extendIf : function(o, c)
+    {
 
         if(!o || !c || typeof c != 'object'){
             return o;
@@ -539,7 +599,8 @@ XObject.extend(XObject,
      * @return {Function} constructor (eg. class
      * @method define
      */
-    define : function(){
+    define : function()
+    {
         // inline overrides
         var io = function(o){
             for(var m in o){