X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e46003aca365ca66ce7c7cccd47fb52d1da2fb91..75480d07cd820c75ca418b990d3059f154bbdf6e:/src/draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index d9188675a..ded92bf04 100644
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *
- *                                                                         *
+ *   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     *
@@ -18,19 +18,27 @@
  ***************************************************************************/
 
 #include "draganddrophelper.h"
+#include "dolphiniconsview.h"
+#include "dolphincontroller.h"
 
 #include <kdirmodel.h>
+#include <kfileitem.h>
 #include <kicon.h>
+#include <konq_operations.h>
 
 #include <QAbstractItemView>
 #include <QAbstractProxyModel>
-#include <QBrush>
+#include <QtDBus>
 #include <QDrag>
-#include <QPainter>
-#include <QRect>
-#include <QWidget>
 
-void DragAndDropHelper::startDrag(QAbstractItemView* itemView, Qt::DropActions supportedActions)
+bool DragAndDropHelper::isMimeDataSupported(const QMimeData* mimeData)
+{
+    return mimeData->hasUrls() || mimeData->hasFormat("application/x-kde-dndextract");
+}
+
+void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
+                                  Qt::DropActions supportedActions,
+                                  DolphinController* controller)
 {
     QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();
     if (indexes.count() > 0) {
@@ -38,6 +46,10 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView, Qt::DropActions s
         if (data == 0) {
             return;
         }
+        
+        if (controller != 0) {
+            controller->emitHideToolTip();
+        }
 
         QDrag* drag = new QDrag(itemView);
         QPixmap pixmap;
@@ -49,37 +61,38 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView, Qt::DropActions s
             const KFileItem item = dirModel->itemForIndex(index);
             pixmap = item.pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
         } else {
-            pixmap = KIcon("item-drag-multiple").pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
+            pixmap = KIcon("document-multiple").pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);
-        drag->exec(supportedActions);
+        drag->exec(supportedActions, Qt::IgnoreAction);
     }
 }
 
-void DragAndDropHelper::drawHoverIndication(QWidget* widget,
-                                            const QRect& bounds,
-                                            const QBrush& brush)
+void DragAndDropHelper::dropUrls(const KFileItem& destItem,
+                                 const KUrl& destPath,
+                                 QDropEvent* event,
+                                 QWidget* widget)
 {
-    QPainter painter(widget);
-    painter.save();
-    QBrush blendedBrush(brush);
-    QColor color = blendedBrush.color();
-    color.setAlpha(64);
-    blendedBrush.setColor(color);
-
-    const int radius = 10;
-    QPainterPath path(QPointF(bounds.left(), bounds.top() + radius));
-    path.quadTo(bounds.left(), bounds.top(), bounds.left() + radius, bounds.top());
-    path.lineTo(bounds.right() - radius, bounds.top());
-    path.quadTo(bounds.right(), bounds.top(), bounds.right(), bounds.top() + radius);
-    path.lineTo(bounds.right(), bounds.bottom() - radius);
-    path.quadTo(bounds.right(), bounds.bottom(), bounds.right() - radius, bounds.bottom());
-    path.lineTo(bounds.left() + radius, bounds.bottom());
-    path.quadTo(bounds.left(), bounds.bottom(), bounds.left(), bounds.bottom() - radius);
-    path.closeSubpath();
-
-    painter.setRenderHint(QPainter::Antialiasing);
-    painter.fillPath(path, blendedBrush);
-    painter.restore();
+    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");
+        message.setArguments(QVariantList() << destination.path());
+        QDBusConnection::sessionBus().call(message);
+    } 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);
+            }
+        }
+    }
 }