Revert part of rB4d9345479aa86f61, and cleanup a bit.
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 16 Oct 2015 09:21:12 +0000 (11:21 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 16 Oct 2015 09:21:12 +0000 (11:21 +0200)
'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...

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

index 0d30113e68a89e3f55aed810beb49ee603f8f3c6..d7b93dc36f05397e83130e9e891dbf7b60e51bd0 100644 (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="")
 
index 5114037f8522e7ac13525391cdd3cd97570c67e6..b9db36628ee0d39b2e39cb3f960a16e248ae37e3 100644 (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);
 }