X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/462982faa361c79daab43ce526ae64646b1ea63c..e19aa49a082076d5ae69931893c1d47b98f85e30:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index 8b3121d22..017a31f1d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,36 +12,49 @@ #include "dolphindebug.h" #include "dolphinmainwindow.h" #include "global.h" +#include "config-dolphin.h" +#if HAVE_KUSERFEEDBACK +#include "userfeedback/dolphinfeedbackprovider.h" +#endif #include #include #include #include -#include #include +#include + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#include +#endif #include #include #include -#include -#include #include +#include #ifndef Q_OS_WIN #include #endif #include -extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { #ifndef Q_OS_WIN // 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 can cause bugs and expose you to security vulnerabilities. " + "Instead use Dolphin normally and you will be prompted for elevated privileges when " + "performing file operations that require them." + << 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 can cause bugs and expose you to security vulnerabilities. " + "Instead use Dolphin normally and you will be prompted for elevated privileges when " + "performing file operations that require them." + << std::endl; return EXIT_FAILURE; } } @@ -50,28 +63,39 @@ extern "C" Q_DECL_EXPORT int kdemain(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())); + KIO::PreviewJob::setDefaultDevicePixelRatio(app.devicePixelRatio()); + 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), 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"), @@ -132,7 +156,19 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) if (parser.isSet(QStringLiteral("daemon"))) { + // Disable session management for the daemonized version + // See https://bugs.kde.org/show_bug.cgi?id=417219 + auto disableSessionManagement = [](QSessionManager &sm) { + sm.setRestartHint(QSessionManager::RestartNever); + }; + 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(); @@ -165,7 +201,12 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) mainWindow->show(); - KDBusService dolphinDBusService; + // Allow starting Dolphin on a system that is not running DBus: + KDBusService::StartupOptions serviceOptions = KDBusService::Multiple; + if (!QDBusConnection::sessionBus().isConnected()) { + serviceOptions |= KDBusService::NoExitOnFailure; + } + KDBusService dolphinDBusService(serviceOptions); DBusInterface interface; if (!app.isSessionRestored()) { @@ -173,22 +214,38 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) } // Only restore session if: - // 1. Dolphin was not started with command line args + // 1. Not explicitly opening a new instance // 2. The "remember state" setting is enabled or session restoration after // reboot is in use // 3. There is a session available to restore - if (!startedWithURLs && (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) { const QString className = KXmlGuiWindow::classNameOfToplevel(1); if (className == QLatin1String("DolphinMainWindow")) { mainWindow->restore(1); + // If the user passed any URLs to Dolphin, open those in the + // window after session-restoring it + if (startedWithURLs) { + if (openFiles) { + mainWindow->openFiles(urls, splitView); + } else { + mainWindow->openDirectories(urls, splitView); + } + } } else { qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!"; } } } +#if HAVE_KUSERFEEDBACK + auto feedbackProvider = DolphinFeedbackProvider::instance(); + Q_UNUSED(feedbackProvider) +#endif + return app.exec(); // krazy:exclude=crash; }