blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Revert part of rB4d9345479aa86f61, and cleanup a bit. 

'thumbnail_size' is now used in all cases, it controlls column width in other viewmodes
of filebrowser. We cannot (easily) rename that DNA member, but I also renamed RNA
property, and fixed its tooltip...
This commit is contained in:
Bastien Montagne 2015-10-16 11:21:12 +02:00
parent 4d9345479a
commit 7bf7f67a46
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/space_filebrowser.py
View File

@ -56,8 +56,7 @@ class FILEBROWSER_HT_header(Header):
layout.prop(params, "display_type", expand=True, text="")
if params.display_type == 'THUMBNAIL':
layout.prop(params, "thumbnail_size", text="")
layout.prop(params, "display_size", text="")
layout.prop(params, "sort_method", expand=True, text="")

9
source/blender/makesrna/intern/rna_space.c
View File

@ -3741,7 +3741,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem thumbnail_size_items[] = {
static EnumPropertyItem display_size_items[] = {
{32, "TINY", 0, "Tiny", ""},
{64, "SMALL", 0, "Small", ""},
{128, "NORMAL", 0, "Normal", ""},
@ -3940,10 +3940,11 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
prop = RNA_def_property(srna, "thumbnail_size", PROP_ENUM, PROP_NONE);
prop = RNA_def_property(srna, "display_size", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "thumbnail_size");
RNA_def_property_enum_items(prop, thumbnail_size_items);
RNA_def_property_ui_text(prop, "Thumbnails Size", "Change the size of the thumbnails");
RNA_def_property_enum_items(prop, display_size_items);
RNA_def_property_ui_text(prop, "Display Size",
"Change the size of the display (width of columns or thumbnails size)");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
}