X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5dd5eaf08da4b7d11e53c90096c2ea0e6a19e840..41f7f4e4e89b97b5c7f31452774c37ce953dd125:/src/global.cpp diff --git a/src/global.cpp b/src/global.cpp index d87a29c7a..12f86a2f3 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -18,15 +18,24 @@ */ #include "global.h" -#include "dolphindebug.h" #include "dolphin_generalsettings.h" +#include "dolphindebug.h" + +#include +#include + +#include +#include +#include +#include QList Dolphin::validateUris(const QStringList& uriList) { + const QString currentDir = QDir::currentPath(); QList urls; foreach (const QString& str, uriList) { - const QUrl url = QUrl::fromUserInput(str, QString(), QUrl::AssumeLocalFile); + const QUrl url = QUrl::fromUserInput(str, currentDir, QUrl::AssumeLocalFile); if (url.isValid()) { urls.append(url); } else { @@ -40,3 +49,95 @@ QUrl Dolphin::homeUrl() { return QUrl::fromUserInput(GeneralSettings::homeUrl(), QString(), QUrl::AssumeLocalFile); } + +void Dolphin::openNewWindow(const QList &urls, QWidget *window, const OpenNewWindowFlags &flags) +{ + QString command = QStringLiteral("dolphin --new-window"); + + if (flags.testFlag(OpenNewWindowFlag::Select)) { + command.append(QLatin1String(" --select")); + } + + if (!urls.isEmpty()) { + command.append(QLatin1String(" %U")); + } + KRun::run( + command, + urls, + window, + QApplication::applicationDisplayName(), + QApplication::windowIcon().name() + ); +} + +bool Dolphin::attachToExistingInstance(const QList& inputUrls, bool openFiles, bool splitView, const QString& preferredService) +{ + // TODO: once Wayland clients can raise or activate themselves remove check from conditional + if (KWindowSystem::isPlatformWayland() || inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) { + return false; + } + + QVector, QStringList>> dolphinServices; + if (!preferredService.isEmpty()) { + QSharedPointer preferred( + new QDBusInterface(preferredService, + QStringLiteral("/dolphin/Dolphin_1"), + QStringLiteral("org.kde.dolphin.MainWindow")) + ); + if (preferred->isValid() && !preferred->lastError().isValid()) { + dolphinServices.append(qMakePair(preferred, QStringList())); + } + } + + // find all dolphin instances + const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); + // Don't match the service without trailing "-" (unique instance) + const QString pattern = QStringLiteral("org.kde.dolphin-"); + // Don't match the pid without leading "-" + const QString myPid = QStringLiteral("-") + QString::number(QCoreApplication::applicationPid()); + for (const QString& service : services) { + if (service.startsWith(pattern) && !service.endsWith(myPid)) { + // Check if instance can handle our URLs + QSharedPointer instance( + new QDBusInterface(service, + QStringLiteral("/dolphin/Dolphin_1"), + QStringLiteral("org.kde.dolphin.MainWindow")) + ); + if (instance->isValid() && !instance->lastError().isValid()) { + dolphinServices.append(qMakePair(instance, QStringList())); + } + } + } + + if (dolphinServices.isEmpty()) { + return false; + } + + QStringList newUrls; + + // check to see if any instances already have any of the given URLs open + const auto urls = QUrl::toStringList(inputUrls); + for (const QString& url : urls) { + bool urlFound = false; + for (auto& service: dolphinServices) { + QDBusReply isUrlOpen = service.first->call(QStringLiteral("isUrlOpen"), url); + if (isUrlOpen.isValid() && isUrlOpen.value()) { + service.second.append(url); + urlFound = true; + break; + } + } + if (!urlFound) { + newUrls.append(url); + } + } + dolphinServices.front().second << newUrls; + + for (const auto& service: dolphinServices) { + if (!service.second.isEmpty()) { + service.first->call(openFiles ? QStringLiteral("openFiles") : QStringLiteral("openDirectories"), service.second, splitView); + service.first->call(QStringLiteral("activateWindow")); + } + } + return true; +}