Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-02-07 06:16:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tracker: Add Cut/Copy/Paste items to context menus

Browse Source 
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 <jscipione@gmail.com>
This commit is contained in:
John Scipione 2023-12-17 13:31:20 -05:00
parent 683100d673
commit 4624f9f260
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kits/tracker/ContainerWindow.cpp
View File

@ -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());

6
src/kits/tracker/FilePanelPriv.cpp
View File

@ -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());