From 10f94beaafd815837c702478def354d5acbb8102 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 30 Jan 2008 22:39:42 +0000 Subject: [PATCH] Don't offer a Move Here/Copy Here/Link Here menu when dropping items above the trash, just move the things into the trash instead. TODO: as the inline comment already says KonqOperations::doDrop() should be used as longterm solution... svn path=/trunk/KDE/kdebase/apps/; revision=768925 --- src/dolphindropcontroller.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/dolphindropcontroller.cpp b/src/dolphindropcontroller.cpp index 002c242ac8..d322c593d5 100644 --- a/src/dolphindropcontroller.cpp +++ b/src/dolphindropcontroller.cpp @@ -45,24 +45,23 @@ void DolphinDropController::dropUrls(const KUrl::List& urls, kDebug() << "Source" << urls; kDebug() << "Destination:" << destination; + if (destination.protocol() == "trash") { + KonqOperations::del(m_parentWidget, KonqOperations::TRASH, urls); + return; + } + Qt::DropAction action = Qt::CopyAction; Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); const bool shiftPressed = modifier & Qt::ShiftModifier; const bool controlPressed = modifier & Qt::ControlModifier; const bool altPressed = modifier & Qt::AltModifier; - if (shiftPressed && controlPressed) { - // shortcut for 'Link Here' is used + if ((shiftPressed && controlPressed) || altPressed) { action = Qt::LinkAction; - } else if (shiftPressed) { - // shortcut for 'Move Here' is used - action = Qt::MoveAction; } else if (controlPressed) { - // shortcut for 'Copy Here' is used action = Qt::CopyAction; - } else if (altPressed) { - // shortcut for 'Link Here' is used - action = Qt::LinkAction; + } else if (shiftPressed) { + action = Qt::MoveAction; } else { // open a context menu which offers the following actions: // - Move Here