X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8998ee8f5163d20a204f2bba8bc240c9bd700be7..119f7a3f:/src/views/draganddrophelper.cpp

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 8e5873480..a09faa345 100644
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -21,39 +21,49 @@
 #include "draganddrophelper.h"
 
 #include <KFileItem>
-#include <KLocale>
+#include <KLocalizedString>
 #include <konq_operations.h>
-#include <KUrl>
+#include <QUrl>
 #include <QApplication>
 #include <QtDBus>
 #include <QDropEvent>
+#include <KUrlMimeData>
 
-QString DragAndDropHelper::dropUrls(const KFileItem& destItem,
-                                    const KUrl& destPath,
-                                    QDropEvent* event)
+KonqOperations* DragAndDropHelper::dropUrls(const KFileItem& destItem, const QUrl& destUrl, QDropEvent* event, QString& error)
 {
-    const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
-    const KUrl destination = dropToItem ? destItem.url() : destPath;
+    error.clear();
+
+    if (!destItem.isNull() && !destItem.isWritable()) {
+        error = xi18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>",
+                       destUrl.toDisplayString(QUrl::PreferLocalFile));
+        return 0;
+    }
 
     const QMimeData* mimeData = event->mimeData();
-    if (mimeData->hasFormat("application/x-kde-dndextract")) {
-        const QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
-        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract",
-                                                              "org.kde.DndExtract", "extractSelectedFilesTo");
-        message.setArguments(QVariantList() << destination.pathOrUrl());
+    if (mimeData->hasFormat("application/x-kde-ark-dndextract-service") &&
+        mimeData->hasFormat("application/x-kde-ark-dndextract-path")) {
+        const QString remoteDBusClient = mimeData->data("application/x-kde-ark-dndextract-service");
+        const QString remoteDBusPath = mimeData->data("application/x-kde-ark-dndextract-path");
+
+        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
+                                                              "org.kde.ark.DndExtract", "extractSelectedFilesTo");
+        message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)});
         QDBusConnection::sessionBus().call(message);
-    } else {
-        const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-        const int urlsCount = urls.count();
-        if (urlsCount == 1 && urls.first() == destination) {
-            return i18nc("@info:status", "A folder cannot be dropped into itself");
-        } else if (dropToItem) {
-            KonqOperations::doDrop(destItem, destination, event, QApplication::activeWindow());
-        } else {
-            KonqOperations::doDrop(KFileItem(), destination, event, QApplication::activeWindow());
+    } else if (!destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile())) {
+        // Drop into a directory or a desktop-file
+        const QList<QUrl> urls = KUrlMimeData::urlsFromMimeData(mimeData);
+        foreach (const QUrl& url, urls) {
+            if (url == destUrl) {
+                error = i18nc("@info:status", "A folder cannot be dropped into itself");
+                return 0;
+            }
         }
+
+        return KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow(), QList<QAction*>());
+    } else {
+        return KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow(), QList<QAction*>());
     }
 
-    return QString();
+    return 0;
 }