]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/main.cpp
Merge branch 'master' into kf6
[dolphin.git] / src / main.cpp
index 779690c1c5de280c9742f2d432e0a3c395156986..2d1ccd0c89951ca1d881b2be052bce7ae3e453d8 100644 (file)
@@ -6,33 +6,43 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+#include "config-dolphin.h"
 #include "dbusinterface.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_version.h"
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"
-#include "config-kuserfeedback.h"
-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK
 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif
 
 #include <KAboutData>
+#include <KConfigGui>
 #include <KCrash>
 #include <KDBusService>
+#include <KIO/PreviewJob>
 #include <KLocalizedString>
+#include <KWindowSystem>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
-#include <KConfigGui>
-#include <KIO/PreviewJob>
+#endif
 
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>
-#include <QDBusInterface>
-#include <QDBusAbstractInterface>
 #include <QDBusConnectionInterface>
 #include <QSessionManager>
 
+#if HAVE_X11
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
+#include <QX11Info>
+#endif
+#endif
+
 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif
@@ -44,10 +54,16 @@ int main(int argc, char **argv)
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+            std::cout << "Running Dolphin with sudo is not supported as it can cause bugs and expose you to security vulnerabilities. Instead, install the "
+                         "`kio-admin` package from your distro and use it to manage root-owned locations by right-clicking on them and selecting \"Open as "
+                         "Administrator\"."
+                      << std::endl;
             return EXIT_FAILURE;
         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+            std::cout << "Running Dolphin with kdesu is not supported as it can cause bugs and expose you to security vulnerabilities. Instead, install the "
+                         "`kio-admin` package from your distro and use it to manage root-owned locations by right-clicking on them and selecting \"Open as "
+                         "Administrator\"."
+                      << std::endl;
             return EXIT_FAILURE;
         }
     }
@@ -56,9 +72,10 @@ int main(int argc, char **argv)
     /**
      * enable high dpi support
      */
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
-
+#endif
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
@@ -66,20 +83,30 @@ int main(int argc, char **argv)
 
     KCrash::initialize();
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
+#endif
 
     KLocalizedString::setApplicationDomain("dolphin");
 
-    KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
+    KAboutData aboutData(QStringLiteral("dolphin"),
+                         i18n("Dolphin"),
+                         QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
-                         i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
+                         i18nc("@info:credit", "(C) 2006-2022 The Dolphin Developers"));
     aboutData.setHomepage(QStringLiteral("https://kde.org/applications/system/org.kde.dolphin"));
+    aboutData.addAuthor(i18nc("@info:credit", "Felix Ernst"),
+                        i18nc("@info:credit", "Maintainer (since 2021) and developer"),
+                        QStringLiteral("felixernst@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Méven Car"),
+                        i18nc("@info:credit", "Maintainer (since 2021) and developer (since 2019)"),
+                        QStringLiteral("meven@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
-                        i18nc("@info:credit", "Maintainer (since 2018) and developer"),
+                        i18nc("@info:credit", "Maintainer (2018-2021) and developer"),
                         QStringLiteral("elvis.angelaccio@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
                         i18nc("@info:credit", "Maintainer (2014-2018) and developer"),
@@ -90,30 +117,14 @@ int main(int argc, char **argv)
     aboutData.addAuthor(i18nc("@info:credit", "Peter Penz"),
                         i18nc("@info:credit", "Maintainer and developer (2006-2012)"),
                         QStringLiteral("peter.penz19@gmail.com"));
-    aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("trueg@kde.org"));
-    aboutData.addAuthor(i18nc("@info:credit", "David Faure"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("faure@kde.org"));
-    aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("aseigo@kde.org"));
-    aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("ereslibre@kde.org"));
-    aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("ervin@kde.org"));
-    aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("freyther@gmx.net"));
-    aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"),
-                        i18nc("@info:credit", "Developer"),
-                        QStringLiteral("m43ksrocks@gmail.com"));
-    aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"),
-                        i18nc("@info:credit", "Documentation"),
-                        QStringLiteral("tuxedup@users.sourceforge.net"));
+    aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"), i18nc("@info:credit", "Developer"), QStringLiteral("trueg@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "David Faure"), i18nc("@info:credit", "Developer"), QStringLiteral("faure@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"), i18nc("@info:credit", "Developer"), QStringLiteral("aseigo@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"), i18nc("@info:credit", "Developer"), QStringLiteral("ereslibre@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"), i18nc("@info:credit", "Developer"), QStringLiteral("ervin@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"), i18nc("@info:credit", "Developer"), QStringLiteral("freyther@gmx.net"));
+    aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"), i18nc("@info:credit", "Developer"), QStringLiteral("m43ksrocks@gmail.com"));
+    aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"), i18nc("@info:credit", "Documentation"), QStringLiteral("tuxedup@users.sourceforge.net"));
 
     KAboutData::setApplicationData(aboutData);
 
@@ -121,11 +132,14 @@ int main(int argc, char **argv)
     aboutData.setupCommandLine(&parser);
 
     // command line options
-    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and folders passed as arguments "
-                                                                                        "will be selected.")));
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"),
+                                        i18nc("@info:shell",
+                                              "The files and folders passed as arguments "
+                                              "will be selected.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("new-window"), i18nc("@info:shell", "Dolphin will explicitly open in a new window.")));
-    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
+    parser.addOption(
+        QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface).")));
     parser.addPositionalArgument(QStringLiteral("+[Url]"), i18nc("@info:shell", "Document to open"));
 
     parser.process(app);
@@ -138,7 +152,6 @@ int main(int argc, char **argv)
     // We later mutate urls, so we need to store if it was empty originally
     const bool startedWithURLs = !urls.isEmpty();
 
-
     if (parser.isSet(QStringLiteral("daemon"))) {
         // Disable session management for the daemonized version
         // See https://bugs.kde.org/show_bug.cgi?id=417219
@@ -148,14 +161,28 @@ int main(int argc, char **argv)
         QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
         QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
 
+#ifdef FLATPAK
+        KDBusService dolphinDBusService(KDBusService::NoExitOnFailure);
+#else
         KDBusService dolphinDBusService;
+#endif
         DBusInterface interface;
         interface.setAsDaemon();
         return app.exec();
     }
 
     if (!parser.isSet(QStringLiteral("new-window"))) {
-        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
+        QString token;
+        if (KWindowSystem::isPlatformWayland()) {
+            token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
+            qunsetenv("XDG_ACTIVATION_TOKEN");
+        } else if (KWindowSystem::isPlatformX11()) {
+#if HAVE_X11
+            token = QX11Info::nextStartupId();
+#endif
+        }
+
+        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView, QString(), token)) {
             // Successfully attached to existing instance of Dolphin
             return 0;
         }
@@ -171,7 +198,7 @@ int main(int argc, char **argv)
         urls.append(urls.last());
     }
 
-    DolphinMainWindowmainWindow = new DolphinMainWindow();
+    DolphinMainWindow *mainWindow = new DolphinMainWindow();
 
     if (openFiles) {
         mainWindow->openFiles(urls, splitView);
@@ -198,9 +225,7 @@ int main(int argc, char **argv)
     // 2. The "remember state" setting is enabled or session restoration after
     //    reboot is in use
     // 3. There is a session available to restore
-    if (!parser.isSet(QStringLiteral("new-window"))
-        && (app.isSessionRestored() || GeneralSettings::rememberOpenedTabs())
-    ) {
+    if (!parser.isSet(QStringLiteral("new-window")) && (app.isSessionRestored() || GeneralSettings::rememberOpenedTabs())) {
         // Get saved state data for the last-closed Dolphin instance
         const QString serviceName = QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
         if (Dolphin::dolphinGuiInstances(serviceName).size() > 0) {
@@ -222,7 +247,7 @@ int main(int argc, char **argv)
         }
     }
 
-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK
     auto feedbackProvider = DolphinFeedbackProvider::instance();
     Q_UNUSED(feedbackProvider)
 #endif