fix #7270 - property list fixes

diff --git a/src/Builder4/PopoverAddProp.bjs b/src/Builder4/PopoverAddProp.bjs
index 3bb4ade..4c9b937 100644 (file)
--- a/src/Builder4/PopoverAddProp.bjs
+++ b/src/Builder4/PopoverAddProp.bjs
@@ -218,7 +218,7 @@
     "        this.model.el.set(iter,",
     "                0,  prop, ",
     "                1,  prop.to_property_option_markup(p.propertyof == xtype),",
-    "                2,  p.doctxt,                ",
+    "                2,  prop.to_property_option_tooltip(),                ",
     "                3,  prop.name,",
     "                4,  prop.rtype,",
     "                5,  p.propertyof,",
@@ -261,4 +261,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 dc5eb55..f591f54 100644 (file)
--- a/src/Builder4/PopoverAddProp.vala
+++ b/src/Builder4/PopoverAddProp.vala
@@ -81,7 +81,7 @@ public class Xcls_PopoverAddProp : Object
             this.model.el.set(iter,
                     0,  prop, 
                     1,  prop.to_property_option_markup(p.propertyof == xtype),
-                    2,  p.doctxt,                
+                    2,  prop.to_property_option_tooltip(),                
                     3,  prop.name,
                     4,  prop.rtype,
                     5,  p.propertyof,

diff --git a/src/Palete/Roo.vala b/src/Palete/Roo.vala
index 1298432..737501e 100644 (file)
--- a/src/Palete/Roo.vala
+++ b/src/Palete/Roo.vala
@@ -248,7 +248,7 @@ namespace Palete {
                                
                                
                                case JsRender.NodePropType.PROP:
-                                       return this.filterProps(cls.props);
+                                       return cls.props;
                                case JsRender.NodePropType.LISTENER:
                                        return cls.signals;
                                case JsRender.NodePropType.METHOD:
@@ -268,33 +268,6 @@ 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 = {};