From a0e5b0312610fab1107982121b654834560de5bc Mon Sep 17 00:00:00 2001 From: Julien Kaspar Date: Thu, 28 Sep 2023 12:52:46 +1000 Subject: [PATCH] Keymap: IC, regions shortcuts and fixed inconsistencies This is a followup fixes related to #105298 This PR adds shortcuts to toggle the sidebar, toolbar, channels and other regions across various editors with the Ctrl-LeftBracket & Ctrl-RightBracket shortcuts. An additional shortcut to toggle the Asset Shelf in the 3D Viewport via Shift Spacebar was also added. This shortcut will be important for various workflows in the future. To avoid shortcut conflicts and improve consistency, Ctrl-L is now consistently being used for select_linked operations. Ref !112042. --- .../keymap_data/industry_compatible_data.py | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index c9879a6af32..c5c7f977b42 100644 --- a/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -586,7 +586,7 @@ def km_uv_editor(params): {"properties": [("extend", True)]}), ("uv.select_loop", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, {"properties": [("extend", False)]}), - ("uv.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, None), + ("uv.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), ("uv.select_more", {"type": 'UP_ARROW', "value": 'PRESS', "repeat": True}, None), ("uv.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS', "repeat": True}, None), ("uv.select_all", {"type": 'A', "value": 'PRESS', "ctrl": True}, {"properties": [("action", 'SELECT')]}), @@ -631,6 +631,8 @@ def km_view3d_generic(_params): {"properties": [("data_path", 'space_data.show_region_toolbar')]}), ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'space_data.show_region_ui')]}), + ("wm.context_toggle", {"type": 'SPACE', "value": 'PRESS', "shift": True}, + {"properties": [("data_path", 'space_data.show_region_asset_shelf')]}), ]) return keymap @@ -895,6 +897,10 @@ def km_graph_editor(params): items.extend([ ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_channels')]}), + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_ui')]}), *_template_items_animation(), ("graph.cursor_set", {"type": 'RIGHTMOUSE', "value": 'PRESS', "ctrl": True}, None), ("graph.clickselect", {"type": 'LEFTMOUSE', "value": 'PRESS'}, @@ -931,7 +937,7 @@ def km_graph_editor(params): {"properties": [("tweak", True), ("axis_range", False), ("mode", 'SUB')]}), ("graph.select_more", {"type": 'UP_ARROW', "value": 'PRESS', "repeat": True}, None), ("graph.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS', "repeat": True}, None), - ("graph.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, None), + ("graph.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), op_menu("GRAPH_MT_delete", {"type": 'BACK_SPACE', "value": 'PRESS'}), ("graph.delete", {"type": 'DEL', "value": 'PRESS'}, {"properties": [("confirm", False)]}), *_template_items_context_menu("GRAPH_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), @@ -975,6 +981,10 @@ def km_image_generic(params): items.extend([ op_panel("TOPBAR_PT_name", {"type": 'RET', "value": 'PRESS'}, [("keep_open", False)]), + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_toolbar')]}), + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_ui')]}), ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), ("image.new", {"type": 'N', "value": 'PRESS', "alt": True}, None), ("image.open", {"type": 'O', "value": 'PRESS', "alt": True}, None), @@ -1064,6 +1074,10 @@ def km_node_generic(_params): items.extend([ op_panel("TOPBAR_PT_name", {"type": 'RET', "value": 'PRESS'}, [("keep_open", False)]), + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_toolbar')]}), + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_ui')]}), ]) return keymap @@ -1201,6 +1215,8 @@ def km_file_browser(params): ) items.extend([ + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_tool_props')]}), ("file.parent", {"type": 'UP_ARROW', "value": 'PRESS', "alt": True}, None), ("file.parent", {"type": 'UP_ARROW', "value": 'PRESS', "ctrl": True}, None), ("file.previous", {"type": 'LEFT_ARROW', "value": 'PRESS', "alt": True}, None), @@ -1344,6 +1360,8 @@ def km_dopesheet_generic(params): items.extend([ op_panel("TOPBAR_PT_name", {"type": 'RET', "value": 'PRESS'}, [("keep_open", False)]), ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_channels')]}), ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'space_data.show_region_ui')]}), ]) @@ -1403,7 +1421,7 @@ def km_dopesheet(params): {"properties": [("mode", 'MARKERS_BETWEEN')]}), ("action.select_more", {"type": 'UP_ARROW', "value": 'PRESS', "ctrl": True, "repeat": True}, None), ("action.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS', "ctrl": True, "repeat": True}, None), - ("action.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, None), + ("action.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), ("action.frame_jump", {"type": 'G', "value": 'PRESS', "ctrl": True}, None), ("wm.context_menu_enum", {"type": 'X', "value": 'PRESS'}, {"properties": [("data_path", 'space_data.auto_snap')]}), @@ -1456,6 +1474,10 @@ def km_nla_generic(params): items.extend([ op_panel("TOPBAR_PT_name", {"type": 'RET', "value": 'PRESS'}, [("keep_open", False)]), + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_channels')]}), + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_ui')]}), ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), *_template_items_animation(), ("nla.tweakmode_enter", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None), @@ -1723,6 +1745,8 @@ def km_sequencercommon(_params): items.extend([ op_panel("TOPBAR_PT_name", {"type": 'RET', "value": 'PRESS'}, [("keep_open", False)]), + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_channels')]}), ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'space_data.show_region_ui')]}), ]) @@ -1814,11 +1838,11 @@ def km_sequencer(params): {"properties": [("extend", True), ("side_of_frame", True), ("linked_time", True)]}), ("sequencer.select_more", {"type": 'UP_ARROW', "value": 'PRESS', "repeat": True}, None), ("sequencer.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS', "repeat": True}, None), - ("sequencer.select_linked_pick", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, + ("sequencer.select_linked_pick", {"type": 'L', "value": 'PRESS', "ctrl": True}, {"properties": [("extend", False)]}), ("sequencer.select_linked_pick", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), - ("sequencer.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, None), + ("sequencer.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), ("sequencer.select_box", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG'}, {"properties": [("tweak", True), ("mode", 'SET')]}), ("sequencer.select_box", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG', "shift": True}, @@ -1999,6 +2023,10 @@ def km_clip_editor(params): ) items.extend([ + ("wm.context_toggle", {"type": 'LEFT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_toolbar')]}), + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_ui')]}), ("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None), ("clip.view_pan", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None), ("clip.view_pan", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None), @@ -2179,6 +2207,8 @@ def km_spreadsheet_generic(_params): *_template_space_region_type_toggle( channels_key={"type": 'T', "value": 'PRESS'}, ), + ("wm.context_toggle", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "ctrl": True}, + {"properties": [("data_path", 'space_data.show_region_ui')]}), ]) return keymap @@ -3108,7 +3138,7 @@ def km_weight_paint_vertex_selection(params): ("paint.vert_select_hide", {"type": 'H', "value": 'PRESS', "shift": True}, {"properties": [("unselected", True)]}), ("paint.face_vert_reveal", {"type": 'H', "value": 'PRESS', "alt": True}, None), - ("paint.vert_select_linked", {"type": 'L', "value": 'PRESS', "alt": True}, None), + ("paint.vert_select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), ("paint.vert_select_linked_pick", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK', "alt": True}, {"properties": [("select", True)]}), ("paint.vert_select_linked_pick", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK', "ctrl": True, "alt": True},