diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-22 12:50:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-22 12:53:40 +0300 |
commit | e98d27fd8d432650489f973abcdfad4163e87f42 (patch) | |
tree | 16c4515cc74341d2c409d2c997a58fbba4cf2f9d /release | |
parent | e93aa9c0fc669d0b09a1159e8ef1e2b9dfcc7320 (diff) |
Keymap: use tab key for indent or auto-complete
Only indent when there aren't characters before the cursor.
This resolves the conflict with Ctrl-Space for view maximize.
D6239 by @wbrbr for text editor, based console support on this.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 82ec7040564..abbc8ad103e 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -2225,7 +2225,7 @@ def km_text(params): {"properties": [("direction", 'UP')]}), ("text.move_lines", {"type": 'DOWN_ARROW', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("direction", 'DOWN')]}), - ("text.indent", {"type": 'TAB', "value": 'PRESS'}, None), + ("text.indent_or_autocomplete", {"type": 'TAB', "value": 'PRESS'}, None), ("text.unindent", {"type": 'TAB', "value": 'PRESS', "shift": True}, None), ("text.comment_toggle", {"type": 'SLASH', "value": 'PRESS', "ctrl": True}, None), ("text.move", {"type": 'HOME', "value": 'PRESS'}, @@ -2305,7 +2305,6 @@ def km_text(params): {"properties": [("lines", 1)]}), ("text.line_break", {"type": 'RET', "value": 'PRESS'}, None), ("text.line_break", {"type": 'NUMPAD_ENTER', "value": 'PRESS'}, None), - ("text.autocomplete", {"type": 'SPACE', "value": 'PRESS', "ctrl": True}, None), ("text.line_number", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), op_menu("TEXT_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("text.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), @@ -2535,7 +2534,6 @@ def km_console(params): {"properties": [("interactive", True)]}), ("console.execute", {"type": 'NUMPAD_ENTER', "value": 'PRESS'}, {"properties": [("interactive", True)]}), - ("console.autocomplete", {"type": 'SPACE', "value": 'PRESS', "ctrl": True}, None), ("console.copy_as_script", {"type": 'C', "value": 'PRESS', "shift": True, "ctrl": True}, None), ("console.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), ("console.paste", {"type": 'V', "value": 'PRESS', "ctrl": True}, None), @@ -2543,7 +2541,7 @@ def km_console(params): ("console.select_word", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None), ("console.insert", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, {"properties": [("text", '\t')]}), - ("console.indent", {"type": 'TAB', "value": 'PRESS'}, None), + ("console.indent_or_autocomplete", {"type": 'TAB', "value": 'PRESS'}, None), ("console.unindent", {"type": 'TAB', "value": 'PRESS', "shift": True}, None), op_menu("CONSOLE_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("console.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 49a394b478d..2fa747b98ab 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -1587,7 +1587,7 @@ def km_text(params): {"properties": [("direction", 'UP')]}), ("text.move_lines", {"type": 'DOWN_ARROW', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("direction", 'DOWN')]}), - ("text.indent", {"type": 'TAB', "value": 'PRESS'}, None), + ("text.indent_or_autocomplete", {"type": 'TAB', "value": 'PRESS'}, None), ("text.unindent", {"type": 'TAB', "value": 'PRESS', "shift": True}, None), ("text.uncomment", {"type": 'D', "value": 'PRESS', "shift": True, "ctrl": True}, None), ("text.move", {"type": 'HOME', "value": 'PRESS'}, @@ -1668,7 +1668,6 @@ def km_text(params): ("text.line_break", {"type": 'RET', "value": 'PRESS'}, None), ("text.line_break", {"type": 'NUMPAD_ENTER', "value": 'PRESS'}, None), op_menu("TEXT_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}), - ("text.autocomplete", {"type": 'SPACE', "value": 'PRESS', "ctrl": True}, None), ("text.line_number", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), ("text.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), ]) @@ -1878,7 +1877,6 @@ def km_console(params): {"properties": [("interactive", True)]}), ("console.execute", {"type": 'NUMPAD_ENTER', "value": 'PRESS'}, {"properties": [("interactive", True)]}), - ("console.autocomplete", {"type": 'SPACE', "value": 'PRESS', "ctrl": True}, None), ("console.copy_as_script", {"type": 'C', "value": 'PRESS', "shift": True, "ctrl": True}, None), ("console.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), ("console.paste", {"type": 'V', "value": 'PRESS', "ctrl": True}, None), @@ -1886,10 +1884,10 @@ def km_console(params): ("console.select_word", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None), ("console.insert", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, {"properties": [("text", '\t')]}), - ("console.indent", {"type": 'TAB', "value": 'PRESS'}, None), + ("console.indent_or_autocomplete", {"type": 'TAB', "value": 'PRESS'}, None), ("console.unindent", {"type": 'TAB', "value": 'PRESS', "shift": True}, None), - ("console.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), op_menu("CONSOLE_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), + ("console.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), ]) return keymap |