replace list.count() > 0 by !list.isEmpty()

[dolphin.git] / src / draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index ded92bf04fef0d73db47b4166cdb458f3d389a2c..637117a2b72a3af586dcc614173271fbb9969aa1 100644 (file)
--- 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     *
@@ -24,6 +25,8 @@
 #include <kdirmodel.h>
 #include <kfileitem.h>
 #include <kicon.h>
+#include <klocale.h>
+#include <kdebug.h>
 #include <konq_operations.h>
 
 #include <QAbstractItemView>
@@ -31,7 +34,19 @@
 #include <QtDBus>
 #include <QDrag>
 
-bool DragAndDropHelper::isMimeDataSupported(const QMimeData* mimeData)
+class DragAndDropHelperSingleton
+{
+public:
+    DragAndDropHelper instance;
+};
+K_GLOBAL_STATIC(DragAndDropHelperSingleton, s_dragAndDropHelper)
+
+DragAndDropHelper& DragAndDropHelper::instance()
+{
+    return s_dragAndDropHelper->instance;
+}
+
+bool DragAndDropHelper::isMimeDataSupported(const QMimeData* mimeData) const
 {
     return mimeData->hasUrls() || mimeData->hasFormat("application/x-kde-dndextract");
 }
@@ -40,13 +55,21 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
                                   Qt::DropActions supportedActions,
                                   DolphinController* controller)
 {
+    // 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();
         }
@@ -65,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,
@@ -76,23 +108,32 @@ 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) {
-            if (dropToItem) {
-                KonqOperations::doDrop(destItem, destination, event, widget);
-            } else {
-                KonqOperations::doDrop(KFileItem(), destination, event, widget);
-            }
+        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 {
+            KonqOperations::doDrop(KFileItem(), destination, event, widget);
         }
     }
 }
+
+DragAndDropHelper::DragAndDropHelper()
+    : m_dragSource(0)
+{
+}
+
+#include "draganddrophelper.moc"