X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/70999c96a27777c2b1d0774b410680abd47eb131..abf17941f7:/src/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 6d5509275..0f619ff30 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -1,6 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
+ *   Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at)                  *
  *                                                                         *
  *   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  *
@@ -19,19 +18,29 @@
  ***************************************************************************/
 
 #include "dolphiniconsview.h"
-#include "dolphinmainwindow.h"
-#include "dolphinview.h"
 
+#include "dolphincontroller.h"
+
+#include <assert.h>
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
 #include <QAbstractProxyModel>
 
-DolphinIconsView::DolphinIconsView(DolphinView* parent) :
+DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     QListView(parent),
-    m_parentView(parent)
+    m_controller(controller)
 {
+    assert(controller != 0);
+
     setResizeMode(QListView::Adjust);
+
+    // TODO: read out settings
+    setViewMode(QListView::IconMode);
+    setGridSize(QSize(128, 96));
+
+    connect(this, SIGNAL(clicked(const QModelIndex&)),
+            controller, SLOT(triggerItem(const QModelIndex&)));
 }
 
 DolphinIconsView::~DolphinIconsView()
@@ -56,21 +65,13 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QListView::contextMenuEvent(event);
-
-    KFileItem* item = 0;
-
-    const QModelIndex index = indexAt(event->pos());
-    if (index.isValid()) {
-        item = m_parentView->fileItem(index);
-    }
-
-    m_parentView->openContextMenu(item, event->globalPos());
+    m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QListView::mouseReleaseEvent(event);
-    m_parentView->declareViewActive();
+    m_controller->triggerActivation();
 }
 
 void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
@@ -83,13 +84,12 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (!urls.isEmpty()) {
+    if (urls.isEmpty() || (event->source() == this)) {
+        QListView::dropEvent(event);
+    }
+    else {
         event->acceptProposedAction();
-
-        // TODO: handle dropping above a directory
-
-        const KUrl& destination = m_parentView->url();
-        m_parentView->mainWindow()->dropUrls(urls, destination);
+        m_controller->indicateDroppedUrls(urls, event->pos());
     }
 }