]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/main.cpp
Merge branch 'Applications/16.04'
[dolphin.git] / src / main.cpp
index cbfc6b72fd6252c5bab939a0c2344b42a726e864..8987d351f058d5b02a67c982ca51c937edc89ecf 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "dolphin_version.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 <KLocalizedString>
-#include "dolphindebug.h"
-#include <kdelibs4configmigrator.h>
+#include <Kdelibs4ConfigMigrator>
 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
+
+    KCrash::initialize();
+
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
 
-    app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
+    KLocalizedString::setApplicationDomain("dolphin");
 
-    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
+    KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          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-2016 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
+    aboutData.setHomepage(QStringLiteral("http://dolphin.kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
                         i18nc("@info:credit", "Maintainer (since 2014) and developer"),
-                        "emmanuelpescosta099@gmail.com");
+                        QStringLiteral("emmanuelpescosta099@gmail.com"));
     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)"),
-                        "peter.penz19@gmail.com");
+                        QStringLiteral("peter.penz19@gmail.com"));
     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"),
-                        "faure@kde.org");
+                        QStringLiteral("faure@kde.org"));
     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"),
-                        "ereslibre@kde.org");
+                        QStringLiteral("ereslibre@kde.org"));
     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"),
-                        "freyther@gmx.net");
+                        QStringLiteral("freyther@gmx.net"));
     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"),
-                        "tuxedup@users.sourceforge.net");
+                        QStringLiteral("tuxedup@users.sourceforge.net"));
 
     KAboutData::setApplicationData(aboutData);
 
@@ -94,49 +100,48 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     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.")));
-    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);
 
-    if (parser.isSet("daemon")) {
+    if (parser.isSet(QStringLiteral("daemon"))) {
         return app.exec();
     }
 
-    DolphinMainWindow* m_mainWindow = new DolphinMainWindow();
-    m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);
-
     const QStringList args = parser.positionalArguments();
     QList<QUrl> urls = Dolphin::validateUris(args);
 
     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());
     }
 
-    if (parser.isSet("select")) {
-        m_mainWindow->openFiles(urls, splitView);
+    DolphinMainWindow* mainWindow = new DolphinMainWindow();
+    mainWindow->setAttribute(Qt::WA_DeleteOnClose);
+
+    if (parser.isSet(QStringLiteral("select"))) {
+        mainWindow->openFiles(urls, splitView);
     } else {
-        m_mainWindow->openDirectories(urls, splitView);
+        mainWindow->openDirectories(urls, splitView);
     }
 
-    m_mainWindow->show();
+    mainWindow->show();
 
     if (app.isSessionRestored()) {
         const QString className = KXmlGuiWindow::classNameOfToplevel(1);
         if (className == QLatin1String("DolphinMainWindow")) {
-            m_mainWindow->restore(1);
+            mainWindow->restore(1);
         } else {
            qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
         }