X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b30eabbee26b1a2189170571e49bc86c0a49d334..6e752f507a1dd82a40d4bd140457203842fc0c80:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index ea55068bf..df725a33f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,6 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "admin/workerintegration.h" #include "config-dolphin.h" #include "dbusinterface.h" #include "dolphin_generalsettings.h" @@ -22,11 +23,13 @@ #include #include #include +#include #include #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include +#define HAVE_STYLE_MANAGER __has_include() +#if HAVE_STYLE_MANAGER +#include #endif #include @@ -36,11 +39,7 @@ #include #if HAVE_X11 -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include -#else -#include -#endif #endif #ifndef Q_OS_WIN @@ -48,51 +47,51 @@ #endif #include +constexpr auto dolphinTranslationDomain{"dolphin"}; + 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 << "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 << "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; - } + if (getuid() == 0 && (!qEnvironmentVariableIsEmpty("SUDO_USER") || !qEnvironmentVariableIsEmpty("KDESU_USER"))) { + QCoreApplication app(argc, argv); // Needed for the xi18ndc() call below. + std::cout << qPrintable( + xi18ndc(dolphinTranslationDomain, + "@info:shell %1 is a terminal command", + "Running Dolphin with sudo is discouraged. Please run %1 instead.", + QStringLiteral("dolphin --sudo"))) + << std::endl; + // We could perform a privilege de-escalation here and continue as normal. It is a bit safer though to simply let the user restart without sudo. + return EXIT_FAILURE; } #endif /** - * enable high dpi support + * trigger initialisation of proper icon theme */ -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); +#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0) + KIconTheme::initTheme(); #endif + QApplication app(argc, argv); app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon())); -#if defined(Q_OS_WIN) +#if HAVE_STYLE_MANAGER + /** + * trigger initialisation of proper application style + */ + KStyleManager::initStyle(); +#else + /** + * For Windows and macOS: use Breeze if available + * Of all tested styles that works the best for us + */ +#if defined(Q_OS_MACOS) || defined(Q_OS_WIN) QApplication::setStyle(QStringLiteral("breeze")); #endif - - 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"); + KLocalizedString::setApplicationDomain(dolphinTranslationDomain); KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), @@ -129,6 +128,7 @@ int main(int argc, char **argv) aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"), i18nc("@info:credit", "Documentation"), QStringLiteral("tuxedup@users.sourceforge.net")); KAboutData::setApplicationData(aboutData); + KCrash::initialize(); QCommandLineParser parser; aboutData.setupCommandLine(&parser); @@ -140,6 +140,8 @@ int main(int argc, char **argv) "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("sudo") << QStringLiteral("admin"), + i18nc("@info:shell", "Set up Dolphin for administrative tasks."))); 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")); @@ -149,11 +151,18 @@ int main(int argc, char **argv) const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView(); const bool openFiles = parser.isSet(QStringLiteral("select")); + const bool adminWorkerInfoWanted = parser.isSet(QStringLiteral("sudo")) || parser.isSet(QStringLiteral("admin")); const QStringList args = parser.positionalArguments(); QList urls = Dolphin::validateUris(args); // We later mutate urls, so we need to store if it was empty originally const bool startedWithURLs = !urls.isEmpty(); + if (adminWorkerInfoWanted || std::any_of(urls.cbegin(), urls.cend(), [](const QUrl &url) { + return url.scheme() == QStringLiteral("admin"); + })) { + Admin::guideUserTowardsInstallingAdminWorker(); + } + if (parser.isSet(QStringLiteral("daemon"))) { // Disable session management for the daemonized version // See https://bugs.kde.org/show_bug.cgi?id=417219 @@ -251,6 +260,10 @@ int main(int argc, char **argv) mainWindow->setSessionAutoSaveEnabled(GeneralSettings::rememberOpenedTabs()); + if (adminWorkerInfoWanted) { + Admin::guideUserTowardsUsingAdminWorker(); + } + #if HAVE_KUSERFEEDBACK auto feedbackProvider = DolphinFeedbackProvider::instance(); Q_UNUSED(feedbackProvider)