diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-28 07:38:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 07:38:30 +0200 |
| commit | cda5a5680852229219ed3f3abc46fdd2bb1877a2 (patch) | |
| tree | 219c0a0bb6dc579414302091f129c74b2cf1a29b /editor | |
| parent | 02490dbd2c6e5d89c29eb14c7c4ff62d7e68986a (diff) | |
| parent | 464756ec0f1ed500c8f6cb585a21c0caf5bca679 (diff) | |
Merge pull request #21495 from tko/macos-replace
[macOS] fix conflicting keybindings for (Find and) Replace...
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/script_text_editor.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 4e7047ee38..53e17fedbc 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1575,15 +1575,20 @@ void ScriptTextEditor::register_editor() { #ifdef OSX_ENABLED ED_SHORTCUT("script_text_editor/find_next", TTR("Find Next"), KEY_MASK_CMD | KEY_G); ED_SHORTCUT("script_text_editor/find_previous", TTR("Find Previous"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_G); + ED_SHORTCUT("script_text_editor/replace", TTR("Replace..."), KEY_MASK_ALT | KEY_MASK_CMD | KEY_F); #else ED_SHORTCUT("script_text_editor/find_next", TTR("Find Next"), KEY_F3); ED_SHORTCUT("script_text_editor/find_previous", TTR("Find Previous"), KEY_MASK_SHIFT | KEY_F3); -#endif ED_SHORTCUT("script_text_editor/replace", TTR("Replace..."), KEY_MASK_CMD | KEY_R); +#endif ED_SHORTCUT("script_text_editor/find_in_files", TTR("Find in files..."), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F); +#ifdef OSX_ENABLED + ED_SHORTCUT("script_text_editor/goto_function", TTR("Goto Function..."), KEY_MASK_CTRL | KEY_MASK_CMD | KEY_J); +#else ED_SHORTCUT("script_text_editor/goto_function", TTR("Goto Function..."), KEY_MASK_ALT | KEY_MASK_CMD | KEY_F); +#endif ED_SHORTCUT("script_text_editor/goto_line", TTR("Goto Line..."), KEY_MASK_CMD | KEY_L); #ifdef OSX_ENABLED |