Pārlūkot izejas kodu

Merge pull request #38637 from Calinou/editor-rename-revert-scene-bind

Rename the editor action "Revert Scene" to "Reload Saved Scene"
Rémi Verschelde 5 gadi atpakaļ
vecāks
revīzija
1c18be1cc9
2 mainītis faili ar 6 papildinājumiem un 5 dzēšanām
  1. 5 4
      editor/editor_node.cpp
  2. 1 1
      editor/editor_node.h

+ 5 - 4
editor/editor_node.cpp

@@ -2412,7 +2412,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			}
 			}
 		} break;
 		} break;
 
 
-		case EDIT_REVERT: {
+		case EDIT_RELOAD_SAVED_SCENE: {
 
 
 			Node *scene = get_edited_scene();
 			Node *scene = get_edited_scene();
 
 
@@ -2427,8 +2427,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			}
 			}
 
 
 			if (unsaved_cache && !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();
 				confirmation->popup_centered();
 				break;
 				break;
 			}
 			}
@@ -6169,7 +6170,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_shortcut(ED_SHORTCUT("editor/redo", TTR("Redo"), KEY_MASK_CMD + KEY_MASK_SHIFT + KEY_Z), EDIT_REDO, true);
 
 
 	p->add_separator();
 	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);
 	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);
 	recent_scenes = memnew(PopupMenu);

+ 1 - 1
editor/editor_node.h

@@ -153,7 +153,7 @@ private:
 		FILE_EXTERNAL_OPEN_SCENE,
 		FILE_EXTERNAL_OPEN_SCENE,
 		EDIT_UNDO,
 		EDIT_UNDO,
 		EDIT_REDO,
 		EDIT_REDO,
-		EDIT_REVERT,
+		EDIT_RELOAD_SAVED_SCENE,
 		TOOLS_ORPHAN_RESOURCES,
 		TOOLS_ORPHAN_RESOURCES,
 		TOOLS_CUSTOM,
 		TOOLS_CUSTOM,
 		RESOURCE_SAVE,
 		RESOURCE_SAVE,