X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/abf17941f7a052d25788d2f2f3c84e5aae935e29..07f083241be254d081b05170d16612c51cfc5ccc:/src/dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index cad005630..8b6139d92 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,10 +20,12 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
 #include <applicationadaptor.h>
+#include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)
@@ -55,16 +57,6 @@ DolphinMainWindow* DolphinApplication::createMainWindow()
     return mainWindow;
 }
 
-int DolphinApplication::openWindow(const QString& url)
-{
-    DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !url.isEmpty()) {
-        win->activeView()->setUrl(KUrl(url));
-    }
-    win->show();
-    return win->getId();
-}
-
 void DolphinApplication::removeMainWindow(DolphinMainWindow* mainWindow)
 {
     m_mainWindows.removeAll(mainWindow);
@@ -77,4 +69,43 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
+int DolphinApplication::newInstance()
+{
+    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    static bool first = true;
+
+    const int argsCount = args->count();
+    if ((argsCount > 0) || !first || !isSessionRestored()) {
+        QList<KUrl> urls;
+        for (int i = 0; i < argsCount; ++i) {
+            urls.append(args->url(i));
+        }
+
+        DolphinMainWindow* win = createMainWindow();
+        if (urls.count() > 0) {
+            if (args->isSet("select")) {
+                win->openFiles(urls);
+            } else {
+                win->openDirectories(urls);
+            }
+        }
+        win->show();
+    }
+
+    first = false;
+    args->clear();
+    return 0;
+}
+
+int DolphinApplication::openWindow(const QString& urlString)
+{
+    DolphinMainWindow* win = createMainWindow();
+    const KUrl url(urlString);
+    if (!url.isEmpty()) {
+        win->openDirectories(QList<KUrl>() << url);
+    }
+    win->show();
+    return win->getId();
+}
+
 #include "dolphinapplication.moc"