The apply button in the settings dialog now disables itself when settings are applied...

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 4bec274927af57c39cb17adadc3ea2ae7745754a..d9dc0728ef2feb893cd22b97b9e89dee4702cd5d 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -70,23 +70,35 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
-
 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 +112,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"