diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-16 12:21:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-16 12:21:12 +0300 |
| commit | 7bf7f67a4604e4daf01e87163c49361acb11bbbe (patch) | |
| tree | 331b9a2b65ef2131b5aafccc6e4340d035306631 | |
| parent | 4d9345479aa86f610650f43a6c5e04235d8943d1 (diff) | |
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...
| -rw-r--r-- | release/scripts/startup/bl_ui/space_filebrowser.py | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 0d30113e68a..d7b93dc36f0 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -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="") diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 5114037f852..b9db36628ee 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -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); } |