asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made reload current project ask for confirmation with unsaved changes

Browse source 
(cherry picked from commit eb81ac8fc5)
This commit is contained in:
Vitika9 2022-03-23 16:37:29 +05:30 committed by Rémi Verschelde
parent c4897c4b8d
commit 8d1827cf7c
2 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
editor/editor_node.cpp
View file

@ -1703,6 +1703,7 @@ void EditorNode::_dialog_action(String p_file) {
case FILE_CLOSE: case FILE_CLOSE:
case FILE_CLOSE_ALL_AND_QUIT: case FILE_CLOSE_ALL_AND_QUIT:
case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER: case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER:
case FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT:
case SCENE_TAB_CLOSE: case SCENE_TAB_CLOSE:
case FILE_SAVE_SCENE: case FILE_SAVE_SCENE:
case FILE_SAVE_AS_SCENE: { case FILE_SAVE_AS_SCENE: {
@ -2354,17 +2355,23 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} break; } break;
case FILE_CLOSE_ALL_AND_QUIT: case FILE_CLOSE_ALL_AND_QUIT:
case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER: case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER:
case FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT:
case FILE_CLOSE: { case FILE_CLOSE: {
if (!p_confirmed) { if (!p_confirmed) {
tab_closing = p_option == FILE_CLOSE ? editor_data.get_edited_scene() : _next_unsaved_scene(false); tab_closing = p_option == FILE_CLOSE ? editor_data.get_edited_scene() : _next_unsaved_scene(false);
_scene_tab_changed(tab_closing); _scene_tab_changed(tab_closing);
if (unsaved_cache || p_option == FILE_CLOSE_ALL_AND_QUIT || p_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER) { if (unsaved_cache || p_option == FILE_CLOSE_ALL_AND_QUIT || p_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER || p_option == FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT) {
Node *scene_root = editor_data.get_edited_scene_root(tab_closing); Node *scene_root = editor_data.get_edited_scene_root(tab_closing);
if (scene_root) { if (scene_root) {
String scene_filename = scene_root->get_filename(); String scene_filename = scene_root->get_filename();
save_confirmation->get_ok()->set_text(TTR("Save & Close")); if (p_option == FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT) {
save_confirmation->set_text(vformat(TTR("Save changes to '%s' before closing?"), scene_filename != "" ? scene_filename : "unsaved scene")); save_confirmation->get_ok()->set_text(TTR("Save & Reload"));
save_confirmation->set_text(vformat(TTR("Save changes to '%s' before reloading?"), scene_filename != "" ? scene_filename : "unsaved scene"));
} else {
save_confirmation->get_ok()->set_text(TTR("Save & Close"));
save_confirmation->set_text(vformat(TTR("Save changes to '%s' before closing?"), scene_filename != "" ? scene_filename : "unsaved scene"));
}
save_confirmation->popup_centered_minsize(); save_confirmation->popup_centered_minsize();
break; break;
} }
@ -2698,11 +2705,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
case FILE_EXPLORE_ANDROID_BUILD_TEMPLATES: { case FILE_EXPLORE_ANDROID_BUILD_TEMPLATES: {
OS::get_singleton()->shell_open("file://" + ProjectSettings::get_singleton()->get_resource_path().plus_file("android")); OS::get_singleton()->shell_open("file://" + ProjectSettings::get_singleton()->get_resource_path().plus_file("android"));
} break; } break;
case RUN_RELOAD_CURRENT_PROJECT: {
restart_editor();
} break;
case FILE_QUIT: case FILE_QUIT:
case RUN_PROJECT_MANAGER: { case RUN_PROJECT_MANAGER:
case RELOAD_CURRENT_PROJECT: {
if (!p_confirmed) { if (!p_confirmed) {
bool save_each = EDITOR_GET("interface/editor/save_each_scene_on_quit"); bool save_each = EDITOR_GET("interface/editor/save_each_scene_on_quit");
if (_next_unsaved_scene(!save_each) == -1) { if (_next_unsaved_scene(!save_each) == -1) {
@ -2717,7 +2722,13 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} }
} else { } else {
if (save_each) { if (save_each) {
_menu_option_confirm(p_option == FILE_QUIT ? FILE_CLOSE_ALL_AND_QUIT : FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER, false); if (p_option == RELOAD_CURRENT_PROJECT) {
_menu_option_confirm(FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT, false);
} else if (p_option == FILE_QUIT) {
_menu_option_confirm(FILE_CLOSE_ALL_AND_QUIT, false);
} else {
_menu_option_confirm(FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER, false);
}
} else { } else {
String unsaved_scenes; String unsaved_scenes;
int i = _next_unsaved_scene(true, 0); int i = _next_unsaved_scene(true, 0);
@ -2725,9 +2736,13 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
unsaved_scenes += "\n " + editor_data.get_edited_scene_root(i)->get_filename(); unsaved_scenes += "\n " + editor_data.get_edited_scene_root(i)->get_filename();
i = _next_unsaved_scene(true, ++i); i = _next_unsaved_scene(true, ++i);
} }
if (p_option == RELOAD_CURRENT_PROJECT) {
save_confirmation->get_ok()->set_text(TTR("Save & Quit")); save_confirmation->get_ok()->set_text(TTR("Save & Reload"));
save_confirmation->set_text((p_option == FILE_QUIT ? TTR("Save changes to the following scene(s) before quitting?") : TTR("Save changes to the following scene(s) before opening Project Manager?")) + unsaved_scenes); save_confirmation->set_text(TTR("Save changes to the following scene(s) before reloading?") + unsaved_scenes);
} else {
save_confirmation->get_ok()->set_text(TTR("Save & Quit"));
save_confirmation->set_text((p_option == FILE_QUIT ? TTR("Save changes to the following scene(s) before quitting?") : TTR("Save changes to the following scene(s) before opening Project Manager?")) + unsaved_scenes);
}
save_confirmation->popup_centered_minsize(); save_confirmation->popup_centered_minsize();
} }
} }
@ -2982,6 +2997,7 @@ void EditorNode::_discard_changes(const String &p_str) {
switch (current_option) { switch (current_option) {
case FILE_CLOSE_ALL_AND_QUIT: case FILE_CLOSE_ALL_AND_QUIT:
case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER: case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER:
case FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT:
case FILE_CLOSE: case FILE_CLOSE:
case FILE_CLOSE_OTHERS: case FILE_CLOSE_OTHERS:
case FILE_CLOSE_RIGHT: case FILE_CLOSE_RIGHT:
@ -2998,13 +3014,19 @@ void EditorNode::_discard_changes(const String &p_str) {
_remove_scene(tab_closing); _remove_scene(tab_closing);
_update_scene_tabs(); _update_scene_tabs();
if (current_option == FILE_CLOSE_ALL_AND_QUIT || current_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER) { if (current_option == FILE_CLOSE_ALL_AND_QUIT || current_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER || current_option == FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT) {
// If restore tabs is enabled, reopen the scene that has just been closed, so it's remembered properly. // If restore tabs is enabled, reopen the scene that has just been closed, so it's remembered properly.
if (bool(EDITOR_GET("interface/scene_tabs/restore_scenes_on_load"))) { if (bool(EDITOR_GET("interface/scene_tabs/restore_scenes_on_load"))) {
_menu_option_confirm(FILE_OPEN_PREV, true); _menu_option_confirm(FILE_OPEN_PREV, true);
} }
if (_next_unsaved_scene(false) == -1) { if (_next_unsaved_scene(false) == -1) {
current_option = current_option == FILE_CLOSE_ALL_AND_QUIT ? FILE_QUIT : RUN_PROJECT_MANAGER; if (current_option == FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT) {
current_option = RELOAD_CURRENT_PROJECT;
} else if (current_option == FILE_CLOSE_ALL_AND_QUIT) {
current_option = FILE_QUIT;
} else {
current_option = RUN_PROJECT_MANAGER;
}
_discard_changes(); _discard_changes();
} else { } else {
_menu_option_confirm(current_option, false); _menu_option_confirm(current_option, false);
@ -3042,6 +3064,9 @@ void EditorNode::_discard_changes(const String &p_str) {
Error err = OS::get_singleton()->execute(exec, args, false, &pid); Error err = OS::get_singleton()->execute(exec, args, false, &pid);
ERR_FAIL_COND(err); ERR_FAIL_COND(err);
} break; } break;
case RELOAD_CURRENT_PROJECT: {
restart_editor();
} break;
} }
} }
@ -6397,7 +6422,7 @@ EditorNode::EditorNode() {
tool_menu->add_item(TTR("Orphan Resource Explorer..."), TOOLS_ORPHAN_RESOURCES); tool_menu->add_item(TTR("Orphan Resource Explorer..."), TOOLS_ORPHAN_RESOURCES);
p->add_separator(); p->add_separator();
p->add_shortcut(ED_SHORTCUT("editor/reload_current_project", TTR("Reload Current Project")), RUN_RELOAD_CURRENT_PROJECT); p->add_shortcut(ED_SHORTCUT("editor/reload_current_project", TTR("Reload Current Project")), RELOAD_CURRENT_PROJECT);
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
p->add_shortcut(ED_SHORTCUT("editor/quit_to_project_list", TTR("Quit to Project List"), KEY_MASK_SHIFT + KEY_MASK_ALT + KEY_Q), RUN_PROJECT_MANAGER, true); p->add_shortcut(ED_SHORTCUT("editor/quit_to_project_list", TTR("Quit to Project List"), KEY_MASK_SHIFT + KEY_MASK_ALT + KEY_Q), RUN_PROJECT_MANAGER, true);
#else #else

3
editor/editor_node.h
View file

@ -146,6 +146,7 @@ private:
FILE_CLOSE_ALL, FILE_CLOSE_ALL,
FILE_CLOSE_ALL_AND_QUIT, FILE_CLOSE_ALL_AND_QUIT,
FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER, FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER,
FILE_CLOSE_ALL_AND_RELOAD_CURRENT_PROJECT,
FILE_QUIT, FILE_QUIT,
FILE_EXTERNAL_OPEN_SCENE, FILE_EXTERNAL_OPEN_SCENE,
EDIT_UNDO, EDIT_UNDO,
@ -164,7 +165,7 @@ private:
RUN_SCENE_SETTINGS, RUN_SCENE_SETTINGS,
RUN_SETTINGS, RUN_SETTINGS,
RUN_USER_DATA_FOLDER, RUN_USER_DATA_FOLDER,
RUN_RELOAD_CURRENT_PROJECT, RELOAD_CURRENT_PROJECT,
RUN_PROJECT_MANAGER, RUN_PROJECT_MANAGER,
RUN_FILE_SERVER, RUN_FILE_SERVER,
RUN_LIVE_DEBUG, RUN_LIVE_DEBUG,