fix merge

diff --git a/src/Builder4/PopoverAddProp.bjs b/src/Builder4/PopoverAddProp.bjs
index 9614074..cd44dc3 100644 (file)
--- a/src/Builder4/PopoverAddProp.bjs
+++ b/src/Builder4/PopoverAddProp.bjs
@@ -180,9 +180,11 @@
     "",
     "        this.model.el.set(iter,",
     "                0,  prop, ",
-    "                1,  prop.to_property_option_markup(),",
-    "                2,  prop.to_property_option_tooltip(),                ",
-    "                3,  prop.name,                ",
+    "                1,  prop.to_property_option_markup(p.propertyof == xtype),",
+    "                2,  p.doctxt,                ",
+    "                3,  prop.name,",
+    "                4,  prop.rtype,",
+    "                5,  p.propertyof,",
     "                -1",
     "        );",
     "    }",
@@ -222,4 +224,4 @@
  "path" : "/home/alan/gitlive/roobuilder/src/Builder4/PopoverAddProp.bjs",
  "permname" : "",
  "title" : ""
-}
\ No newline at end of file
+}

diff --git a/src/Builder4/PopoverAddProp.vala b/src/Builder4/PopoverAddProp.vala
index 78fd8b8..833a00e 100644 (file)
--- a/src/Builder4/PopoverAddProp.vala
+++ b/src/Builder4/PopoverAddProp.vala
@@ -76,9 +76,11 @@ public class Xcls_PopoverAddProp : Object
     
             this.model.el.set(iter,
                     0,  prop, 
-                    1,  prop.to_property_option_markup(),
-                    2,  prop.to_property_option_tooltip(),                
-                    3,  prop.name,                
+                    1,  prop.to_property_option_markup(p.propertyof == xtype),
+                    2,  p.doctxt,                
+                    3,  prop.name,
+                    4,  prop.rtype,
+                    5,  p.propertyof,
                     -1
             );
         }

diff --git a/src/Palete/Roo.vala b/src/Palete/Roo.vala
index 737501e..1298432 100644 (file)
--- a/src/Palete/Roo.vala
+++ b/src/Palete/Roo.vala
@@ -248,7 +248,7 @@ namespace Palete {
                                
                                
                                case JsRender.NodePropType.PROP:
-                                       return cls.props;
+                                       return this.filterProps(cls.props);
                                case JsRender.NodePropType.LISTENER:
                                        return cls.signals;
                                case JsRender.NodePropType.METHOD:
@@ -268,6 +268,33 @@ namespace Palete {
 
                         
                }
+               
+               
+               // get rid of objecst from props list.. (assumed to be anything with 'dot' in the type.
+               public Gee.HashMap<string,GirObject>  filterProps(Gee.HashMap<string,GirObject> props)
+               {
+                       // we shold probably cache this??
+                       
+                       var outprops = new Gee.HashMap<string,GirObject>(); 
+                       
+                       foreach(var k in props.keys) {
+                               var val = props.get(k);
+                        
+                               if (!val.type.contains(".")) {
+                                       outprops.set(k,val);
+ 
+                               }
+                                
+                               // do nothing? - classes not allowed?
+                               
+                       }
+                       
+                       
+                       return outprops;
+               
+               
+               }
+               
                public string[] getInheritsFor(string ename)
                {
                        string[] ret = {};