Open Dolphin in the split-view when started with 2 URLs from the command line. Thanks...

CCMAIL: david@davidedmundson.co.uk

svn path=/trunk/KDE/kdebase/apps/; revision=789204

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 4bec274927af57c39cb17adadc3ea2ae7745754a..c5c1969e55961d9ae04a92c543f926ec707c9245 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -76,17 +76,30 @@ int DolphinApplication::newInstance()
     KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     static bool first = true;
-    if (args->count() > 0) {
+
+    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));
         }
-    } else if( !first || !isSessionRestored()) {
-        openWindow(KUrl());
     }
-    first = false;
 
+    first = false;
     args->clear();
-
     return 0;
 }
 
@@ -100,4 +113,19 @@ int DolphinApplication::openWindow(const KUrl& url)
     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"

diff --git a/src/dolphinapplication.h b/src/dolphinapplication.h
index 8b19e6ef2487fe1df7957840b86817fb90783117..af2006e7dc4a59c52874b0f2a3a0e4d2fb8922ed 100644 (file)
--- a/src/dolphinapplication.h
+++ b/src/dolphinapplication.h
@@ -58,6 +58,7 @@ public:
 
 public slots:
     int openWindow(const KUrl& url);
+    int openSplitWindow(const KUrl& leftUrl,const KUrl& rightUrl);
 
 protected:
     /** Called by the DolphinMainWindow to deregister. */