godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Make "Find in Files" always available in the script editor

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias
2019-05-02 20:07:06 -03:00
parent 262924296b
commit 52651509f0
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/script_editor_plugin.cpp
View File

@@ -603,6 +603,8 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
idx = history[history_pos].control->get_index(); idx = history[history_pos].control->get_index();
} }
tab_container->set_current_tab(idx); tab_container->set_current_tab(idx);
} else {
_update_selected_editor_menu();
} }
_update_history_arrows(); _update_history_arrows();
@@ -1002,6 +1004,9 @@ void ScriptEditor::_menu_option(int p_option) {
save_all_scripts(); save_all_scripts();
} break; } break;
case SEARCH_IN_FILES: {
_on_find_in_files_requested("");
} break;
case SEARCH_HELP: { case SEARCH_HELP: {
help_search_dialog->popup_dialog(); help_search_dialog->popup_dialog();
@@ -2694,11 +2699,23 @@ void ScriptEditor::_update_selected_editor_menu() {
} }
EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_current_tab_control()); EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_current_tab_control());
script_search_menu->get_popup()->clear();
if (eh) { if (eh) {
script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find..."), KEY_MASK_CMD | KEY_F), HELP_SEARCH_FIND);
script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTR("Find Next"), KEY_F3), HELP_SEARCH_FIND_NEXT);
script_search_menu->get_popup()->add_separator();
script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_in_files", TTR("Find in Files"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F), SEARCH_IN_FILES);
script_search_menu->show();
} else {
if (tab_container->get_child_count() == 0) {
script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_in_files", TTR("Find in Files"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F), SEARCH_IN_FILES);
script_search_menu->show(); script_search_menu->show();
} else { } else {
script_search_menu->hide(); script_search_menu->hide();
} }
}
} }
void ScriptEditor::_update_history_pos(int p_new_pos) { void ScriptEditor::_update_history_pos(int p_new_pos) {
@@ -3109,10 +3126,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
script_search_menu->set_text(TTR("Search")); script_search_menu->set_text(TTR("Search"));
script_search_menu->set_switch_on_hover(true); script_search_menu->set_switch_on_hover(true);
script_search_menu->get_popup()->set_hide_on_window_lose_focus(true); script_search_menu->get_popup()->set_hide_on_window_lose_focus(true);
script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find..."), KEY_MASK_CMD | KEY_F), HELP_SEARCH_FIND);
script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTR("Find Next"), KEY_F3), HELP_SEARCH_FIND_NEXT);
script_search_menu->get_popup()->connect("id_pressed", this, "_menu_option"); script_search_menu->get_popup()->connect("id_pressed", this, "_menu_option");
script_search_menu->hide();
debug_menu = memnew(MenuButton); debug_menu = memnew(MenuButton);
menu_hb->add_child(debug_menu); menu_hb->add_child(debug_menu);

1
editor/plugins/script_editor_plugin.h
View File

@@ -157,6 +157,7 @@ class ScriptEditor : public PanelContainer {
DEBUG_SHOW, DEBUG_SHOW,
DEBUG_SHOW_KEEP_OPEN, DEBUG_SHOW_KEEP_OPEN,
DEBUG_WITH_EXTERNAL_EDITOR, DEBUG_WITH_EXTERNAL_EDITOR,
SEARCH_IN_FILES,
SEARCH_HELP, SEARCH_HELP,
SEARCH_WEBSITE, SEARCH_WEBSITE,
REQUEST_DOCS, REQUEST_DOCS,