New tab should be placed after the current tab

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ec6833681bfac2084629ed496cfd59001141217e..08405d0073b963d6ea187bd8e1aaf705e4c51903 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,69 +19,96 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include "dolphinmainwindow.h"
-#include "dolphin_generalsettings.h"

 #include "dbusinterface.h"
 #include "dbusinterface.h"

-#include "global.h"
+#include "dolphin_generalsettings.h"
+#include "dolphin_version.h"

 #include "dolphindebug.h"
 #include "dolphindebug.h"

+#include "dolphinmainwindow.h"
+#include "global.h"

 
 

-#include <KDBusService>

 #include <KAboutData>
 #include <KAboutData>

-#include <QCommandLineParser>
-#include <QCommandLineOption>
-#include <QApplication>
+#include <KCrash>
+#include <KDBusService>

 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 

+#include <QApplication>
+#include <QCommandLineParser>
+
+#ifndef Q_OS_WIN
+#include <unistd.h>
+#endif
+#include <iostream>
+

 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
 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
+

     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);

-    app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
+
+    KCrash::initialize();

 
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
 
 
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
 

-    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
+    KLocalizedString::setApplicationDomain("dolphin");
+
+    KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),

                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,

-                         i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
-    aboutData.setHomepage("http://dolphin.kde.org");
+                         i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
+    aboutData.setHomepage(QStringLiteral("https://dolphin.kde.org"));
+    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"),
     aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),

-                        i18nc("@info:credit", "Maintainer (since 2014) and developer"),
-                        "emmanuelpescosta099@gmail.com");
+                        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"),
     aboutData.addAuthor(i18nc("@info:credit", "Frank Reininghaus"),
                         i18nc("@info:credit", "Maintainer (2012-2014) and developer"),

-                        "frank78ac@googlemail.com");
+                        QStringLiteral("frank78ac@googlemail.com"));

     aboutData.addAuthor(i18nc("@info:credit", "Peter Penz"),
                         i18nc("@info:credit", "Maintainer and developer (2006-2012)"),
     aboutData.addAuthor(i18nc("@info:credit", "Peter Penz"),
                         i18nc("@info:credit", "Maintainer and developer (2006-2012)"),

-                        "peter.penz19@gmail.com");
+                        QStringLiteral("peter.penz19@gmail.com"));

     aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"),
                         i18nc("@info:credit", "Developer"),

-                        "trueg@kde.org");
+                        QStringLiteral("trueg@kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "David Faure"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "David Faure"),
                         i18nc("@info:credit", "Developer"),

-                        "faure@kde.org");
+                        QStringLiteral("faure@kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"),
                         i18nc("@info:credit", "Developer"),

-                        "aseigo@kde.org");
+                        QStringLiteral("aseigo@kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"),
                         i18nc("@info:credit", "Developer"),

-                        "ereslibre@kde.org");
+                        QStringLiteral("ereslibre@kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"),
                         i18nc("@info:credit", "Developer"),

-                        "ervin@kde.org");
+                        QStringLiteral("ervin@kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"),
                         i18nc("@info:credit", "Developer"),

-                        "freyther@gmx.net");
+                        QStringLiteral("freyther@gmx.net"));

     aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"),
                         i18nc("@info:credit", "Developer"),
     aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"),
                         i18nc("@info:credit", "Developer"),

-                        "m43ksrocks@gmail.com");
+                        QStringLiteral("m43ksrocks@gmail.com"));

     aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"),
                         i18nc("@info:credit", "Documentation"),
     aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"),
                         i18nc("@info:credit", "Documentation"),

-                        "tuxedup@users.sourceforge.net");
+                        QStringLiteral("tuxedup@users.sourceforge.net"));

 
     KAboutData::setApplicationData(aboutData);
 
 
     KAboutData::setApplicationData(aboutData);
 


@@ -89,21 +116,19 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     DBusInterface interface;
 
     QCommandLineParser parser;
     DBusInterface interface;
 
     QCommandLineParser parser;

-    parser.addVersionOption();
-    parser.addHelpOption();

     aboutData.setupCommandLine(&parser);
 
     // command line options
     aboutData.setupCommandLine(&parser);
 
     // command line options

-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("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.")));
                                                                                         "will be selected.")));

-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
-    parser.addPositionalArgument(QLatin1String("+[Url]"), i18nc("@info:shell", "Document to open"));
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
+    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);
 
 
     parser.process(app);
     aboutData.processCommandLine(&parser);
 

-    if (parser.isSet("daemon")) {
+    if (parser.isSet(QStringLiteral("daemon"))) {

         return app.exec();
     }
 
         return app.exec();
     }
 


@@ -112,20 +137,18 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     if (urls.isEmpty()) {
         // We need at least one URL to open Dolphin
 
     if (urls.isEmpty()) {
         // We need at least one URL to open Dolphin

-        const QUrl homeUrl(QUrl::fromLocalFile(GeneralSettings::homeUrl()));
-        urls.append(homeUrl);
+        urls.append(Dolphin::homeUrl());

     }
 
     }
 

-    const bool splitView = parser.isSet("split") || GeneralSettings::splitView();
+    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();
     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("select")) {
+    if (parser.isSet(QStringLiteral("select"))) {

         mainWindow->openFiles(urls, splitView);
     } else {
         mainWindow->openDirectories(urls, splitView);
         mainWindow->openFiles(urls, splitView);
     } else {
         mainWindow->openDirectories(urls, splitView);