X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fcf8436737384a1b4483ff927faf041ba01213ea..6f5f07d391043175d955d62bd09c77af14164faf:/src/dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 439a6fd21..e0e1c5940 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,9 +20,18 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
-DolphinApplication::DolphinApplication()
+#include <applicationadaptor.h>
+#include <kcmdlineargs.h>
+#include <kurl.h>
+#include <QtDBus/QDBusConnection>
+
+DolphinApplication::DolphinApplication() :
+    m_lastId(0)
 {
+    new ApplicationAdaptor(this);
+    QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
 }
 
 DolphinApplication::~DolphinApplication()
@@ -40,7 +49,8 @@ DolphinApplication* DolphinApplication::app()
 
 DolphinMainWindow* DolphinApplication::createMainWindow()
 {
-    DolphinMainWindow* mainWindow = new DolphinMainWindow();
+    DolphinMainWindow* mainWindow = new DolphinMainWindow(m_lastId);
+    ++m_lastId;
     mainWindow->init();
 
     m_mainWindows.append(mainWindow);
@@ -59,4 +69,33 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
+
+int DolphinApplication::newInstance()
+{
+    int exitValue = KUniqueApplication::newInstance();
+
+    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    if (args->count() > 0) {
+        for (int i = 0; i < args->count(); ++i) {
+            openWindow(args->url(i));
+        }
+    } else {
+        openWindow(KUrl());
+    }
+
+    args->clear();
+
+    return exitValue;
+}
+
+int DolphinApplication::openWindow(const KUrl& url)
+{
+    DolphinMainWindow* win = createMainWindow();
+    if ((win->activeViewContainer() != 0) && url.isValid()) {
+        win->activeViewContainer()->setUrl(url);
+    }
+    win->show();
+    return win->getId();
+}
+
 #include "dolphinapplication.moc"