X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/abf17941f7a052d25788d2f2f3c84e5aae935e29..6d9f5b21315bf7c9f6b08e32a89346e22c482714:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index 9de7b609a..14529005f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,7 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006 by Peter Penz * * Copyright (C) 2006 by Stefan Monov * + * Copyright (C) 2015 by Mathieu Tarral * * * * 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,142 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "dolphinapplication.h" #include "dolphinmainwindow.h" -#include -#include -#include -#include -#include -#include - -static KCmdLineOptions options[] = -{ - { "+[Url]", I18N_NOOP( "Document to open" ), 0 }, - KCmdLineLastOption -}; +#include "dolphin_generalsettings.h" + +#include +#include +#include +#include +#include +#include +#include +#include -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); + Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin")); + migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc")); + migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc")); + migrate.migrate(); - static QDBusInterface dbusIface("org.kde.dolphin", "/dolphin/Application", "", - QDBusConnection::connectToBus(QDBusConnection::SessionBus, "session_bus")); - QDBusReply reply = dbusIface.call("openWindow", url); -} + app.setWindowIcon(QIcon::fromTheme("system-file-manager")); -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(); + KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60", + 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"); + aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"), + i18nc("@info:credit", "Maintainer (since 2014) and developer"), + "emmanuelpescosta099@gmail.com"); + aboutData.addAuthor(i18nc("@info:credit", "Frank Reininghaus"), + i18nc("@info:credit", "Maintainer (2012-2014) and developer"), + "frank78ac@googlemail.com"); + aboutData.addAuthor(i18nc("@info:credit", "Peter Penz"), + i18nc("@info:credit", "Maintainer and developer (2006-2012)"), + "peter.penz19@gmail.com"); + aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"), + i18nc("@info:credit", "Developer"), + "trueg@kde.org"); + aboutData.addAuthor(i18nc("@info:credit", "David Faure"), + i18nc("@info:credit", "Developer"), + "faure@kde.org"); + aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"), + i18nc("@info:credit", "Developer"), + "aseigo@kde.org"); + aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"), + i18nc("@info:credit", "Developer"), + "ereslibre@kde.org"); + aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"), + i18nc("@info:credit", "Developer"), + "ervin@kde.org"); + aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"), + i18nc("@info:credit", "Developer"), + "freyther@gmx.net"); + aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"), + i18nc("@info:credit", "Developer"), + "m43ksrocks@gmail.com"); + aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"), + i18nc("@info:credit", "Documentation"), + "tuxedup@users.sourceforge.net"); + + KAboutData::setApplicationData(aboutData); + + KDBusService dolphinDBusService; + + QCommandLineParser parser; + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + + // command line options + parser.addOption(QCommandLineOption(QStringList() << QLatin1String("select"), i18nc("@info:shell", "The files and directories passed as arguments " + "will be selected."))); + parser.addOption(QCommandLineOption(QStringList() << QLatin1String("split"), i18nc("@info:shell", "Dolphin will get started with a split view."))); + parser.addPositionalArgument(QLatin1String("+[Url]"), i18nc("@info:shell", "Document to open")); + + parser.process(app); + aboutData.processCommandLine(&parser); + + + DolphinMainWindow* m_mainWindow = new DolphinMainWindow(); + m_mainWindow->setAttribute(Qt::WA_DeleteOnClose); + + QList urls; + const QStringList args = parser.positionalArguments(); + foreach (const QString& str, args) { + const QUrl url = QUrl::fromUserInput(str, QString(), QUrl::AssumeLocalFile); + if (url.isValid()) { + urls.append(url); + } else { + qWarning() << "Invalid URL: " << str; + } } + bool resetSplitSettings = false; + if (parser.isSet("split") && !GeneralSettings::splitView()) { + // Dolphin should be opened with a split view although this is not + // set in the GeneralSettings. Temporary adjust the setting until + // all passed URLs have been opened. + GeneralSettings::setSplitView(true); + resetSplitSettings = true; -#warning TODO, SessionManagement -#if 0 - if (false /* KDE4-TODO: app.isSessionRestored() */) { - int n = 1; - while (KMainWindow::canBeRestored(n)){ - Dolphin::mainWin().restore(n); - ++n; + // We need 2 URLs to open Dolphin in split view mode + if (urls.isEmpty()) { // No URL given - Open home URL in all two views + urls.append(GeneralSettings::homeUrl()); + urls.append(GeneralSettings::homeUrl()); + } else if (urls.length() == 1) { // Only 1 URL given - Open given URL in all two views + urls.append(urls.at(0)); } - } else { -#endif + } - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); - if (args->count() > 0) { - for (int i = 0; i < args->count(); ++i) { - openWindow(app, args->arg(i)); + if (!urls.isEmpty()) { + if (parser.isSet("select")) { + m_mainWindow->openFiles(urls); + } else { + m_mainWindow->openDirectories(urls); } + } else { + const QUrl homeUrl(QUrl::fromLocalFile(GeneralSettings::homeUrl())); + m_mainWindow->openNewActivatedTab(homeUrl); } - else { - openWindow(app); + + if (resetSplitSettings) { + GeneralSettings::setSplitView(false); } - args->clear(); - if (app != 0) { - return app->exec(); + + m_mainWindow->show(); + + if (app.isSessionRestored()) { + const QString className = KXmlGuiWindow::classNameOfToplevel(1); + if (className == QLatin1String("DolphinMainWindow")) { + m_mainWindow->restore(1); + } else { + kWarning() << "Unknown class " << className << " in session saved data!"; + } } + + return app.exec(); // krazy:exclude=crash; }