Rename the "Delete" option in the FileSystem dock to "Move to Trash"
It actually moves files to the system trash instead of removing them
completely.
(cherry picked from commit e7ed287fda
)
This commit is contained in:
parent
12681b497b
commit
c9a694a11d
2 changed files with 3 additions and 3 deletions
|
@ -474,13 +474,13 @@ void DependencyRemoveDialog::show(const Vector<String> &p_folders, const Vector<
|
||||||
removed_deps.sort();
|
removed_deps.sort();
|
||||||
if (removed_deps.empty()) {
|
if (removed_deps.empty()) {
|
||||||
owners->hide();
|
owners->hide();
|
||||||
text->set_text(TTR("Remove selected files from the project? (Can't be restored)"));
|
text->set_text(TTR("Remove selected files from the project? (no undo)\nYou can find the removed files in the system trash to restore them."));
|
||||||
set_size(Size2());
|
set_size(Size2());
|
||||||
popup_centered();
|
popup_centered();
|
||||||
} else {
|
} else {
|
||||||
_build_removed_dependency_tree(removed_deps);
|
_build_removed_dependency_tree(removed_deps);
|
||||||
owners->show();
|
owners->show();
|
||||||
text->set_text(TTR("The files being removed are required by other resources in order for them to work.\nRemove them anyway? (no undo)"));
|
text->set_text(TTR("The files being removed are required by other resources in order for them to work.\nRemove them anyway? (no undo)\nYou can find the removed files in the system trash to restore them."));
|
||||||
popup_centered(Size2(500, 350));
|
popup_centered(Size2(500, 350));
|
||||||
}
|
}
|
||||||
EditorFileSystem::get_singleton()->scan_changes();
|
EditorFileSystem::get_singleton()->scan_changes();
|
||||||
|
|
|
@ -2252,7 +2252,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, Vector<Str
|
||||||
|
|
||||||
if (p_paths.size() > 1 || p_paths[0] != "res://") {
|
if (p_paths.size() > 1 || p_paths[0] != "res://") {
|
||||||
p_popup->add_icon_item(get_icon("MoveUp", "EditorIcons"), TTR("Move To..."), FILE_MOVE);
|
p_popup->add_icon_item(get_icon("MoveUp", "EditorIcons"), TTR("Move To..."), FILE_MOVE);
|
||||||
p_popup->add_icon_item(get_icon("Remove", "EditorIcons"), TTR("Delete"), FILE_REMOVE);
|
p_popup->add_icon_item(get_icon("Remove", "EditorIcons"), TTR("Move to Trash"), FILE_REMOVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p_paths.size() == 1) {
|
if (p_paths.size() == 1) {
|
||||||
|
|
Loading…
Reference in a new issue