* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
+#include "dbusinterface.h"
+#include "dolphin_generalsettings.h"
#include "dolphin_version.h"
+#include "dolphindebug.h"
#include "dolphinmainwindow.h"
-#include "dolphin_generalsettings.h"
-#include "dbusinterface.h"
#include "global.h"
-#include "dolphindebug.h"
-#include <KDBusService>
#include <KAboutData>
#include <KCrash>
-#include <QCommandLineParser>
-#include <QCommandLineOption>
-#include <QApplication>
+#include <KDBusService>
#include <KLocalizedString>
#include <Kdelibs4ConfigMigrator>
+#include <KConfigGui>
+
+#include <QApplication>
+#include <QCommandLineParser>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusAbstractInterface>
+#include <QDBusConnectionInterface>
+
+#ifndef Q_OS_WIN
+#include <unistd.h>
+#endif
+#include <iostream>
extern "C" Q_DECL_EXPORT int kdemain(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;
+ return EXIT_FAILURE;
+ } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+ std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+ return EXIT_FAILURE;
+ }
+ }
+#endif
+
+ /**
+ * enable high dpi support
+ */
+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
+
QApplication app(argc, argv);
- app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
- app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
+ app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
KCrash::initialize();
KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
i18nc("@title", "File Manager"),
KAboutLicense::GPL,
- i18nc("@info:credit", "(C) 2006-2016 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
- aboutData.setHomepage(QStringLiteral("http://dolphin.kde.org"));
+ i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
+ aboutData.setHomepage(QStringLiteral("https://kde.org/applications/system/org.kde.dolphin"));
+ aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
+ i18nc("@info:credit", "Maintainer (since 2018) and developer"),
+ QStringLiteral("elvis.angelaccio@kde.org"));
aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
- i18nc("@info:credit", "Maintainer (since 2014) and developer"),
+ i18nc("@info:credit", "Maintainer (2014-2018) and developer"),
QStringLiteral("emmanuelpescosta099@gmail.com"));
aboutData.addAuthor(i18nc("@info:credit", "Frank Reininghaus"),
i18nc("@info:credit", "Maintainer (2012-2014) and developer"),
KAboutData::setApplicationData(aboutData);
- KDBusService dolphinDBusService;
- DBusInterface interface;
-
QCommandLineParser parser;
- parser.addVersionOption();
- parser.addHelpOption();
aboutData.setupCommandLine(&parser);
// command line options
- parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and directories passed as arguments "
+ 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.addPositionalArgument(QStringLiteral("+[Url]"), i18nc("@info:shell", "Document to open"));
parser.process(app);
aboutData.processCommandLine(&parser);
+ const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView();
+ const bool openFiles = parser.isSet(QStringLiteral("select"));
+ const QStringList args = parser.positionalArguments();
+ QList<QUrl> urls = Dolphin::validateUris(args);
+ // We later mutate urls, so we need to store if it was empty originally
+ const bool startedWithURLs = !urls.isEmpty();
+
+
if (parser.isSet(QStringLiteral("daemon"))) {
+ KDBusService dolphinDBusService;
+ DBusInterface interface;
+ interface.setAsDaemon();
return app.exec();
}
- const QStringList args = parser.positionalArguments();
- QList<QUrl> urls = Dolphin::validateUris(args);
+ if (!parser.isSet(QStringLiteral("new-window"))) {
+ if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
+ // Successfully attached to existing instance of Dolphin
+ return 0;
+ }
+ }
- if (urls.isEmpty()) {
+ if (!startedWithURLs) {
// We need at least one URL to open Dolphin
urls.append(Dolphin::homeUrl());
}
- const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView();
if (splitView && urls.size() < 2) {
// Split view does only make sense if we have at least 2 URLs
urls.append(urls.last());
}
DolphinMainWindow* mainWindow = new DolphinMainWindow();
- mainWindow->setAttribute(Qt::WA_DeleteOnClose);
- if (parser.isSet(QStringLiteral("select"))) {
+ if (openFiles) {
mainWindow->openFiles(urls, splitView);
} else {
mainWindow->openDirectories(urls, splitView);
mainWindow->show();
- if (app.isSessionRestored()) {
- const QString className = KXmlGuiWindow::classNameOfToplevel(1);
- if (className == QLatin1String("DolphinMainWindow")) {
- mainWindow->restore(1);
- } else {
- qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
+ if (!app.isSessionRestored()) {
+ KConfigGui::setSessionConfig(QStringLiteral("dolphin"), QStringLiteral("dolphin"));
+ }
+
+ // Only restore session if:
+ // 1. Dolphin was not started with command line args
+ // 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()) ) {
+ // 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);
+ } else {
+ qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
+ }
}
}
+ KDBusService dolphinDBusService;
+ DBusInterface interface;
+
return app.exec(); // krazy:exclude=crash;
}
projects / dolphin.git / blobdiff