diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-28 07:40:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 07:40:55 +0200 |
| commit | ac38b7e97b3de082d87a65bed7b53b51e603fec0 (patch) | |
| tree | 55559decb27d49bf92f10f288680481f80f3387a | |
| parent | cda5a5680852229219ed3f3abc46fdd2bb1877a2 (diff) | |
| parent | c2f0b4c9c638e628a36b91f9c797fd0ba4cd020c (diff) | |
Merge pull request #21496 from tko/macos-complete
[macOS] change "Complete Symbol" shortcut to not conflict with Spotlight
| -rw-r--r-- | editor/plugins/script_text_editor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 53e17fedbc..66705f85bf 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1549,10 +1549,11 @@ void ScriptTextEditor::register_editor() { ED_SHORTCUT("script_text_editor/unfold_all_lines", TTR("Unfold All Lines"), 0); #ifdef OSX_ENABLED ED_SHORTCUT("script_text_editor/clone_down", TTR("Clone Down"), KEY_MASK_SHIFT | KEY_MASK_CMD | KEY_C); + ED_SHORTCUT("script_text_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CTRL | KEY_SPACE); #else ED_SHORTCUT("script_text_editor/clone_down", TTR("Clone Down"), KEY_MASK_CMD | KEY_B); -#endif ED_SHORTCUT("script_text_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CMD | KEY_SPACE); +#endif ED_SHORTCUT("script_text_editor/trim_trailing_whitespace", TTR("Trim Trailing Whitespace"), KEY_MASK_CMD | KEY_MASK_ALT | KEY_T); ED_SHORTCUT("script_text_editor/convert_indent_to_spaces", TTR("Convert Indent To Spaces"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_Y); ED_SHORTCUT("script_text_editor/convert_indent_to_tabs", TTR("Convert Indent To Tabs"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_X); |