Merge branch 'Applications/16.04'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 9de7b609a4accd9c560eec9c0de94c6835283c81..8987d351f058d5b02a67c982ca51c937edc89ecf 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *

+ *   Copyright (C) 2015 by Mathieu Tarral <mathieu.tarral@gmail.com>       *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -18,83 +19,133 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include "dolphinapplication.h"
+#include "dolphin_version.h"

 #include "dolphinmainwindow.h"
 #include "dolphinmainwindow.h"

-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <krun.h>
-#include <QDBusInterface>
-#include <QDBusReply>
-
-static KCmdLineOptions options[] =
-{
-    { "+[Url]", I18N_NOOP( "Document to open" ), 0 },
-    KCmdLineLastOption
-};
+#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 <Kdelibs4ConfigMigrator>

 
 

-void openWindow(DolphinApplication* app, const QString& url = QString())
+extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)

 {
 {

-    if (app != 0) {
-        app->openWindow(url);
-        return;
+    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();
+
+    KLocalizedString::setApplicationDomain("dolphin");
+
+    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"));
+    aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
+                        i18nc("@info:credit", "Maintainer (since 2014) and developer"),
+                        QStringLiteral("emmanuelpescosta099@gmail.com"));
+    aboutData.addAuthor(i18nc("@info:credit", "Frank Reininghaus"),
+                        i18nc("@info:credit", "Maintainer (2012-2014) and developer"),
+                        QStringLiteral("frank78ac@googlemail.com"));
+    aboutData.addAuthor(i18nc("@info:credit", "Peter Penz"),
+                        i18nc("@info:credit", "Maintainer and developer (2006-2012)"),
+                        QStringLiteral("peter.penz19@gmail.com"));
+    aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("trueg@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "David Faure"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("faure@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("aseigo@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("ereslibre@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("ervin@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("freyther@gmx.net"));
+    aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"),
+                        i18nc("@info:credit", "Developer"),
+                        QStringLiteral("m43ksrocks@gmail.com"));
+    aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"),
+                        i18nc("@info:credit", "Documentation"),
+                        QStringLiteral("tuxedup@users.sourceforge.net"));
+
+    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 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("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(QStringLiteral("daemon"))) {
+        return app.exec();

     }
 
     }
 

-    static QDBusInterface dbusIface("org.kde.dolphin", "/dolphin/Application", "",
-                                    QDBusConnection::connectToBus(QDBusConnection::SessionBus, "session_bus"));
-    QDBusReply<int> reply = dbusIface.call("openWindow", url);
-}
+    const QStringList args = parser.positionalArguments();
+    QList<QUrl> urls = Dolphin::validateUris(args);

 
 

-int main(int argc, char **argv)
-{
-    KAboutData about("dolphin",
-                     I18N_NOOP("Dolphin"),
-                     "0.8.0",
-                     I18N_NOOP("File Manager"),
-                     KAboutData::License_GPL,
-                     "(C) 2006 Peter Penz");
-    about.setHomepage("http://enzosworld.gmxhome.de");
-    about.setBugAddress("peter.penz@gmx.at");
-    about.addAuthor("Peter Penz", I18N_NOOP("Maintainer and developer"), "peter.penz@gmx.at");
-    about.addAuthor("Cvetoslav Ludmiloff", I18N_NOOP("Developer"), "ludmiloff@gmail.com");
-    about.addAuthor("Stefan Monov", I18N_NOOP("Developer"), "logixoul@gmail.com");
-    about.addAuthor("Michael Austin", I18N_NOOP("Documentation"), "tuxedup@users.sourceforge.net");
-    about.addAuthor("Orville Bennett", I18N_NOOP("Documentation"), "obennett@hartford.edu");
-    about.addCredit("Aaron J. Seigo", I18N_NOOP("... for the great support and the amazing patches"));
-    about.addCredit("Patrice Tremblay and Gregor Kalisnik", I18N_NOOP("... for their patches"));
-    about.addCredit("Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano",
-                    I18N_NOOP("... for their translations"));
-
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
-    DolphinApplication *app = 0;
-    if (DolphinApplication::start()) {
-        app = new DolphinApplication();
+    if (urls.isEmpty()) {
+        // 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());
+    }

 
 

-#warning TODO, SessionManagement
-#if 0
-    if (false /* KDE4-TODO: app.isSessionRestored() */) {
-        int n = 1;
-        while (KMainWindow::canBeRestored(n)){
-            Dolphin::mainWin().restore(n);
-            ++n;
-        }
+    DolphinMainWindow* mainWindow = new DolphinMainWindow();
+    mainWindow->setAttribute(Qt::WA_DeleteOnClose);
+
+    if (parser.isSet(QStringLiteral("select"))) {
+        mainWindow->openFiles(urls, splitView);

     } else {
     } else {

-#endif
+        mainWindow->openDirectories(urls, splitView);
+    }
+
+    mainWindow->show();

 
 

-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    if (args->count() > 0) {
-        for (int i = 0; i < args->count(); ++i) {
-            openWindow(app, args->arg(i));
+    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!";

         }
     }
         }
     }

-    else {
-        openWindow(app);
-    }
-    args->clear();
-    if (app != 0) {
-        return app->exec();
-    }
+
+    return app.exec(); // krazy:exclude=crash;

 }
 }