Use KFileItem::text() instead of KFileItem::name().

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 77a2f3f36e89c9e5fbd601eb8535f5594a14bd89..c8d495db192499f968ab92d5d81e6df3116709ed 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

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

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -30,13 +30,11 @@
 #include <KDesktopFile>
 #include <KFileItemDelegate>
 #include <KFilePlacesModel>
 #include <KDesktopFile>
 #include <KFileItemDelegate>
 #include <KFilePlacesModel>

-#include <KGlobalSettings>

 #include <KLocale>
 #include <KIconEffect>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KLocale>
 #include <KIconEffect>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>

-#include <KMenu>
-#include <knewmenu.h>
+#include <KNewFileMenu>

 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>


@@ -49,14 +47,8 @@
 #include "dolphinmainwindow.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "dolphinmainwindow.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"

-#include "settings/dolphinsettings.h"

 #include "statusbar/dolphinstatusbar.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "views/dolphincolumnview.h"
-#include "views/dolphindetailsview.h"
-#include "views/draganddrophelper.h"
-#include "views/dolphiniconsview.h"
-#include "views/dolphinmodel.h"
-#include "views/dolphinviewcontroller.h"
+#include "views/dolphinplacesmodel.h"

 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 


@@ -77,15 +69,15 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

-    m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
-    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)),
-            this, SLOT(dropUrls(const KUrl&, QDropEvent*)));
+    m_urlNavigator = new KUrlNavigator(DolphinPlacesModel::instance(), url, this);
+    connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)),
+            this, SLOT(dropUrls(KUrl,QDropEvent*)));

     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(activate()));
     connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
             this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion)));
 
     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(activate()));
     connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
             this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion)));
 

-    const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    const GeneralSettings* settings = GeneralSettings::self();

     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());
     m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl()));
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());
     m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl()));


@@ -99,27 +91,28 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
 
     m_view = new DolphinView(url, this);
     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
 
     m_view = new DolphinView(url, this);

-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),      m_urlNavigator, SLOT(setUrl(const KUrl&)));
+    connect(m_view, SIGNAL(urlChanged(KUrl)),             m_urlNavigator, SLOT(setUrl(KUrl)));

     connect(m_view, SIGNAL(writeStateChanged(bool)),      this, SIGNAL(writeStateChanged(bool)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),   this, SLOT(showItemInfo(KFileItem)));
     connect(m_view, SIGNAL(writeStateChanged(bool)),      this, SIGNAL(writeStateChanged(bool)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),   this, SLOT(showItemInfo(KFileItem)));

-    connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&)));
-    connect(m_view, SIGNAL(infoMessage(const QString&)),  this, SLOT(showInfoMessage(const QString&)));
-    connect(m_view, SIGNAL(itemTriggered(KFileItem)),     this, SLOT(slotItemTriggered(KFileItem)));
-    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),      this, SLOT(redirect(KUrl, KUrl)));
+    connect(m_view, SIGNAL(errorMessage(QString)),        this, SLOT(showErrorMessage(QString)));
+    connect(m_view, SIGNAL(infoMessage(QString)),         this, SLOT(showInfoMessage(QString)));
+    connect(m_view, SIGNAL(itemActivated(KFileItem)),     this, SLOT(slotItemActivated(KFileItem)));
+    connect(m_view, SIGNAL(redirection(KUrl,KUrl)),       this, SLOT(redirect(KUrl,KUrl)));

     connect(m_view, SIGNAL(startedPathLoading(KUrl)),     this, SLOT(slotStartedPathLoading()));
     connect(m_view, SIGNAL(finishedPathLoading(KUrl)),    this, SLOT(slotFinishedPathLoading()));
     connect(m_view, SIGNAL(itemCountChanged()),           this, SLOT(delayedStatusBarUpdate()));
     connect(m_view, SIGNAL(pathLoadingProgress(int)),     this, SLOT(updateProgress(int)));
     connect(m_view, SIGNAL(startedPathLoading(KUrl)),     this, SLOT(slotStartedPathLoading()));
     connect(m_view, SIGNAL(finishedPathLoading(KUrl)),    this, SLOT(slotFinishedPathLoading()));
     connect(m_view, SIGNAL(itemCountChanged()),           this, SLOT(delayedStatusBarUpdate()));
     connect(m_view, SIGNAL(pathLoadingProgress(int)),     this, SLOT(updateProgress(int)));

-    connect(m_view, SIGNAL(infoMessage(const QString&)),  this, SLOT(showInfoMessage(const QString&)));
-    connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&)));
-    connect(m_view, SIGNAL(urlIsFileError(const KUrl&)),  this, SLOT(openFile(const KUrl&)));
-    connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)),    this, SLOT(delayedStatusBarUpdate()));
-    connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), this, SLOT(showOperationCompletedMessage(const QString&)));
-
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)),
-            this, SLOT(saveViewState()));
+    connect(m_view, SIGNAL(infoMessage(QString)),         this, SLOT(showInfoMessage(QString)));
+    connect(m_view, SIGNAL(errorMessage(QString)),        this, SLOT(showErrorMessage(QString)));
+    connect(m_view, SIGNAL(urlIsFileError(KUrl)),         this, SLOT(openFile(KUrl)));
+    connect(m_view, SIGNAL(selectionChanged(KFileItemList)),    this, SLOT(delayedStatusBarUpdate()));
+    connect(m_view, SIGNAL(operationCompletedMessage(QString)), this, SLOT(showOperationCompletedMessage(QString)));
+    connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)),          this, SLOT(slotViewUrlAboutToBeChanged(KUrl)));
+
+    connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)),
+            this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl)));
+    connect(m_urlNavigator, SIGNAL(urlChanged(KUrl)),
+            this, SLOT(slotUrlNavigatorLocationChanged(KUrl)));

     connect(m_urlNavigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
 
     connect(m_urlNavigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
 


@@ -140,11 +133,11 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     // initialize filter bar
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     // initialize filter bar
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());

-    connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
-            this, SLOT(setNameFilter(const QString&)));
+    connect(m_filterBar, SIGNAL(filterChanged(QString)),
+            this, SLOT(setNameFilter(QString)));

     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));

-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+    connect(m_view, SIGNAL(urlChanged(KUrl)),

             m_filterBar, SLOT(clear()));
 
     m_topLayout->addWidget(m_urlNavigator);
             m_filterBar, SLOT(clear()));
 
     m_topLayout->addWidget(m_urlNavigator);


@@ -162,7 +155,7 @@ DolphinViewContainer::~DolphinViewContainer()
 
 KUrl DolphinViewContainer::url() const
 {
 
 KUrl DolphinViewContainer::url() const
 {

-    return m_urlNavigator->locationUrl();
+    return m_view->url();

 }
 
 void DolphinViewContainer::setActive(bool active)
 }
 
 void DolphinViewContainer::setActive(bool active)


@@ -177,16 +170,55 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
     return m_view->isActive();
 }
 

+const DolphinStatusBar* DolphinViewContainer::statusBar() const
+{
+    return m_statusBar;
+}
+
+DolphinStatusBar* DolphinViewContainer::statusBar()
+{
+    return m_statusBar;
+}
+
+const KUrlNavigator* DolphinViewContainer::urlNavigator() const
+{
+    return m_urlNavigator;
+}
+
+KUrlNavigator* DolphinViewContainer::urlNavigator()
+{
+    return m_urlNavigator;
+}
+
+const DolphinView* DolphinViewContainer::view() const
+{
+    return m_view;
+}
+
+DolphinView* DolphinViewContainer::view()
+{
+    return m_view;
+}
+
+const DolphinSearchBox* DolphinViewContainer::searchBox() const
+{
+    return m_searchBox;
+}
+
+DolphinSearchBox* DolphinViewContainer::searchBox()
+{
+    return m_searchBox;
+}
+

 void DolphinViewContainer::refresh()
 {
 void DolphinViewContainer::refresh()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    if (settings->modifiedStartupSettings()) {
+    if (GeneralSettings::modifiedStartupSettings()) {

         // The startup settings should only get applied if they have been
         // modified by the user. Otherwise keep the (possibly) different current
         // settings of the URL navigator and the filterbar.
         // The startup settings should only get applied if they have been
         // modified by the user. Otherwise keep the (possibly) different current
         // settings of the URL navigator and the filterbar.

-        m_urlNavigator->setUrlEditable(settings->editableUrl());
-        m_urlNavigator->setShowFullPath(settings->showFullPath());
-        setFilterBarVisible(settings->filterBar());
+        m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
+        m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());
+        setFilterBarVisible(GeneralSettings::filterBar());

     }
 
     m_view->refresh();
     }
 
     m_view->refresh();


@@ -212,11 +244,13 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
     m_urlNavigator->setVisible(!enabled);
 
     if (enabled) {
     m_urlNavigator->setVisible(!enabled);
 
     if (enabled) {

+        KUrl url = m_urlNavigator->locationUrl();
+        m_searchBox->setText(QString());
+        m_searchBox->setReadOnly(isSearchUrl(url), url);
+

         // Remember the most recent non-search URL as search path
         // of the search-box, so that it can be restored
         // when switching back to the URL navigator.
         // Remember the most recent non-search URL as search path
         // of the search-box, so that it can be restored
         // when switching back to the URL navigator.

-        KUrl url = m_urlNavigator->locationUrl();
-

         int index = m_urlNavigator->historyIndex();
         const int historySize = m_urlNavigator->historySize();
         while (isSearchUrl(url) && (index < historySize)) {
         int index = m_urlNavigator->historyIndex();
         const int historySize = m_urlNavigator->historySize();
         while (isSearchUrl(url) && (index < historySize)) {


@@ -257,7 +291,7 @@ void DolphinViewContainer::setUrl(const KUrl& newUrl)
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
 {
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
 {

-    Q_ASSERT(m_filterBar != 0);
+    Q_ASSERT(m_filterBar);

     if (visible) {
         m_filterBar->show();
         m_filterBar->setFocus();
     if (visible) {
         m_filterBar->show();
         m_filterBar->setFocus();


@@ -286,21 +320,12 @@ void DolphinViewContainer::updateStatusBar()
 {
     m_statusBarTimestamp.start();
 
 {
     m_statusBarTimestamp.start();
 

-    // As the item count information is less important
-    // in comparison with other messages, it should only
-    // be shown if:
-    // - the status bar is empty or
-    // - shows already the item count information or
-    // - shows only a not very important information

     const QString newMessage = m_view->statusBarText();
     const QString newMessage = m_view->statusBarText();

-    const QString currentMessage = m_statusBar->message();
-    const bool updateStatusBarMsg = currentMessage.isEmpty()
-                                    || (currentMessage == m_statusBar->defaultText())
-                                    || (m_statusBar->type() == DolphinStatusBar::Information);
-

     m_statusBar->setDefaultText(newMessage);
 
     m_statusBar->setDefaultText(newMessage);
 

-    if (updateStatusBarMsg) {
+    // We don't want to override errors. Other messages are only protected by
+    // the Statusbar itself depending on timings (see DolphinStatusBar::setMessage).
+    if (m_statusBar->type() != DolphinStatusBar::Error) {

         m_statusBar->setMessage(newMessage, DolphinStatusBar::Default);
     }
 }
         m_statusBar->setMessage(newMessage, DolphinStatusBar::Default);
     }
 }


@@ -336,7 +361,7 @@ void DolphinViewContainer::slotFinishedPathLoading()
         m_statusBar->setProgress(100);
     }
 
         m_statusBar->setProgress(100);
     }
 

-    if (isSearchUrl(url()) && (m_view->items().count() == 0)) {
+    if (isSearchUrl(url()) && m_view->items().isEmpty()) {

         // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead
         // of showing the default status bar information ("0 items") a more helpful information is given:
         m_statusBar->setMessage(i18nc("@info:status", "No items found."), DolphinStatusBar::Information);
         // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead
         // of showing the default status bar information ("0 items") a more helpful information is given:
         m_statusBar->setMessage(i18nc("@info:status", "No items found."), DolphinStatusBar::Information);


@@ -345,6 +370,48 @@ void DolphinViewContainer::slotFinishedPathLoading()
     }
 }
 
     }
 }
 

+void DolphinViewContainer::slotItemActivated(const KFileItem& item)
+{
+    KUrl url = item.targetUrl();
+
+    if (item.isDir()) {
+        m_view->setUrl(url);
+        return;
+    }
+
+    if (GeneralSettings::browseThroughArchives() && item.isFile() && url.isLocalFile()) {
+        // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
+        // zip:/<path>/ when clicking on a zip file, etc.
+        // The .protocol file specifies the mimetype that the kioslave handles.
+        // Note that we don't use mimetype inheritance since we don't want to
+        // open OpenDocument files as zip folders...
+        const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype());
+        if (!protocol.isEmpty()) {
+            url.setProtocol(protocol);
+            m_view->setUrl(url);
+            return;
+        }
+    }
+
+    if (item.mimetype() == QLatin1String("application/x-desktop")) {
+        // Redirect to the URL in Type=Link desktop files
+        KDesktopFile desktopFile(url.toLocalFile());
+        if (desktopFile.hasLinkType()) {
+            url = desktopFile.readUrl();
+            m_view->setUrl(url);
+            return;
+        }
+    }
+
+    item.run();
+}
+
+void DolphinViewContainer::openFile(const KUrl& url)
+{
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+    slotItemActivated(item);
+}
+

 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {


@@ -356,7 +423,13 @@ void DolphinViewContainer::showItemInfo(const KFileItem& item)
             m_statusBar->clear();
         }
     } else {
             m_statusBar->clear();
         }
     } else {

-        m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
+        QString message;
+        if (item.isDir()) {
+            message = item.text();
+        } else {
+            message = i18nc("@info:status filename (type)", "%1 (%2)", item.text(), item.mimeComment());
+        }
+        m_statusBar->setMessage(message, DolphinStatusBar::Default);

     }
 }
 
     }
 }
 


@@ -394,20 +467,36 @@ void DolphinViewContainer::activate()
     setActive(true);
 }
 
     setActive(true);
 }
 

-void DolphinViewContainer::saveViewState()
+void DolphinViewContainer::slotViewUrlAboutToBeChanged(const KUrl& url)

 {
 {

-    QByteArray locationState;
-    QDataStream stream(&locationState, QIODevice::WriteOnly);
-    m_view->saveState(stream);
-    m_urlNavigator->saveLocationState(locationState);
+    // URL changes of the view can happen in two ways:
+    // 1. The URL navigator gets changed and will trigger the view to update its URL
+    // 2. The URL of the view gets changed and will trigger the URL navigator to update
+    //    its URL (e.g. by clicking on an item)
+    // In this scope the view-state may only get saved in case 2:
+    if (url != m_urlNavigator->locationUrl()) {
+        saveViewState();
+    }
+}
+
+void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url)
+{
+    // URL changes of the view can happen in two ways:
+    // 1. The URL navigator gets changed and will trigger the view to update its URL
+    // 2. The URL of the view gets changed and will trigger the URL navigator to update
+    //    its URL (e.g. by clicking on an item)
+    // In this scope the view-state may only get saved in case 1:
+    if (url != m_view->url()) {
+        saveViewState();
+    }

 }
 
 void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
 {
     if (KProtocolManager::supportsListing(url)) {
         setSearchModeEnabled(isSearchUrl(url));
 }
 
 void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
 {
     if (KProtocolManager::supportsListing(url)) {
         setSearchModeEnabled(isSearchUrl(url));

-

         m_view->setUrl(url);
         m_view->setUrl(url);

+

         if (isActive() && !isSearchUrl(url)) {
             // When an URL has been entered, the view should get the focus.
             // The focus must be requested asynchronously, as changing the URL might create
         if (isActive() && !isSearchUrl(url)) {
             // When an URL has been entered, the view should get the focus.
             // The focus must be requested asynchronously, as changing the URL might create


@@ -443,7 +532,9 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
 
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
 
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {

-    DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);
+    Q_UNUSED(destination);
+    Q_UNUSED(event);
+    //DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);

 }
 
 void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
 }
 
 void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)


@@ -469,15 +560,12 @@ void DolphinViewContainer::requestFocus()
 
 void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion)
 {
 
 void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion)
 {

-    DolphinSettings& settings = DolphinSettings::instance();
-    settings.generalSettings()->setUrlCompletionMode(completion);
-    settings.save();
+    GeneralSettings::setUrlCompletionMode(completion);

 }
 
 void DolphinViewContainer::slotHistoryChanged()
 {
     QByteArray locationState = m_urlNavigator->locationState();
 }
 
 void DolphinViewContainer::slotHistoryChanged()
 {
     QByteArray locationState = m_urlNavigator->locationState();

-

     if (!locationState.isEmpty()) {
         QDataStream stream(&locationState, QIODevice::ReadOnly);
         m_view->restoreState(stream);
     if (!locationState.isEmpty()) {
         QDataStream stream(&locationState, QIODevice::ReadOnly);
         m_view->restoreState(stream);


@@ -501,6 +589,7 @@ void DolphinViewContainer::closeSearchBox()
 void DolphinViewContainer::stopLoading()
 {
     m_view->stopLoading();
 void DolphinViewContainer::stopLoading()
 {
     m_view->stopLoading();

+    m_statusBar->setProgress(100);

 }
 
 bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
 }
 
 bool DolphinViewContainer::isSearchUrl(const KUrl& url) const


@@ -509,48 +598,12 @@ bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
     return protocol.contains("search") || (protocol == QLatin1String("nepomuk"));
 }
 
     return protocol.contains("search") || (protocol == QLatin1String("nepomuk"));
 }
 

-void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
-{
-    KUrl url = item.targetUrl();
-
-    if (item.isDir()) {
-        m_view->setUrl(url);
-        return;
-    }
-
-    const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    const bool browseThroughArchives = settings->browseThroughArchives();
-    if (browseThroughArchives && item.isFile() && url.isLocalFile()) {
-        // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
-        // zip:/<path>/ when clicking on a zip file, etc.
-        // The .protocol file specifies the mimetype that the kioslave handles.
-        // Note that we don't use mimetype inheritance since we don't want to
-        // open OpenDocument files as zip folders...
-        const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype());
-        if (!protocol.isEmpty()) {
-            url.setProtocol(protocol);
-            m_view->setUrl(url);
-            return;
-        }
-    }
-
-    if (item.mimetype() == "application/x-desktop") {
-        // redirect to the url in Type=Link desktop files
-        KDesktopFile desktopFile(url.toLocalFile());
-        if (desktopFile.hasLinkType()) {
-            url = desktopFile.readUrl();
-            m_view->setUrl(url);
-            return;
-        }
-    }
-
-    item.run();
-}
-
-void DolphinViewContainer::openFile(const KUrl& url)
+void DolphinViewContainer::saveViewState()

 {
 {

-    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
-    slotItemTriggered(item);
+    QByteArray locationState;
+    QDataStream stream(&locationState, QIODevice::WriteOnly);
+    m_view->saveState(stream);
+    m_urlNavigator->saveLocationState(locationState);

 }
 
 #include "dolphinviewcontainer.moc"
 }
 
 #include "dolphinviewcontainer.moc"