Increase version number to 1.5

[dolphin.git] / src / draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index 30804c2c1379da4e1908acb638084945c00292a5..a85e3cb6acfa9340c47147971b2f16bbb0cae91b 100644 (file)
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -20,7 +20,7 @@
 
 #include "draganddrophelper.h"
 #include "dolphiniconsview.h"
-#include "dolphincontroller.h"
+#include "dolphinviewcontroller.h"
 
 #include <kdirmodel.h>
 #include <kfileitem.h>
@@ -53,17 +53,25 @@ bool DragAndDropHelper::isMimeDataSupported(const QMimeData* mimeData) const
 
 void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
                                   Qt::DropActions supportedActions,
-                                  DolphinController* controller)
+                                  DolphinViewController* dolphinViewController)
 {
+    // Do not start a new drag until the previous one has been finished.
+    // This is a (possibly temporary) fix for bug #187884.
+    static bool isDragging = false;
+    if (isDragging) {
+        return;
+    }
+    isDragging = true;
+
     QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();
-    if (indexes.count() > 0) {
+    if (!indexes.isEmpty()) {
         QMimeData *data = itemView->model()->mimeData(indexes);
         if (data == 0) {
             return;
         }
 
-        if (controller != 0) {
-            controller->emitHideToolTip();
+        if (dolphinViewController != 0) {
+            dolphinViewController->requestToolTipHiding();
         }
 
         QDrag* drag = new QDrag(itemView);
@@ -80,8 +88,17 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);
+
+        m_dragSource = itemView;
         drag->exec(supportedActions, Qt::IgnoreAction);
+        m_dragSource = 0;
     }
+    isDragging = false;
+}
+
+bool DragAndDropHelper::isDragSource(QAbstractItemView* itemView)
+{
+    return (m_dragSource != 0) && (m_dragSource == itemView);
 }
 
 void DragAndDropHelper::dropUrls(const KFileItem& destItem,
@@ -96,7 +113,7 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
     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 {
@@ -115,6 +132,7 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 }
 
 DragAndDropHelper::DragAndDropHelper()
+    : m_dragSource(0)
 {
 }