Unify the search interface for non-indexed and indexed folders

[dolphin.git] / src / draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index a4971a62cc7a08aa3088db773b74e49c384d986c..88dca9b40b9fc29114eb52327e014f1ed0419f67 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 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     *
  *   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     *


@@ -19,7 +20,7 @@
 
 #include "draganddrophelper.h"
 #include "dolphiniconsview.h"
 
 #include "draganddrophelper.h"
 #include "dolphiniconsview.h"

-#include "dolphincontroller.h"
+#include "dolphinviewcontroller.h"

 
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
 #include <kdirmodel.h>
 #include <kfileitem.h>


@@ -31,6 +32,7 @@
 #include <QAbstractProxyModel>
 #include <QtDBus>
 #include <QDrag>
 #include <QAbstractProxyModel>
 #include <QtDBus>
 #include <QDrag>

+#include <QPainter>

 
 class DragAndDropHelperSingleton
 {
 
 class DragAndDropHelperSingleton
 {


@@ -51,35 +53,41 @@ bool DragAndDropHelper::isMimeDataSupported(const QMimeData* mimeData) const
 
 void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
                                   Qt::DropActions supportedActions,
 
 void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
                                   Qt::DropActions supportedActions,

-                                  DolphinController* controller)
+                                  DolphinViewController* dolphinViewController)

 {
 {

-    QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();
-    if (indexes.count() > 0) {
+    // 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;
+
+    const QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();
+    if (!indexes.isEmpty()) {

         QMimeData *data = itemView->model()->mimeData(indexes);
         if (data == 0) {
             return;
         }
         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);
         }
 
         QDrag* drag = new QDrag(itemView);

-        QPixmap pixmap;
-        if (indexes.count() == 1) {
-            QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(itemView->model());
-            KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
-            const QModelIndex index = proxyModel->mapToSource(indexes.first());
-
-            const KFileItem item = dirModel->itemForIndex(index);
-            pixmap = item.pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
-        } else {
-            pixmap = KIcon("document-multiple").pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
-        }
-        drag->setPixmap(pixmap);
+        drag->setPixmap(createDragPixmap(itemView));

         drag->setMimeData(data);
         drag->setMimeData(data);

+
+        m_dragSource = itemView;

         drag->exec(supportedActions, Qt::IgnoreAction);
         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,
 }
 
 void DragAndDropHelper::dropUrls(const KFileItem& destItem,


@@ -89,23 +97,21 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 {
     const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
     const KUrl destination = dropToItem ? destItem.url() : destPath;
 {
     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",
     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);
         message.setArguments(QVariantList() << destination.path());
         QDBusConnection::sessionBus().call(message);

-    } else {                                
+    } else {

         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         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 {
         } else if (dropToItem) {
             KonqOperations::doDrop(destItem, destination, event, widget);
         } else {


@@ -115,7 +121,68 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 }
 
 DragAndDropHelper::DragAndDropHelper()
 }
 
 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 dragPixmap;

 }
 
 #include "draganddrophelper.moc"
 }
 
 #include "draganddrophelper.moc"