X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e19aa49a082076d5ae69931893c1d47b98f85e30..832b7c4a1b820043fd0b0191d937050107694ed9:/src/global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index d8132b20a..c91046efb 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -15,14 +15,15 @@
 #include <KDialogJobUiDelegate>
 #include <KIO/ApplicationLauncherJob>
 #include <KService>
+#include <KWindowSystem>
 
 #include <QApplication>
 
-QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
+QList<QUrl> Dolphin::validateUris(const QStringList &uriList)
 {
     const QString currentDir = QDir::currentPath();
     QList<QUrl> urls;
-    for (const QString& str : uriList) {
+    for (const QString &str : uriList) {
         const QUrl url = QUrl::fromUserInput(str, currentDir, QUrl::AssumeLocalFile);
         if (url.isValid()) {
             urls.append(url);
@@ -56,11 +57,15 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
     job->start();
 }
 
-bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)
+bool Dolphin::attachToExistingInstance(const QList<QUrl> &inputUrls,
+                                       bool openFiles,
+                                       bool splitView,
+                                       const QString &preferredService,
+                                       const QString &activationToken)
 {
     bool attached = false;
 
-    if (inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {
+    if (inputUrls.isEmpty()) {
         return false;
     }
 
@@ -70,7 +75,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
     }
 
     int activeWindowIndex = -1;
-    for (const auto& interface: qAsConst(dolphinInterfaces)) {
+    for (const auto &interface : std::as_const(dolphinInterfaces)) {
         ++activeWindowIndex;
 
         auto isActiveWindowReply = interface.first->isActiveWindow();
@@ -81,56 +86,64 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
     }
 
     // check to see if any instances already have any of the given URLs or their parents open
-    const auto urls = QUrl::toStringList(inputUrls);
-    for (const QString& url : urls) {
+    QList<QUrl> newWindowURLs;
+    for (const QUrl &url : inputUrls) {
         bool urlFound = false;
+        const QString urlString = url.toString();
 
         // looping through the windows starting from the active one
         int i = activeWindowIndex;
         do {
             auto &interface = dolphinInterfaces[i];
 
-            auto isUrlOpenReply = openFiles ? interface.first->isUrlOrParentOpen(url) : interface.first->isUrlOpen(url);
+            auto isUrlOpenReply = openFiles ? interface.first->isItemVisibleInAnyView(urlString) : interface.first->isUrlOpen(urlString);
             isUrlOpenReply.waitForFinished();
             if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
-                interface.second.append(url);
+                interface.second.append(urlString);
                 urlFound = true;
                 break;
             }
 
             i = (i + 1) % dolphinInterfaces.size();
-        }
-        while (i != activeWindowIndex);
+        } while (i != activeWindowIndex);
 
         if (!urlFound) {
-            dolphinInterfaces[activeWindowIndex].second.append(url);
+            if (GeneralSettings::openExternallyCalledFolderInNewTab()) {
+                dolphinInterfaces[activeWindowIndex].second.append(urlString);
+            } else {
+                newWindowURLs.append(url);
+            }
         }
     }
 
-    for (const auto& interface: qAsConst(dolphinInterfaces)) {
+    for (const auto &interface : std::as_const(dolphinInterfaces)) {
         if (interface.second.isEmpty()) {
             continue;
         }
-        auto reply = openFiles ?
-                    interface.first->openFiles(interface.second, splitView) :
-                    interface.first->openDirectories(interface.second, splitView);
+        auto reply = openFiles ? interface.first->openFiles(interface.second, splitView) : interface.first->openDirectories(interface.second, splitView);
         reply.waitForFinished();
         if (!reply.isError()) {
-            interface.first->activateWindow();
+            interface.first->activateWindow(activationToken);
             attached = true;
         }
     }
+    if (attached && !newWindowURLs.isEmpty()) {
+        if (openFiles) {
+            openNewWindow(newWindowURLs, nullptr, Dolphin::OpenNewWindowFlag::Select);
+        } else {
+            openNewWindow(newWindowURLs);
+        }
+    }
+
     return attached;
 }
 
-QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString& preferredService)
+QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString &preferredService)
 {
     QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> dolphinInterfaces;
     if (!preferredService.isEmpty()) {
         QSharedPointer<OrgKdeDolphinMainWindowInterface> preferredInterface(
-            new OrgKdeDolphinMainWindowInterface(preferredService,
-                QStringLiteral("/dolphin/Dolphin_1"),
-                QDBusConnection::sessionBus()));
+            new OrgKdeDolphinMainWindowInterface(preferredService, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
         if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) {
             dolphinInterfaces.append(qMakePair(preferredInterface, QStringList()));
         }
@@ -143,13 +156,11 @@ QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Do
     const QString pattern = QStringLiteral("org.kde.dolphin-");
     // Don't match the pid without leading "-"
     const QString myPid = QLatin1Char('-') + QString::number(QCoreApplication::applicationPid());
-    for (const QString& service : dbusServices) {
+    for (const QString &service : dbusServices) {
         if (service.startsWith(pattern) && !service.endsWith(myPid)) {
             // Check if instance can handle our URLs
             QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
-                        new OrgKdeDolphinMainWindowInterface(service,
-                            QStringLiteral("/dolphin/Dolphin_1"),
-                            QDBusConnection::sessionBus()));
+                new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
             if (interface->isValid() && !interface->lastError().isValid()) {
                 dolphinInterfaces.append(qMakePair(interface, QStringList()));
             }
@@ -175,18 +186,17 @@ double GlobalConfig::animationDurationFactor()
     updateAnimationDurationFactor(kdeGlobalsConfig, {"AnimationDurationFactor"});
 
     KConfigWatcher::Ptr configWatcher = KConfigWatcher::create(KSharedConfig::openConfig());
-    connect(configWatcher.data(), &KConfigWatcher::configChanged,
-            &GlobalConfig::updateAnimationDurationFactor);
+    connect(configWatcher.data(), &KConfigWatcher::configChanged, &GlobalConfig::updateAnimationDurationFactor);
     return s_animationDurationFactor;
 }
 
 void GlobalConfig::updateAnimationDurationFactor(const KConfigGroup &group, const QByteArrayList &names)
 {
-    if (group.name() == QLatin1String("KDE") &&
-        names.contains(QByteArrayLiteral("AnimationDurationFactor"))) {
-        s_animationDurationFactor = std::max(0.0,
-                group.readEntry("AnimationDurationFactor", 1.0));
+    if (group.name() == QLatin1String("KDE") && names.contains(QByteArrayLiteral("AnimationDurationFactor"))) {
+        s_animationDurationFactor = std::max(0.0, group.readEntry("AnimationDurationFactor", 1.0));
     }
 }
 
 double GlobalConfig::s_animationDurationFactor = -1.0;
+
+#include "moc_global.cpp"