Use capitalized KDE includes

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3111925ff94fe43dac6244ddbbe06cf27ab76dee..86aefe959d776ee7d4b5762bc24b8ba1df8b9857 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,66 +18,58 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"

-#include <kprotocolmanager.h>
+#include <KProtocolManager>

 
 #include <QtGui/QApplication>
 
 #include <QtGui/QApplication>

-#include <QtGui/QClipboard>

 #include <QtGui/QKeyEvent>
 #include <QtGui/QItemSelection>
 #include <QtGui/QBoxLayout>
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 
 #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 <KDesktopFile>
+#include <KFileItemDelegate>
+#include <KFilePlacesModel>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KIconEffect>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KMenu>

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

-#include <kfileitemlistproperties.h>

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

-#include <kshell.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
-#include <krun.h>
-
-#include "dolphinmodel.h"
-#include "dolphincolumnview.h"
-#include "dolphincontroller.h"
-#include "dolphinstatusbar.h"
+#include <KShell>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <KRun>
+
+#include "dolphin_generalsettings.h"

 #include "dolphinmainwindow.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 "filterbar/filterbar.h"
+#include "search/dolphinsearchbox.h"

 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettings.h"

-#include "dolphin_generalsettings.h"
-
-DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
-                                           QWidget* parent,
-                                           const KUrl& url) :
+#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/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_statusBarTimer(0),
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),
     m_statusBarTimer(0),

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

 {
     hide();
 
 {
     hide();
 


@@ -96,78 +88,56 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());

-    m_urlNavigator->setHomeUrl(settings->homeUrl());
+    m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl()));

     KUrlComboBox* editor = m_urlNavigator->editor();
     editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode()));
 
     KUrlComboBox* editor = m_urlNavigator->editor();
     editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode()));
 

-    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);
-
-    connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(delayedStatusBarUpdate()));
-    connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(updateProgress(int)));
-    connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)),
-            this, SLOT(delayedStatusBarUpdate()));
-    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&, const QList<QAction*>&)),
-            this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));
-    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_view, SIGNAL(selectionChanged(const KFileItemList&)),
-            this, SLOT(delayedStatusBarUpdate()));
+    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(const KUrl&)),      m_urlNavigator, SLOT(setUrl(const 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(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(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&)),
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),

-            this, SLOT(restoreView(const KUrl&)));
+            this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)),
+            this, SLOT(saveViewState()));

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

+    // initialize status bar

     m_statusBar = new DolphinStatusBar(this, m_view);
     m_statusBar = new DolphinStatusBar(this, m_view);

+    connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopLoading()));
+

     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBarTimer->setInterval(300);
     connect(m_statusBarTimer, SIGNAL(timeout()),
             this, SLOT(updateStatusBar()));
 
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBarTimer->setInterval(300);
     connect(m_statusBarTimer, SIGNAL(timeout()),
             this, SLOT(updateStatusBar()));
 

+    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());
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),


@@ -178,48 +148,27 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             m_filterBar, SLOT(clear()));
 
     m_topLayout->addWidget(m_urlNavigator);
             m_filterBar, SLOT(clear()));
 
     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);

+
+    setSearchModeEnabled(isSearchUrl(url));

 }
 
 DolphinViewContainer::~DolphinViewContainer()
 {
 }
 
 DolphinViewContainer::~DolphinViewContainer()
 {

-    m_dirLister->disconnect();
-
-    delete m_proxyModel;
-    m_proxyModel = 0;
-    delete m_dolphinModel;
-    m_dolphinModel = 0;
-    m_dirLister = 0; // deleted by m_dolphinModel

 }
 
 }
 

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

 {
 {

-    if (newUrl != m_urlNavigator->url()) {
-        m_urlNavigator->setUrl(newUrl);
-        // 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
-{
-    return m_urlNavigator->url();
+    return m_urlNavigator->locationUrl();

 }
 
 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


@@ -230,6 +179,16 @@ bool DolphinViewContainer::isActive() const
 
 void DolphinViewContainer::refresh()
 {
 
 void DolphinViewContainer::refresh()
 {

+    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    if (settings->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(settings->editableUrl());
+        m_urlNavigator->setShowFullPath(settings->showFullPath());
+        setFilterBarVisible(settings->filterBar());
+    }
+

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


@@ -239,103 +198,163 @@ 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) {
-        m_filterBar->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) {
+        // 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)) {
+            ++index;
+            url = m_urlNavigator->locationUrl(index);
+        }
+
+        if (!isSearchUrl(url)) {
+            m_searchBox->setSearchPath(url);
+        }

     } else {
     } else {

-        closeFilterBar();
+        // 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);

     }
 }
 
     }
 }
 

-bool DolphinViewContainer::isUrlEditable() const
+void DolphinViewContainer::setFilterBarVisible(bool visible)

 {
 {

-    return m_urlNavigator->isUrlEditable();
+    Q_ASSERT(m_filterBar != 0);
+    if (visible) {
+        m_filterBar->show();
+        m_filterBar->setFocus();
+        m_filterBar->selectAll();
+    } else {
+        closeFilterBar();
+    }

 }
 
 void DolphinViewContainer::delayedStatusBarUpdate()
 {
 }
 
 void DolphinViewContainer::delayedStatusBarUpdate()
 {

-    // 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();
+    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::updateStatusBar()
 {
 }
 
 void DolphinViewContainer::updateStatusBar()
 {

+    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
     // 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 newMessage = m_view->statusBarText();
+    const QString currentMessage = m_statusBar->message();
+    const bool updateStatusBarMsg = currentMessage.isEmpty()
+                                    || (currentMessage == m_statusBar->defaultText())
+                                    || (m_statusBar->type() == DolphinStatusBar::Information);

 
 

-    const QString text(m_view->statusBarText());
-    m_statusBar->setDefaultText(text);
+    m_statusBar->setDefaultText(newMessage);

 
     if (updateStatusBarMsg) {
 
     if (updateStatusBarMsg) {

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

     }
 }
 
 void DolphinViewContainer::updateProgress(int percent)
 {
     }
 }
 
 void DolphinViewContainer::updateProgress(int percent)
 {

-    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);
-        }
+    if (m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));

     }
     }

+    m_statusBar->setProgress(percent);
+}

 
 

-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
+void DolphinViewContainer::slotStartedPathLoading()
+{
+    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.
+        updateProgress(-1);

     }
 }
 
     }
 }
 

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

 {
 {

-    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->items().count() == 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 {

-        KFileItemListProperties capabilities(KFileItemList() << item);
-        m_isFolderWritable = capabilities.supportsWriting();
-    }
-
-    if (isActive()) {
-        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+        updateStatusBar();

     }
 }
 
 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 {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }
     } else {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }


@@ -370,45 +389,29 @@ void DolphinViewContainer::setNameFilter(const QString& nameFilter)
     delayedStatusBarUpdate();
 }
 
     delayedStatusBarUpdate();
 }
 

-void DolphinViewContainer::openContextMenu(const KFileItem& item,
-                                           const KUrl& url,
-                                           const QList<QAction*>& customActions)
-{
-    DolphinContextMenu contextMenu(m_mainWindow, item, url);
-    contextMenu.setCustomActions(customActions);
-    contextMenu.open();
-}
-
-void DolphinViewContainer::saveContentsPos(int x, int y)
-{
-    m_urlNavigator->savePosition(x, y);
-}
-
-void DolphinViewContainer::restoreContentsPos()
+void DolphinViewContainer::activate()

 {
 {

-    if (!url().isEmpty()) {
-        const QPoint pos = m_urlNavigator->savedPosition();
-        m_view->setContentsPosition(pos.x(), pos.y());
-    }
+    setActive(true);

 }
 
 }
 

-void DolphinViewContainer::activate()
+void DolphinViewContainer::saveViewState()

 {
 {

-    setActive(true);
+    QByteArray locationState;
+    QDataStream stream(&locationState, QIODevice::WriteOnly);
+    m_view->saveState(stream);
+    m_urlNavigator->saveLocationState(locationState);

 }
 
 }
 

-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)) {


@@ -430,7 +433,7 @@ void DolphinViewContainer::restoreView(const KUrl& url)
                                    "Protocol not supported by Dolphin, Konqueror has been launched"));
         }
 
                                    "Protocol not supported by Dolphin, Konqueror has been launched"));
         }
 

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

         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {
         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {


@@ -438,12 +441,6 @@ void DolphinViewContainer::restoreView(const KUrl& url)
     }
 }
 
     }
 }
 

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

 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
     DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
     DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);


@@ -454,7 +451,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);
 }
 


@@ -472,15 +476,39 @@ void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion com
 
 void DolphinViewContainer::slotHistoryChanged()
 {
 
 void DolphinViewContainer::slotHistoryChanged()
 {

-    const int index = m_urlNavigator->historyIndex();
-    if (index > 0) {
-        // The "Go Forward" action is enabled. Try to mark
-        // the previous directory as active item:
-        const KUrl url = m_urlNavigator->historyUrl(index - 1);
-        m_view->activateItem(url);
+    QByteArray locationState = m_urlNavigator->locationState();
+
+    if (!locationState.isEmpty()) {
+        QDataStream stream(&locationState, QIODevice::ReadOnly);
+        m_view->restoreState(stream);

     }
 }
 
     }
 }
 

+void DolphinViewContainer::startSearching(const QString &text)
+{
+    Q_UNUSED(text);
+    const KUrl url = m_searchBox->urlForSearching();
+    if (url.isValid() && !url.isEmpty()) {
+        m_urlNavigator->setLocationUrl(url);
+    }
+}
+
+void DolphinViewContainer::closeSearchBox()
+{
+    setSearchModeEnabled(false);
+}
+
+void DolphinViewContainer::stopLoading()
+{
+    m_view->stopLoading();
+}
+
+bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
+{
+    const QString protocol = url.protocol();
+    return protocol.contains("search") || (protocol == QLatin1String("nepomuk"));
+}
+

 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
 {
     KUrl url = item.targetUrl();
 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
 {
     KUrl url = item.targetUrl();


@@ -506,14 +534,21 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
         }
     }
 
         }
     }
 

+    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)
 {
     item.run();
 }
 
 void DolphinViewContainer::openFile(const KUrl& url)
 {

-    // 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);
 }
     const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
     slotItemTriggered(item);
 }