David's patches come in faster than light: removed code duplication, as a proper...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index eb3dde47f68b5e8c6a879ab22d617be1b04d1996..6d55092755cf7b4e08ec4300d01c28a3be00b7db 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,14 +19,17 @@
  ***************************************************************************/
 
 #include "dolphiniconsview.h"
+#include "dolphinmainwindow.h"
 #include "dolphinview.h"
 
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
+#include <QAbstractProxyModel>
+
 DolphinIconsView::DolphinIconsView(DolphinView* parent) :
     QListView(parent),
-    m_parentView( parent )
+    m_parentView(parent)
 {
     setResizeMode(QListView::Adjust);
 }
@@ -58,12 +61,7 @@ void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 
     const QModelIndex index = indexAt(event->pos());
     if (index.isValid()) {
-        // TODO: assuming that model() returns an instance of the class
-        // KDirModel is dangerous, especially in combination with a proxy model.
-        // As the current test implementation of proxy model does not work, this
-        // will be cleaned up later.
-        KDirModel* dirModel = static_cast<KDirModel*>(model());
-        item = dirModel->itemForIndex(index);
+        item = m_parentView->fileItem(index);
     }
 
     m_parentView->openContextMenu(item, event->globalPos());
@@ -75,4 +73,24 @@ void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event)
     m_parentView->declareViewActive();
 }
 
+void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
+{
+    if (event->mimeData()->hasUrls()) {
+        event->acceptProposedAction();
+    }
+}
+
+void DolphinIconsView::dropEvent(QDropEvent* event)
+{
+    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+    if (!urls.isEmpty()) {
+        event->acceptProposedAction();
+
+        // TODO: handle dropping above a directory
+
+        const KUrl& destination = m_parentView->url();
+        m_parentView->mainWindow()->dropUrls(urls, destination);
+    }
+}
+
 #include "dolphiniconsview.moc"