[Bf-blender-cvs] [efcf46fb6d8] master: Fix T90317: Confusing File Browser Preferences
Harley Acheson
noreply at git.blender.org
Thu Sep 9 18:50:49 CEST 2021
Commit: efcf46fb6d87f1eb22ce2c0b5c9314d31269b648
Author: Harley Acheson
Date: Thu Sep 9 09:49:45 2021 -0700
Branches: master
https://developer.blender.org/rBefcf46fb6d87f1eb22ce2c0b5c9314d31269b648
Fix T90317: Confusing File Browser Preferences
Preferences / File Browser section made less confusing.
See D12436 for details and comparisons.
Differential Revision: https://developer.blender.org/D12436
Reviewed by Campbell Barton and Julian Eisel
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 0d1cbc424d7..1711519bce1 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1455,13 +1455,11 @@ class USERPREF_PT_saveload_file_browser(SaveLoadPanel, CenterAlignMixIn, Panel):
prefs = context.preferences
paths = prefs.filepaths
- col = layout.column()
+ col = layout.column(heading="Defaults")
col.prop(paths, "use_filter_files")
-
- col = layout.column(heading="Hide")
- col.prop(paths, "show_hidden_files_datablocks", text="Dot File & Data-Blocks")
- col.prop(paths, "hide_recent_locations", text="Recent Locations")
- col.prop(paths, "hide_system_bookmarks", text="System Bookmarks")
+ col.prop(paths, "show_hidden_files_datablocks")
+ col.prop(paths, "show_recent_locations")
+ col.prop(paths, "show_system_bookmarks")
# -----------------------------------------------------------------------------
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 0a328c3b068..b3a3d0198fe 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6073,26 +6073,25 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
RNA_def_struct_ui_text(srna, "File Paths", "Default paths for external files");
prop = RNA_def_property(srna, "show_hidden_files_datablocks", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_DOT);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_HIDE_DOT);
RNA_def_property_ui_text(prop,
- "Hide Dot Files/Data-Blocks",
- "Hide files and data-blocks if their name start with a dot (.*)");
+ "Show Hidden Files/Data-Blocks",
+ "Show files and data-blocks that are normally hidden");
prop = RNA_def_property(srna, "use_filter_files", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_FILTERFILEEXTS);
- RNA_def_property_ui_text(prop,
- "Filter File Extensions",
- "Display only files with extensions in the image select window");
+ RNA_def_property_ui_text(
+ prop, "Filter Files", "Enable filtering of files in the File Browser");
- prop = RNA_def_property(srna, "hide_recent_locations", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_RECENT);
+ prop = RNA_def_property(srna, "show_recent_locations", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_HIDE_RECENT);
RNA_def_property_ui_text(
- prop, "Hide Recent Locations", "Hide recent locations in the file selector");
+ prop, "Show Recent Locations", "Show Recent locations list in the File Browser");
- prop = RNA_def_property(srna, "hide_system_bookmarks", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_SYSTEM_BOOKMARKS);
+ prop = RNA_def_property(srna, "show_system_bookmarks", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_HIDE_SYSTEM_BOOKMARKS);
RNA_def_property_ui_text(
- prop, "Hide System Bookmarks", "Hide system bookmarks in the file selector");
+ prop, "Show System Locations", "Show System locations list in the File Browser");
prop = RNA_def_property(srna, "use_relative_paths", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_RELPATHS);
More information about the Bf-blender-cvs
mailing list