Make global view properties the default setting

[dolphin.git] / src / dbusinterface.cpp

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index f9f1a6b2255418d03c993efebcd24d682741725d..c780bc7cdc9cb853f4df70cc9d57a4df72183872 100644 (file)
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -20,18 +20,18 @@
 #include "dbusinterface.h"
 #include "global.h"
 
 #include "dbusinterface.h"
 #include "global.h"
 

-#include <QDBusConnection>
-#include <QList>
-#include <QUrl>

 #include <KPropertiesDialog>
 #include <KPropertiesDialog>

-#include <KRun>
+
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>

 
 DBusInterface::DBusInterface() :
     QObject()
 {
 
 DBusInterface::DBusInterface() :
     QObject()
 {

-    QDBusConnection::sessionBus().registerService(QStringLiteral("org.freedesktop.FileManager1"));

     QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this,
             QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
     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)
 }
 
 void DBusInterface::ShowFolders(const QStringList& uriList, const QString& startUpId)


@@ -41,7 +41,7 @@ void DBusInterface::ShowFolders(const QStringList& uriList, const QString& start
     if (urls.isEmpty()) {
         return;
     }
     if (urls.isEmpty()) {
         return;
     }

-    KRun::run(QStringLiteral("dolphin %u"), urls, nullptr);
+    Dolphin::openNewWindow(urls);

 }
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
 }
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)


@@ -51,7 +51,7 @@ void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUp
     if (urls.isEmpty()) {
         return;
     }
     if (urls.isEmpty()) {
         return;
     }

-    KRun::run(QStringLiteral("dolphin --select %u"), urls, nullptr);
+    Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);

 }
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)
 }
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)