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). --- .../blender/editors/space_userpref/userpref_ops.c | 32 ---------------------- 1 file changed, 32 deletions(-) (limited to 'source/blender/editors/space_userpref') diff --git a/source/blender/editors/space_userpref/userpref_ops.c b/source/blender/editors/space_userpref/userpref_ops.c index c932d537b54..1ec459ccfca 100644 --- a/source/blender/editors/space_userpref/userpref_ops.c +++ b/source/blender/editors/space_userpref/userpref_ops.c @@ -72,39 +72,7 @@ static void PREFERENCES_OT_reset_default_theme(wmOperatorType *ot) /** \} */ -/* -------------------------------------------------------------------- */ -/** \name Toggle Auto-Save Override - * - * This operator only exists so there is a useful tool-tip for for adjusting the global flag. - * \{ */ - -static int preferences_autosave_override_toggle_exec(bContext *UNUSED(C), wmOperator *UNUSED(op)) -{ - G.f ^= G_FLAG_USERPREF_NO_SAVE_ON_EXIT; - return OPERATOR_FINISHED; -} - -static void PREFERENCES_OT_autosave_override_toggle(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Toggle Override Auto-Save"; - ot->idname = "PREFERENCES_OT_autosave_override_toggle"; - ot->description = - "The current session has \"Factory Preferences\" loaded " - "which disables automatically saving.\n" - "Disable this to auto-save the preferences"; - - /* callbacks */ - ot->exec = preferences_autosave_override_toggle_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER; -} - -/** \} */ - void ED_operatortypes_userpref(void) { WM_operatortype_append(PREFERENCES_OT_reset_default_theme); - WM_operatortype_append(PREFERENCES_OT_autosave_override_toggle); } -- cgit v1.2.3