DolphinView: rename copySelectedItems to copySelectedItemsToClipboard

[dolphin.git] / src / dbusinterface.cpp

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index 15016d2e08a978d85d3e814612f9f169627b95f7..abdb3a0fefdee27308bc64788755790e28c91e30 100644 (file)
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -39,12 +39,12 @@ DBusInterface::DBusInterface() :
 
 void DBusInterface::ShowFolders(const QStringList& uriList, const QString& startUpId)
 {
 
 void DBusInterface::ShowFolders(const QStringList& uriList, const QString& startUpId)
 {

-    Q_UNUSED(startUpId);
+    Q_UNUSED(startUpId)

     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }

-    const auto serviceName = QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+    const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());

     if(!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName)) {
         Dolphin::openNewWindow(urls);
     }
     if(!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName)) {
         Dolphin::openNewWindow(urls);
     }


@@ -52,12 +52,12 @@ void DBusInterface::ShowFolders(const QStringList& uriList, const QString& start
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
 {
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
 {

-    Q_UNUSED(startUpId);
+    Q_UNUSED(startUpId)

     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }

-    const auto serviceName = QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+    const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());

     if(!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName)) {
         Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
     };
     if(!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName)) {
         Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
     };


@@ -65,9 +65,19 @@ void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUp
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)
 {
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)
 {

-    Q_UNUSED(startUpId);
+    Q_UNUSED(startUpId)

     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (!urls.isEmpty()) {
         KPropertiesDialog::showDialog(urls);
     }
 }
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (!urls.isEmpty()) {
         KPropertiesDialog::showDialog(urls);
     }
 }

+
+void DBusInterface::setAsDaemon()
+{
+    m_isDaemon = true;
+}
+
+bool DBusInterface::isDaemon() const
+{
+    return m_isDaemon;
+}