README.txt

[app.Builder.js] / XObject.js

diff --git a/XObject.js b/XObject.js
index d3bc5c9..65883ec 100644 (file)
--- a/XObject.js
+++ b/XObject.js
@@ -77,13 +77,16 @@ function XObject (cfg) {
     this.items = this.items || [];
     // pack can be false!
     if (typeof(this.pack) == 'undefined') {
-        var Gtk  = imports.gi.Gtk;
+        
         this.pack = [ 'add' ]
+        /*
+        var Gtk  = imports.gi.Gtk;
         switch (true) {
             // any others!!
             case (this.xtype == Gtk.MenuItem):  this.pack = [ 'append' ]; break;
             
         }
+        */
         
     }
     
@@ -138,7 +141,7 @@ XObject.prototype = {
         var isSeed = typeof(Seed) != 'undefined';
          
         // xtype= Gtk.Menu ?? what about c_new stuff?
-        if (XObject.debug) print("init: typeof(xtype): "  + typeof(this.xtype));
+        if (XObject.debug) print("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(','));
             this.el = this.xtype(this.config);
@@ -163,7 +166,7 @@ XObject.prototype = {
             this.el  =   isSeed ? new constructor(this.config) : new constructor();
             
         }
-        if (XObject.debug) print("init: typeof(el):" + typeof(this.el));
+        if (XObject.debug) print("init: ID:"+ this.id +" typeof(el):" + this.el);
         
         // always overlay props..
         // check for 'write' on object..
@@ -190,6 +193,12 @@ XObject.prototype = {
             if (i == 'type') { // problem with Gtk.Window... - not decided on a better way to handle this.
                 continue;
             }
+            if (i == 'buttons') { // problem with Gtk.MessageDialog..
+                continue;
+            }
+            if (i[0] == '.') { // parent? - 
+                continue;
+            }
             this.el[i] = this.config[i];
         }
         
@@ -199,8 +208,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);
         })
             
@@ -208,9 +235,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?'
     },
       
@@ -239,9 +267,7 @@ XObject.prototype = {
             imports.console.dump(item);
             Seed.quit();
         }
-        
-       
-       
+         
         
         if (item.pack===false) {  // no 
             return;
@@ -255,12 +281,16 @@ XObject.prototype = {
         var args = [];
         var pack_m  = false;
         if (typeof(item.pack) == 'string') {
-            var args = item.pack.split(',');
-            args.forEach(function(e, i) {
-                if (e == 'false') { args[i] = false; return; }
-                if (e == 'true') {  args[i] = true;  return; }
-                if (parseInt(e) !== NaN) { args[i] = parseInt(e); return; }
+             
+            item.pack.split(',').forEach(function(e, i) {
+                
+                if (e == 'false') { args.push( false); return; }
+                if (e == 'true') {  args.push( true);  return; }
+                if (!isNaN(parseInt(e))) { args.push( parseInt(e)); return; }
+                args.push(e);
             });
+            //print(args.join(","));
+            
             pack_m = args.shift();
         } else {
             pack_m = item.pack.shift();
@@ -269,7 +299,16 @@ XObject.prototype = {
         
         // handle error.
         if (pack_m && typeof(this.el[pack_m]) == 'undefined') {
-            Seed.print('pack method not available : ' + this.xtype + '.' +  pack_m);
+            
+            throw {
+                name: "ArgumentError", 
+                message : 'pack method not available : ' + this.id + " : " + this.xtype + '.' +  pack_m + " ADDING " + item.el
+                    
+            }
+           
+            
+            
+            
             return;
         }
         
@@ -277,7 +316,7 @@ XObject.prototype = {
         //Seed.print('Pack ' + this.el + '.'+ pack_m + '(' + item.el + ')');
 
         args.unshift(item.el);
-        if (XObject.debug) print('[' + args.join(',') +']');
+        if (XObject.debug) print(pack_m + '[' + args.join(',') +']');
         //Seed.print('args: ' + args.length);
         if (pack_m) {
             this.el[pack_m].apply(this.el, args);
@@ -297,7 +336,7 @@ XObject.prototype = {
     {
  
         if (XObject.debug) Seed.print("Add signal " + sig);
- 
+        fn.id= sig;
         var _li = XObject.createDelegate(fn,this);
         // private listeners that are not copied to GTk.
         
@@ -336,8 +375,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) {
@@ -364,8 +416,6 @@ XObject.prototype = {
             xid = child.shift();
             
             child = child.join('.');
-           
-            
             
         }
         if (xid == this.id) {
@@ -593,6 +643,8 @@ XObject.extend(XObject,
     createDelegate : function(method, obj, args, appendArgs){
         
         return function() {
+            if (XObject.debug) print("CALL: " + obj.id + ':'+ method.id);
+            
             var callArgs = args || arguments;
             if(appendArgs === true){
                 callArgs = Array.prototype.slice.call(arguments, 0);