Page MenuHome
Files F16013

ui_template_list_svn39893.patch
Public
Actions

ui_template_list_svn39893.patch
View Options

Index: source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- source/blender/makesrna/intern/rna_ui_api.c (révision 39893)
+++ source/blender/makesrna/intern/rna_ui_api.c (copie de travail)
@@ -403,6 +403,7 @@
RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR|PROP_NEVER_NULL);
parm= RNA_def_string(func, "active_property", "", 0, "", "Identifier of property in data, for the active element.");
RNA_def_property_flag(parm, PROP_REQUIRED);
+ parm= RNA_def_string(func, "enum_ctrls_name", "", 0, "", "Identifier of a string property in each data memeber, specifying which of its properties should have a widget displayed in its row.");
RNA_def_int(func, "rows", 5, 0, INT_MAX, "", "Number of rows to display.", 0, INT_MAX);
RNA_def_int(func, "maxrows", 5, 0, INT_MAX, "", "Maximum number of rows to display.", 0, INT_MAX);
RNA_def_enum(func, "type", list_type_items, 0, "Type", "Type of list to use.");
Index: source/blender/editors/include/UI_interface.h
===================================================================
--- source/blender/editors/include/UI_interface.h (révision 39893)
+++ source/blender/editors/include/UI_interface.h (copie de travail)
@@ -729,7 +729,7 @@
void uiTemplateTextureImage(uiLayout *layout, struct bContext *C, struct Tex *tex);
void uiTemplateReportsBanner(uiLayout *layout, struct bContext *C);
-void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, int rows, int maxrows, int type);
+void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, const char *enum_ctrls_name, int rows, int maxrows, int type);
/* items */
void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname);
Index: source/blender/editors/interface/interface_templates.c
===================================================================
--- source/blender/editors/interface/interface_templates.c (révision 39893)
+++ source/blender/editors/interface/interface_templates.c (copie de travail)
@@ -2038,8 +2038,7 @@
return rnaicon;
}
-static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, PointerRNA *itemptr, int i, int rnaicon, PointerRNA *activeptr, PropertyRNA *activeprop)
-{
+static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, PointerRNA *itemptr, int i, int rnaicon, PointerRNA *activeptr, PropertyRNA *activeprop, const char *enum_ctrls_name){
uiBlock *block= uiLayoutGetBlock(layout);
uiBut *but;
uiLayout *split, *overlap, *sub, *row;
@@ -2131,6 +2130,78 @@
/* nothing else special to do... */
uiItemL(sub, name, icon); /* fails, backdrop LISTROW... */
}
+ /* There is a last chance to display custom controls (in addition to the name/label):
+ * If the given item property group features a “template_list_enum_controls” enum property,
+ * this tries to add controls for all properties of the item listed in that enum property.
+ *
+ * This is especially useful for python. E.g., if you list a collection of this property
+ * group:
+ *
+ * class TestPropertyGroup(bpy.types.PropertyGroup):
+ * bool = BoolProperty(default=False)
+ * integer = IntProperty()
+ * string = StringProperty()
+ *
+ * # A string of all identifiers (colon-separated) which property’s controls should be
+ * # displayed in a template_list.
+ * template_list_controls = StringProperty(default="integer:bool:string", options={"HIDDEN"})
+ *
+ * … you’ll get a numfield for the integer prop, a check box for the bool prop, and a textfield
+ * for the string prop, after the name of each item of the collection.
+ */
+ else if (enum_ctrls_name) {
+ PropertyRNA *enum_ctrls;
+ row = uiLayoutRow(sub, 1);
+ uiItemL(row, name, icon);
+
+ /* XXX: Check, as sometimes we get an itemptr looking like
+ * {id = {data = 0x0}, type = 0x0, data = 0x0}
+ * which would obviously produce a sigsev… */
+ if (itemptr->type) {
+ /* If the special property is set for the item, and it is a collection… */
+ enum_ctrls = RNA_struct_find_property(itemptr, enum_ctrls_name);
+ if(enum_ctrls) {
+ if(RNA_property_type(enum_ctrls) == PROP_STRING) {
+ char *prop_names = RNA_property_string_get_alloc(itemptr, enum_ctrls, NULL, 0);
+#ifndef strtok_r
+ #ifdef strtok_s
+ #define strtok_r strtok_s
+ #endif
+#endif
+#ifdef strtok_r
+ char *id = NULL;
+ char *ctx = NULL;
+ for(id = strtok_r(prop_names, ":", &ctx); id; id = strtok_r(NULL, ":", &ctx)) {
+ uiItemR(row, itemptr, id, 0, NULL, 0);
+ }
+#else
+ size_t len = strlen(prop_names);
+ char *start_match = prop_names;
+ char *end_match = strchr(start_match, ':');
+ char last = 0;
+ if(!end_match && len) {
+ end_match = prop_names+len;
+ last = 1;
+ }
+ while(end_match) {
+ char *id = BLI_strdupn(start_match, (size_t)(end_match-start_match));
+ uiItemR(row, itemptr, id, 0, NULL, 0);
+ MEM_freeN(id);
+ if(last) break;
+ start_match = end_match+1;
+ end_match = strchr(start_match, ':');
+ if(!end_match) {
+ end_match = prop_names+len;
+ last = 1;
+ }
+ }
+#endif
+ MEM_freeN(prop_names);
+ }
+ }
+ }
+ }
+
else
uiItemL(sub, name, icon); /* fails, backdrop LISTROW... */
@@ -2139,7 +2210,7 @@
MEM_freeN(namebuf);
}
-void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, PointerRNA *activeptr, const char *activepropname, int rows, int maxrows, int listtype)
+void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, PointerRNA *activeptr, const char *activepropname, const char *enum_ctrls_name, int rows, int maxrows, int listtype)
{
//Scene *scene= CTX_data_scene(C);
PropertyRNA *prop= NULL, *activeprop;
@@ -2293,7 +2364,7 @@
/* create list items */
RNA_PROP_BEGIN(ptr, itemptr, prop) {
if(i >= pa->list_scroll && i<pa->list_scroll+items)
- list_item_row(C, col, ptr, &itemptr, i, rnaicon, activeptr, activeprop);
+ list_item_row(C, col, ptr, &itemptr, i, rnaicon, activeptr, activeprop, enum_ctrls_name);
i++;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
70/23/5f71a5864bc5b0d61953ae016098

Event Timeline