Test.GtkWriter.vala.c

[app.Builder.js] / Palete / Gtk.js

diff --git a/Palete/Gtk.js b/Palete/Gtk.js
index c11532e..98faa2e 100644 (file)
--- a/Palete/Gtk.js
+++ b/Palete/Gtk.js
@@ -2,6 +2,7 @@
  
 Gio = imports.gi.Gio;
 GIRepository  = imports.gi.GIRepository;
+GObject= imports.gi.GObject;
 xml     = imports.libxml;
 console = imports.console;
 XObject = imports.XObject.XObject;
@@ -184,10 +185,10 @@ Gtk = XObject.define(
   
         getPropertiesFor: function(ename, type)
         {
-            print("Loading for " + ename);
+            //print("Loading for " + ename);
             
             if (typeof(this.proplist[ename]) != 'undefined') {
-                print("using cache");
+                //print("using cache");
                 return this.proplist[ename][type];
             }
             // use introspection to get lists..
@@ -201,7 +202,7 @@ Gtk = XObject.define(
                 print("COULND NOT FIND BY NAME");
                 return [];
             }
-            var etype = GIRepository.base_info_get_type(bi);
+            var etype = bi.get_type();;
             var meth = etype == GIRepository.InfoType.INTERFACE ?
                 [ 
                     'interface_info_get_n_properties',
@@ -246,6 +247,7 @@ Gtk = XObject.define(
                 
                 
                 var ty = this.typeToName(GIRepository.property_info_get_type(prop));
+                var flags = GIRepository.property_info_get_flags(prop);
                 print (n_original +":"+ ty);
                 if (ty === false) {
                     continue;
@@ -254,7 +256,8 @@ Gtk = XObject.define(
                      name :  n_original.replace(/\-/g, '_'),
                      type :  ty,
                      desc : this.doc(ename + '.' + n_original),
-                     sig : ''
+                     sig : '',
+                     ctor_only : (flags  & GObject.ParamFlags.CONSTRUCT_ONLY) > 0
                 }
                 plist.push(add)
             }
@@ -282,19 +285,30 @@ Gtk = XObject.define(
             for (var i =0;i <  GIRepository[meth[4]](bi); i++) {
                 var prop = GIRepository[meth[5]](bi,i);  
                 var n_original =  prop.get_name();
-                print(ename +": ADD : " + n_original );
-                var flags = GIRepository.property_info_get_flags(prop);
-                if (flags & GIRepository.FunctionInfoFlags.IS_CONSTRUCTOR) {
-                    continue;
-                }
-                if (!(flags & GIRepository.FunctionInfoFlags.IS_METHOD)) {
+                print(ename +": ADD method: " + n_original );
+                //var flags = GIRepository.property_info_get_flags(prop);
+                
+                if (n_original.match(/^new/)) {
+                    var add = {
+                        name :  n_original.replace(/\-/g, '_'),
+                        type : 'ctor', //???
+                        desc : '',
+                        //desc : this.doc(ename + "."+ n_original)
+                    };
+                    this.genParams(prop,add);
+                    mlist.push(add);
                     continue;
                 }
+                continue;
+                // not sure why we need all the other ones...
+                //if (!(flags & GIRepository.FunctionInfoFlags.IS_METHOD)) {
+                //    continue;
+                //}
                 // print ('signal: ' + n_original); 
                 var add = {
                     name :  n_original.replace(/\-/g, '_'),
                     type : 'function', //???
-                    desc : this.doc(ename + '.signal.' + n_original)
+                    desc : '', //this.doc(ename + '.' + n_original)
                 };
                 this.genParams(prop,add);
                 mlist.push(add);
@@ -336,7 +350,7 @@ Gtk = XObject.define(
             // use the parent implements list to ensure no dupes..
             for(var i =0; i < GIRepository.object_info_get_n_interfaces(bi); i++) {
                  
-                var prop = GIRepository.object_info_get_interfaces(bi);
+                var prop = GIRepository.object_info_get_interface(bi,i);
                 var iface = prop.get_namespace() +'.'+ prop.get_name();
                 if ( ilist.indexOf(iface) > -1) {
                     continue;
@@ -366,9 +380,10 @@ Gtk = XObject.define(
             meth.ret_type = this.typeToName(GIRepository.callable_info_get_return_type(sig));
             // might be a numbeR??
             meth.params = [];
-            for(var a_i  =0; a_i   < sig.get_n_args(); a_i++) {
-                var arg = sig.get_arg( a_i);
-                 
+            for(var a_i  =0; a_i   < GIRepository.callable_info_get_n_args(sig); a_i++) {
+                var arg = GIRepository.callable_info_get_arg(sig, a_i);
+                print(arg.get_name());
+                print(arg.get_type());
                 meth.params.push({
                     name  : arg.get_name(),
                     type : this.typeToName(arg.get_type(), true)
@@ -388,8 +403,8 @@ Gtk = XObject.define(
             if (ret_type == 'boolean') {
                 ret = "    return false;\n";
             }
-            for(var a_i  =0; a_i   < sig.get_n_args(); a_i++) {
-                var arg = sig.get_arg(a_i);
+            for(var a_i  =0; a_i   < GIRepository.callable_info_get_n_args(sig); a_i++) {
+                var arg = GIRepository.callable_info_get_arg(sig, a_i);
                 
                 args.push(arg.get_name());
             }
@@ -400,7 +415,15 @@ Gtk = XObject.define(
         },
         typeToName  : function (type_info, allow_iface) // find type for properties or arguments.
         {
-           var ty = GIRepository.type_tag_to_string( GIRepository.type_info_get_tag(type_info));
+            print(type_info);
+            if (type_info == 17) {
+                return 'integer';
+            }
+             
+            var x = GIRepository.type_info_get_tag(type_info);
+            print(x);
+            var ty = GIRepository.type_tag_to_string( GIRepository.type_info_get_tag(type_info));
+            print(ty);
            
             if ((ty == 'void') && GIRepository.type_info_is_pointer(type_info)) {
                 return false;
@@ -413,7 +436,7 @@ Gtk = XObject.define(
             }
             // we can accept enum types here..
             var interface_info = GIRepository.type_info_get_interface(type_info);
-            var interface_type = GIRepository.base_info_get_type (interface_info);
+            var interface_type = interface_info.get_type();
             
             if (!allow_iface && interface_type != GIRepository.InfoType.ENUM) {
                 return false;