[Bf-blender-cvs] [c29ed65f03c] master: UI: adjust preferences save/revert button layout

Campbell Barton noreply at git.blender.org
Wed May 15 00:58:54 CEST 2019


Commit: c29ed65f03c480022ec8d4b98355ffc0ca82fb80
Author: Campbell Barton
Date:   Wed May 15 08:55:36 2019 +1000
Branches: master
https://developer.blender.org/rBc29ed65f03c480022ec8d4b98355ffc0ca82fb80

UI: adjust preferences save/revert button layout

Also add description for factory preferences.

===================================================================

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index bec64295732..ca2d616a919 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -34,16 +34,13 @@ class USERPREF_HT_header(Header):
     def draw_buttons(layout, context, *, is_vertical=False):
         prefs = context.preferences
 
-        if is_vertical:
-            sub = layout.column(align=True)
-        else:
-            sub = layout.row(align=True)
+        row = layout.row()
 
-        sub.operator("wm.save_userpref")
-        sub_revert = sub.row(align=True)
-        sub_revert.active = prefs.is_dirty
-        sub_revert.operator("wm.read_userpref", text="Revert Preferences")
-        sub.operator("wm.read_factory_userpref", text="Load Factory Preferences")
+        row.operator("wm.save_userpref", text="Save")
+        row_revert = row.row(align=True)
+        row_revert.active = prefs.is_dirty
+        row_revert.operator("wm.read_userpref", text="Revert")
+        layout.operator("wm.read_factory_userpref", text="Load Factory Settings")
 
         layout.prop(prefs, "use_preferences_save")
 
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 70bbf9a178a..304daa2dd00 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1820,6 +1820,7 @@ 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->invoke = WM_operator_confirm;
   ot->exec = wm_userpref_read_exec;



More information about the Bf-blender-cvs mailing list