Skip to content

Commit 6810fc0

Browse files
committed
Merge pull request godotengine#104431 from akien-mga/revert-96536
Revert "Add option to copy a file's name in the FileSystem dock"
2 parents 21e1e43 + 09988ae commit 6810fc0

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

editor/filesystem_dock.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -2544,14 +2544,6 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
25442544
}
25452545
} break;
25462546

2547-
case FILE_COPY_NAME: {
2548-
if (!p_selected.is_empty()) {
2549-
const String &fpath = p_selected[0];
2550-
const String file_name = fpath.get_file();
2551-
DisplayServer::get_singleton()->clipboard_set(file_name);
2552-
}
2553-
} break;
2554-
25552547
case FILE_COPY_UID: {
25562548
if (!p_selected.is_empty()) {
25572549
ResourceUID::ID uid = ResourceLoader::get_resource_uid(p_selected[0]);
@@ -3290,7 +3282,6 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
32903282
if (p_paths.size() == 1) {
32913283
p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("ActionCopy")), ED_GET_SHORTCUT("filesystem_dock/copy_path"), FILE_COPY_PATH);
32923284
p_popup->add_shortcut(ED_GET_SHORTCUT("filesystem_dock/copy_absolute_path"), FILE_COPY_ABSOLUTE_PATH);
3293-
p_popup->add_shortcut(ED_GET_SHORTCUT("filesystem_dock/copy_name"), FILE_COPY_NAME);
32943285
if (ResourceLoader::get_resource_uid(p_paths[0]) != ResourceUID::INVALID_ID) {
32953286
p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Instance")), ED_GET_SHORTCUT("filesystem_dock/copy_uid"), FILE_COPY_UID);
32963287
}
@@ -3648,8 +3639,6 @@ void FileSystemDock::_tree_gui_input(Ref<InputEvent> p_event) {
36483639
_tree_rmb_option(FILE_COPY_PATH);
36493640
} else if (ED_IS_SHORTCUT("filesystem_dock/copy_absolute_path", p_event)) {
36503641
_tree_rmb_option(FILE_COPY_ABSOLUTE_PATH);
3651-
} else if (ED_IS_SHORTCUT("filesystem_dock/copy_name", p_event)) {
3652-
_tree_rmb_option(FILE_COPY_NAME);
36533642
} else if (ED_IS_SHORTCUT("filesystem_dock/copy_uid", p_event)) {
36543643
_tree_rmb_option(FILE_COPY_UID);
36553644
} else if (ED_IS_SHORTCUT("filesystem_dock/delete", p_event)) {
@@ -3733,8 +3722,6 @@ void FileSystemDock::_file_list_gui_input(Ref<InputEvent> p_event) {
37333722
_file_list_rmb_option(FILE_COPY_PATH);
37343723
} else if (ED_IS_SHORTCUT("filesystem_dock/copy_absolute_path", p_event)) {
37353724
_file_list_rmb_option(FILE_COPY_ABSOLUTE_PATH);
3736-
} else if (ED_IS_SHORTCUT("filesystem_dock/copy_name", p_event)) {
3737-
_tree_rmb_option(FILE_COPY_NAME);
37383725
} else if (ED_IS_SHORTCUT("filesystem_dock/delete", p_event)) {
37393726
_file_list_rmb_option(FILE_REMOVE);
37403727
} else if (ED_IS_SHORTCUT("filesystem_dock/rename", p_event)) {
@@ -4055,7 +4042,6 @@ FileSystemDock::FileSystemDock() {
40554042
// `KeyModifierMask::CMD_OR_CTRL | Key::C` conflicts with other editor shortcuts.
40564043
ED_SHORTCUT("filesystem_dock/copy_path", TTRC("Copy Path"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::C);
40574044
ED_SHORTCUT("filesystem_dock/copy_absolute_path", TTRC("Copy Absolute Path"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::ALT | Key::C);
4058-
ED_SHORTCUT("filesystem_dock/copy_name", TTR("Copy Name"));
40594045
ED_SHORTCUT("filesystem_dock/copy_uid", TTRC("Copy UID"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::ALT | KeyModifierMask::SHIFT | Key::C);
40604046
ED_SHORTCUT("filesystem_dock/duplicate", TTRC("Duplicate..."), KeyModifierMask::CMD_OR_CTRL | Key::D);
40614047
ED_SHORTCUT("filesystem_dock/delete", TTRC("Delete"), Key::KEY_DELETE);

editor/filesystem_dock.h

-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ class FileSystemDock : public VBoxContainer {
121121
FILE_OPEN_IN_TERMINAL,
122122
FILE_COPY_PATH,
123123
FILE_COPY_ABSOLUTE_PATH,
124-
FILE_COPY_NAME,
125124
FILE_COPY_UID,
126125
FOLDER_EXPAND_ALL,
127126
FOLDER_COLLAPSE_ALL,

0 commit comments

Comments
 (0)