X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a7838db28e24e9618a39954524f055dc3335f7a9..b1c9b5126d:/src/draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index a4971a62c..002394155 100644
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *
- *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *                                                                      *                                                                         *
+ *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -25,6 +26,7 @@
 #include <kfileitem.h>
 #include <kicon.h>
 #include <klocale.h>
+#include <kdebug.h>
 #include <konq_operations.h>
 
 #include <QAbstractItemView>
@@ -59,7 +61,7 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
         if (data == 0) {
             return;
         }
-        
+
         if (controller != 0) {
             controller->emitHideToolTip();
         }
@@ -78,10 +80,18 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);
+
+        m_dragSource = itemView;
         drag->exec(supportedActions, Qt::IgnoreAction);
+        m_dragSource = 0;
     }
 }
 
+bool DragAndDropHelper::isDragSource(QAbstractItemView* itemView)
+{
+    return (m_dragSource != 0) && (m_dragSource == itemView);
+}
+
 void DragAndDropHelper::dropUrls(const KFileItem& destItem,
                                  const KUrl& destPath,
                                  QDropEvent* event,
@@ -89,23 +99,21 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 {
     const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
     const KUrl destination = dropToItem ? destItem.url() : destPath;
-    
+
     const QMimeData* mimeData = event->mimeData();
     if (mimeData->hasFormat("application/x-kde-dndextract")) {
         QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract",
-                                                              "org.kde.DndExtract", "extractFilesTo");
+                                                              "org.kde.DndExtract", "extractSelectedFilesTo");
         message.setArguments(QVariantList() << destination.path());
         QDBusConnection::sessionBus().call(message);
-    } else {                                
+    } else {
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-        const KUrl sourceDir = KUrl(urls.first().directory());
-        if (sourceDir == destination) {
-            const QString msg = i18ncp("@info:status",
-                                       "The dropped item is already inside the folder %2",
-                                       "The dropped items are already inside the folder %2",
-                                       urls.count(), destination.fileName());
-            emit informationMessage(msg);
+        const int urlsCount = urls.count();
+        if (urlsCount == 0) {
+            // TODO: handle dropping of other data
+        } else if ((urlsCount == 1) && (urls.first() == destination)) {
+            emit errorMessage(i18nc("@info:status", "A folder cannot be dropped into itself"));
         } else if (dropToItem) {
             KonqOperations::doDrop(destItem, destination, event, widget);
         } else {
@@ -115,6 +123,7 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 }
 
 DragAndDropHelper::DragAndDropHelper()
+    : m_dragSource(0)
 {
 }