Bugfix: Currently, if you open dolphin, select a bunch of files, and right click and

select Open With > whatever, all the files are opened. Which is the right
thing. However, if you hit enter to open those selected files, no file is
opened. Currently, the file is only opened if there's only *one* file
selected. The attached patch fixes this problem.

svn path=/trunk/KDE/kdebase/apps/; revision=777695

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 5f5f761dc558e7ad84f8b0191f50d13c20bb1518..f8db0e865e8d3bfc682ea144cc48783e828303ee 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -349,9 +349,15 @@ void DolphinColumnWidget::keyPressEvent(QKeyEvent* event)
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
                          && (event->key() == Qt::Key_Return)
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
                          && (event->key() == Qt::Key_Return)

-                         && (selModel->selectedIndexes().count() <= 1);
-    if (trigger) {
-        triggerItem(currentIndex);
+                         && (selModel->selectedIndexes().count() > 0);
+    if(trigger) {
+        const QModelIndexList indexList = selModel->selectedIndexes();
+        foreach (const QModelIndex &index, indexList) {
+            KFileItem item = itemForIndex(index);
+            if (!item.isNull()) {
+                triggerItem(index);
+            }
+        }

     }
 }
 
     }
 }
 

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 75481fb36a0636c35a8b07d19651c5a2f3fb8718..3f23795ba408b285b907e5777c2c698a4cea1966 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -377,9 +377,15 @@ void DolphinDetailsView::keyPressEvent(QKeyEvent* event)
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
                          && (event->key() == Qt::Key_Return)
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
                          && (event->key() == Qt::Key_Return)

-                         && (selModel->selectedIndexes().count() <= 1);
-    if (trigger) {
-        triggerItem(currentIndex);
+                         && (selModel->selectedIndexes().count() > 0);
+    if(trigger) {
+        const QModelIndexList indexList = selModel->selectedIndexes();
+        foreach (const QModelIndex &index, indexList) {
+            KFileItem item = itemForIndex(index);
+            if (!item.isNull()) {
+                triggerItem(index);
+            }
+        }

     }
 }
 
     }
 }
 

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 96f69436d1d0f2e56bb72acc68b1dbef5383a1e2..b1ffd401c60a509d326566380fb690dbca38e131 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -297,9 +297,15 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
                          && (event->key() == Qt::Key_Return)
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
                          && (event->key() == Qt::Key_Return)

-                         && (selModel->selectedIndexes().count() <= 1);
-    if (trigger) {
-        triggerItem(currentIndex);
+                         && (selModel->selectedIndexes().count() > 0);
+    if(trigger) {
+        const QModelIndexList indexList = selModel->selectedIndexes();
+        foreach (const QModelIndex &index, indexList) {
+            KFileItem item = itemForIndex(index);
+            if (!item.isNull()) {
+                triggerItem(index);
+            }
+        }

     }
 }
 
     }
 }