Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 439a6fd2181d03dc6e8f26335ed85b503ab9f6e1..cad0056304588a5bf9db5f4ae2906e6e990acc49 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -21,8 +21,15 @@
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 
-DolphinApplication::DolphinApplication()
+#include <applicationadaptor.h>
+#include <kurl.h>
+#include <QDBusConnection>
+
+DolphinApplication::DolphinApplication() :
+    m_lastId(0)
 {
+    new ApplicationAdaptor(this);
+    QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
 }
 
 DolphinApplication::~DolphinApplication()
@@ -40,13 +47,24 @@ DolphinApplication* DolphinApplication::app()
 
 DolphinMainWindow* DolphinApplication::createMainWindow()
 {
-    DolphinMainWindow* mainWindow = new DolphinMainWindow();
+    DolphinMainWindow* mainWindow = new DolphinMainWindow(m_lastId);
+    ++m_lastId;
     mainWindow->init();
 
     m_mainWindows.append(mainWindow);
     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);