SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dbusinterface.cpp

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index c780bc7cdc9cb853f4df70cc9d57a4df72183872..18544493c386dd90f4791794b72b0026e114804a 100644 (file)
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -1,64 +1,84 @@
 /*
- * Copyright 2015 Ashish Bansal<bansal.ashish096@gmail.com>
+ * SPDX-FileCopyrightText: 2015 Ashish Bansal <bansal.ashish096@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dbusinterface.h"
+#include "dolphin_generalsettings.h"
 #include "global.h"
 
 #include <KPropertiesDialog>
+#include <KWindowSystem>
 
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 
-DBusInterface::DBusInterface() :
-    QObject()
+DBusInterface::DBusInterface()
+    : QObject()
 {
-    QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this,
-            QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
-    QDBusConnection::sessionBus().interface()->registerService(QStringLiteral("org.freedesktop.FileManager1"),
-                                                               QDBusConnectionInterface::QueueService);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"),
+                                                 this,
+                                                 QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+    QDBusConnectionInterface *sessionInterface = QDBusConnection::sessionBus().interface();
+    if (sessionInterface) {
+        sessionInterface->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)
 {
-    Q_UNUSED(startUpId);
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
-    Dolphin::openNewWindow(urls);
+    const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+    if (!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName, startUpId)) {
+        Dolphin::openNewWindow(urls);
+    }
 }
 
-void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
+void DBusInterface::ShowItems(const QStringList &uriList, const QString &startUpId)
 {
-    Q_UNUSED(startUpId);
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (urls.isEmpty()) {
         return;
     }
-    Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
+    const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+    if (!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName, startUpId)) {
+        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)
 {
-    Q_UNUSED(startUpId);
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
     if (!urls.isEmpty()) {
+        KWindowSystem::setCurrentXdgActivationToken(startUpId);
         KPropertiesDialog::showDialog(urls);
     }
 }
+
+void DBusInterface::SortOrderForUrl(const QString &url, QString &role, QString &order)
+{
+    QUrl qurl(url);
+    auto sort = Dolphin::sortOrderForUrl(qurl);
+    role = sort.first;
+    if (sort.second == Qt::AscendingOrder) {
+        order = QStringLiteral("ascending");
+    } else {
+        order = QStringLiteral("descending");
+    }
+}
+
+void DBusInterface::setAsDaemon()
+{
+    m_isDaemon = true;
+}
+
+bool DBusInterface::isDaemon() const
+{
+    return m_isDaemon;
+}
+
+#include "moc_dbusinterface.cpp"