On middle-click, open file with the second application for the file mime

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 8627891c053d92f40e1eda0765532efa38a17c22..ffd0d9b5eb0afba4ce7d4474714b757a7b2acb70 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -31,12 +31,14 @@
 #else
 #include <KIO/JobUiDelegate>
 #endif
 #else
 #include <KIO/JobUiDelegate>
 #endif

+#include <KApplicationTrader>

 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <KMessageWidget>
 #include <KProtocolManager>
 #include <KShell>
 
 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <KMessageWidget>
 #include <KProtocolManager>
 #include <KShell>
 

+#include <QApplication>

 #include <QDesktopServices>
 #include <QDropEvent>
 #include <QGridLayout>
 #include <QDesktopServices>
 #include <QDropEvent>
 #include <QGridLayout>


@@ -134,6 +136,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     connect(m_view, &DolphinView::writeStateChanged, this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo, this, &DolphinViewContainer::showItemInfo);
     connect(m_view, &DolphinView::itemActivated, this, &DolphinViewContainer::slotItemActivated);
     connect(m_view, &DolphinView::writeStateChanged, this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo, this, &DolphinViewContainer::showItemInfo);
     connect(m_view, &DolphinView::itemActivated, this, &DolphinViewContainer::slotItemActivated);

+    connect(m_view, &DolphinView::fileMiddleClickActivated, this, &DolphinViewContainer::slotfileMiddleClickActivated);

     connect(m_view, &DolphinView::itemsActivated, this, &DolphinViewContainer::slotItemsActivated);
     connect(m_view, &DolphinView::redirection, this, &DolphinViewContainer::redirect);
     connect(m_view, &DolphinView::directoryLoadingStarted, this, &DolphinViewContainer::slotDirectoryLoadingStarted);
     connect(m_view, &DolphinView::itemsActivated, this, &DolphinViewContainer::slotItemsActivated);
     connect(m_view, &DolphinView::redirection, this, &DolphinViewContainer::redirect);
     connect(m_view, &DolphinView::directoryLoadingStarted, this, &DolphinViewContainer::slotDirectoryLoadingStarted);


@@ -343,6 +346,9 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti
         }
         Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
         Q_CHECK_PTR(m_selectionModeBottomBar);
         }
         Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
         Q_CHECK_PTR(m_selectionModeBottomBar);

+        if (m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget()) || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) {
+            m_view->setFocus();
+        }

         m_selectionModeTopBar->setVisible(false, WithAnimation);
         m_selectionModeBottomBar->setVisible(false, WithAnimation);
         Q_EMIT selectionModeChanged(false);
         m_selectionModeTopBar->setVisible(false, WithAnimation);
         m_selectionModeBottomBar->setVisible(false, WithAnimation);
         Q_EMIT selectionModeChanged(false);


@@ -630,7 +636,7 @@ void DolphinViewContainer::updateStatusBar()
 void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)
 {
     if (m_statusBar->progressText().isEmpty()) {
 void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)
 {
     if (m_statusBar->progressText().isEmpty()) {

-        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));
+        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder…"));

     }
     m_statusBar->setProgress(percent);
 }
     }
     m_statusBar->setProgress(percent);
 }


@@ -638,7 +644,7 @@ void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)
 void DolphinViewContainer::updateDirectorySortingProgress(int percent)
 {
     if (m_statusBar->progressText().isEmpty()) {
 void DolphinViewContainer::updateDirectorySortingProgress(int percent)
 {
     if (m_statusBar->progressText().isEmpty()) {

-        m_statusBar->setProgressText(i18nc("@info:progress", "Sorting..."));
+        m_statusBar->setProgressText(i18nc("@info:progress", "Sorting…"));

     }
     m_statusBar->setProgress(percent);
 }
     }
     m_statusBar->setProgress(percent);
 }


@@ -649,7 +655,7 @@ void DolphinViewContainer::slotDirectoryLoadingStarted()
         // Search KIO-slaves usually don't provide any progress information. Give
         // a hint to the user that a searching is done:
         updateStatusBar();
         // Search KIO-slaves usually don't provide any progress information. Give
         // a hint to the user that a searching is done:
         updateStatusBar();

-        m_statusBar->setProgressText(i18nc("@info", "Searching..."));
+        m_statusBar->setProgressText(i18nc("@info", "Searching…"));

         m_statusBar->setProgress(-1);
     } else {
         // Trigger an undetermined progress indication. The progress
         m_statusBar->setProgress(-1);
     } else {
         // Trigger an undetermined progress indication. The progress


@@ -735,6 +741,26 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item)
     job->start();
 }
 
     job->start();
 }
 

+void DolphinViewContainer::slotfileMiddleClickActivated(const KFileItem &item)
+{
+    KService::List services = KApplicationTrader::queryByMimeType(item.mimetype());
+
+    if (services.length() >= 2) {
+        auto service = services.at(1);
+
+        KIO::ApplicationLauncherJob *job = new KIO::ApplicationLauncherJob(service, this);
+        job->setUrls({item.url()});
+
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
+        job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
+#else
+        job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
+#endif
+        connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
+        job->start();
+    }
+}
+

 void DolphinViewContainer::slotItemsActivated(const KFileItemList &items)
 {
     Q_ASSERT(items.count() >= 2);
 void DolphinViewContainer::slotItemsActivated(const KFileItemList &items)
 {
     Q_ASSERT(items.count() >= 2);


@@ -955,3 +981,5 @@ QString DolphinViewContainer::getNearestExistingAncestorOfPath(const QString &pa
 
     return dir.exists() ? dir.path() : QString{};
 }
 
     return dir.exists() ? dir.path() : QString{};
 }

+
+#include "moc_dolphinviewcontainer.cpp"