Merge branch 'master' into kf6

2 files changed, 10 insertions, 1 deletions

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 3db81ec18..3beb246a1 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1110,6 +1110,7 @@ void DolphinView::slotItemMiddleClicked(int index)
     const KFileItem &item = m_model->fileItem(index);
     const QUrl &url = openItemAsFolderUrl(item);
     const auto modifiers = QGuiApplication::keyboardModifiers();
+    const QString &archiveProtocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype());
     if (!url.isEmpty()) {
         // keep in sync with KUrlNavigator::slotNavigatorButtonClicked
         if (modifiers & Qt::ShiftModifier) {
@@ -1117,13 +1118,15 @@ void DolphinView::slotItemMiddleClicked(int index)
         } else {
             Q_EMIT tabRequested(url);
         }
-    } else if (isTabsForFilesEnabled()) {
+    } else if (!archiveProtocol.isEmpty() && isTabsForFilesEnabled()) {
         // keep in sync with KUrlNavigator::slotNavigatorButtonClicked
         if (modifiers & Qt::ShiftModifier) {
             Q_EMIT activeTabRequested(item.url());
         } else {
             Q_EMIT tabRequested(item.url());
         }
+    } else {
+        Q_EMIT fileMiddleClickActivated(item);
     }
 }
 
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 21ca49c24..f851724c2 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -453,6 +453,12 @@ Q_SIGNALS:
     void itemActivated(const KFileItem &item);
 
     /**
+     * Is emitted when clicking on a file with the middle mouse button.
+     * @note: This will not be emitted for folders or file archives that will/can be opened like folders.
+     */
+    void fileMiddleClickActivated(const KFileItem &item);
+
+    /**
      * Is emitted when multiple items have been activated by e. g.
      * context menu open with.
      */