Do not warn the user about closing Dolphin windows with multiple tabs

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index e0e1c594044e3055679a16aa27e5f369678b329e..988019de1bf9d7e16b01b9519d82e28ef5f833ec 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -28,7 +28,7 @@
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
-    m_lastId(0)
+    m_lastId(0), m_closedBySessionManager(false)
 {
     new ApplicationAdaptor(this);
     QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
@@ -69,23 +69,46 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
-
 int DolphinApplication::newInstance()
 {
-    int exitValue = KUniqueApplication::newInstance();
-
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    if (args->count() > 0) {
+    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));
         }
-    } else {
-        openWindow(KUrl());
     }
 
+    first = false;
     args->clear();
+    return 0;
+}
+
+bool DolphinApplication::closedBySessionManager() const
+{
+    return m_closedBySessionManager;
+}
 
-    return exitValue;
+void DolphinApplication::commitData(QSessionManager& sessionManager) {
+    m_closedBySessionManager = true;
+    KUniqueApplication::commitData(sessionManager);
+    m_closedBySessionManager = false;
 }
 
 int DolphinApplication::openWindow(const KUrl& url)
@@ -98,4 +121,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"