|
@@ -6352,7 +6352,11 @@ EditorNode::EditorNode() {
|
|
|
|
|
|
p = help_menu->get_popup();
|
|
|
p->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
|
|
|
- p->add_icon_shortcut(gui_base->get_theme_icon("HelpSearch", "EditorIcons"), ED_SHORTCUT("editor/editor_help", TTR("Search")), HELP_SEARCH);
|
|
|
+#ifdef OSX_ENABLED
|
|
|
+ p->add_icon_shortcut(gui_base->get_theme_icon("HelpSearch", "EditorIcons"), ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_MASK_ALT | KEY_SPACE), HELP_SEARCH);
|
|
|
+#else
|
|
|
+ p->add_icon_shortcut(gui_base->get_theme_icon("HelpSearch", "EditorIcons"), ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_F1), HELP_SEARCH);
|
|
|
+#endif
|
|
|
p->add_separator();
|
|
|
p->add_icon_shortcut(gui_base->get_theme_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/online_docs", TTR("Online Docs")), HELP_DOCS);
|
|
|
p->add_icon_shortcut(gui_base->get_theme_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/q&a", TTR("Q&A")), HELP_QA);
|
|
@@ -6943,14 +6947,12 @@ EditorNode::EditorNode() {
|
|
|
ED_SHORTCUT("editor/editor_3d", TTR("Open 3D Editor"), KEY_MASK_ALT | KEY_2);
|
|
|
ED_SHORTCUT("editor/editor_script", TTR("Open Script Editor"), KEY_MASK_ALT | KEY_3);
|
|
|
ED_SHORTCUT("editor/editor_assetlib", TTR("Open Asset Library"), KEY_MASK_ALT | KEY_4);
|
|
|
- ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_MASK_ALT | KEY_SPACE);
|
|
|
#else
|
|
|
// Use the Ctrl modifier so F2 can be used to rename nodes in the scene tree dock.
|
|
|
ED_SHORTCUT("editor/editor_2d", TTR("Open 2D Editor"), KEY_MASK_CTRL | KEY_F1);
|
|
|
ED_SHORTCUT("editor/editor_3d", TTR("Open 3D Editor"), KEY_MASK_CTRL | KEY_F2);
|
|
|
ED_SHORTCUT("editor/editor_script", TTR("Open Script Editor"), KEY_MASK_CTRL | KEY_F3);
|
|
|
ED_SHORTCUT("editor/editor_assetlib", TTR("Open Asset Library"), KEY_MASK_CTRL | KEY_F4);
|
|
|
- ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_F1);
|
|
|
#endif
|
|
|
ED_SHORTCUT("editor/editor_next", TTR("Open the next Editor"));
|
|
|
ED_SHORTCUT("editor/editor_prev", TTR("Open the previous Editor"));
|