Always clear DolphinView's m_currentItemUrl member in updateViewState()

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 4bec274927af57c39cb17adadc3ea2ae7745754a..a4b105b90f31dfbb2be0c9243be710e65f9f889c 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006-2011 by Peter Penz <peter.penz19@gmail.com>        *

  *   Copyright (C) 2006 by Holger 'zecke' Freyther <freyther@kde.org>      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   Copyright (C) 2006 by Holger 'zecke' Freyther <freyther@kde.org>      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,84 +20,87 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"

-#include "dolphinviewcontainer.h"
+#include "dolphin_generalsettings.h"

 
 

-#include <applicationadaptor.h>
-#include <kcmdlineargs.h>
-#include <kurl.h>
-#include <QtDBus/QDBusConnection>
-#include <QtCore/QDir>
+#include <KCmdLineArgs>
+#include <KDebug>
+#include <KRun>
+#include <KUrl>

 
 DolphinApplication::DolphinApplication() :
 
 DolphinApplication::DolphinApplication() :

-    m_lastId(0)
+    m_mainWindow(0)

 {
 {

-    new ApplicationAdaptor(this);
-    QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
-}
+    KGlobal::locale()->insertCatalog("libkonq"); // Needed for applications using libkonq

 
 

-DolphinApplication::~DolphinApplication()
-{
-    // cleanup what ever is left from the MainWindows
-    while (m_mainWindows.count() != 0) {
-        delete m_mainWindows.takeFirst();
-    }
-}
+    m_mainWindow = new DolphinMainWindow();
+    m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);

 
 

-DolphinApplication* DolphinApplication::app()
-{
-    return qobject_cast<DolphinApplication*>(qApp);
-}
+    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();

 
 

-DolphinMainWindow* DolphinApplication::createMainWindow()
-{
-    DolphinMainWindow* mainWindow = new DolphinMainWindow(m_lastId);
-    ++m_lastId;
-    mainWindow->init();
+    const int argsCount = args->count();

 
 

-    m_mainWindows.append(mainWindow);
-    return mainWindow;
-}
+    QList<KUrl> urls;
+    for (int i = 0; i < argsCount; ++i) {
+        const KUrl url = args->url(i);
+        if (url.isValid()) {
+            urls.append(url);
+        }
+    }

 
 

-void DolphinApplication::removeMainWindow(DolphinMainWindow* mainWindow)
-{
-    m_mainWindows.removeAll(mainWindow);
-}
+    bool resetSplitSettings = false;
+    if (args->isSet("split") && !GeneralSettings::splitView()) {
+        // Dolphin should be opened with a split view although this is not
+        // set in the GeneralSettings. Temporary adjust the setting until
+        // all passed URLs have been opened.
+        GeneralSettings::setSplitView(true);
+        resetSplitSettings = true;

 
 

-void DolphinApplication::refreshMainWindows()
-{
-    for (int i = 0; i < m_mainWindows.count(); ++i) {
-        m_mainWindows[i]->refreshViews();
+        // We need 2 URLs to open Dolphin in split view mode
+        if (urls.isEmpty()) { // No URL given - Open home URL in all two views
+            urls.append(GeneralSettings::homeUrl());
+            urls.append(GeneralSettings::homeUrl());
+        } else if (urls.length() == 1) { // Only 1 URL given - Open given URL in all two views
+            urls.append(urls.at(0));
+        }

     }
     }

-}

 
 

-
-int DolphinApplication::newInstance()
-{
-    KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    static bool first = true;
-    if (args->count() > 0) {
-        for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->url(i));
+    if (!urls.isEmpty()) {
+        if (args->isSet("select")) {
+            m_mainWindow->openFiles(urls);
+        } else {
+            m_mainWindow->openDirectories(urls);

         }
         }

-    } else if( !first || !isSessionRestored()) {
-        openWindow(KUrl());
+    } else {
+        const KUrl homeUrl(GeneralSettings::homeUrl());
+        m_mainWindow->openNewActivatedTab(homeUrl);
+    }
+
+    if (resetSplitSettings) {
+        GeneralSettings::setSplitView(false);

     }
     }

-    first = false;

 
     args->clear();
 
 
     args->clear();
 

-    return 0;
+    m_mainWindow->show();
+}
+
+DolphinApplication::~DolphinApplication()
+{
+}
+
+DolphinApplication* DolphinApplication::app()
+{
+    return qobject_cast<DolphinApplication*>(qApp);

 }
 
 }
 

-int DolphinApplication::openWindow(const KUrl& url)
+void DolphinApplication::restoreSession()

 {
 {

-    DolphinMainWindow* win = createMainWindow();
-    if ((win->activeViewContainer() != 0) && url.isValid()) {
-        win->activeViewContainer()->setUrl(url);
+    const QString className = KXmlGuiWindow::classNameOfToplevel(1);
+    if (className == QLatin1String("DolphinMainWindow")) {
+        m_mainWindow->restore(1);
+    } else {
+        kWarning() << "Unknown class " << className << " in session saved data!";

     }
     }

-    win->show();
-    return win->getId();

 }
 
 #include "dolphinapplication.moc"
 }
 
 #include "dolphinapplication.moc"