Simplify startup split view handling

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 14529005fe4bdf142114cc779fb160ec32f4c351..cbfc6b72fd6252c5bab939a0c2344b42a726e864 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,8 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphin_generalsettings.h"
+#include "dbusinterface.h"
+#include "global.h"
 
 #include <KDBusService>
 #include <KAboutData>
@@ -28,12 +30,13 @@
 #include <QCommandLineOption>
 #include <QApplication>
 #include <KLocalizedString>
-#include <KDebug>
+#include "dolphindebug.h"
 #include <kdelibs4configmigrator.h>
 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
+    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
@@ -41,7 +44,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
-    KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60",
+    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
@@ -83,6 +86,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     KAboutData::setApplicationData(aboutData);
 
     KDBusService dolphinDBusService;
+    DBusInterface interface;
 
     QCommandLineParser parser;
     parser.addVersionOption();
@@ -93,56 +97,38 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     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.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.process(app);
     aboutData.processCommandLine(&parser);
 
+    if (parser.isSet("daemon")) {
+        return app.exec();
+    }
 
     DolphinMainWindow* m_mainWindow = new DolphinMainWindow();
     m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);
 
-    QList<QUrl> 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;
-        }
-    }
+    QList<QUrl> urls = Dolphin::validateUris(args);
 
-    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;
-
-        // 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));
-        }
+    if (urls.isEmpty()) {
+        // We need at least one URL to open Dolphin
+        const QUrl homeUrl(QUrl::fromLocalFile(GeneralSettings::homeUrl()));
+        urls.append(homeUrl);
     }
 
-    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);
+    const bool splitView = parser.isSet("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 (resetSplitSettings) {
-        GeneralSettings::setSplitView(false);
+    if (parser.isSet("select")) {
+        m_mainWindow->openFiles(urls, splitView);
+    } else {
+        m_mainWindow->openDirectories(urls, splitView);
     }
 
     m_mainWindow->show();
@@ -152,7 +138,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         if (className == QLatin1String("DolphinMainWindow")) {
             m_mainWindow->restore(1);
         } else {
-            kWarning() << "Unknown class " << className << " in session saved data!";
+           qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
         }
     }