From: Méven Car Date: Tue, 22 Aug 2023 08:16:27 +0000 (+0200) Subject: On middle-click, open file with the second application for the file mime X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d27ee07de7558470ef7b497fbe3d3504ce7cad07?hp=-c On middle-click, open file with the second application for the file mime FEATURE: 390631 --- d27ee07de7558470ef7b497fbe3d3504ce7cad07 diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 03e49985c..ffd0d9b5e 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -31,6 +31,7 @@ #else #include #endif +#include #include #include #include @@ -135,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::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); @@ -739,6 +741,26 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item) 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); diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index f9c62296e..0c8b184fe 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -326,6 +326,11 @@ private Q_SLOTS: */ void slotItemsActivated(const KFileItemList &items); + /** + * Handles middle click of file. It opens the file passed using the second application associated with the file's mimetype. + */ + void slotfileMiddleClickActivated(const KFileItem &item); + /** * Shows the information for the item \a item inside the statusbar. If the * item is null, the default statusbar information is shown. diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 13c8b4df2..e0d01d1e8 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1136,6 +1136,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) { @@ -1143,13 +1144,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 @@ -452,6 +452,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.