there's no need having 2-liners inside their own method when this method is only...

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index b35e583147e613a4687f4762daadff28bc2d0ab4..ea18db1323b31ab2e8899eeb9c6fb7d2ac96bc97 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,18 +20,27 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
-DolphinApplication::DolphinApplication()
+#include <applicationadaptor.h>
+#include <kcmdlineargs.h>
+#include <kurl.h>
+#include <QtDBus/QDBusConnection>
+#include <QtCore/QDir>
+
+DolphinApplication::DolphinApplication() :
+    m_lastId(0)
 {
+    new ApplicationAdaptor(this);
+    QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
 }
 
-/*
- * cleanup what ever is left from the MainWindows
- */
 DolphinApplication::~DolphinApplication()
 {
-    while( m_mainWindows.count() != 0 )
+    // cleanup what ever is left from the MainWindows
+    while (m_mainWindows.count() != 0) {
         delete m_mainWindows.takeFirst();
+    }
 }
 
 DolphinApplication* DolphinApplication::app()
@@ -41,24 +50,54 @@ DolphinApplication* DolphinApplication::app()
 
 DolphinMainWindow* DolphinApplication::createMainWindow()
 {
-    DolphinMainWindow* mainwindow = new DolphinMainWindow;
-    mainwindow->init();
-    
-    m_mainWindows.append( mainwindow );
-    return mainwindow;
+    DolphinMainWindow* mainWindow = new DolphinMainWindow(m_lastId);
+    ++m_lastId;
+    mainWindow->init();
+
+    m_mainWindows.append(mainWindow);
+    return mainWindow;
 }
 
-void DolphinApplication::removeMainWindow( DolphinMainWindow *mainwindow )
+void DolphinApplication::removeMainWindow(DolphinMainWindow* mainWindow)
 {
-    m_mainWindows.removeAll( mainwindow );
+    m_mainWindows.removeAll(mainWindow);
 }
 
 void DolphinApplication::refreshMainWindows()
 {
-    for( int i = 0; i < m_mainWindows.count(); ++i ) {
+    for (int i = 0; i < m_mainWindows.count(); ++i) {
         m_mainWindows[i]->refreshViews();
     }
 }
 
-#include "dolphinapplication.moc"
 
+int DolphinApplication::newInstance()
+{
+    int exitValue = KUniqueApplication::newInstance();
+
+    KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
+    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"