From 2962819d1c4e3a3835647015904e07c93ecfc370 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 10 May 2020 20:12:25 +0200 Subject: [PATCH] Rename the editor action "Revert Scene" to "Reload Saved Scene" This option can be used to workaround various issues with stuff not reloading properly when changes are made. The option was renamed to clarify the fact that it actually reloads the scene saved on the filesystem. --- editor/editor_node.cpp | 9 +++++---- editor/editor_node.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index c37ede41661..8eb70225e83 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2390,7 +2390,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { } } break; - case EDIT_REVERT: { + case EDIT_RELOAD_SAVED_SCENE: { Node *scene = get_edited_scene(); @@ -2405,8 +2405,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { } if (unsaved_cache && !p_confirmed) { - confirmation->get_ok()->set_text(TTR("Revert")); - confirmation->set_text(TTR("This action cannot be undone. Revert anyway?")); + confirmation->get_ok()->set_text(TTR("Reload Saved Scene")); + confirmation->set_text( + TTR("The current scene has unsaved changes.\nReload the saved scene anyway? This action cannot be undone.")); confirmation->popup_centered(); break; } @@ -6157,7 +6158,7 @@ EditorNode::EditorNode() { p->add_shortcut(ED_SHORTCUT("editor/redo", TTR("Redo"), KEY_MASK_CMD + KEY_MASK_SHIFT + KEY_Z), EDIT_REDO, true); p->add_separator(); - p->add_shortcut(ED_SHORTCUT("editor/revert_scene", TTR("Revert Scene")), EDIT_REVERT); + p->add_shortcut(ED_SHORTCUT("editor/reload_saved_scene", TTR("Reload Saved Scene")), EDIT_RELOAD_SAVED_SCENE); p->add_shortcut(ED_SHORTCUT("editor/close_scene", TTR("Close Scene"), KEY_MASK_CMD + KEY_MASK_SHIFT + KEY_W), FILE_CLOSE); recent_scenes = memnew(PopupMenu); diff --git a/editor/editor_node.h b/editor/editor_node.h index c6f04b07495..74c49afdfea 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -152,7 +152,7 @@ private: FILE_EXTERNAL_OPEN_SCENE, EDIT_UNDO, EDIT_REDO, - EDIT_REVERT, + EDIT_RELOAD_SAVED_SCENE, TOOLS_ORPHAN_RESOURCES, TOOLS_CUSTOM, RESOURCE_SAVE,