godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6137 from supaiku-o/master 

Add a Close All files option to script editor
This commit is contained in:
Juan Linietsky 2016-09-10 12:07:39 -03:00 committed by GitHub
parent c5b7385110 3d84849e03
commit 3c30a3b1aa
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -480,6 +480,33 @@ void ScriptEditor::_close_docs_tab() {
} }
void ScriptEditor::_close_all_tabs() {
int child_count = tab_container->get_child_count();
for (int i = child_count-1; i>=0; i--) {
tab_container->set_current_tab(i);
ScriptEditorBase *se = tab_container->get_child(i)->cast_to<ScriptEditorBase>();
if (se) {
// Maybe there are unsaved changes
if (se->is_unsaved()) {
_ask_close_current_unsaved_tab(se);
continue;
}
}
_close_current_tab();
}
}
void ScriptEditor::_ask_close_current_unsaved_tab(ScriptEditorBase *current) {
erase_tab_confirm->set_text("Close and save changes?\n\""+current->get_name()+"\"");
erase_tab_confirm->popup_centered_minsize();
}
void ScriptEditor::_resave_scripts(const String& p_str) { void ScriptEditor::_resave_scripts(const String& p_str) {
@ -831,8 +858,7 @@ void ScriptEditor::_menu_option(int p_option) {
case FILE_CLOSE: { case FILE_CLOSE: {
if (current->is_unsaved()) { if (current->is_unsaved()) {
erase_tab_confirm->set_text("Close and save changes?\n\""+current->get_name()+"\""); _ask_close_current_unsaved_tab(current);
erase_tab_confirm->popup_centered_minsize();
} else { } else {
_close_current_tab(); _close_current_tab();
} }
@ -840,6 +866,9 @@ void ScriptEditor::_menu_option(int p_option) {
case CLOSE_DOCS: { case CLOSE_DOCS: {
_close_docs_tab(); _close_docs_tab();
} break; } break;
case CLOSE_ALL: {
_close_all_tabs();
} break;
case DEBUG_NEXT: { case DEBUG_NEXT: {
if (debugger) if (debugger)
@ -913,6 +942,9 @@ void ScriptEditor::_menu_option(int p_option) {
case CLOSE_DOCS: { case CLOSE_DOCS: {
_close_docs_tab(); _close_docs_tab();
} break; } break;
case CLOSE_ALL: {
_close_all_tabs();
} break;
} }
@ -1977,6 +2009,7 @@ void ScriptEditor::_bind_methods() {
ObjectTypeDB::bind_method("_menu_option",&ScriptEditor::_menu_option); ObjectTypeDB::bind_method("_menu_option",&ScriptEditor::_menu_option);
ObjectTypeDB::bind_method("_close_current_tab",&ScriptEditor::_close_current_tab); ObjectTypeDB::bind_method("_close_current_tab",&ScriptEditor::_close_current_tab);
ObjectTypeDB::bind_method("_close_docs_tab", &ScriptEditor::_close_docs_tab); ObjectTypeDB::bind_method("_close_docs_tab", &ScriptEditor::_close_docs_tab);
ObjectTypeDB::bind_method("_close_all_tabs", &ScriptEditor::_close_all_tabs);
ObjectTypeDB::bind_method("_editor_play",&ScriptEditor::_editor_play); ObjectTypeDB::bind_method("_editor_play",&ScriptEditor::_editor_play);
ObjectTypeDB::bind_method("_editor_pause",&ScriptEditor::_editor_pause); ObjectTypeDB::bind_method("_editor_pause",&ScriptEditor::_editor_pause);
ObjectTypeDB::bind_method("_editor_stop",&ScriptEditor::_editor_stop); ObjectTypeDB::bind_method("_editor_stop",&ScriptEditor::_editor_stop);
@ -2067,6 +2100,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
file_menu->get_popup()->add_separator(); file_menu->get_popup()->add_separator();
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_docs", TTR("Close Docs")), CLOSE_DOCS); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_docs", TTR("Close Docs")), CLOSE_DOCS);
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_file", TTR("Close"), KEY_MASK_CMD | KEY_W), FILE_CLOSE); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_file", TTR("Close"), KEY_MASK_CMD | KEY_W), FILE_CLOSE);
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_all", TTR("Close All")), CLOSE_ALL);
file_menu->get_popup()->connect("item_pressed", this,"_menu_option"); file_menu->get_popup()->connect("item_pressed", this,"_menu_option");

4
tools/editor/plugins/script_editor_plugin.h
View File

@ -133,6 +133,7 @@ class ScriptEditor : public VBoxContainer {
FILE_SAVE_THEME_AS, FILE_SAVE_THEME_AS,
FILE_CLOSE, FILE_CLOSE,
CLOSE_DOCS, CLOSE_DOCS,
CLOSE_ALL,
FILE_TOOL_RELOAD, FILE_TOOL_RELOAD,
FILE_TOOL_RELOAD_SOFT, FILE_TOOL_RELOAD_SOFT,
DEBUG_NEXT, DEBUG_NEXT,
@ -221,6 +222,9 @@ class ScriptEditor : public VBoxContainer {
void _close_current_tab(); void _close_current_tab();
void _close_docs_tab(); void _close_docs_tab();
void _close_all_tabs();
void _ask_close_current_unsaved_tab(ScriptEditorBase *current);
bool grab_focus_block; bool grab_focus_block;