Port KRun::run usage to run another Dolphin process, to ApplicationLauncherJob

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index e7ff67d776578cfa88368e1177b99b1e94c77b91..19f43e06b04c5dcac9bfad6e755c579b57da4f55 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -21,14 +21,15 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphindebug.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphindebug.h"

+#include "dolphinmainwindowinterface.h"

 
 

-#include <KRun>
+#include <KDialogJobUiDelegate>
+#include <KIO/ApplicationLauncherJob>
+#include <KService>

 #include <KWindowSystem>
 
 #include <QApplication>
 #include <QIcon>
 #include <KWindowSystem>
 
 #include <QApplication>
 #include <QIcon>

-#include <QDBusInterface>
-#include <QDBusConnectionInterface>

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


@@ -61,83 +62,86 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
     if (!urls.isEmpty()) {
         command.append(QLatin1String(" %U"));
     }
     if (!urls.isEmpty()) {
         command.append(QLatin1String(" %U"));
     }

-    KRun::run(
-        command,
-        urls,
-        window,
-        QApplication::applicationDisplayName(),
-        QApplication::windowIcon().name()
-    );
+    KService::Ptr service(new KService(QApplication::applicationDisplayName(), command, QApplication::windowIcon().name()));
+    auto *job = new KIO::ApplicationLauncherJob(service, window);
+    job->setUrls(urls);
+    job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, window));
+    job->start();

 }
 
 }
 

-bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles, bool splitView, const QString& preferredService)
+bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)

 {
 {

-    if (KWindowSystem::isPlatformWayland()) {
-        // TODO: once Wayland clients can raise or activate themselves remove this conditional
+    bool attached = false;
+
+    // TODO: once Wayland clients can raise or activate themselves remove check from conditional
+    if (KWindowSystem::isPlatformWayland() || inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {

         return false;
     }
 
         return false;
     }
 

-    const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value();
-
-    // Don't match the service without trailing "-" (unique instance)
-    const QString pattern = QStringLiteral("org.kde.dolphin-");
-    const QString myPid = QString::number(QCoreApplication::applicationPid());
-    QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinServices;
+    QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> dolphinInterfaces;

     if (!preferredService.isEmpty()) {
     if (!preferredService.isEmpty()) {

-        QSharedPointer<QDBusInterface> preferred(
-            new QDBusInterface(preferredService,
-            QStringLiteral("/dolphin/Dolphin_1"),
-            QStringLiteral("org.kde.dolphin.MainWindow"))
-        );
-        if (preferred->isValid()) {
-            dolphinServices.append(qMakePair(preferred, QStringList() ));
+        QSharedPointer<OrgKdeDolphinMainWindowInterface> preferredInterface(
+            new OrgKdeDolphinMainWindowInterface(preferredService,
+                QStringLiteral("/dolphin/Dolphin_1"),
+                QDBusConnection::sessionBus()));
+        if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) {
+            dolphinInterfaces.append(qMakePair(preferredInterface, QStringList()));

         }
     }
 
         }
     }
 

-    // find all dolphin instances
-    for (const QString& service : services) {
+    // Look for dolphin instances among all available dbus services.
+    const QStringList dbusServices = 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 = QLatin1Char('-') + QString::number(QCoreApplication::applicationPid());
+    for (const QString& service : dbusServices) {

         if (service.startsWith(pattern) && !service.endsWith(myPid)) {
             // Check if instance can handle our URLs
         if (service.startsWith(pattern) && !service.endsWith(myPid)) {
             // Check if instance can handle our URLs

-            QSharedPointer<QDBusInterface> instance(
-                new QDBusInterface(service,
-                QStringLiteral("/dolphin/Dolphin_1"),
-                QStringLiteral("org.kde.dolphin.MainWindow"))
-            );
-            if (!instance->isValid()) {
-                continue;
+            QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
+                        new OrgKdeDolphinMainWindowInterface(service,
+                            QStringLiteral("/dolphin/Dolphin_1"),
+                            QDBusConnection::sessionBus()));
+            if (interface->isValid() && !interface->lastError().isValid()) {
+                dolphinInterfaces.append(qMakePair(interface, QStringList()));

             }
             }

-            dolphinServices.append(qMakePair(instance, QStringList()));

         }
     }
 
         }
     }
 

-    if (dolphinServices.isEmpty()) {
+    if (dolphinInterfaces.isEmpty()) {

         return false;
     }
 
     QStringList newUrls;
 
     // check to see if any instances already have any of the given URLs open
         return false;
     }
 
     QStringList newUrls;
 
     // check to see if any instances already have any of the given URLs open

-    for (const QString& url : QUrl::toStringList(urls)) {
+    const auto urls = QUrl::toStringList(inputUrls);
+    for (const QString& url : urls) {

         bool urlFound = false;
         bool urlFound = false;

-        for (auto& service: dolphinServices) {
-            QDBusReply<bool> isUrlOpen = service.first->call(QStringLiteral("isUrlOpen"), url);
-            if (isUrlOpen.isValid() && isUrlOpen.value()) {
-                    service.second.append(url);
-                    urlFound = true;
-                    break;
+        for (auto& interface: dolphinInterfaces) {
+            auto isUrlOpenReply = interface.first->isUrlOpen(url);
+            isUrlOpenReply.waitForFinished();
+            if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
+                interface.second.append(url);
+                urlFound = true;
+                break;

             }
         }
         if (!urlFound) {
             newUrls.append(url);
         }
     }
             }
         }
         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"));
+    dolphinInterfaces.front().second << newUrls;
+
+    for (const auto& interface: dolphinInterfaces) {
+        if (!interface.second.isEmpty()) {
+            auto reply = openFiles ? interface.first->openFiles(interface.second, splitView) : interface.first->openDirectories(interface.second, splitView);
+            reply.waitForFinished();
+            if (!reply.isError()) {
+                interface.first->activateWindow();
+                attached = true;
+            }

         }
     }
         }
     }

-    return true;
+    return attached;

 }
 }