Reanimated drag & drop support again after introducing the DolphinController. It is now also possible to move the items inside an icon view like discussed on kde-devel/kde-usability.

svn path=/trunk/KDE/kdebase/apps/; revision=634228

1 files changed, 8 insertions, 13 deletions

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 411a410d3..0b350f8b2 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -91,8 +91,7 @@ QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QTreeView::contextMenuEvent(event);
-    m_controller->triggerContextMenuRequest(event->pos(),
-                                            event->globalPos());
+    m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
@@ -110,18 +109,14 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 {
-    QTreeView::dropEvent(event);
-    // TODO: temporary deactivated until DolphinController will support this
-
-    /*const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (!urls.isEmpty()) {
+    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+    if (urls.isEmpty() || (event->source() == this)) {
+        QTreeView::dropEvent(event);
+    }
+    else {
         event->acceptProposedAction();
-
-        // TODO: handle dropping above a directory
-
-        const KUrl& destination = m_controller->url();
-        m_controller->emitDropUrlsSignal(urls, destination);
-    }*/
+        m_controller->indicateDroppedUrls(urls, event->pos());
+    }
 }
 
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)