From 4624f9f2605e84131c95eda001b2f29df3a8be45 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sun, 17 Dec 2023 13:31:20 -0500 Subject: [PATCH] Tracker: Add Cut/Copy/Paste items to context menus Remove CUT_COPY_PASTE_IN_CONTEXT_MENU define entirely. Change-Id: I457ee140c2bde7e5ab750528b3196adfe9eb7018 Reviewed-on: https://review.haiku-os.org/c/haiku/+/6358 Reviewed-by: John Scipione --- src/kits/tracker/ContainerWindow.cpp | 4 ---- src/kits/tracker/FilePanelPriv.cpp | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index 2e7a672275..c636919c6c 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -2567,7 +2567,6 @@ BContainerWindow::AddPoseContextMenu(BMenu* menu) // The "Move To", "Copy To", "Create Link" menus are inserted here, // have a look at UpdateMenu() and SetupMoveCopyMenus(). -#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU if (!TargetModel()->IsPrintersDir() && !TargetModel()->IsRoot() && !TargetModel()->IsTrash() && !TargetModel()->InTrash()) { menu->AddItem(Shortcuts()->CutItem()); @@ -2575,7 +2574,6 @@ BContainerWindow::AddPoseContextMenu(BMenu* menu) menu->AddItem(Shortcuts()->PasteItem()); menu->AddSeparatorItem(); } -#endif menu->AddItem(Shortcuts()->IdentifyItem()); menu->AddItem(new BMenuItem(new BMenu(Shortcuts()->AddOnsLabel()))); @@ -2619,13 +2617,11 @@ BContainerWindow::AddWindowContextMenu(BMenu* menu) menu->AddSeparatorItem(); } -#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU if (!(TargetModel()->IsPrintersDir() || TargetModel()->IsVolume() || TargetModel()->IsRoot() || TargetModel()->IsTrash() || TargetModel()->InTrash())) { menu->AddItem(Shortcuts()->PasteItem()); menu->AddSeparatorItem(); } -#endif if (TargetModel()->IsDesktop()) // "Clean up" on Desktop menu->AddItem(Shortcuts()->CleanupItem()); diff --git a/src/kits/tracker/FilePanelPriv.cpp b/src/kits/tracker/FilePanelPriv.cpp index f20bd7b10c..ef98249fcf 100644 --- a/src/kits/tracker/FilePanelPriv.cpp +++ b/src/kits/tracker/FilePanelPriv.cpp @@ -998,9 +998,7 @@ TFilePanel::AddPoseContextMenu(BMenu* menu) menu->AddItem(Shortcuts()->CutItem()); menu->AddItem(Shortcuts()->CopyItem()); -#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU menu->AddItem(Shortcuts()->PasteItem()); -#endif } @@ -1011,10 +1009,8 @@ TFilePanel::AddVolumeContextMenu(BMenu* menu) menu->AddItem(Shortcuts()->GetInfoItem()); menu->AddItem(Shortcuts()->EditNameItem()); -#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU menu->AddSeparatorItem(); menu->AddItem(Shortcuts()->PasteItem()); -#endif } @@ -1024,10 +1020,8 @@ TFilePanel::AddWindowContextMenu(BMenu* menu) menu->AddItem(Shortcuts()->NewFolderItem()); menu->AddItem(new BSeparatorItem()); -#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU menu->AddItem(Shortcuts()->PasteItem()); menu->AddSeparatorItem(); -#endif menu->AddItem(Shortcuts()->SelectItem()); menu->AddItem(Shortcuts()->SelectAllItem());