GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 0712aa173f8c7429d7e6c80ce0f86a7692e4c441..d5fbec6bc47666dda08edfad8f75867c7dbcfd12 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -18,7 +18,6 @@
 #include <KWindowSystem>
 
 #include <QApplication>
 #include <KWindowSystem>
 
 #include <QApplication>

-#include <QIcon>

 
 QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
 {
 
 QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
 {


@@ -58,11 +57,11 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
     job->start();
 }
 
     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;
 
 {
     bool attached = false;
 

-    if (inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {
+    if (inputUrls.isEmpty()) {

         return false;
     }
 
         return false;
     }
 


@@ -71,35 +70,70 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
         return false;
     }
 
         return false;
     }
 

-    QStringList newUrls;
+    int activeWindowIndex = -1;
+    for (const auto& interface: qAsConst(dolphinInterfaces)) {
+        ++activeWindowIndex;
+
+        auto isActiveWindowReply = interface.first->isActiveWindow();
+        isActiveWindowReply.waitForFinished();
+        if (!isActiveWindowReply.isError() && isActiveWindowReply.value()) {
+            break;
+        }
+    }

 
 

-    // 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) {
+    // check to see if any instances already have any of the given URLs or their parents open
+    QList<QUrl> newWindowURLs;
+    for (const QUrl& url : inputUrls) {

         bool urlFound = false;
         bool urlFound = false;

-        for (auto& interface: dolphinInterfaces) {
-            auto isUrlOpenReply = interface.first->isUrlOpen(url);
+        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->isItemVisibleInAnyView(urlString) : interface.first->isUrlOpen(urlString);

             isUrlOpenReply.waitForFinished();
             if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
             isUrlOpenReply.waitForFinished();
             if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {

-                interface.second.append(url);
+                interface.second.append(urlString);

                 urlFound = true;
                 break;
             }
                 urlFound = true;
                 break;
             }

+
+            i = (i + 1) % dolphinInterfaces.size();

         }
         }

+        while (i != activeWindowIndex);
+

         if (!urlFound) {
         if (!urlFound) {

-            newUrls.append(url);
+            if (GeneralSettings::openExternallyCalledFolderInNewTab()) {
+                dolphinInterfaces[activeWindowIndex].second.append(urlString);
+            } else {
+                newWindowURLs.append(url);
+            }

         }
     }
 
     for (const auto& interface: qAsConst(dolphinInterfaces)) {
         }
     }
 
     for (const auto& interface: qAsConst(dolphinInterfaces)) {

-        auto reply = openFiles ? interface.first->openFiles(newUrls, splitView) : interface.first->openDirectories(newUrls, splitView);
+        if (interface.second.isEmpty()) {
+            continue;
+        }
+        auto reply = openFiles ?
+                    interface.first->openFiles(interface.second, splitView) :
+                    interface.first->openDirectories(interface.second, splitView);

         reply.waitForFinished();
         if (!reply.isError()) {
         reply.waitForFinished();
         if (!reply.isError()) {

-            interface.first->activateWindow();
+            interface.first->activateWindow(activationToken);

             attached = true;
             attached = true;

-            break;

         }
     }
         }
     }

+    if (attached && !newWindowURLs.isEmpty()) {
+        if (openFiles) {
+            openNewWindow(newWindowURLs, nullptr, Dolphin::OpenNewWindowFlag::Select);
+        } else {
+            openNewWindow(newWindowURLs);
+        }
+    }
+

     return attached;
 }
 
     return attached;
 }