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

Made save dialog open immediately when running unsaved scene.

Browse Source 
Previously there was an unneeded confirmation dialog.
This commit is contained in:
Eric M 2021-01-06 11:17:56 +10:00
parent cdfcf68af9
commit a54110ba60
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/editor_node.cpp
View File

@ -2123,7 +2123,10 @@ void EditorNode::_run(bool p_current, const String &p_custom) {
if (scene->get_filename() == "") { if (scene->get_filename() == "") {
current_option = -1; current_option = -1;
_menu_option_confirm(FILE_SAVE_BEFORE_RUN, false); _menu_option(FILE_SAVE_AS_SCENE);
// Set the option to save and run so when the dialog is accepted, the scene runs.
current_option = FILE_SAVE_AND_RUN;
file->set_title(TTR("Save scene before running..."));
return; return;
} }
@ -2382,18 +2385,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
case FILE_SAVE_ALL_SCENES: { case FILE_SAVE_ALL_SCENES: {
_save_all_scenes(); _save_all_scenes();
} break; } break;
case FILE_SAVE_BEFORE_RUN: {
if (!p_confirmed) {
confirmation->get_cancel_button()->set_text(TTR("No"));
confirmation->get_ok_button()->set_text(TTR("Yes"));
confirmation->set_text(TTR("This scene has never been saved. Save before running?"));
confirmation->popup_centered();
break;
}
_menu_option(FILE_SAVE_AS_SCENE);
_menu_option_confirm(FILE_SAVE_AND_RUN, false);
} break;
case FILE_EXPORT_PROJECT: { case FILE_EXPORT_PROJECT: {
project_export->popup_export(); project_export->popup_export();

1
editor/editor_node.h
View File

@ -125,7 +125,6 @@ private:
FILE_SAVE_SCENE, FILE_SAVE_SCENE,
FILE_SAVE_AS_SCENE, FILE_SAVE_AS_SCENE,
FILE_SAVE_ALL_SCENES, FILE_SAVE_ALL_SCENES,
FILE_SAVE_BEFORE_RUN,
FILE_SAVE_AND_RUN, FILE_SAVE_AND_RUN,
FILE_SHOW_IN_FILESYSTEM, FILE_SHOW_IN_FILESYSTEM,
FILE_IMPORT_SUBSCENE, FILE_IMPORT_SUBSCENE,