Increase version number to 1.5

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 439a6fd2181d03dc6e8f26335ed85b503ab9f6e1..8b6139d925257bbe3ab9118acb4d4119baec7d7b 100644 (file)
--- 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,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"