Two clicks on file/folder to rename

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3c687c8d250ff11969d36d28805e515a991c3c3c..d830166109fb8617dc33257cebbaa83d36ccc3bc 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,166 +18,215 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"

+#include <KProtocolManager>
+
+#include <QDropEvent>
+#include <QTimer>
+#include <QMimeData>
+#include <QVBoxLayout>
+#include <QLoggingCategory>
+
+#include <KFileItemActions>
+#include <KFilePlacesModel>
+#include <KLocalizedString>
+#include <KIO/PreviewJob>
+#include <kio_version.h>
+#include <KMessageWidget>
+#include <KShell>
+#include <QUrl>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <KRun>
+
+#ifdef KActivities_FOUND
+#endif

 
 

-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QItemSelection>
-#include <QtGui/QBoxLayout>
-#include <QtCore/QTimer>
-#include <QtGui/QScrollBar>
-
-#include <kdirmodel.h>
-#include <kfileitemdelegate.h>
-#include <kfileplacesmodel.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kiconeffect.h>
-#include <kio/netaccess.h>
-#include <kio/renamedialog.h>
-#include <kio/previewjob.h>
-#include <kmimetyperesolver.h>
-#include <konqmimedata.h>
-#include <konq_operations.h>
-#include <kurl.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 "dolphinitemcategorizer.h"
-#include "filterbar.h"
-#include "renamedialog.h"
-#include "kurlnavigator.h"
-#include "viewproperties.h"
-#include "dolphinsettings.h"
+#include "global.h"
+#include "dolphindebug.h"

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

+#include "filterbar/filterbar.h"
+#include "search/dolphinsearchbox.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"

 
 

-DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
-                                           QWidget* parent,
-                                           const KUrl& url,
-                                           DolphinView::Mode mode,
-                                           bool showHiddenFiles) :
+DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :

     QWidget(parent),
     QWidget(parent),

-    m_showProgress(false),
-    m_folderCount(0),
-    m_fileCount(0),
-    m_mainWindow(mainWindow),

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

+    m_searchBox(0),
+    m_messageWidget(0),

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

-    m_dirModel(0),
-    m_dirLister(0),
-    m_proxyModel(0)
+    m_statusBarTimer(0),
+    m_statusBarTimestamp(),
+    m_autoGrabFocus(true)
+#ifdef KActivities_FOUND
+    , m_activityResourceInstance(0)
+#endif

 {
     hide();
 {
     hide();

-    setFocusPolicy(Qt::StrongFocus);
+

     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

-    connect(m_mainWindow, SIGNAL(activeViewChanged()),
-            this, SLOT(updateActivationState()));
+    m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);
+    connect(m_urlNavigator, &KUrlNavigator::activated,
+            this, &DolphinViewContainer::activate);
+    connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,
+            this, &DolphinViewContainer::saveUrlCompletionMode);

 
 

-    QClipboard* clipboard = QApplication::clipboard();
-    connect(clipboard, SIGNAL(dataChanged()),
-            this, SLOT(updateCutItems()));
-
-    m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
-
-    const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    const GeneralSettings* settings = GeneralSettings::self();

     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setUrlEditable(settings->editableUrl());

-    m_urlNavigator->setHomeUrl(settings->homeUrl());
-
-    m_dirLister = new DolphinDirLister();
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
-    m_dirLister->setShowingDotFiles(showHiddenFiles);
-    m_dirLister->setDelayedMimeTypes(true);
-
-    m_dirModel = new KDirModel();
-    m_dirModel->setDirLister(m_dirLister);
-    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
-
-    m_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dirModel);
-
-    connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(updateStatusBar()));
-    connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(updateProgress(int)));
-    connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
-            this, SLOT(updateStatusBar()));
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(updateItemCount()));
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(updateCutItems()));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));
-    connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(showInfoMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
-
-    m_view = new DolphinView(this,
-                             url,
-                             m_dirLister,
-                             m_dirModel,
-                             m_proxyModel,
-                             mode,
-                             showHiddenFiles);
-    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(urlsDropped(const KUrl::List&, const KUrl&)),
-            m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
-
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            m_view, SLOT(setUrl(const KUrl&)));
-
-    m_statusBar = new DolphinStatusBar(this, url);
-
+    m_urlNavigator->setShowFullPath(settings->showFullPath());
+    m_urlNavigator->setHomeUrl(Dolphin::homeUrl());
+    KUrlComboBox* editor = m_urlNavigator->editor();
+    editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode()));
+
+    m_searchBox = new DolphinSearchBox(this);
+    m_searchBox->hide();
+    connect(m_searchBox, &DolphinSearchBox::activated, this, &DolphinViewContainer::activate);
+    connect(m_searchBox, &DolphinSearchBox::closeRequest, this, &DolphinViewContainer::closeSearchBox);
+    connect(m_searchBox, &DolphinSearchBox::searchRequest, this, &DolphinViewContainer::startSearching);
+    connect(m_searchBox, &DolphinSearchBox::returnPressed, this, &DolphinViewContainer::requestFocus);
+
+    m_messageWidget = new KMessageWidget(this);
+    m_messageWidget->setCloseButtonVisible(true);
+    m_messageWidget->hide();
+
+    m_view = new DolphinView(url, this);
+    connect(m_view, &DolphinView::urlChanged,
+            m_urlNavigator, &KUrlNavigator::setLocationUrl);
+    connect(m_view, &DolphinView::urlChanged,
+            m_messageWidget, &KMessageWidget::hide);
+    connect(m_view, &DolphinView::writeStateChanged,
+            this, &DolphinViewContainer::writeStateChanged);
+    connect(m_view, &DolphinView::requestItemInfo,
+            this, &DolphinViewContainer::showItemInfo);
+    connect(m_view, &DolphinView::itemActivated,
+            this, &DolphinViewContainer::slotItemActivated);
+    connect(m_view, &DolphinView::itemsActivated,
+            this, &DolphinViewContainer::slotItemsActivated);
+    connect(m_view, &DolphinView::redirection,
+            this, &DolphinViewContainer::redirect);
+    connect(m_view, &DolphinView::directoryLoadingStarted,
+            this, &DolphinViewContainer::slotDirectoryLoadingStarted);
+    connect(m_view, &DolphinView::directoryLoadingCompleted,
+            this, &DolphinViewContainer::slotDirectoryLoadingCompleted);
+    connect(m_view, &DolphinView::directoryLoadingCanceled,
+            this, &DolphinViewContainer::slotDirectoryLoadingCanceled);
+    connect(m_view, &DolphinView::itemCountChanged,
+            this, &DolphinViewContainer::delayedStatusBarUpdate);
+    connect(m_view, &DolphinView::directoryLoadingProgress,
+            this, &DolphinViewContainer::updateDirectoryLoadingProgress);
+    connect(m_view, &DolphinView::directorySortingProgress,
+            this, &DolphinViewContainer::updateDirectorySortingProgress);
+    connect(m_view, &DolphinView::selectionChanged,
+            this, &DolphinViewContainer::delayedStatusBarUpdate);
+    connect(m_view, &DolphinView::errorMessage,
+            this, &DolphinViewContainer::showErrorMessage);
+    connect(m_view, &DolphinView::urlIsFileError,
+            this, &DolphinViewContainer::slotUrlIsFileError);
+    connect(m_view, &DolphinView::activated,
+            this, &DolphinViewContainer::activate);
+
+    connect(m_urlNavigator, &KUrlNavigator::urlAboutToBeChanged,
+            this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
+    connect(m_urlNavigator, &KUrlNavigator::urlChanged,
+            this, &DolphinViewContainer::slotUrlNavigatorLocationChanged);
+    connect(m_urlNavigator, &KUrlNavigator::urlSelectionRequested,
+            this, &DolphinViewContainer::slotUrlSelectionRequested);
+    connect(m_urlNavigator, &KUrlNavigator::returnPressed,
+            this, &DolphinViewContainer::slotReturnPressed);
+    connect(m_urlNavigator, &KUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) {
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 37, 0)
+        m_view->dropUrls(destination, event, m_urlNavigator->dropWidget());
+#else
+        // TODO: remove as soon as we can hard-depend of KF5 >= 5.37
+        m_view->dropUrls(destination, event, m_view);
+#endif
+    });
+
+    // Initialize status bar
+    m_statusBar = new DolphinStatusBar(this);
+    m_statusBar->setUrl(m_view->url());
+    m_statusBar->setZoomLevel(m_view->zoomLevel());
+    connect(m_view, &DolphinView::urlChanged,
+            m_statusBar, &DolphinStatusBar::setUrl);
+    connect(m_view, &DolphinView::zoomLevelChanged,
+            m_statusBar, &DolphinStatusBar::setZoomLevel);
+    connect(m_view, &DolphinView::infoMessage,
+            m_statusBar, &DolphinStatusBar::setText);
+    connect(m_view, &DolphinView::operationCompletedMessage,
+            m_statusBar, &DolphinStatusBar::setText);
+    connect(m_statusBar, &DolphinStatusBar::stopPressed,
+            this, &DolphinViewContainer::stopDirectoryLoading);
+    connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged,
+            this, &DolphinViewContainer::slotStatusBarZoomLevelChanged);
+
+    m_statusBarTimer = new QTimer(this);
+    m_statusBarTimer->setSingleShot(true);
+    m_statusBarTimer->setInterval(300);
+    connect(m_statusBarTimer, &QTimer::timeout, this, &DolphinViewContainer::updateStatusBar);
+
+    KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
+    connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished,
+            this, &DolphinViewContainer::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(changeNameFilter(const QString&)));
-    connect(m_filterBar, SIGNAL(closeRequest()),
-            this, SLOT(closeFilterBar()));
+    connect(m_filterBar, &FilterBar::filterChanged,
+            this, &DolphinViewContainer::setNameFilter);
+    connect(m_filterBar, &FilterBar::closeRequest,
+            this, &DolphinViewContainer::closeFilterBar);
+    connect(m_filterBar, &FilterBar::focusViewRequest,
+            this, &DolphinViewContainer::requestFocus);
+    connect(m_view, &DolphinView::urlChanged,
+            m_filterBar, &FilterBar::slotUrlChanged);

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

+    m_topLayout->addWidget(m_searchBox);
+    m_topLayout->addWidget(m_messageWidget);

     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()
-{
-    delete m_dirLister;
-    m_dirLister = 0;
+    setSearchModeEnabled(isSearchUrl(url));
+
+    // Initialize kactivities resource instance
+
+    #ifdef KActivities_FOUND
+    m_activityResourceInstance = new KActivities::ResourceInstance(
+            window()->winId(), url);
+    m_activityResourceInstance->setParent(this);
+    #endif

 }
 
 }
 

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

 {
 {

-    m_urlNavigator->setUrl(url);

 }
 
 }
 

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

 {
 {

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

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

+    m_searchBox->setActive(active);

     m_urlNavigator->setActive(active);
     m_view->setActive(active);
     m_urlNavigator->setActive(active);
     m_view->setActive(active);

+
+    #ifdef KActivities_FOUND
+    if (active) {
+        m_activityResourceInstance->notifyFocusedIn();
+    } else {
+        m_activityResourceInstance->notifyFocusedOut();
+    }
+    #endif

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


@@ -186,263 +235,463 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
     return m_view->isActive();
 }
 

-void DolphinViewContainer::renameSelectedItems()
+void DolphinViewContainer::setAutoGrabFocus(bool grab)

 {
 {

-    DolphinViewContainer* view = m_mainWindow->activeViewContainer();
-    const KUrl::List urls = m_view->selectedUrls();
-    if (urls.count() > 1) {
-        // More than one item has been selected for renaming. Open
-        // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(urls);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
-        }
+    m_autoGrabFocus = grab;
+}

 
 

-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            view->statusBar()->setMessage(dialog.errorString(),
-                                          DolphinStatusBar::Error);
-        } else {
-            // TODO: check how this can be integrated into KonqUndoManager/KonqOperations
-            // as one operation instead of n rename operations like it is done now...
-            Q_ASSERT(newName.contains('#'));
-
-            // iterate through all selected items and rename them...
-            const int replaceIndex = newName.indexOf('#');
-            Q_ASSERT(replaceIndex >= 0);
-            int index = 1;
-
-            KUrl::List::const_iterator it = urls.begin();
-            KUrl::List::const_iterator end = urls.end();
-            while (it != end) {
-                const KUrl& oldUrl = *it;
-                QString number;
-                number.setNum(index++);
-
-                QString name(newName);
-                name.replace(replaceIndex, 1, number);
-
-                if (oldUrl.fileName() != name) {
-                    KUrl newUrl = oldUrl;
-                    newUrl.setFileName(name);
-                    m_mainWindow->rename(oldUrl, newUrl);
-                }
-                ++it;
-            }
+bool DolphinViewContainer::autoGrabFocus() const
+{
+    return m_autoGrabFocus;
+}
+
+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;
+}
+
+void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
+{
+    if (msg.isEmpty()) {
+        return;
+    }
+
+    m_messageWidget->setText(msg);
+
+    switch (type) {
+    case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
+    case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;
+    case Error:       m_messageWidget->setMessageType(KMessageWidget::Error); break;
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+
+    m_messageWidget->setWordWrap(false);
+    const int unwrappedWidth = m_messageWidget->sizeHint().width();
+    m_messageWidget->setWordWrap(unwrappedWidth > size().width());
+
+    if (m_messageWidget->isVisible()) {
+        m_messageWidget->hide();
+    }
+    m_messageWidget->animatedShow();
+}
+
+void DolphinViewContainer::readSettings()
+{
+    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(Dolphin::homeUrl());
+        setFilterBarVisible(GeneralSettings::filterBar());
+    }
+
+    m_view->readSettings();
+    m_statusBar->readSettings();
+}
+
+bool DolphinViewContainer::isFilterBarVisible() const
+{
+    return m_filterBar->isVisible();
+}
+
+void DolphinViewContainer::setSearchModeEnabled(bool enabled)
+{
+    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) {
+        const QUrl& locationUrl = m_urlNavigator->locationUrl();
+        m_searchBox->fromSearchUrl(locationUrl);

     } else {
     } else {

-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        Q_ASSERT(urls.count() == 1);
-
-        // TODO: Think about using KFileItemDelegate as soon as it supports editing.
-        // Currently the RenameDialog is used, but I'm not sure whether inline renaming
-        // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(urls);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
+        m_view->setViewPropertiesContext(QString());
+
+        // Restore the URL for the URL navigator. If Dolphin has been
+        // started with a search-URL, the home URL is used as fallback.
+        QUrl url = m_searchBox->searchPath();
+        if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) {
+            url = Dolphin::homeUrl();

         }
         }

+        m_urlNavigator->setLocationUrl(url);
+    }
+}

 
 

-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            view->statusBar()->setMessage(dialog.errorString(),
-                                          DolphinStatusBar::Error);
-        } else {
-            const KUrl& oldUrl = urls.first();
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(newName);
-            m_mainWindow->rename(oldUrl, newUrl);
+bool DolphinViewContainer::isSearchModeEnabled() const
+{
+    return m_searchBox->isVisible();
+}
+
+QString DolphinViewContainer::placesText() const
+{
+    QString text;
+
+    if (isSearchModeEnabled()) {
+        text = m_searchBox->searchPath().fileName() + QLatin1String(": ") + m_searchBox->text();
+    } else {
+        text = url().fileName();
+        if (text.isEmpty()) {
+            text = url().host();
+        }
+        if (text.isEmpty()) {
+            text = url().scheme();

         }
     }
         }
     }

+
+    return text;

 }
 
 }
 

-DolphinStatusBar* DolphinViewContainer::statusBar() const
+void DolphinViewContainer::reload()

 {
 {

-    return m_statusBar;
+    view()->reload();
+    m_messageWidget->hide();

 }
 
 }
 

-bool DolphinViewContainer::isFilterBarVisible() const
+void DolphinViewContainer::setUrl(const QUrl& newUrl)

 {
 {

-    return m_filterBar->isVisible();
+    if (newUrl != m_urlNavigator->locationUrl()) {
+        m_urlNavigator->setLocationUrl(newUrl);
+    }
+
+    #ifdef KActivities_FOUND
+    m_activityResourceInstance->setUri(newUrl);
+    #endif

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const
+void DolphinViewContainer::delayedStatusBarUpdate()

 {
 {

-    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    return m_dirModel->itemForIndex(dirModelIndex);
+    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();
+    }

 }
 
 }
 

-DolphinMainWindow* DolphinViewContainer::mainWindow() const
+void DolphinViewContainer::updateStatusBar()

 {
 {

-    return m_mainWindow;
+    m_statusBarTimestamp.start();
+
+    const QString text = m_view->statusBarText();
+    m_statusBar->setDefaultText(text);
+    m_statusBar->resetToDefaultText();

 }
 
 }
 

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

 {
 {

-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
+    if (m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));

     }
     }

+    m_statusBar->setProgress(percent);

 }
 
 }
 

-void DolphinViewContainer::updateItemCount()
+void DolphinViewContainer::updateDirectorySortingProgress(int percent)

 {
 {

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

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

-        m_showProgress = false;

     }
 
     }
 

-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
+    if (isSearchUrl(url()) && m_view->itemsCount() == 0) {
+        // The dir lister has been completed on a Baloo-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->setText(i18nc("@info:status", "No items found."));
+    } else {
+        updateStatusBar();
+    }
+}
+
+void DolphinViewContainer::slotDirectoryLoadingCanceled()
+{
+    if (!m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(QString());
+        m_statusBar->setProgress(100);
+    }

 
 

-    m_fileCount = 0;
-    m_folderCount = 0;
+    m_statusBar->setText(QString());
+}

 
 

-    while (it != end) {
-        KFileItem* item = *it;
-        if (item->isDir()) {
-            ++m_folderCount;
-        } else {
-            ++m_fileCount;
-        }
-        ++it;
+void DolphinViewContainer::slotUrlIsFileError(const QUrl& url)
+{
+    const KFileItem item(url);
+
+    // Find out if the file can be opened in the view (for example, this is the
+    // case if the file is an archive). The mime type must be known for that.
+    item.determineMimeType();
+    const QUrl& folderUrl = DolphinView::openItemAsFolderUrl(item, true);
+    if (!folderUrl.isEmpty()) {
+        setUrl(folderUrl);
+    } else {
+        slotItemActivated(item);

     }
     }

+}

 
 

-    updateStatusBar();
+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);
+
+    const QUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());
+    if (!url.isEmpty()) {
+        setUrl(url);
+        return;
+    }

 
 

-    QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
+    KRun *run = new KRun(item.targetUrl(), this);
+    run->setShowScriptExecutionPrompt(true);

 }
 
 }
 

-void DolphinViewContainer::showInfoMessage(const QString& msg)
+void DolphinViewContainer::slotItemsActivated(const KFileItemList& items)

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Information);
+    Q_ASSERT(items.count() >= 2);
+
+    KFileItemActions fileItemActions(this);
+    fileItemActions.runPreferredApplications(items, QString());

 }
 
 }
 

-void DolphinViewContainer::showErrorMessage(const QString& msg)
+void DolphinViewContainer::showItemInfo(const KFileItem& item)

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Error);
+    if (item.isNull()) {
+        m_statusBar->resetToDefaultText();
+    } else {
+        m_statusBar->setText(item.getStatusBarInfo());
+    }

 }
 
 void DolphinViewContainer::closeFilterBar()
 {
 }
 
 void DolphinViewContainer::closeFilterBar()
 {

-    m_filterBar->hide();
+    m_filterBar->closeFilterBar();
+    m_view->setFocus();

     emit showFilterBarChanged(false);
 }
 
     emit showFilterBarChanged(false);
 }
 

-QString DolphinViewContainer::defaultStatusBarText() const
+void DolphinViewContainer::setNameFilter(const QString& nameFilter)

 {
 {

-    return KIO::itemsSummaryString(m_fileCount + m_folderCount,
-                                   m_fileCount,
-                                   m_folderCount,
-                                   0, false);
+    m_view->setNameFilter(nameFilter);
+    delayedStatusBarUpdate();

 }
 
 }
 

-QString DolphinViewContainer::selectionStatusBarText() const
+void DolphinViewContainer::activate()

 {
 {

-    QString text;
-    const KFileItemList list = m_view->selectedItems();
-    if (list.isEmpty()) {
-        // when an item is triggered, it is temporary selected but selectedItems()
-        // will return an empty list
-        return QString();
-    }
+    setActive(true);
+}
+
+void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const QUrl&)
+{
+    saveViewState();
+}

 
 

-    int fileCount = 0;
-    int folderCount = 0;
-    KIO::filesize_t byteSize = 0;
-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
-    while (it != end) {
-        KFileItem* item = *it;
-        if (item->isDir()) {
-            ++folderCount;
+void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
+{
+    slotReturnPressed();
+
+    if (KProtocolManager::supportsListing(url)) {
+        setSearchModeEnabled(isSearchUrl(url));
+        m_view->setUrl(url);
+        tryRestoreViewState();
+
+        if (m_autoGrabFocus && 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
+            // a new view widget.
+            QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);
+        }
+    } else if (KProtocolManager::isSourceProtocol(url)) {
+        QString app = QStringLiteral("konqueror");
+        if (url.scheme().startsWith(QLatin1String("http"))) {
+            showMessage(i18nc("@info:status", // krazy:exclude=qmethods
+                              "Dolphin does not support web pages, the web browser has been launched"),
+                        Information);
+
+            const KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "General");
+            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 {
         } else {

-            ++fileCount;
-            byteSize += item->size();
+            showMessage(i18nc("@info:status",
+                              "Protocol not supported by Dolphin, Konqueror has been launched"),
+                        Information);

         }
         }

-        ++it;
+
+        const QString secureUrl = KShell::quoteArg(url.toDisplayString(QUrl::PreferLocalFile));
+        const QString command = app + ' ' + secureUrl;
+        KRun::runCommand(command, app, app, this);
+    } else {
+        showMessage(i18nc("@info:status", "Invalid protocol"), Error);

     }
     }

+}

 
 

-    if (folderCount > 0) {
-        text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
-        if (fileCount > 0) {
-            text += ", ";
-        }
+void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url)
+{
+    qCDebug(DolphinDebug) << "slotUrlSelectionRequested: " << url;
+    m_view->markUrlsAsSelected({url});
+    m_view->markUrlAsCurrent(url); // makes the item scroll into view
+}
+
+void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)
+{
+    Q_UNUSED(oldUrl);
+    const bool block = m_urlNavigator->signalsBlocked();
+    m_urlNavigator->blockSignals(true);
+
+    // 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);
+}
+
+void DolphinViewContainer::requestFocus()
+{
+    m_view->setFocus();
+}
+
+void DolphinViewContainer::saveUrlCompletionMode(KCompletion::CompletionMode completion)
+{
+    GeneralSettings::setUrlCompletionMode(completion);
+}
+
+void DolphinViewContainer::slotReturnPressed()
+{
+    if (!GeneralSettings::editableUrl()) {
+        m_urlNavigator->setUrlEditable(false);

     }
     }

+}

 
 

-    if (fileCount > 0) {
-        const QString sizeText(KIO::convertSize(byteSize));
-        text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
+void DolphinViewContainer::startSearching()
+{
+    const QUrl url = m_searchBox->urlForSearching();
+    if (url.isValid() && !url.isEmpty()) {
+        m_view->setViewPropertiesContext(QStringLiteral("search"));
+        m_urlNavigator->setLocationUrl(url);

     }
     }

+}

 
 

-    return text;
+void DolphinViewContainer::closeSearchBox()
+{
+    setSearchModeEnabled(false);

 }
 
 }
 

-void DolphinViewContainer::showFilterBar(bool show)
+void DolphinViewContainer::stopDirectoryLoading()

 {
 {

-    Q_ASSERT(m_filterBar != 0);
-    m_filterBar->setVisible(show);
+    m_view->stopLoading();
+    m_statusBar->setProgress(100);

 }
 
 }
 

-void DolphinViewContainer::updateStatusBar()
+void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel)

 {
 {

-    // 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->hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
-    m_statusBar->setDefaultText(text);
+    m_view->setZoomLevel(zoomLevel);
+}

 
 

-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
-    }
+void DolphinViewContainer::showErrorMessage(const QString& msg)
+{
+    showMessage(msg, Error);

 }
 
 }
 

-void DolphinViewContainer::changeNameFilter(const QString& nameFilter)
-{
-    // The name filter of KDirLister does a 'hard' filtering, which
-    // means that only the items are shown where the names match
-    // exactly the filter. This is non-transparent for the user, which
-    // just wants to have a 'soft' filtering: does the name contain
-    // the filter string?
-    QString adjustedFilter(nameFilter);
-    adjustedFilter.insert(0, '*');
-    adjustedFilter.append('*');
-
-    // Use the ProxyModel to filter:
-    // This code is #ifdefed as setNameFilter behaves
-    // slightly different than the QSortFilterProxyModel
-    // as it will not remove directories. I will ask
-    // our beloved usability experts for input
-    // -- z.
-#if 0
-    m_dirLister->setNameFilter(adjustedFilter);
-    m_dirLister->emitChanges();
-#else
-    m_proxyModel->setFilterRegExp(nameFilter);
-#endif
+bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
+{
+    return url.scheme().contains(QStringLiteral("search"));

 }
 
 }
 

-void DolphinViewContainer::openContextMenu(KFileItem* item,
-                                           const KUrl& url)
+void DolphinViewContainer::saveViewState()

 {
 {

-    DolphinContextMenu contextMenu(m_mainWindow, item, url);
-    contextMenu.open();
+    QByteArray locationState;
+    QDataStream stream(&locationState, QIODevice::WriteOnly);
+    m_view->saveState(stream);
+    m_urlNavigator->saveLocationState(locationState);

 }
 
 }
 

-#include "dolphinviewcontainer.moc"
+void DolphinViewContainer::tryRestoreViewState()
+{
+    QByteArray locationState = m_urlNavigator->locationState();
+    if (!locationState.isEmpty()) {
+        QDataStream stream(&locationState, QIODevice::ReadOnly);
+        m_view->restoreState(stream);
+    }
+}