Merge branch 'Applications/19.08'

[dolphin.git] / src / dbusinterface.cpp

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index f9f1a6b2255418d03c993efebcd24d682741725d..15016d2e08a978d85d3e814612f9f169627b95f7 100644 (file)
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -19,19 +19,22 @@
 
 #include "dbusinterface.h"
 #include "global.h"
+#include "dolphin_generalsettings.h"
 
-#include <QDBusConnection>
-#include <QList>
-#include <QUrl>
 #include <KPropertiesDialog>
-#include <KRun>
+
+#include <QApplication>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusConnectionInterface>
 
 DBusInterface::DBusInterface() :
     QObject()
 {
-    QDBusConnection::sessionBus().registerService(QStringLiteral("org.freedesktop.FileManager1"));
     QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this,
             QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+    QDBusConnection::sessionBus().interface()->registerService(QStringLiteral("org.freedesktop.FileManager1"),
+                                                               QDBusConnectionInterface::QueueService);
 }
 
 void DBusInterface::ShowFolders(const QStringList& uriList, const QString& startUpId)
@@ -41,7 +44,10 @@ void DBusInterface::ShowFolders(const QStringList& uriList, const QString& start
     if (urls.isEmpty()) {
         return;
     }
-    KRun::run(QStringLiteral("dolphin %u"), urls, nullptr);
+    const auto serviceName = QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+    if(!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName)) {
+        Dolphin::openNewWindow(urls);
+    }
 }
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
@@ -51,7 +57,10 @@ void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUp
     if (urls.isEmpty()) {
         return;
     }
-    KRun::run(QStringLiteral("dolphin --select %u"), urls, nullptr);
+    const auto serviceName = QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+    if(!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName)) {
+        Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
+    };
 }
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)