Fix for crash which was introduced by commit

[dolphin.git] / src / views / draganddrophelper.cpp

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 9708415f0a057953b32aeaa7d5b24e3b662de5bc..a09faa345179fbb016b67289c550650a56639614 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2007-2011 by Peter Penz <peter.penz19@gmail.com>        *

  *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,163 +20,50 @@
 
 #include "draganddrophelper.h"
 
 
 #include "draganddrophelper.h"
 

-#include <kdirmodel.h>
-#include <kfileitem.h>
-#include <kicon.h>
-#include <klocale.h>
+#include <KFileItem>
+#include <KLocalizedString>

 #include <konq_operations.h>
 #include <konq_operations.h>

-
-#include "views/dolphiniconsview.h"
-#include "views/dolphinviewcontroller.h"
-
-#include <QAbstractItemView>
-#include <QAbstractProxyModel>
+#include <QUrl>
+#include <QApplication>

 #include <QtDBus>
 #include <QtDBus>

-#include <QDrag>
-#include <QPainter>
-
-class DragAndDropHelperSingleton
-{
-public:
-    DragAndDropHelper instance;
-};
-K_GLOBAL_STATIC(DragAndDropHelperSingleton, s_dragAndDropHelper)
+#include <QDropEvent>
+#include <KUrlMimeData>

 
 

-DragAndDropHelper& DragAndDropHelper::instance()
+KonqOperations* DragAndDropHelper::dropUrls(const KFileItem& destItem, const QUrl& destUrl, QDropEvent* event, QString& error)

 {
 {

-    return s_dragAndDropHelper->instance;
-}
+    error.clear();

 
 

-void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
-                                  Qt::DropActions supportedActions,
-                                  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;
+    if (!destItem.isNull() && !destItem.isWritable()) {
+        error = xi18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>",
+                       destUrl.toDisplayString(QUrl::PreferLocalFile));
+        return 0;

     }
     }

-    isDragging = true;
-
-    const QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();
-    if (!indexes.isEmpty()) {
-        QMimeData *data = itemView->model()->mimeData(indexes);
-        if (data == 0) {
-            return;
-        }
-
-        if (dolphinViewController != 0) {
-            dolphinViewController->requestToolTipHiding();
-        }
-
-        QDrag* drag = new QDrag(itemView);
-        drag->setPixmap(createDragPixmap(itemView));
-        drag->setMimeData(data);
-
-        m_dragSource = itemView;
-        drag->exec(supportedActions, Qt::IgnoreAction);
-        m_dragSource = 0;
-    }
-    isDragging = false;
-}
-
-bool DragAndDropHelper::isDragSource(QAbstractItemView* itemView) const
-{
-    return (m_dragSource != 0) && (m_dragSource == itemView);
-}
-
-void DragAndDropHelper::dropUrls(const KFileItem& destItem,
-                                 const KUrl& destPath,
-                                 QDropEvent* event,
-                                 QWidget* widget)
-{
-    const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
-    const KUrl destination = dropToItem ? destItem.url() : destPath;

 
     const QMimeData* mimeData = event->mimeData();
 
     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", "extractSelectedFilesTo");
-        message.setArguments(QVariantList() << destination.path());
+    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);
         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)) {
-            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);
+    } 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;
+            }

         }
         }

-    }
-}
-
-DragAndDropHelper::DragAndDropHelper()
-    : m_dragSource(0)
-{
-}
-
-QPixmap DragAndDropHelper::createDragPixmap(QAbstractItemView* itemView) const
-{
-    const QModelIndexList selectedIndexes = itemView->selectionModel()->selectedIndexes();
-    Q_ASSERT(!selectedIndexes.isEmpty());
-
-    QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(itemView->model());
-    KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
-
-    const int itemCount = selectedIndexes.count();
-
-    // If more than one item is dragged, align the items inside a
-    // rectangular grid. The maximum grid size is limited to 5 x 5 items.
-    int xCount = 3;
-    int size = KIconLoader::SizeMedium;
-    if (itemCount > 16) {
-        xCount = 5;
-        size = KIconLoader::SizeSmall;
-    } else if (itemCount > 9) {
-        xCount = 4;
-        size = KIconLoader::SizeSmallMedium;
-    }

 
 

-    if (itemCount < xCount) {
-        xCount = itemCount;
-    }
-
-    int yCount = itemCount / xCount;
-    if (itemCount % xCount != 0) {
-        ++yCount;
-    }
-    if (yCount > xCount) {
-        yCount = xCount;
-    }
-
-    // Draw the selected items into the grid cells
-    QPixmap dragPixmap(xCount * size + xCount - 1, yCount * size + yCount - 1);
-    dragPixmap.fill(Qt::transparent);
-
-    QPainter painter(&dragPixmap);
-    int x = 0;
-    int y = 0;
-    foreach (const QModelIndex& selectedIndex, selectedIndexes) {
-        const QModelIndex index = proxyModel->mapToSource(selectedIndex);
-        const KFileItem item = dirModel->itemForIndex(index);
-        const QPixmap pixmap = item.pixmap(size, size);
-        painter.drawPixmap(x, y, pixmap);
-
-        x += size + 1;
-        if (x >= dragPixmap.width()) {
-            x = 0;
-            y += size + 1;
-        }
-        if (y >= dragPixmap.height()) {
-            break;
-        }
+        return KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow(), QList<QAction*>());
+    } else {
+        return KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow(), QList<QAction*>());

     }
 
     }
 

-    return dragPixmap;
+    return 0;

 }
 
 }
 

-#include "draganddrophelper.moc"