archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Preferences: add new Viewport, Animation, Navigation, Save & Load sections.

Browse Source 
This further changes the preferences organization, to avoid grouping unrelated
settings together. With more sections we can also expand more panels by default,
making it possible to quickly go through sections and see the settings of each.

Panels with less used settings are still collapsed by default, to keep all panel
headers visible without scrolling.

Differential Revision: https://developer.blender.org/D4216
This commit is contained in:
Brecht Van Lommel
2019-01-16 18:49:31 +01:00
parent 4f9bcd6166
commit ad707115d5
4 changed files with 375 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

673
release/scripts/startup/bl_ui/space_userpref.py
View File

File diff suppressed because it is too large Load Diff

3
source/blender/blenloader/intern/versioning_defaults.c
View File

@@ -107,6 +107,9 @@ void BLO_update_defaults_userpref_blend(void)
/* Init weight paint range. */
BKE_colorband_init(&U.coba_weight, true);
/* Default visible section. */
U.userpref = USER_SECTION_INTERFACE;
/* Default to left click select. */
BKE_keyconfig_pref_set_select_mouse(&U, 0, true);
}

15
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -784,14 +784,13 @@ extern UserDef U;
/* Toggles for unfinished 2.8 UserPref design. */
//#define WITH_USERDEF_WORKSPACES
//#define WITH_USERDEF_SYSTEM_SPLIT
/* UserDef.userpref (UI active_section) */
typedef enum eUserPref_Section {
USER_SECTION_INTERFACE = 0,
USER_SECTION_EDIT = 1,
USER_SECTION_SYSTEM_FILES = 2,
USER_SECTION_SYSTEM_GENERAL = 3,
USER_SECTION_EDITING = 1,
USER_SECTION_SAVE_LOAD = 2,
USER_SECTION_SYSTEM = 3,
USER_SECTION_THEME = 4,
USER_SECTION_INPUT = 5,
USER_SECTION_ADDONS = 6,
@@ -802,10 +801,10 @@ typedef enum eUserPref_Section {
USER_SECTION_WORKSPACE_ADDONS = 10,
USER_SECTION_WORKSPACE_KEYMAPS = 11,
#endif
#ifdef WITH_USERDEF_SYSTEM_SPLIT
USER_SECTION_SYSTEM_DISPLAY = 12,
USER_SECTION_SYSTEM_DEVICES = 13,
#endif
USER_SECTION_VIEWPORT = 12,
USER_SECTION_ANIMATION = 13,
USER_SECTION_NAVIGATION = 14,
USER_SECTION_FILE_PATHS = 15,
} eUserPref_Section;
/* UserDef.userpref_flag (State of the user preferences UI). */

29
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -4875,7 +4875,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
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_ui_text(prop, "Hide Dot Files/Data-Blocks", "Hide files/data-blocks that start with a dot (.*)");
RNA_def_property_ui_text(prop, "Hide Dot Files/Libraries", "Hide files and data-blocks if their name start with a dot (.*)");
prop = RNA_def_property(srna, "use_filter_files", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_FILTERFILEEXTS);
@@ -5068,27 +5068,28 @@ void RNA_def_userdef(BlenderRNA *brna)
PropertyRNA *prop;
static const EnumPropertyItem preference_section_items[] = {
{0, "", ICON_USER, "User", ""},
{USER_SECTION_INTERFACE, "INTERFACE", 0, "Interface", ""},
{USER_SECTION_THEME, "THEMES", 0, "Themes", ""},
{USER_SECTION_VIEWPORT, "VIEWPORT", 0, "Viewport", ""},
{USER_SECTION_LIGHT, "LIGHTS", 0, "Lights", ""},
{USER_SECTION_EDIT, "EDITING", 0, "Editing", ""},
{USER_SECTION_INPUT, "INPUT", 0, "Input", ""},
{USER_SECTION_KEYMAP, "KEYMAP", 0, "Keymap", ""},
{USER_SECTION_EDITING, "EDITING", 0, "Editing", ""},
{USER_SECTION_ANIMATION, "ANIMATION", 0, "Animation", ""},
{0, "", 0, NULL, NULL},
{USER_SECTION_ADDONS, "ADDONS", 0, "Add-ons", ""},
#ifdef WITH_USERDEF_WORKSPACES
{0, "", ICON_WORKSPACE, "Workspaces", ""},
#if 0 //def WITH_USERDEF_WORKSPACES
{0, "", 0, NULL, NULL},
{USER_SECTION_WORKSPACE_CONFIG, "WORKSPACE_CONFIG", 0, "Configuration File", ""},
{USER_SECTION_WORKSPACE_ADDONS, "WORKSPACE_ADDONS", 0, "Add-on Overrides", ""},
{USER_SECTION_WORKSPACE_KEYMAPS, "WORKSPACE_KEYMAPS", 0, "Keymap Overrides", ""},
#endif
{0, "", ICON_SYSTEM, "System", ""},
{USER_SECTION_SYSTEM_GENERAL, "SYSTEM_GENERAL", 0, "General", ""},
{USER_SECTION_SYSTEM_FILES, "SYSTEM_FILES", 0, "Files", ""},
#ifdef WITH_USERDEF_SYSTEM_SPLIT
{USER_SECTION_SYSTEM_DISPLAY, "SYSTEM_DISPLAY", 0, "Display", ""},
{USER_SECTION_SYSTEM_DEVICES, "SYSTEM_DEVICES", 0, "Devices", ""},
#endif
{0, "", 0, NULL, NULL},
{USER_SECTION_INPUT, "INPUT", 0, "Input", ""},
{USER_SECTION_NAVIGATION, "NAVIGATION", 0, "Navigation", ""},
{USER_SECTION_KEYMAP, "KEYMAP", 0, "Keymap", ""},
{0, "", 0, NULL, NULL},
{USER_SECTION_SYSTEM, "SYSTEM", 0, "System", ""},
{USER_SECTION_SAVE_LOAD, "SAVE_LOAD", 0, "Save & Load", ""},
{USER_SECTION_FILE_PATHS, "FILE_PATHS", 0, "File Paths", ""},
{0, NULL, 0, NULL, NULL}
};