From 4a5e046c923f4858981c429dd710cdc38ac83ece Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Jul 2019 09:29:28 +1000 Subject: UI: remove button to enable auto-save after load factory preferences Based on feedback from T66675, the current interface is confusing, leading to users accidentally overwriting their preferences. Now, once factory settings are loaded preferences are not saved and the save button is shown (as when auto-save is disabled). Tool tips note that factory settings require manual saving afterwards. Also rename preference menu items for better consistency (settings/state -> preferences). --- source/blender/windowmanager/intern/wm_files.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index d517622645c..47e04bba4c1 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1871,7 +1871,9 @@ void WM_OT_read_factory_userpref(wmOperatorType *ot) { ot->name = "Load Factory Preferences"; ot->idname = "WM_OT_read_factory_userpref"; - ot->description = "Load default preferences"; + ot->description = + "Load factory default preferences. " + "To make changes to preferences permanent, use \"Save Preferences\""; ot->invoke = WM_operator_confirm; ot->exec = wm_userpref_read_exec; @@ -2044,7 +2046,9 @@ void WM_OT_read_factory_settings(wmOperatorType *ot) { ot->name = "Load Factory Settings"; ot->idname = "WM_OT_read_factory_settings"; - ot->description = "Load default file and preferences"; + ot->description = + "Load factory default startup file and preferences. " + "To make changes permanent, use \"Save Startup File\" and \"Save Preferences\""; ot->invoke = WM_operator_confirm; ot->exec = wm_homefile_read_exec; -- cgit v1.2.3