dolphinmainwindow: zoom action is now a KToolBarPopupAction

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 64282e711de29956fad1e216b77cfe99c5d8f184..c91046efbfb8765c541fdd4603e3745a7e4fa492 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -1,40 +1,29 @@
 /*
 /*

- * 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 "global.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphindebug.h"
  */
 
 #include "global.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphindebug.h"

+#include "dolphinmainwindowinterface.h"
+#include "views/viewproperties.h"

 
 

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

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

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

 
 

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

 {
     const QString currentDir = QDir::currentPath();
     QList<QUrl> urls;
 {
     const QString currentDir = QDir::currentPath();
     QList<QUrl> urls;

-    foreach (const QString& str, uriList) {
+    for (const QString &str : uriList) {

         const QUrl url = QUrl::fromUserInput(str, currentDir, QUrl::AssumeLocalFile);
         if (url.isValid()) {
             urls.append(url);
         const QUrl url = QUrl::fromUserInput(str, currentDir, QUrl::AssumeLocalFile);
         if (url.isValid()) {
             urls.append(url);


@@ -61,84 +50,153 @@ 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>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)
+bool Dolphin::attachToExistingInstance(const QList<QUrl> &inputUrls,
+                                       bool openFiles,
+                                       bool splitView,
+                                       const QString &preferredService,
+                                       const QString &activationToken)

 {
 {

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

         return false;
     }
 
         return false;
     }
 

-    QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinServices;
+    auto dolphinInterfaces = dolphinGuiInstances(preferredService);
+    if (dolphinInterfaces.isEmpty()) {
+        return false;
+    }
+
+    int activeWindowIndex = -1;
+    for (const auto &interface : std::as_const(dolphinInterfaces)) {
+        ++activeWindowIndex;
+
+        auto isActiveWindowReply = interface.first->isActiveWindow();
+        isActiveWindowReply.waitForFinished();
+        if (!isActiveWindowReply.isError() && isActiveWindowReply.value()) {
+            break;
+        }
+    }
+
+    // check to see if any instances already have any of the given URLs or their parents open
+    QList<QUrl> newWindowURLs;
+    for (const QUrl &url : inputUrls) {
+        bool urlFound = false;
+        const QString urlString = url.toString();
+
+        // looping through the windows starting from the active one
+        int i = activeWindowIndex;
+        do {
+            auto &interface = dolphinInterfaces[i];
+
+            auto isUrlOpenReply = openFiles ? interface.first->isItemVisibleInAnyView(urlString) : interface.first->isUrlOpen(urlString);
+            isUrlOpenReply.waitForFinished();
+            if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
+                interface.second.append(urlString);
+                urlFound = true;
+                break;
+            }
+
+            i = (i + 1) % dolphinInterfaces.size();
+        } while (i != activeWindowIndex);
+
+        if (!urlFound) {
+            if (GeneralSettings::openExternallyCalledFolderInNewTab()) {
+                dolphinInterfaces[activeWindowIndex].second.append(urlString);
+            } else {
+                newWindowURLs.append(url);
+            }
+        }
+    }
+
+    for (const auto &interface : std::as_const(dolphinInterfaces)) {
+        if (interface.second.isEmpty()) {
+            continue;
+        }
+        auto reply = openFiles ? interface.first->openFiles(interface.second, splitView) : interface.first->openDirectories(interface.second, splitView);
+        reply.waitForFinished();
+        if (!reply.isError()) {
+            interface.first->activateWindow(activationToken);
+            attached = true;
+        }
+    }
+    if (attached && !newWindowURLs.isEmpty()) {
+        if (openFiles) {
+            openNewWindow(newWindowURLs, nullptr, Dolphin::OpenNewWindowFlag::Select);
+        } else {
+            openNewWindow(newWindowURLs);
+        }
+    }
+
+    return attached;
+}
+
+QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString &preferredService)
+{
+    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() && !preferred->lastError().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
-    const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value();
+    // Look for dolphin instances among all available dbus services.
+    QDBusConnectionInterface *sessionInterface = QDBusConnection::sessionBus().interface();
+    const QStringList dbusServices = sessionInterface ? sessionInterface->registeredServiceNames().value() : QStringList();

     // Don't match the service without trailing "-" (unique instance)
     const QString pattern = QStringLiteral("org.kde.dolphin-");
     // Don't match the pid without leading "-"
     // 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 = QStringLiteral("-") + QString::number(QCoreApplication::applicationPid());
-    for (const QString& service : services) {
+    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() || instance->lastError().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()) {
-        return false;
-    }
+    return dolphinInterfaces;
+}

 
 

-    QStringList newUrls;
+QPair<QString, Qt::SortOrder> Dolphin::sortOrderForUrl(QUrl &url)
+{
+    ViewProperties globalProps(url);
+    return QPair<QString, Qt::SortOrder>(globalProps.sortRole(), globalProps.sortOrder());
+}

 
 

-    // check to see if any instances already have any of the given URLs open
-    const auto urls = QUrl::toStringList(inputUrls);
-    for (const QString& url : urls) {
-        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;
-            }
-        }
-        if (!urlFound) {
-            newUrls.append(url);
-        }
+double GlobalConfig::animationDurationFactor()
+{
+    if (s_animationDurationFactor >= 0.0) {
+        return s_animationDurationFactor;

     }
     }

-    dolphinServices.front().second << newUrls;
+    // This is the first time this method is called.
+    auto kdeGlobalsConfig = KConfigGroup(KSharedConfig::openConfig(), QStringLiteral("KDE"));
+    updateAnimationDurationFactor(kdeGlobalsConfig, {"AnimationDurationFactor"});

 
 

-    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"));
-        }
+    KConfigWatcher::Ptr configWatcher = KConfigWatcher::create(KSharedConfig::openConfig());
+    connect(configWatcher.data(), &KConfigWatcher::configChanged, &GlobalConfig::updateAnimationDurationFactor);
+    return s_animationDurationFactor;
+}
+
+void GlobalConfig::updateAnimationDurationFactor(const KConfigGroup &group, const QByteArrayList &names)
+{
+    if (group.name() == QLatin1String("KDE") && names.contains(QByteArrayLiteral("AnimationDurationFactor"))) {
+        s_animationDurationFactor = std::max(0.0, group.readEntry("AnimationDurationFactor", 1.0));

     }
     }

-    return true;

 }
 }

+
+double GlobalConfig::s_animationDurationFactor = -1.0;
+
+#include "moc_global.cpp"