From 3c83d8f14defbec5f09aeeb78de3885535d2dc71 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 8 Feb 2012 15:16:35 +0100 Subject: Drag and drop: Adjust destination if the item is no directory or desktop-file The URL of the view should be used as destination target if a dropping is not done above a directory or desktop-file. BUG: 293511 FIXED-IN: 4.8.1 --- src/views/draganddrophelper.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/views/draganddrophelper.cpp') diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 83673ad72..2cd1e86e0 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -41,15 +41,18 @@ QString DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destU "org.kde.DndExtract", "extractSelectedFilesTo"); message.setArguments(QVariantList() << destUrl.pathOrUrl()); QDBusConnection::sessionBus().call(message); - } else { + } else if (!destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile())) { + // Drop into a directory or a desktop-file const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); foreach (const KUrl& url, urls) { if (url == destUrl) { return i18nc("@info:status", "A folder cannot be dropped into itself"); } } - + KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow()); + } else { + KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow()); } return QString(); -- cgit v1.3