i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'haiku/master' into package-management

Browse Source 
Conflicts:
	build/jam/HaikuImage
	build/jam/OptionalPackageDependencies
	build/jam/OptionalPackages
	build/scripts/build_cross_tools_gcc4
	src/add-ons/translators/icns/Jamfile
	src/add-ons/translators/jpeg/Jamfile
This commit is contained in:
Ingo Weinhold
2013-07-08 14:01:00 +02:00
parent 2f3dc946cd 5d4ef3e417
commit 7e78b434f4
438 changed files with 15612 additions and 25171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/ContainerWindow.cpp
+4 -3
View File
@@ -2764,9 +2764,10 @@ BContainerWindow::AddFileContextMenus(BMenu* menu)
menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"),
new BMessage(kMoveToTrash), 'T'));
// add separator for copy to/move to items (navigation items)
menu->AddSeparatorItem();
if (!IsPrintersDir()) {
// add separator for copy to/move to items (navigation items)
menu->AddSeparatorItem();
}
} else {
menu->AddItem(new BMenuItem(B_TRANSLATE("Delete"),
new BMessage(kDelete), 0));