[Bf-blender-cvs] [b5d4bd8ac3e] userpref_redesign: More small tweaks/fixes to new Preferences
William Reynish
noreply at git.blender.org
Fri Dec 21 00:24:51 CET 2018
Commit: b5d4bd8ac3eec8e7b5a87ebc5cd6d6f2d4019933
Author: William Reynish
Date: Fri Dec 21 00:09:01 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rBb5d4bd8ac3eec8e7b5a87ebc5cd6d6f2d4019933
More small tweaks/fixes to new Preferences
* Fixed gap in Viewports panel
* Made all buttons to install things (Addons, Lights, Keymaps, Themes etc) use the same icon and use elipses (...) to communicate the fact that they open a dialog.
* Fixed own code error in Input > View panel
* Re-ordered panels in Input section - now related Mouse and Devices panels are next to each other
* Renamed User Preferences in the Editor list to just Preferences - consistent with Edit > Preferences
* Removed icon for auto-key toggle - doesn't fit here
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 74f6ec1fc85..78d0e229d8c 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -179,6 +179,9 @@ class USERPREF_PT_interface_viewports(PreferencePanel):
userpref = context.user_preferences
return (userpref.active_section == 'INTERFACE')
+ def draw(self, context):
+ pass
+
class USERPREF_PT_interface_viewports_3d(PreferencePanel):
bl_label = "3D Viewports"
@@ -719,7 +722,7 @@ class USERPREF_PT_theme(Panel):
row = layout.row()
- row.operator("wm.theme_install", text="Install", icon='FILEBROWSER')
+ row.operator("wm.theme_install", text="Install...", icon='IMPORT')
row.operator("ui.reset_default_theme", text="Reset", icon='LOOP_BACK')
subrow = row.row(align=True)
@@ -1346,17 +1349,16 @@ class USERPREF_PT_input_view(PreferencePanel):
layout.row().prop(inputs, "view_rotate_method", expand=True)
- layout.row().prop(inputs, "view_zoom_method", text="Zoom Method")
+ layout.prop(inputs, "view_zoom_method", text="Zoom Method")
if inputs.view_zoom_method in {'DOLLY', 'CONTINUE'}:
- sub.row().prop(inputs, "view_zoom_axis", expand=True)
- sub.prop(inputs, "invert_mouse_zoom", text="Invert Mouse Zoom Direction")
+ layout.row().prop(inputs, "view_zoom_axis", expand=True)
+ layout.prop(inputs, "invert_mouse_zoom", text="Invert Mouse Zoom Direction")
layout.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction")
#sub.prop(view, "wheel_scroll_lines", text="Scroll Lines")
if sys.platform == "darwin":
- sub = layout.column()
- sub.prop(inputs, "use_trackpad_natural", text="Natural Trackpad Direction")
+ layout.prop(inputs, "use_trackpad_natural", text="Natural Trackpad Direction")
class USERPREF_PT_input_view_fly_walk(PreferencePanel):
bl_label = "Fly & Walk"
@@ -1604,7 +1606,7 @@ class USERPREF_PT_addons(Panel):
]
row = layout.row()
- row.operator("wm.addon_install", icon='ADD', text="Install...")
+ row.operator("wm.addon_install", icon='IMPORT', text="Install...")
row.operator("wm.addon_refresh", icon='FILE_REFRESH', text="Refresh")
row.menu("USERPREF_MT_addons_online_resources", text="Online Resources")
@@ -1826,9 +1828,9 @@ class USERPREF_PT_studiolight_add(PreferencePanel):
userpref = context.user_preferences
row = layout.row()
- row.operator('wm.studiolight_install', text="Add MatCap").type = 'MATCAP'
- row.operator('wm.studiolight_install', text="Add LookDev HDRI").type = 'WORLD'
- op = row.operator('wm.studiolight_install', text="Add Studio Light")
+ row.operator('wm.studiolight_install', icon='IMPORT', text="Add MatCap...").type = 'MATCAP'
+ row.operator('wm.studiolight_install', icon='IMPORT', text="Add LookDev HDRI...").type = 'WORLD'
+ op = row.operator('wm.studiolight_install', icon='IMPORT', text="Add Studio Light...")
op.type = 'STUDIO'
op.filter_glob = ".sl"
@@ -2005,12 +2007,13 @@ classes += (
USERPREF_MT_keyconfigs,
USERPREF_PT_input_mouse,
- USERPREF_PT_input_view,
- USERPREF_PT_input_view_fly_walk,
- USERPREF_PT_input_view_fly_walk_gravity,
USERPREF_PT_input_devices,
USERPREF_PT_input_devices_tablet,
USERPREF_PT_input_devices_ndof,
+ USERPREF_PT_input_view,
+ USERPREF_PT_input_view_fly_walk,
+ USERPREF_PT_input_view_fly_walk_gravity,
+
USERPREF_PT_keymap,
USERPREF_MT_addons_online_resources,
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index b77eed67d21..c994140d384 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -102,7 +102,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = {
{SPACE_OUTLINER, "OUTLINER", ICON_OUTLINER, "Outliner", "Overview of scene graph and all available data-blocks"},
{SPACE_BUTS, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"},
{SPACE_FILE, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", "Browse for files and assets"},
- {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences",
+ {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "Preferences",
"Edit persistent configuration settings"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 76be9905b43..e66fbd61c06 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4038,7 +4038,6 @@ static void rna_def_userdef_edit(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Auto Keying Enable",
"Automatic keyframe insertion for Objects and Bones "
"(default setting used for new Scenes)");
- RNA_def_property_ui_icon(prop, ICON_REC, 0);
prop = RNA_def_property(srna, "auto_keying_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, auto_key_modes);
More information about the Bf-blender-cvs
mailing list