Merge pull request #49519 from Xrayez/filesystem-delete-for-everyone

Use "Delete" in FileSystemDock on all platforms
This commit is contained in:
Rémi Verschelde 2021-06-11 23:35:45 +02:00 committed by GitHub
commit 1b943dbea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 16 deletions

View File

@ -2777,22 +2777,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
// `KEY_MASK_CMD | KEY_C` conflicts with other editor shortcuts. // `KEY_MASK_CMD | KEY_C` conflicts with other editor shortcuts.
ED_SHORTCUT("filesystem_dock/copy_path", TTR("Copy Path"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_C); ED_SHORTCUT("filesystem_dock/copy_path", TTR("Copy Path"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_C);
ED_SHORTCUT("filesystem_dock/duplicate", TTR("Duplicate..."), KEY_MASK_CMD | KEY_D); ED_SHORTCUT("filesystem_dock/duplicate", TTR("Duplicate..."), KEY_MASK_CMD | KEY_D);
ED_SHORTCUT("filesystem_dock/delete", TTR("Delete"), KEY_DELETE);
#if defined(WINDOWS_ENABLED)
// TRANSLATORS: This string is only used on Windows, as it refers to the system trash
// as "Recycle Bin" instead of "Trash". Make sure to use the translation of "Recycle Bin"
// recommended by Microsoft for the target language.
ED_SHORTCUT("filesystem_dock/delete", TTR("Move to Recycle Bin"), KEY_DELETE);
#elif defined(OSX_ENABLED)
// TRANSLATORS: This string is only used on macOS, as it refers to the system trash
// as "Bin" instead of "Trash". Make sure to use the translation of "Bin"
// recommended by Apple for the target language.
ED_SHORTCUT("filesystem_dock/delete", TTR("Move to Bin"), KEY_DELETE);
#else
// TRANSLATORS: This string is only used on platforms other than Windows and macOS.
ED_SHORTCUT("filesystem_dock/delete", TTR("Move to Trash"), KEY_DELETE);
#endif
ED_SHORTCUT("filesystem_dock/rename", TTR("Rename..."), KEY_F2); ED_SHORTCUT("filesystem_dock/rename", TTR("Rename..."), KEY_F2);
VBoxContainer *top_vbc = memnew(VBoxContainer); VBoxContainer *top_vbc = memnew(VBoxContainer);