Change default Dolphin toolbar layout

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 922b71766fd4751e7ca287e9f1de2bed1b984017..10adfc638b05cd4d91ba1816d587bbccb0c4108f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,10 @@
 
 #include <QApplication>
 #include <QCommandLineParser>
 
 #include <QApplication>
 #include <QCommandLineParser>

+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusAbstractInterface>
+#include <QDBusConnectionInterface>

 
 #ifndef Q_OS_WIN
 #include <unistd.h>
 
 #ifndef Q_OS_WIN
 #include <unistd.h>


@@ -71,8 +75,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
     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"));
+                         i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
+    aboutData.setHomepage(QStringLiteral("https://dolphin.kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
                         i18nc("@info:credit", "Maintainer (since 2018) and developer"),
                         QStringLiteral("elvis.angelaccio@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
                         i18nc("@info:credit", "Maintainer (since 2018) and developer"),
                         QStringLiteral("elvis.angelaccio@kde.org"));


@@ -122,33 +126,42 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     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("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("new-window"), i18nc("@info:shell", "Dolphin will explicitly open in a new window.")));

     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);
 
     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();
-    }
-
+    const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView();
+    const bool openFiles = parser.isSet(QStringLiteral("select"));

     const QStringList args = parser.positionalArguments();
     QList<QUrl> urls = Dolphin::validateUris(args);
 
     const QStringList args = parser.positionalArguments();
     QList<QUrl> urls = Dolphin::validateUris(args);
 

-    if (urls.isEmpty()) {
-        // We need at least one URL to open Dolphin
-        urls.append(Dolphin::homeUrl());
+    if (parser.isSet(QStringLiteral("daemon"))) {
+        return app.exec();

     }
 
     }
 

-    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 (splitView && urls.size() < 2) {
         // Split view does only make sense if we have at least 2 URLs
         urls.append(urls.last());
     }
 

+    if (!parser.isSet(QStringLiteral("new-window"))) {
+        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
+            // Successfully attached to existing instance of Dolphin
+            return 0;
+        }
+    }
+
+    if (urls.isEmpty()) {
+        // We need at least one URL to open Dolphin
+        urls.append(Dolphin::homeUrl());
+    }
+    

     DolphinMainWindow* mainWindow = new DolphinMainWindow();
 
     DolphinMainWindow* mainWindow = new DolphinMainWindow();
 

-    if (parser.isSet(QStringLiteral("select"))) {
+    if (openFiles) {

         mainWindow->openFiles(urls, splitView);
     } else {
         mainWindow->openDirectories(urls, splitView);
         mainWindow->openFiles(urls, splitView);
     } else {
         mainWindow->openDirectories(urls, splitView);