X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=d3bee7979881a9817d0277fc8627d6969732e7b6;hp=9ba21a2c6b4577a45c066cff3b402039cb985b7a;hb=44c28a5868e34c214f62b24ef1bab34983b4e663;hpb=f1220679ea534935eeb0f2f14a548b2159651429

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 9ba21a2c6..d3bee7979 100644
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -48,7 +48,7 @@ function BuildLists () {
     
  
 
-    var ns_list = [ 'Gtk' , 'Gdk', 'Pango', 'GtkSource', 'WebKit', 'Vte'] ; //NameSpace.namespaces();
+    var ns_list = [ 'Gtk' , 'Gdk', 'Pango', 'GtkSource', 'WebKit', 'Vte', 'GtkClutter'] ; //NameSpace.namespaces();
      
     ns_list = ns_list.sort();
     // let's try and load them, so we find out early what will fail.
@@ -90,6 +90,7 @@ function BuildLists () {
             //titleType : odata.titleType,
             extendsClasses : [],
             can_contain : [],
+            can_contain_using: [],
           //  can_be_added_to : [],
             //using_methods : { },
             can_be_added_to_as : {}
@@ -129,8 +130,12 @@ function BuildLists () {
                     addable_type = p.memberOf + '.' + p.type;
                 }
                 
-                
-               
+                if (m.memberOf == 'Gtk.Buildable') {
+                    return;
+                }
+                if (m.name =='add_mnemonic_label') {
+                    return;
+                }
                 // in theory you can not add a window to anything.. ???
                 //if ('Gtk.Window' == addable_type || methods[addable_type].extendsClasses.indexOf('Gtk.Window') > -1) {
                 //    return;
@@ -144,7 +149,9 @@ function BuildLists () {
                 //}
                 
                 methods[cls].can_contain.pushUnique(addable_type);
-                
+                var add = m.memberOf +':'+ m.name;
+ 
+                methods[cls].can_contain_using.pushUnique(add);
                 //methods[cls].using_methods[m.name] = m.params;
                 
                 //if (methods[addable_type].can_be_added_to.indexOf(cls) < 0) { 
@@ -152,7 +159,6 @@ function BuildLists () {
                 //}
                 
                 
-                var add = m.memberOf +':'+ m.name;
                 
                 if (typeof(methods[addable_type].can_be_added_to_as[cls]) == 'undefined') {
                     methods[addable_type].can_be_added_to_as[cls]=[];
@@ -326,21 +332,48 @@ right:
         
     }
     var nusage = {};
+	var usage_left = {};
     for(var par in usage) {
         // see if the parent can be added to something.
         if (!canTop(par)) {
             continue;
         }
+		var duped = false;
+		for(var dupe in usage) {
+			if (par != dupe && usage[par].join(',') == usage[dupe].join(',') && nusage[dupe]) {
+				duped = true;
+				
+				if (typeof(usage_left[dupe]) == 'undefined') {
+					usage_left[dupe] = []; 
+				}
+				print(par+ ' is a dupe of ' + dupe);
+				usage_left[dupe].pushUnique(par);
+				break;
+			}
+		}
+		 if (duped) {
+		 	continue;
+		 }
         nusage[par] = usage[par];
         
     }
-    
+    usage = nusage;
     print(JSON.stringify(nusage,null,4));
-    
-    print(JSON.stringify(methods['Gtk.Switch'],null,4));
+    Seed.exit();
+    //print(JSON.stringify(methods['Gtk.Switch'],null,4));
 
-    
-    
+    var str = [];
+	for(var par in usage) {
+		str.push('left');
+		str.push('   ' + par);
+		if (typeof(usage_left[par]) != 'undefined') {
+			usage_left[par].forEach(function(d) { str.push('    ' + d);});
+		}
+		str.push('right');
+		usage[par].forEach(function(d) { str.push('    ' + d);});
+		str.push('');
+	}
+	print(str.join("\n"));
     //print(JSON.stringify(implementations ,null,4));
     /*
       methods is