src/builder4_vala.stamp
authorAlan Knowles <alan@roojs.com>
Mon, 11 May 2015 12:19:57 +0000 (20:19 +0800)
committerAlan Knowles <alan@roojs.com>
Mon, 11 May 2015 12:19:57 +0000 (20:19 +0800)
src/builder4_vala.stamp-t
src/Application.c.valatmp
src/Main.c.valatmp
src/JsRender/Gtk.c.valatmp
src/JsRender/JsRender.c.valatmp
src/JsRender/Lang.c.valatmp
src/JsRender/NodeToGlade.c.valatmp
src/JsRender/NodeToGtk.c.valatmp
src/JsRender/NodeToJs.c.valatmp
src/JsRender/NodeToVala.c.valatmp
src/JsRender/Node.c.valatmp
src/JsRender/Roo.c.valatmp
src/Project/Gtk.c.valatmp
src/Project/Project.c.valatmp
src/Project/Roo.c.valatmp
src/Palete/Gir.c.valatmp
src/Palete/GirObject.c.valatmp
src/Palete/VapiParser.c.valatmp
src/Palete/Gtk.c.valatmp
src/Palete/RooDatabase.c.valatmp
src/Palete/Javascript.c.valatmp
src/Palete/Palete.c.valatmp
src/Palete/Roo.c.valatmp
src/Palete/ValaSource.c.valatmp
src/Builder4/About.c.valatmp
src/Builder4/DialogConfirm.c.valatmp
src/Builder4/DialogNewComponent.c.valatmp
src/Builder4/StandardErrorDialog.c.valatmp
src/Builder4/DialogSaveTemplate.c.valatmp
src/Builder4/DialogSaveModule.c.valatmp
src/Builder4/DialogTemplateSelect.c.valatmp
src/Builder4/EditProject.c.valatmp
src/Builder4/Editor.c.valatmp
src/Builder4/ProjectSettings.c.valatmp
src/Builder4/WindowRightPalete.c.valatmp
src/Builder4/WindowLeftTree.c.valatmp
src/Builder4/WindowRooView.c.valatmp
src/Builder4/WindowLeftProps.c.valatmp
src/Builder4/ClutterFiles.c.valatmp
src/Builder4/WindowLeftProjects.c.valatmp
src/Builder4/WindowAddProp.c.valatmp
src/Builder4/GtkView.c.valatmp
src/Builder4/ValaProjectSettings.c.valatmp
src/Builder4/MainWindow.c.valatmp
src/Builder4/WindowState.c.valatmp
src/Builder4/FakeServer.c.valatmp
src/Builder4/DialogPluginWebkit.c.valatmp
src/Resources.c.valatmp

src/Palete/Palete.vala
src/Palete/Roo.vala

index eda2d0d..606b5ca 100644 (file)
@@ -393,7 +393,7 @@ namespace Palete
        public abstract Gee.HashMap<string,GirObject> getPropertiesFor(string ename, string type);
        public abstract GirObject? getClass(string ename);
        
-       public abstract bool type
+       public abstract bool typeOptions(string fqn, string key, string type, out string[] opts);
        
     }
 
index c873d3c..1a3ae34 100644 (file)
@@ -46,8 +46,8 @@ namespace Palete {
                                prop.propertyof = o.has_member("memberOf") ? o.get_string_member("memberOf") : "";
                                prop.sig = o.has_member("sig") ? o.get_string_member("sig") : "";
                                
-                               if (o.has_member("optvals")) {
-                                       var oar = o.get_array_member("desc");
+                               if (o.has_member("optvals")  ) {
+                                       var oar = o.get_array_member("optvals");
                                        
                                        for (var oi = 0; oi < oar.get_length(); oi++) {
                                                prop.optvalues.add(oar.get_string_element(oi));