Merge remote-tracking branch 'origin/master' into kf6

2 files changed, 12 insertions, 0 deletions

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 8b245f0e7..8bdb18ba2 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -47,6 +47,15 @@ PlacesPanel::PlacesPanel(QWidget *parent)
     connect(m_configureTrashAction, &QAction::triggered, this, &PlacesPanel::slotConfigureTrash);
     addAction(m_configureTrashAction);
 
+    m_openInSplitView = new QAction(QIcon::fromTheme(QStringLiteral("view-right-new")), i18nc("@action:inmenu", "Open in Split View"));
+    m_openInSplitView->setPriority(QAction::HighPriority);
+    connect(m_openInSplitView, &QAction::triggered, this, [this]() {
+        const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
+        Q_EMIT openInSplitViewRequested(url);
+    });
+
+    addAction(m_openInSplitView);
+
     connect(this, &PlacesPanel::contextMenuAboutToShow, this, &PlacesPanel::slotContextMenuAboutToShow);
 
     connect(this, &PlacesPanel::iconSizeChanged, this, [](const QSize &newSize) {
@@ -188,6 +197,7 @@ void PlacesPanel::slotContextMenuAboutToShow(const QModelIndex &index, QMenu *me
     const Solid::Device device = placesModel->deviceForIndex(index);
 
     m_configureTrashAction->setVisible(url.scheme() == QLatin1String("trash"));
+    m_openInSplitView->setVisible(url.isValid());
 
     // show customContextMenuActions only on the view's context menu
     if (!url.isValid() && !device.isValid()) {
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 2eb309483..cbd5fc224 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -51,6 +51,7 @@ Q_SIGNALS:
     void storageTearDownRequested(const QString &mountPath);
     void storageTearDownExternallyRequested(const QString &mountPath);
     void storageTearDownSuccessful();
+    void openInSplitViewRequested(const QUrl &url);
 
 protected:
     void showEvent(QShowEvent *event) override;
@@ -75,6 +76,7 @@ private:
     QPersistentModelIndex m_indexToTearDown;
 
     QAction *m_configureTrashAction;
+    QAction *m_openInSplitView;
     QAction *m_lockPanelsAction;
 };