X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e46003aca365ca66ce7c7cccd47fb52d1da2fb91..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index f5fd5e836..a0aa1d895 100644
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -19,12 +19,16 @@
 
 #include "dolphincontroller.h"
 
+#include <kdirmodel.h>
+#include <QAbstractProxyModel>
+
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomInPossible(false),
     m_zoomOutPossible(false),
     m_url(),
-    m_dolphinView(dolphinView)
+    m_dolphinView(dolphinView),
+    m_itemView(0)
 {
 }
 
@@ -40,6 +44,11 @@ void DolphinController::setUrl(const KUrl& url)
     }
 }
 
+void DolphinController::setItemView(QAbstractItemView* view)
+{
+    m_itemView = view;
+}
+
 void DolphinController::triggerUrlChangeRequest(const KUrl& url)
 {
     if (m_url != url) {
@@ -96,14 +105,50 @@ void DolphinController::triggerZoomOut()
     emit zoomOut();
 }
 
-void DolphinController::triggerItem(const KFileItem& item)
+void DolphinController::handleKeyPressEvent(QKeyEvent* event)
 {
-    emit itemTriggered(item);
+    Q_ASSERT(m_itemView != 0);
+
+    const QItemSelectionModel* selModel = m_itemView->selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    const bool trigger = currentIndex.isValid()
+                         && (event->key() == Qt::Key_Return)
+                         && (selModel->selectedIndexes().count() > 0);
+    if (trigger) {
+        const QModelIndexList indexList = selModel->selectedIndexes();
+        foreach (const QModelIndex& index, indexList) {
+            triggerItem(index);
+        }
+    }
 }
 
-void DolphinController::emitItemEntered(const KFileItem& item)
+KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
-    emit itemEntered(item);
+    Q_ASSERT(m_itemView != 0);
+
+    QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_itemView->model());
+    KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
+    const QModelIndex dirIndex = proxyModel->mapToSource(index);
+    return dirModel->itemForIndex(dirIndex);
+}
+
+void DolphinController::triggerItem(const QModelIndex& index)
+{
+    const KFileItem item = itemForIndex(index);
+    if (index.isValid() && (index.column() == KDirModel::Name)) {
+        emit itemTriggered(item);
+    } else {
+        m_itemView->clearSelection();
+        emit itemEntered(item);
+    }
+}
+
+void DolphinController::emitItemEntered(const QModelIndex& index)
+{
+    KFileItem item = itemForIndex(index);
+    if (!item.isNull()) {
+        emit itemEntered(item);
+    }
 }
 
 void DolphinController::emitViewportEntered()