[Bf-blender-cvs] [b9627204770] soc-2020-info-editor: WIP: Keymap: change info editor keymap to match outliner
Mateusz Grzeliński
noreply at git.blender.org
Fri Jun 5 15:03:19 CEST 2020
Commit: b96272047708823833c87d4772df17f166aa9ff2
Author: Mateusz Grzeliński
Date: Fri Jun 5 15:00:09 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBb96272047708823833c87d4772df17f166aa9ff2
WIP: Keymap: change info editor keymap to match outliner
- click on empty space - deselect
- ctrl + click to select multiple reports
- add active report - last selected
- shift select to select range from active report
- ctrl shift select to select multiple ranges
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M source/blender/editors/space_info/info_report.c
M source/blender/makesdna/DNA_space_types.h
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 08e81d89c4f..c6cf4eddf38 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -265,6 +265,7 @@ def _template_items_editmode_mesh_select_mode(params):
for k, e in (('ONE', 'VERT'), ('TWO', 'EDGE'), ('THREE', 'FACE'))
]
+
def _template_items_uv_select_mode(params):
if params.legacy:
return [
@@ -284,6 +285,7 @@ def _template_items_uv_select_mode(params):
{"properties": [("data_path", 'tool_settings.uv_select_mode'), ("value", 'ISLAND')]}),
]
+
def _template_items_proportional_editing(*, connected=False):
return [
op_menu_pie("VIEW3D_MT_proportional_editing_falloff_pie", {"type": 'O', "value": 'PRESS', "shift": True}),
@@ -411,19 +413,19 @@ def km_window(params):
{"type": k, "value": 'PRESS', "shift": True},
{"properties": [("space_type", t)]})
for k, t in (
- ('F1', 'FILE_BROWSER'),
- ('F2', 'CLIP_EDITOR'),
- ('F3', 'NODE_EDITOR'),
- ('F4', 'CONSOLE'),
- ('F5', 'VIEW_3D'),
- ('F6', 'GRAPH_EDITOR'),
- ('F7', 'PROPERTIES'),
- ('F8', 'SEQUENCE_EDITOR'),
- ('F9', 'OUTLINER'),
- ('F10', 'IMAGE_EDITOR'),
- ('F11', 'TEXT_EDITOR'),
- ('F12', 'DOPESHEET_EDITOR'),
- )
+ ('F1', 'FILE_BROWSER'),
+ ('F2', 'CLIP_EDITOR'),
+ ('F3', 'NODE_EDITOR'),
+ ('F4', 'CONSOLE'),
+ ('F5', 'VIEW_3D'),
+ ('F6', 'GRAPH_EDITOR'),
+ ('F7', 'PROPERTIES'),
+ ('F8', 'SEQUENCE_EDITOR'),
+ ('F9', 'OUTLINER'),
+ ('F10', 'IMAGE_EDITOR'),
+ ('F11', 'TEXT_EDITOR'),
+ ('F12', 'DOPESHEET_EDITOR'),
+ )
),
# NDOF settings
@@ -832,8 +834,9 @@ def km_uv_editor(params):
{"properties": [("extend", True)]}),
("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True},
{"properties": [("extend", False)]}),
- ("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True},
- {"properties": [("extend", True)]}),
+ (
+ "uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True},
+ {"properties": [("extend", True)]}),
("uv.select_split", {"type": 'Y', "value": 'PRESS'}, None),
("uv.select_box", {"type": 'B', "value": 'PRESS'},
{"properties": [("pinned", False)]}),
@@ -872,7 +875,8 @@ def km_uv_editor(params):
("transform.translate", {"type": params.select_tweak, "value": 'ANY'}, None),
("transform.rotate", {"type": 'R', "value": 'PRESS', "repeat": False}, None),
("transform.resize", {"type": 'S', "value": 'PRESS', "repeat": False}, None),
- ("transform.shear", {"type": 'S', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True, "repeat": False}, None),
+ ("transform.shear", {"type": 'S', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True, "repeat": False},
+ None),
("transform.mirror", {"type": 'M', "value": 'PRESS', "ctrl": True, "repeat": False}, None),
("wm.context_toggle", {"type": 'TAB', "value": 'PRESS', "shift": True},
{"properties": [("data_path", 'tool_settings.use_snap')]}),
@@ -967,9 +971,9 @@ def km_view3d(params):
("view3d.localview_remove_from", {"type": 'M', "value": 'PRESS'}, None),
# Navigation.
*((
- ("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
- ("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
- ) if params.use_v3d_mmb_pan else (
+ ("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
+ ("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
+ ) if params.use_v3d_mmb_pan else (
("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
)),
@@ -1070,15 +1074,15 @@ def km_view3d(params):
("view3d.view_axis", {"type": 'NUMPAD_7', "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("type", 'BOTTOM'), ("align_active", True)]}),
*((
- ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'NORTH', "alt": True},
- {"properties": [("type", 'TOP'), ("relative", True)]}),
- ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'SOUTH', "alt": True},
- {"properties": [("type", 'BOTTOM'), ("relative", True)]}),
- ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'EAST', "alt": True},
- {"properties": [("type", 'RIGHT'), ("relative", True)]}),
- ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'WEST', "alt": True},
- {"properties": [("type", 'LEFT'), ("relative", True)]}),
- ) if params.v3d_alt_mmb_drag_action == 'RELATIVE' else (
+ ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'NORTH', "alt": True},
+ {"properties": [("type", 'TOP'), ("relative", True)]}),
+ ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'SOUTH', "alt": True},
+ {"properties": [("type", 'BOTTOM'), ("relative", True)]}),
+ ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'EAST', "alt": True},
+ {"properties": [("type", 'RIGHT'), ("relative", True)]}),
+ ("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'WEST', "alt": True},
+ {"properties": [("type", 'LEFT'), ("relative", True)]}),
+ ) if params.v3d_alt_mmb_drag_action == 'RELATIVE' else (
("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'NORTH', "alt": True},
{"properties": [("type", 'TOP')]}),
("view3d.view_axis", {"type": 'EVT_TWEAK_M', "value": 'SOUTH', "alt": True},
@@ -1161,11 +1165,13 @@ def km_view3d(params):
("transform.resize", {"type": 'S', "value": 'PRESS', "repeat": False}, None),
("transform.bend", {"type": 'W', "value": 'PRESS', "shift": True, "repeat": False}, None),
("transform.tosphere", {"type": 'S', "value": 'PRESS', "shift": True, "alt": True, "repeat": False}, None),
- ("transform.shear", {"type": 'S', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True, "repeat": False}, None),
+ ("transform.shear", {"type": 'S', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True, "repeat": False},
+ None),
("transform.mirror", {"type": 'M', "value": 'PRESS', "ctrl": True, "repeat": False}, None),
("wm.context_toggle", {"type": 'TAB', "value": 'PRESS', "shift": True},
{"properties": [("data_path", 'tool_settings.use_snap')]}),
- op_panel("VIEW3D_PT_snapping", {"type": 'TAB', "value": 'PRESS', "shift": True, "ctrl": True}, [("keep_open", False)]),
+ op_panel("VIEW3D_PT_snapping", {"type": 'TAB', "value": 'PRESS', "shift": True, "ctrl": True},
+ [("keep_open", False)]),
("object.transform_axis_target", {"type": 'T', "value": 'PRESS', "shift": True}, None),
("transform.skin_resize", {"type": 'A', "value": 'PRESS', "ctrl": True, "repeat": False}, None),
])
@@ -1244,7 +1250,8 @@ def km_view3d(params):
{"properties": [("data_path", 'tool_settings.transform_pivot_point'), ("value", 'ACTIVE_ELEMENT')]}),
# Old shading.
("wm.context_toggle_enum", {"type": 'Z', "value": 'PRESS'},
- {"properties": [("data_path", 'space_data.shading.type'), ("value_1", 'WIREFRAME'), ("value_2", 'SOLID')]}),
+ {"properties": [("data_path", 'space_data.shading.type'), ("value_1", 'WIREFRAME'),
+ ("value_2", 'SOLID')]}),
("wm.context_toggle_enum", {"type": 'Z', "value": 'PRESS', "shift": True},
{"properties": [("data_path", 'space_data.shading.type'), ("value_1", 'RENDERED'), ("value_2", 'SOLID')]}),
("wm.context_toggle_enum", {"type": 'Z', "value": 'PRESS', "alt": True},
@@ -1317,7 +1324,8 @@ def km_mask_editing(params):
("mask.slide_point", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
("mask.slide_spline_curvature", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
("mask.handle_type_set", {"type": 'V', "value": 'PRESS'}, None),
- ("mask.normals_make_consistent", {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True}, None),
+ ("mask.normals_make_consistent", {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True},
+ None),
("mask.parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None),
("mask.parent_clear", {"type": 'P', "value": 'PRESS', "alt": True}, None),
("mask.shape_key_insert", {"type": 'I', "value": 'PRESS'}, None),
@@ -1395,6 +1403,7 @@ def km_time_scrub(_params):
return keymap
+
def km_time_scrub_clip(_params):
items = []
keymap = (
@@ -1812,8 +1821,12 @@ def km_info(params):
items.extend([
("info.select_pick", {"type": 'LEFTMOUSE', "value": 'CLICK'}, None),
+ ("info.select_pick", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True},
+ {"properties": [("extend", True), ("deselect_all", False)]}),
("info.select_pick", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True},
- {"properties": [("extend", True)]}),
+ {"properties": [("extend_range", True)]}),
+ ("info.select_pick", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True, "shift": True},
+ {"properties": [("deselect_all", False), ("extend_range", True)]}),
("info.select_box", {"type"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list