[Bf-blender-cvs] [27eba3867ae] blender2.8: Keymap: move tool system keymaps into the default keymap
Campbell Barton
noreply at git.blender.org
Thu Nov 15 02:45:59 CET 2018
Commit: 27eba3867ae9489b1fc87aab49481a69e8f84822
Author: Campbell Barton
Date: Thu Nov 15 12:22:36 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB27eba3867ae9489b1fc87aab49481a69e8f84822
Keymap: move tool system keymaps into the default keymap
Note that tools can still define their keymaps,
since it's useful for add-ons.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 0320238a681..6e062e9d317 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -71,6 +71,7 @@ class KeymapParams:
# ------------------------------------------------------------------------------
# Constants
+
# Physical layout.
NUMBERS_1 = ('ONE', 'TWO', 'THREE', 'FOUR', 'FIVE', 'SIX', 'SEVEN', 'EIGHT', 'NINE', 'ZERO')
# Numeric order.
@@ -161,6 +162,22 @@ def _template_items_proportional_editing(*, connected=False):
]
+# Tool System Templates
+
+def _template_items_tool_select_actions(operator, *, type, value):
+ kmi_args = {"type": type, "value": value}
+ return [
+ (operator, kmi_args,
+ {"properties": [("mode", 'SET')]}),
+ (operator, {**kmi_args, "shift": True},
+ {"properties": [("mode", 'ADD')]}),
+ (operator, {**kmi_args, "ctrl": True},
+ {"properties": [("mode", 'SUB')]}),
+ (operator, {**kmi_args, "shift": True, "ctrl": True},
+ {"properties": [("mode", 'AND')]}),
+ ]
+
+
# ------------------------------------------------------------------------------
# Window, Screen, Areas, Regions
@@ -4790,6 +4807,838 @@ def km_backdrop_transform_widget(_params):
return keymap
+# ------------------------------------------------------------------------------
+# Tool System Keymaps
+#
+# Named are auto-generated based on the tool name and it's toolbar.
+
+def km_image_editor_tool_uv_cursor(_params):
+ return (
+ "Image Editor Tool: Uv, Cursor",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("uv.cursor_set", {"type": 'ACTIONMOUSE', "value": 'PRESS'}, None),
+ ("transform.translate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("release_confirm", True), ("cursor_transform", True)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_select_box(_params):
+ return (
+ "Image Editor Tool: Uv, Select Box",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("uv.select_box", {"type": 'EVT_TWEAK_A', "value": 'ANY'}, None),
+ ("uv.select_box", {"type": 'EVT_TWEAK_A', "value": 'ANY', "ctrl": True},
+ {"properties": [("deselect", True)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_select_circle(_params):
+ return (
+ "Image Editor Tool: Uv, Select Circle",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("uv.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("deselect", False)]}),
+ ("uv.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS', "ctrl": True},
+ {"properties": [("deselect", True)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_select_lasso(_params):
+ return (
+ "Image Editor Tool: Uv, Select Lasso",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("uv.select_lasso", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("deselect", False)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_annotate(_params):
+ return (
+ "Image Editor Tool: Uv, Annotate",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("mode", 'DRAW'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_annotate_line(_params):
+ return (
+ "Image Editor Tool: Uv, Annotate Line",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("mode", 'DRAW_STRAIGHT'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_annotate_polygon(_params):
+ return (
+ "Image Editor Tool: Uv, Annotate Polygon",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("mode", 'DRAW_POLY'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_image_editor_tool_uv_annotate_eraser(_params):
+ return (
+ "Image Editor Tool: Uv, Annotate Eraser",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("mode", 'ERASER'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_cursor(_params):
+ return (
+ "3D View Tool: Object, Cursor",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("view3d.cursor3d", {"type": 'ACTIONMOUSE', "value": 'PRESS'}, None),
+ ("transform.translate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("release_confirm", True), ("cursor_transform", True)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_select_box(_params):
+ return (
+ "3D View Tool: Object, Select Box",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": _template_items_tool_select_actions("view3d.select_box", type='EVT_TWEAK_A', value='ANY')},
+ )
+
+
+def km_3d_view_tool_object_select_circle(_params):
+ return (
+ "3D View Tool: Object, Select Circle",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("view3d.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("deselect", False)]}),
+ ("view3d.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS', "ctrl": True},
+ {"properties": [("deselect", True)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_select_lasso(_params):
+ return (
+ "3D View Tool: Object, Select Lasso",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": _template_items_tool_select_actions("view3d.select_lasso", type='EVT_TWEAK_A', value='ANY')},
+ )
+
+
+def km_3d_view_tool_object_transform(_params):
+ return (
+ "3D View Tool: Object, Transform",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("transform.from_gizmo", {"type": 'EVT_TWEAK_A', "value": 'ANY'}, None),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_move(_params):
+ return (
+ "3D View Tool: Object, Move",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("transform.translate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("release_confirm", True)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_rotate(_params):
+ return (
+ "3D View Tool: Object, Rotate",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("transform.rotate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("release_confirm", True)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_scale(_params):
+ return (
+ "3D View Tool: Object, Scale",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("transform.resize", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("release_confirm", True)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_annotate(_params):
+ return (
+ "3D View Tool: Object, Annotate",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("mode", 'DRAW'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_annotate_line(_params):
+ return (
+ "3D View Tool: Object, Annotate Line",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ {"properties": [("mode", 'DRAW_STRAIGHT'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_annotate_polygon(_params):
+ return (
+ "3D View Tool: Object, Annotate Polygon",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("mode", 'DRAW_POLY'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_annotate_eraser(_params):
+ return (
+ "3D View Tool: Object, Annotate Eraser",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ {"properties": [("mode", 'ERASER'), ("wait_for_input", False)]}),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_object_measure(_params):
+ return (
+ "3D View Tool: Object, Measure",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("view3d.ruler_add", {"type": 'EVT_TWEAK_A', "value": 'ANY'}, None),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_pose_breakdowner(_params):
+ return (
+ "3D View Tool: Pose, Breakdowner",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": (
+ ("pose.breakdown", {"type": 'ACTIONMOUSE', "value": 'PRESS'}, None),
+ ),
+ },
+ )
+
+
+def km_3d_view_tool_pose_push(_params):
+ return (
+ "3D View Tool: Pose, Push",
+ {"space_type": 'VIEW_3D', "region_type": 'WIN
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list