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

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 545d365bd..a0aa1d895 100644
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -19,11 +19,16 @@
 
 #include "dolphincontroller.h"
 
-DolphinController::DolphinController(QObject* parent) :
-    QObject(parent),
-    m_showPreview(false),
+#include <kdirmodel.h>
+#include <QAbstractProxyModel>
+
+DolphinController::DolphinController(DolphinView* dolphinView) :
+    QObject(dolphinView),
     m_zoomInPossible(false),
-    m_zoomOutPossible(false)
+    m_zoomOutPossible(false),
+    m_url(),
+    m_dolphinView(dolphinView),
+    m_itemView(0)
 {
 }
 
@@ -31,22 +36,42 @@ DolphinController::~DolphinController()
 {
 }
 
+void DolphinController::setUrl(const KUrl& url)
+{
+    if (m_url != url) {
+        m_url = url;
+        emit urlChanged(url);
+    }
+}
+
+void DolphinController::setItemView(QAbstractItemView* view)
+{
+    m_itemView = view;
+}
+
+void DolphinController::triggerUrlChangeRequest(const KUrl& url)
+{
+    if (m_url != url) {
+        emit requestUrlChange(url);
+    }
+}
+
 void DolphinController::triggerContextMenuRequest(const QPoint& pos)
 {
     emit activated();
     emit requestContextMenu(pos);
 }
 
-void DolphinController::triggerActivation()
+void DolphinController::requestActivation()
 {
     emit activated();
 }
 
 void DolphinController::indicateDroppedUrls(const KUrl::List& urls,
-        const QModelIndex& index,
-        QWidget* source)
+                                            const KUrl& destPath,
+                                            const KFileItem& destItem)
 {
-    emit urlsDropped(urls, index, source);
+    emit urlsDropped(urls, destPath, destItem);
 }
 
 
@@ -60,12 +85,14 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
-void DolphinController::setShowPreview(bool showPreview)
+void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info)
 {
-    if (m_showPreview != showPreview) {
-        m_showPreview = showPreview;
-        emit showPreviewChanged(showPreview);
-    }
+    emit additionalInfoChanged(info);
+}
+
+void DolphinController::indicateActivationChange(bool active)
+{
+    emit activationChanged(active);
 }
 
 void DolphinController::triggerZoomIn()
@@ -78,14 +105,55 @@ void DolphinController::triggerZoomOut()
     emit zoomOut();
 }
 
+void DolphinController::handleKeyPressEvent(QKeyEvent* event)
+{
+    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);
+        }
+    }
+}
+
+KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
+{
+    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)
 {
-    emit itemTriggered(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::indicateSelectionChange()
+void DolphinController::emitViewportEntered()
 {
-    emit selectionChanged();
+    emit viewportEntered();
 }
 
 #include "dolphincontroller.moc"