KFileItemModel: interface cleanups

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index e22342ed8b5e055b2270f1c557b47c91716bd952..e10072d2af2a6d058ca4a98eb30ffb6bdd438ace 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  *


@@ -18,63 +18,51 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"

-#include <kprotocolmanager.h>
-
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QItemSelection>
-#include <QtGui/QBoxLayout>
-#include <QtCore/QTimer>
-#include <QtGui/QScrollBar>
-
-#include <kfileitemdelegate.h>
-#include <kfileplacesmodel.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kiconeffect.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kmenu.h>
-#include <kmimetyperesolver.h>
-#include <knewmenu.h>
+#include <KProtocolManager>
+
+#include <QApplication>
+#include <QKeyEvent>
+#include <QItemSelection>
+#include <QBoxLayout>
+#include <QTimer>
+#include <QScrollBar>
+
+#include <KDesktopFile>
+#include <KFileItemDelegate>
+#include <KFilePlacesModel>
+#include <KLocale>
+#include <KIconEffect>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KNewFileMenu>

 #include <konqmimedata.h>
 #include <konqmimedata.h>

-#include <konq_fileitemcapabilities.h>

 #include <konq_operations.h>
 #include <konq_operations.h>

-#include <kurl.h>
-#include <krun.h>
+#include <KShell>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <KRun>

 
 

-#include "dolphinmodel.h"
-#include "dolphincolumnview.h"
-#include "dolphincontroller.h"
-#include "dolphinstatusbar.h"
-#include "dolphinmainwindow.h"
-#include "dolphindirlister.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphindetailsview.h"
-#include "dolphiniconsview.h"
-#include "dolphincontextmenu.h"
-#include "draganddrophelper.h"
-#include "filterbar.h"
-#include "kurlnavigator.h"
-#include "viewproperties.h"
-#include "settings/dolphinsettings.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_generalsettings.h"

-
-DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
-                                           QWidget* parent,
-                                           const KUrl& url) :
+#include "dolphinmainwindow.h"
+#include "filterbar/filterbar.h"
+#include "search/dolphinsearchbox.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "views/dolphinplacesmodel.h"
+#include "views/draganddrophelper.h"
+#include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"
+
+DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :

     QWidget(parent),
     QWidget(parent),

-    m_showProgress(false),
-    m_isFolderWritable(false),
-    m_mainWindow(mainWindow),

     m_topLayout(0),
     m_urlNavigator(0),
     m_topLayout(0),
     m_urlNavigator(0),

+    m_searchBox(0),

     m_view(0),
     m_filterBar(0),
     m_statusBar(0),
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),

-    m_dirLister(0),
-    m_proxyModel(0)
+    m_statusBarTimer(0),
+    m_statusBarTimestamp()

 {
     hide();
 
 {
     hide();
 


@@ -82,126 +70,99 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     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, 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->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());

-    m_urlNavigator->setHomeUrl(settings->homeUrl());
-
-    m_dirLister = new DolphinDirLister();
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(window());
-    m_dirLister->setDelayedMimeTypes(true);
-
-    m_dolphinModel = new DolphinModel(this);
-    m_dolphinModel->setDirLister(m_dirLister);
-    m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
-
-    m_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dolphinModel);
-    m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl()));
+    KUrlComboBox* editor = m_urlNavigator->editor();
+    editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode()));
+
+    m_searchBox = new DolphinSearchBox(this);
+    m_searchBox->hide();
+    connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
+    connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(startSearching(QString)));
+    connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
+
+    m_view = new DolphinView(url, this);
+    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(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(directoryLoadingStarted()),          this, SLOT(slotDirectoryLoadingStarted()));
+    connect(m_view, SIGNAL(directoryLoadingCompleted()),        this, SLOT(slotDirectoryLoadingCompleted()));
+    connect(m_view, SIGNAL(itemCountChanged()),                 this, SLOT(delayedStatusBarUpdate()));
+    connect(m_view, SIGNAL(directoryLoadingProgress(int)),      this, SLOT(updateDirectoryLoadingProgress(int)));
+    connect(m_view, SIGNAL(directorySortingProgress(int)),      this, SLOT(updateDirectorySortingProgress(int)));
+    connect(m_view, SIGNAL(infoMessage(QString)),               this, SLOT(showInfoMessage(QString)));
+    connect(m_view, SIGNAL(errorMessage(QString)),              this, SLOT(showErrorMessage(QString)));
+    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()));
+
+    // initialize status bar
+    m_statusBar = new DolphinStatusBar(this, m_view);
+    connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopLoading()));

 
 

-    connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(updateStatusBar()));
-    connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(updateProgress(int)));
-    connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)),
+    m_statusBarTimer = new QTimer(this);
+    m_statusBarTimer->setSingleShot(true);
+    m_statusBarTimer->setInterval(300);
+    connect(m_statusBarTimer, SIGNAL(timeout()),

             this, SLOT(updateStatusBar()));
             this, SLOT(updateStatusBar()));

-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(slotDirListerCompleted()));
-    connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(showInfoMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)),
-            this, SLOT(openFile(const KUrl&)));
-
-    m_view = new DolphinView(this,
-                             url,
-                             m_dirLister,
-                             m_dolphinModel,
-                             m_proxyModel);
-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
-            m_urlNavigator, SLOT(setUrl(const KUrl&)));
-    connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)),
-            this, SLOT(openContextMenu(KFileItem, const KUrl&)));
-    connect(m_view, SIGNAL(contentsMoved(int, int)),
-            this, SLOT(saveContentsPos(int, int)));
-    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(operationCompletedMessage(const QString&)),
-            this, SLOT(showOperationCompletedMessage(const QString&)));
-    connect(m_view, SIGNAL(itemTriggered(KFileItem)),
-            this, SLOT(slotItemTriggered(KFileItem)));
-    connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
-            this, SLOT(saveRootUrl(const KUrl&)));
-    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
-            this, SLOT(redirect(KUrl, KUrl)));
-
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(restoreView(const KUrl&)));

 
 

-    m_statusBar = new DolphinStatusBar(this, m_view);
+    KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
+    connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
+            this, SLOT(delayedStatusBarUpdate()));

 
 

+    // initialize filter bar

     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     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(KUrl)),
+            m_filterBar, SLOT(clear()));

 
     m_topLayout->addWidget(m_urlNavigator);
 
     m_topLayout->addWidget(m_urlNavigator);

+    m_topLayout->addWidget(m_searchBox);

     m_topLayout->addWidget(m_view);
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
     m_topLayout->addWidget(m_view);
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);

-}

 
 

-DolphinViewContainer::~DolphinViewContainer()
-{
-    m_dirLister->disconnect();
-
-    delete m_proxyModel;
-    m_proxyModel = 0;
-    delete m_dolphinModel;
-    m_dolphinModel = 0;
-    m_dirLister = 0; // deleted by m_dolphinModel
+    setSearchModeEnabled(isSearchUrl(url));

 }
 
 }
 

-void DolphinViewContainer::setUrl(const KUrl& newUrl)
+DolphinViewContainer::~DolphinViewContainer()

 {
 {

-    m_urlNavigator->setUrl(newUrl);
-    if (newUrl != m_urlNavigator->url()) {
-        // Temporary disable the 'File'->'Create New...' menu until
-        // the write permissions can be checked in a fast way at
-        // DolphinViewContainer::slotDirListerCompleted().
-        m_isFolderWritable = false;
-        if (isActive()) {
-            m_mainWindow->newMenu()->menu()->setEnabled(false);
-        }
-    }

 }
 
 }
 

-const KUrl& DolphinViewContainer::url() const
+KUrl DolphinViewContainer::url() const

 {
 {

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

 }
 
 void DolphinViewContainer::setActive(bool active)
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
 }
 
 void DolphinViewContainer::setActive(bool active)
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);

-    if (active) {
-        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
-    }

 }
 
 bool DolphinViewContainer::isActive() const
 }
 
 bool DolphinViewContainer::isActive() const


@@ -210,10 +171,60 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
     return m_view->isActive();
 }
 

-void DolphinViewContainer::refresh()
+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::readSettings()

 {
 {

-    m_view->refresh();
-    m_statusBar->refresh();
+    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.
+        m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
+        m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());
+        m_urlNavigator->setHomeUrl(KUrl(GeneralSettings::homeUrl()));
+        setFilterBarVisible(GeneralSettings::filterBar());
+    }
+
+    m_view->readSettings();
+    m_statusBar->readSettings();

 }
 
 bool DolphinViewContainer::isFilterBarVisible() const
 }
 
 bool DolphinViewContainer::isFilterBarVisible() const


@@ -221,74 +232,208 @@ bool DolphinViewContainer::isFilterBarVisible() const
     return m_filterBar->isVisible();
 }
 
     return m_filterBar->isVisible();
 }
 

-void DolphinViewContainer::showFilterBar(bool show)
+void DolphinViewContainer::setSearchModeEnabled(bool enabled)

 {
 {

-    Q_ASSERT(m_filterBar != 0);
-    if (show) {
+    if (enabled == isSearchModeEnabled()) {
+        if (enabled && !m_searchBox->hasFocus()) {
+            m_searchBox->setFocus();
+            m_searchBox->selectAll();
+        }
+        return;
+    }
+
+    m_searchBox->setVisible(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.
+        int index = m_urlNavigator->historyIndex();
+        const int historySize = m_urlNavigator->historySize();
+        while (isSearchUrl(url) && (index < historySize)) {
+            ++index;
+            url = m_urlNavigator->locationUrl(index);
+        }
+
+        if (!isSearchUrl(url)) {
+            m_searchBox->setSearchPath(url);
+        }
+    } else {
+        // Restore the URL for the URL navigator. If Dolphin has been
+        // started with a search-URL, the home URL is used as fallback.
+        const KUrl url = m_searchBox->searchPath();
+        if (url.isValid() && !url.isEmpty()) {
+            if (isSearchUrl(url)) {
+                m_urlNavigator->goHome();
+            } else {
+                m_urlNavigator->setLocationUrl(url);
+            }
+        }
+    }
+
+    emit searchModeChanged(enabled);
+}
+
+bool DolphinViewContainer::isSearchModeEnabled() const
+{
+    return m_searchBox->isVisible();
+}
+
+void DolphinViewContainer::setUrl(const KUrl& newUrl)
+{
+    if (newUrl != m_urlNavigator->locationUrl()) {
+        m_urlNavigator->setLocationUrl(newUrl);
+    }
+}
+
+void DolphinViewContainer::setFilterBarVisible(bool visible)
+{
+    Q_ASSERT(m_filterBar);
+    if (visible) {

         m_filterBar->show();
         m_filterBar->show();

+        m_filterBar->setFocus();
+        m_filterBar->selectAll();

     } else {
         closeFilterBar();
     }
 }
 
     } else {
         closeFilterBar();
     }
 }
 

-bool DolphinViewContainer::isUrlEditable() const
+void DolphinViewContainer::delayedStatusBarUpdate()

 {
 {

-    return m_urlNavigator->isUrlEditable();
+    if (m_statusBarTimer->isActive() && (m_statusBarTimestamp.elapsed() > 2000)) {
+        // No update of the statusbar has been done during the last 2 seconds,
+        // although an update has been requested. Trigger an immediate update.
+        m_statusBarTimer->stop();
+        updateStatusBar();
+    } else {
+        // Invoke updateStatusBar() with a small delay. This assures that
+        // when a lot of delayedStatusBarUpdates() are done in a short time,
+        // no bottleneck is given.
+        m_statusBarTimer->start();
+    }

 }
 
 }
 

-void DolphinViewContainer::updateProgress(int percent)
+void DolphinViewContainer::updateStatusBar()

 {
 {

-    if (!m_showProgress) {
-        // Only show the directory loading progress if the status bar does
-        // not contain another progress information. This means that
-        // the directory loading progress information has the lowest priority.
-        const QString progressText(m_statusBar->progressText());
-        const QString loadingText(i18nc("@info:progress", "Loading folder..."));
-        m_showProgress = progressText.isEmpty() || (progressText == loadingText);
-        if (m_showProgress) {
-            m_statusBar->setProgressText(loadingText);
-            m_statusBar->setProgress(0);
-        }
+    m_statusBarTimestamp.start();
+
+    const QString newMessage = m_view->statusBarText();
+    m_statusBar->setDefaultText(newMessage);
+
+    // 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);
+    }
+}
+
+void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)
+{
+    if (m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));

     }
     }

+    m_statusBar->setProgress(percent);
+}
+
+void DolphinViewContainer::updateDirectorySortingProgress(int percent)
+{
+    if (m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(i18nc("@info:progress", "Sorting..."));
+    }
+    m_statusBar->setProgress(percent);
+}

 
 

-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
+void DolphinViewContainer::slotDirectoryLoadingStarted()
+{
+    if (isSearchUrl(url())) {
+        // Search KIO-slaves usually don't provide any progress information. Give
+        // a hint to the user that a searching is done:
+        updateStatusBar();
+        m_statusBar->setProgressText(i18nc("@info", "Searching..."));
+        m_statusBar->setProgress(-1);
+    } else {
+        // Trigger an undetermined progress indication. The progress
+        // information in percent will be triggered by the percent() signal
+        // of the directory lister later.
+        updateDirectoryLoadingProgress(-1);

     }
 }
 
     }
 }
 

-void DolphinViewContainer::slotDirListerCompleted()
+void DolphinViewContainer::slotDirectoryLoadingCompleted()

 {
 {

-    if (m_showProgress) {
+    if (!m_statusBar->progressText().isEmpty()) {

         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);
         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);

-        m_showProgress = false;

     }
 
     }
 

-    updateStatusBar();
-    QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection);
-
-    // Enable the 'File'->'Create New...' menu only if the directory
-    // supports writing.
-    KFileItem item = m_dirLister->rootItem();
-    if (item.isNull()) {
-        // it is unclear whether writing is supported
-        m_isFolderWritable = true;
+    if (isSearchUrl(url()) && m_view->itemsCount() == 0) {
+        // 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);

     } else {
     } else {

-        KonqFileItemCapabilities capabilities(KFileItemList() << item);
-        m_isFolderWritable = capabilities.supportsWriting();
+        updateStatusBar();

     }
     }

+}

 
 

-    if (isActive()) {
-        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+void DolphinViewContainer::slotItemActivated(const KFileItem& item)
+{
+    // It is possible to activate items on inactive views by
+    // drag & drop operations. Assure that activating an item always
+    // results in an active view.
+    m_view->setActive(true);
+
+    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::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {
 }
 
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {

-        m_statusBar->clear();
+        // Only clear the status bar if unimportant messages are shown.
+        // This prevents that information- or error-messages get hidden
+        // by moving the mouse above the viewport or when closing the
+        // context menu.
+        if (m_statusBar->type() == DolphinStatusBar::Default) {
+            m_statusBar->clear();
+        }

     } else {
     } else {

-        m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
+        const QString message = item.isDir() ? item.text() : item.getStatusBarInfo();
+        m_statusBar->setMessage(message, DolphinStatusBar::Default);

     }
 }
 
     }
 }
 


@@ -315,72 +460,51 @@ void DolphinViewContainer::closeFilterBar()
     emit showFilterBarChanged(false);
 }
 
     emit showFilterBarChanged(false);
 }
 

-void DolphinViewContainer::updateStatusBar()
-{
-    // 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
-    // - if any progress is given don't show the item count info at all
-    const QString msg(m_statusBar->message());
-    const bool updateStatusBarMsg = (msg.isEmpty() ||
-                                     (msg == m_statusBar->defaultText()) ||
-                                     (m_statusBar->type() == DolphinStatusBar::Information)) &&
-                                    (m_statusBar->progress() == 100);
-
-    const QString text(m_view->statusBarText());
-    m_statusBar->setDefaultText(text);
-
-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
-    }
-}
-

 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {
     m_view->setNameFilter(nameFilter);
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {
     m_view->setNameFilter(nameFilter);

-    updateStatusBar();
-}
-
-void DolphinViewContainer::openContextMenu(const KFileItem& item,
-                                           const KUrl& url)
-{
-    DolphinContextMenu contextMenu(m_mainWindow, item, url);
-    contextMenu.open();
+    delayedStatusBarUpdate();

 }
 
 }
 

-void DolphinViewContainer::saveContentsPos(int x, int y)
+void DolphinViewContainer::activate()

 {
 {

-    m_urlNavigator->savePosition(x, y);
+    setActive(true);

 }
 
 }
 

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

 {
 {

-    if (!url().isEmpty()) {
-        const QPoint pos = m_urlNavigator->savedPosition();
-        m_view->setContentsPosition(pos.x(), pos.y());
+    // 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::activate()
+void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url)

 {
 {

-    setActive(true);
+    // 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::restoreView(const KUrl& url)
+void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)

 {
     if (KProtocolManager::supportsListing(url)) {
 {
     if (KProtocolManager::supportsListing(url)) {

-        m_view->updateView(url, m_urlNavigator->savedRootUrl());
-        if (isActive()) {
+        setSearchModeEnabled(isSearchUrl(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
             // When an URL has been entered, the view should get the focus.
             // The focus must be requested asynchronously, as changing the URL might create

-            // a new view widget. Using QTimer::singleShow() works reliable, however
-            // QMetaObject::invokeMethod() with a queued connection does not work, which might
-            // indicate that we should pass a hint to DolphinView::updateView()
-            // regarding the focus instead. To test: Enter an URL and press CTRL+Enter.
-            // Expected result: The view should get the focus.
+            // a new view widget.

             QTimer::singleShot(0, this, SLOT(requestFocus()));
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {
             QTimer::singleShot(0, this, SLOT(requestFocus()));
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {


@@ -392,27 +516,27 @@ void DolphinViewContainer::restoreView(const KUrl& url)
             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {
                 app = browser;
             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {
                 app = browser;

+                if (app.startsWith('!')) {
+                    // a literal command has been configured, remove the '!' prefix
+                    app = app.mid(1);
+                }

             }
         } else {
             showErrorMessage(i18nc("@info:status",
                                    "Protocol not supported by Dolphin, Konqueror has been launched"));
         }
             }
         } else {
             showErrorMessage(i18nc("@info:status",
                                    "Protocol not supported by Dolphin, Konqueror has been launched"));
         }

-        const QString command = app + ' ' + url.pathOrUrl();
+
+        const QString secureUrl = KShell::quoteArg(url.pathOrUrl());
+        const QString command = app + ' ' + secureUrl;

         KRun::runCommand(command, app, app, this);
     } else {
         showErrorMessage(i18nc("@info:status", "Invalid protocol"));
     }
 }
 
         KRun::runCommand(command, app, app, this);
     } else {
         showErrorMessage(i18nc("@info:status", "Invalid protocol"));
     }
 }
 

-void DolphinViewContainer::saveRootUrl(const KUrl& url)
-{
-    Q_UNUSED(url);
-    m_urlNavigator->saveRootUrl(m_view->rootUrl());
-}
-

 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {

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

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


@@ -420,7 +544,14 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);

-    m_urlNavigator->setUrl(newUrl);
+
+    // Assure that the location state is reset for redirection URLs. This
+    // allows to skip redirection URLs when going back or forward in the
+    // URL history.
+    m_urlNavigator->saveLocationState(QByteArray());
+    m_urlNavigator->setLocationUrl(newUrl);
+    setSearchModeEnabled(isSearchUrl(newUrl));
+

     m_urlNavigator->blockSignals(block);
 }
 
     m_urlNavigator->blockSignals(block);
 }
 


@@ -429,41 +560,52 @@ void DolphinViewContainer::requestFocus()
     m_view->setFocus();
 }
 
     m_view->setFocus();
 }
 

-void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
+void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion)

 {
 {

-    KUrl url = item.targetUrl();
+    GeneralSettings::setUrlCompletionMode(completion);
+}

 
 

-    if (item.isDir()) {
-        m_view->setUrl(url);
-        return;
+void DolphinViewContainer::slotHistoryChanged()
+{
+    QByteArray locationState = m_urlNavigator->locationState();
+    if (!locationState.isEmpty()) {
+        QDataStream stream(&locationState, QIODevice::ReadOnly);
+        m_view->restoreState(stream);

     }
     }

+}

 
 

-    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;
-        }
+void DolphinViewContainer::startSearching(const QString &text)
+{
+    Q_UNUSED(text);
+    const KUrl url = m_searchBox->urlForSearching();
+    if (url.isValid() && !url.isEmpty()) {
+        m_urlNavigator->setLocationUrl(url);

     }
     }

+}

 
 

-    item.run();
+void DolphinViewContainer::closeSearchBox()
+{
+    setSearchModeEnabled(false);
+}
+
+void DolphinViewContainer::stopLoading()
+{
+    m_view->stopLoading();
+    m_statusBar->setProgress(100);
+}
+
+bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
+{
+    const QString protocol = url.protocol();
+    return protocol.contains("search") || (protocol == QLatin1String("nepomuk"));

 }
 
 }
 

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

 {
 {

-    // Using m_dolphinModel for getting the file item instance is not possible
-    // here: openFile() is triggered by an error of the directory lister
-    // job, so the file item must be received "manually".
-    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"