[Bf-blender-cvs] [c9f24a56907] blender2.8: WM: remove interaction presets
Campbell Barton
noreply at git.blender.org
Mon Nov 19 22:17:09 CET 2018
Commit: c9f24a569070f8b4f804cf56e1f0f87e0042a4e2
Author: Campbell Barton
Date: Tue Nov 20 08:08:46 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc9f24a569070f8b4f804cf56e1f0f87e0042a4e2
WM: remove interaction presets
These only exposed a few options, which didn't end up helping
much to make Blender's key-map fit the behavior of other applications.
===================================================================
D release/scripts/presets/interaction/3dsmax.py
D release/scripts/presets/interaction/blender.py
D release/scripts/presets/interaction/maya.py
M release/scripts/startup/bl_operators/presets.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/space_userpref.py
M tests/python/bl_run_operators.py
===================================================================
diff --git a/release/scripts/presets/interaction/3dsmax.py b/release/scripts/presets/interaction/3dsmax.py
deleted file mode 100644
index 681aa4ab4b7..00000000000
--- a/release/scripts/presets/interaction/3dsmax.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration 3dsmax
-import bpy
-
-bpy.context.user_preferences.edit.use_drag_immediately = False
-bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
-bpy.context.user_preferences.view.use_auto_perspective = True
-bpy.context.user_preferences.view.use_quit_dialog = True
-bpy.context.user_preferences.inputs.select_mouse = 'LEFT'
-bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
-bpy.context.user_preferences.inputs.view_zoom_axis = 'VERTICAL'
-bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = False
diff --git a/release/scripts/presets/interaction/blender.py b/release/scripts/presets/interaction/blender.py
deleted file mode 100644
index 0c79a3fc909..00000000000
--- a/release/scripts/presets/interaction/blender.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration Blender
-import bpy
-
-bpy.context.user_preferences.view.use_mouse_depth_cursor = False
-bpy.context.user_preferences.view.use_mouse_depth_navigate = False
-bpy.context.user_preferences.view.use_zoom_to_mouse = False
-bpy.context.user_preferences.view.use_rotate_around_active = False
-bpy.context.user_preferences.edit.use_drag_immediately = False
-bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
-bpy.context.user_preferences.inputs.select_mouse = 'RIGHT'
-bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
-bpy.context.user_preferences.inputs.view_zoom_axis = 'VERTICAL'
-bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = False
diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py
deleted file mode 100644
index 059669d6482..00000000000
--- a/release/scripts/presets/interaction/maya.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration Blender
-import bpy
-
-bpy.context.user_preferences.edit.use_drag_immediately = True
-bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
-bpy.context.user_preferences.inputs.select_mouse = 'LEFT'
-bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
-bpy.context.user_preferences.inputs.view_zoom_axis = 'HORIZONTAL'
-bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = False
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 3e08bd1fe6f..770133e2514 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -441,32 +441,6 @@ class AddPresetHairDynamics(AddPresetBase, Operator):
]
-class AddPresetInteraction(AddPresetBase, Operator):
- """Add or remove an Application Interaction Preset"""
- bl_idname = "wm.interaction_preset_add"
- bl_label = "Add Interaction Preset"
- preset_menu = "USERPREF_MT_interaction_presets"
-
- preset_defines = [
- "user_preferences = bpy.context.user_preferences"
- ]
-
- preset_values = [
- "user_preferences.edit.use_drag_immediately",
- "user_preferences.edit.use_insertkey_xyz_to_rgb",
- "user_preferences.inputs.invert_mouse_zoom",
- "user_preferences.inputs.select_mouse",
- "user_preferences.inputs.use_emulate_numpad",
- "user_preferences.inputs.use_mouse_continuous",
- "user_preferences.inputs.use_mouse_emulate_3_button",
- "user_preferences.inputs.view_rotate_method",
- "user_preferences.inputs.view_zoom_axis",
- "user_preferences.inputs.view_zoom_method",
- ]
-
- preset_subdir = "interaction"
-
-
class AddPresetTrackingCamera(AddPresetBase, Operator):
"""Add or remove a Tracking Camera Intrinsics Preset"""
bl_idname = "clip.camera_preset_add"
@@ -748,7 +722,6 @@ classes = (
AddPresetCloth,
AddPresetFluid,
AddPresetHairDynamics,
- AddPresetInteraction,
AddPresetInterfaceTheme,
AddPresetKeyconfig,
AddPresetNodeColor,
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 81183dd3fd6..0f112d408c4 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1419,49 +1419,6 @@ class WM_OT_keyconfig_activate(Operator):
return {'CANCELLED'}
-class WM_OT_appconfig_default(Operator):
- bl_idname = "wm.appconfig_default"
- bl_label = "Default Application Configuration"
-
- def execute(self, context):
- import os
-
- context.window_manager.keyconfigs.active = context.window_manager.keyconfigs.default
-
- filepath = os.path.join(bpy.utils.preset_paths("interaction")[0], "blender.py")
-
- if os.path.exists(filepath):
- bpy.ops.script.execute_preset(
- filepath=filepath,
- menu_idname="USERPREF_MT_interaction_presets",
- )
-
- return {'FINISHED'}
-
-
-class WM_OT_appconfig_activate(Operator):
- bl_idname = "wm.appconfig_activate"
- bl_label = "Activate Application Configuration"
-
- filepath: StringProperty(
- subtype='FILE_PATH',
- )
-
- def execute(self, context):
- import os
- filepath = self.filepath
- bpy.utils.keyconfig_set(filepath)
- dirname, filename = os.path.split(filepath)
- filepath = os.path.normpath(os.path.join(dirname, os.pardir, "interaction", filename))
- if os.path.exists(filepath):
- bpy.ops.script.execute_preset(
- filepath=filepath,
- menu_idname="USERPREF_MT_interaction_presets",
- )
-
- return {'FINISHED'}
-
-
class WM_OT_sysinfo(Operator):
"""Generate system information, saved into a text file"""
@@ -2754,8 +2711,6 @@ classes = (
WM_OT_addon_remove,
WM_OT_addon_userpref_show,
WM_OT_app_template_install,
- WM_OT_appconfig_activate,
- WM_OT_appconfig_default,
WM_OT_context_collection_boolean_set,
WM_OT_context_cycle_array,
WM_OT_context_cycle_enum,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index a2f9c11b46d..a14d1b892be 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -73,25 +73,6 @@ class USERPREF_PT_tabs(Panel):
layout.row().prop(userpref, "active_section", expand=True)
-class USERPREF_MT_interaction_presets(Menu):
- bl_label = "Presets"
- preset_subdir = "interaction"
- preset_operator = "script.execute_preset"
- draw = Menu.draw_preset
-
-
-class USERPREF_MT_appconfigs(Menu):
- bl_label = "AppPresets"
- preset_subdir = "keyconfig"
- preset_operator = "wm.appconfig_activate"
-
- def draw(self, context):
- self.layout.operator("wm.appconfig_default", text="Blender (default)")
-
- # now draw the presets
- Menu.draw_preset(self, context)
-
-
class USERPREF_PT_interface(Panel):
bl_space_type = 'USER_PREFERENCES'
bl_label = "Interface"
@@ -1089,13 +1070,6 @@ class USERPREF_PT_input(Panel):
# General settings
sub = layout.column()
- sub.label(text="Presets:")
- subrow = sub.row(align=True)
-
- subrow.menu("USERPREF_MT_interaction_presets", text=bpy.types.USERPREF_MT_interaction_presets.bl_label)
- subrow.operator("wm.interaction_preset_add", text="", icon='ADD')
- subrow.operator("wm.interaction_preset_add", text="", icon='REMOVE').remove_active = True
- sub.separator()
sub.label(text="Mouse:")
sub.prop(inputs, "use_mouse_emulate_3_button")
@@ -1608,8 +1582,6 @@ class USERPREF_PT_studiolight_specular(Panel, StudioLightPanelMixin):
classes = (
USERPREF_HT_header,
USERPREF_PT_tabs,
- USERPREF_MT_interaction_presets,
- USERPREF_MT_appconfigs,
USERPREF_PT_interface,
USERPREF_PT_edit,
USERPREF_PT_system,
diff --git a/tests/python/bl_run_operators.py b/tests/python/bl_run_operators.py
index 9a3f801b04a..f3b1ec2f4c2 100644
--- a/tests/python/bl_run_operators.py
+++ b/tests/python/bl_run_operators.py
@@ -81,7 +81,6 @@ op_blacklist = (
"wm.operator_cheat_sheet",
"wm.interface_theme_*",
"wm.previews_ensure", # slow - but harmless
- "wm.appconfig_*", # just annoying - but harmless
"wm.keyitem_add", # just annoying - but harmless
"wm.keyconfig_activate", # just annoying - but harmless
"wm.keyconfig_preset_add", # just annoying - but harmless
More information about the Bf-blender-cvs
mailing list