Merge branch 'Applications/15.08'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 105330059021c96172e85febcbe41985ba05608a..b4ca2c6af74273a22d555e6bd02cc75d17387348 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,10 +19,12 @@
  *   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>
@@ -30,21 +32,20 @@
 #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("system-file-manager"));
+
     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"));
-
-    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
+    KAboutData aboutData("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"));
@@ -107,50 +108,36 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         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);
 
-    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);
+    DolphinMainWindow* mainWindow = new DolphinMainWindow();
+    mainWindow->setAttribute(Qt::WA_DeleteOnClose);
+
+    if (parser.isSet("select")) {
+        mainWindow->openFiles(urls, splitView);
+    } else {
+        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!";
         }