assure that the size hint calculation and the painting code are consistent

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 59e870adb4691680e48db16b9048a21106704690..f61bf795a1a5ebcde2609f3bb62478072ac0b43c 100644 (file)
--- 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,17 +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();
-    //TODO find how to raise a window (as if we've launched a new dolphin process)
-    return win->getId();
-}
-
 void DolphinApplication::removeMainWindow(DolphinMainWindow* mainWindow)
 {
     m_mainWindows.removeAll(mainWindow);
@@ -78,4 +69,60 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
+int DolphinApplication::newInstance()
+{
+    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    static bool first = true;
+
+    switch (args->count()) {
+    case 0:
+        if( !first || !isSessionRestored()) {
+            openWindow(KUrl());
+        }
+        break;
+
+    case 1:
+        openWindow(args->url(0));
+        break;
+
+    case 2:
+        openSplitWindow(args->url(0),args->url(1));
+        break;
+
+    default:
+        for (int i = 0; i < args->count(); ++i) {
+            openWindow(args->url(i));
+        }
+    }
+
+    first = false;
+    args->clear();
+    return 0;
+}
+
+int DolphinApplication::openWindow(const KUrl& url)
+{
+    DolphinMainWindow* win = createMainWindow();
+    if ((win->activeViewContainer() != 0) && url.isValid()) {
+        win->activeViewContainer()->setUrl(url);
+    }
+    win->show();
+    return win->getId();
+}
+
+int DolphinApplication::openSplitWindow(const KUrl& leftUrl, const KUrl& rightUrl)
+{
+    DolphinMainWindow* win = createMainWindow();
+    if ((win->activeViewContainer() != 0) && leftUrl.isValid()) {
+        win->activeViewContainer()->setUrl(leftUrl);
+    }
+    win->toggleSplitView();
+    if ((win->activeViewContainer() != 0) && rightUrl.isValid()){
+      win->activeViewContainer()->setUrl(rightUrl);
+    }
+    win->show();
+    return win->getId();
+}
+
+
 #include "dolphinapplication.moc"