godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Save the current script when pressing Ctrl + S if no scene is open

Browse Source 
- Tweak the dialog messages to be more informative.
  - The "Saved N modified resources" dialog is not a warning per se,
    so make it more explicit.

(cherry picked from commit 39f9b92f54)
This commit is contained in:
Hugo Locurcio
2021-05-09 12:29:50 +02:00
committed by Rémi Verschelde
parent c1e887edb8
commit c318cf6ed2
3 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/editor_node.cpp
View File

@@ -2352,15 +2352,24 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
Node *scene = editor_data.get_edited_scene_root(scene_idx);
if (!scene) {
int saved = _save_external_resources();
String err_text;
if (saved > 0) {
err_text = vformat(TTR("Saved %s modified resource(s)."), itos(saved));
} else {
err_text = TTR("A root node is required to save the scene.");
if (p_option == FILE_SAVE_SCENE) {
// Pressing Ctrl + S saves the current script if a scene is currently open, but it won't if the scene has no root node.
// Work around this by explicitly saving the script in this case (similar to pressing Ctrl + Alt + S).
ScriptEditor::get_singleton()->save_current_script();
}
const int saved = _save_external_resources();
if (saved > 0) {
show_accept(
vformat(TTR("The current scene has no root node, but %d modified external resource(s) were saved anyway."), saved),
TTR("OK"));
} else if (p_option == FILE_SAVE_AS_SCENE) {
// Don't show this dialog when pressing Ctrl + S to avoid interfering with script saving.
show_accept(
TTR("A root node is required to save the scene. You can add a root node using the Scene tree dock."),
TTR("OK"));
}
show_accept(err_text, TTR("OK"));
break;
}