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).

1 files changed, 6 insertions, 19 deletions

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 2f573d83132..02d9f797581 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -40,22 +40,9 @@ class USERPREF_HT_header(Header):
 
         row = layout.row()
         row.menu("USERPREF_MT_save_load", text="", icon='COLLAPSEMENU')
-        # Use '_is_startup' so once factory settings are loaded
-        # this display option will show, since it's confusing if disabling
-        # the option makes it dissapiers.
-        if prefs.use_preferences_save:
-            use_userpref_skip_save_on_exit = bpy.app.use_userpref_skip_save_on_exit
-            if use_userpref_skip_save_on_exit or getattr(USERPREF_HT_header, "_is_startup", False):
-                USERPREF_HT_header._is_startup = True
-
-                sub = row.row(align=True)
-                sub.alignment = 'LEFT'
-                props = sub.operator(
-                    "preferences.autosave_override_toggle",
-                    text="Skip Auto-Save",
-                    emboss=False,
-                    icon='CHECKBOX_HLT' if use_userpref_skip_save_on_exit else 'CHECKBOX_DEHLT',
-                )
+
+        if prefs.use_preferences_save and (not bpy.app.use_userpref_skip_save_on_exit):
+            pass
         else:
             sub = row.row(align=True)
             sub.active = prefs.is_dirty
@@ -103,13 +90,13 @@ class USERPREF_MT_save_load(Menu):
 
         layout.operator_context = 'EXEC_AREA'
         if prefs.use_preferences_save:
-            layout.operator("wm.save_userpref", text="Save Current State")
+            layout.operator("wm.save_userpref", text="Save Preferences")
         sub_revert = layout.column(align=True)
         sub_revert.active = prefs.is_dirty
-        sub_revert.operator("wm.read_userpref", text="Revert to Saved")
+        sub_revert.operator("wm.read_userpref", text="Revert to Saved Preferences")
 
         layout.operator_context = 'INVOKE_AREA'
-        layout.operator("wm.read_factory_userpref", text="Load Factory Settings")
+        layout.operator("wm.read_factory_userpref", text="Load Factory Preferences")
 
 
 class USERPREF_PT_save_preferences(Panel):