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

Merge pull request #90660 from adamscott/rename-file-updated-dialog

Browse Source 
Improve UX when saving newer files on disk
This commit is contained in:
Rémi Verschelde
2024-05-29 11:19:41 +02:00
parent bda8e30e80 38d8abea12
commit 4d906f46b3
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_node.cpp
View File

@@ -7228,6 +7228,8 @@ EditorNode::EditorNode() {
disk_changed = memnew(ConfirmationDialog); disk_changed = memnew(ConfirmationDialog);
{ {
disk_changed->set_title(TTR("Files have been modified on disk"));
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
disk_changed->add_child(vbc); disk_changed->add_child(vbc);
@@ -7241,9 +7243,9 @@ EditorNode::EditorNode() {
disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_modified_scenes)); disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_modified_scenes));
disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_project_settings)); disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_project_settings));
disk_changed->set_ok_button_text(TTR("Reload")); disk_changed->set_ok_button_text(TTR("Discard local changes and reload"));
disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave"); disk_changed->add_button(TTR("Keep local changes and overwrite"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
disk_changed->connect("custom_action", callable_mp(this, &EditorNode::_resave_scenes)); disk_changed->connect("custom_action", callable_mp(this, &EditorNode::_resave_scenes));
} }

16
editor/plugins/script_editor_plugin.cpp
View File

@@ -4249,12 +4249,18 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
disk_changed = memnew(ConfirmationDialog); disk_changed = memnew(ConfirmationDialog);
{ {
disk_changed->set_title(TTR("Files have been modified on disk"));
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
disk_changed->add_child(vbc); disk_changed->add_child(vbc);
Label *dl = memnew(Label); Label *files_are_newer_label = memnew(Label);
dl->set_text(TTR("The following files are newer on disk.\nWhat action should be taken?:")); files_are_newer_label->set_text(TTR("The following files are newer on disk."));
vbc->add_child(dl); vbc->add_child(files_are_newer_label);
Label *what_action_label = memnew(Label);
what_action_label->set_text(TTR("What action should be taken?:"));
vbc->add_child(what_action_label);
disk_changed_list = memnew(Tree); disk_changed_list = memnew(Tree);
vbc->add_child(disk_changed_list); vbc->add_child(disk_changed_list);
@@ -4262,9 +4268,9 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
disk_changed_list->set_v_size_flags(SIZE_EXPAND_FILL); disk_changed_list->set_v_size_flags(SIZE_EXPAND_FILL);
disk_changed->connect("confirmed", callable_mp(this, &ScriptEditor::reload_scripts).bind(false)); disk_changed->connect("confirmed", callable_mp(this, &ScriptEditor::reload_scripts).bind(false));
disk_changed->set_ok_button_text(TTR("Reload")); disk_changed->set_ok_button_text(TTR("Discard local changes and reload"));
disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave"); disk_changed->add_button(TTR("Keep local changes and overwrite"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
disk_changed->connect("custom_action", callable_mp(this, &ScriptEditor::_resave_scripts)); disk_changed->connect("custom_action", callable_mp(this, &ScriptEditor::_resave_scripts));
} }