BUG:222186

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index a7c91def54713e0aa74e979c0202248ecaaf7634..0bbf0557a178d04f3bb7065524400cb74f66ddbc 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -52,6 +52,11 @@ void DolphinController::setUrl(const KUrl& url)
     }
 }
 
+void DolphinController::redirectToUrl(const KUrl& url)
+{
+    m_url = url;
+}
+
 void DolphinController::setItemView(QAbstractItemView* view)
 {
     if (m_itemView != 0) {
@@ -170,9 +175,28 @@ void DolphinController::handleKeyPressEvent(QKeyEvent* event)
                             || (event->key() == Qt::Key_Enter))
                          && !selModel->selectedIndexes().isEmpty();
     if (trigger) {
+        QModelIndexList dirQueue;
         const QModelIndexList indexList = selModel->selectedIndexes();
         foreach (const QModelIndex& index, indexList) {
-            emit itemTriggered(itemForIndex(index));
+            // Trigger non-directories immediately.
+            if (!itemForIndex(index).isDir()) {
+                emit itemTriggered(itemForIndex(index));
+            } else {
+                // Keep storing the directory indexes for trigger later.
+                dirQueue << index;
+            }
+        }
+        // Trigger directories - Tabs if multiple, else normal.
+        if (!dirQueue.isEmpty()) {
+            if (dirQueue.length() == 1) {
+                // For single directory selection, open normally.
+                emit itemTriggered(itemForIndex(dirQueue[0]));
+            } else {
+                foreach(const QModelIndex& dir, dirQueue) {
+                    // Since its a valid directory - open a tab.
+                    emit tabRequested(itemForIndex(dir).url());
+                }
+            }
         }
     }
 }