[Bf-blender-cvs] [7bf7f67] master: Revert part of rB4d9345479aa86f61, and cleanup a bit.

Bastien Montagne noreply at git.blender.org
Fri Oct 16 11:23:06 CEST 2015


Commit: 7bf7f67a4604e4daf01e87163c49361acb11bbbe
Author: Bastien Montagne
Date:   Fri Oct 16 11:21:12 2015 +0200
Branches: master
https://developer.blender.org/rB7bf7f67a4604e4daf01e87163c49361acb11bbbe

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...

===================================================================

M	release/scripts/startup/bl_ui/space_filebrowser.py
M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 0d30113..d7b93dc 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 5114037..b9db366 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);
 }




More information about the Bf-blender-cvs mailing list