[Details mode] Allow to fill the column size of directories with actual size

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3ea81e4bad627d67046d10704372c976a5a57654..4ab34a06a85ef1632c6bdd8ed499489a1e03023b 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,155 +18,231 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"

-#include <KProtocolManager>

 
 

-#include <QApplication>
-#include <QKeyEvent>
-#include <QItemSelection>
-#include <QBoxLayout>
-#include <QTimer>
-#include <QScrollBar>
+#include "dolphin_generalsettings.h"
+#include "dolphinplacesmodelsingleton.h"
+#include "dolphindebug.h"
+#include "filterbar/filterbar.h"
+#include "global.h"
+#include "search/dolphinsearchbox.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "trash/dolphintrash.h"
+#include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"
+#include "dolphin_detailsmodesettings.h"
+#include "views/dolphinview.h"

 
 

-#include <KDesktopFile>
-#include <KFileItemDelegate>
+#ifdef HAVE_KACTIVITIES
+#include <KActivities/ResourceInstance>
+#endif

 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KFileItemActions>
 #include <KFilePlacesModel>

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

 #include <KIO/PreviewJob>
 #include <KIO/PreviewJob>

+#include <KLocalizedString>

 #include <KMessageWidget>
 #include <KMessageWidget>

-#include <KNewFileMenu>
-#include <konqmimedata.h>
-#include <konq_operations.h>
+#include <KProtocolManager>
+#include <KRun>

 #include <KShell>
 #include <KShell>

-#include <KUrl>

 #include <KUrlComboBox>
 #include <KUrlNavigator>
 #include <KUrlComboBox>
 #include <KUrlNavigator>

-#include <KRun>

 
 

-#ifdef KActivities_FOUND
-#include <KActivities/ResourceInstance>
-#endif
-
-#include "dolphin_generalsettings.h"
-#include "filterbar/filterbar.h"
-#include "search/dolphinsearchbox.h"
-#include "statusbar/dolphinstatusbar.h"
-#include "views/draganddrophelper.h"
-#include "views/viewmodecontroller.h"
-#include "views/viewproperties.h"
+#include <QDropEvent>
+#include <QLoggingCategory>
+#include <QMimeData>
+#include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
+#include <QDesktopServices>

 
 

-DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
+DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :

     QWidget(parent),
     QWidget(parent),

-    m_topLayout(0),
-    m_urlNavigator(0),
-    m_searchBox(0),
-    m_messageWidget(0),
-    m_view(0),
-    m_filterBar(0),
-    m_statusBar(0),
-    m_statusBarTimer(0),
+    m_topLayout(nullptr),
+    m_navigatorWidget(nullptr),
+    m_urlNavigator(nullptr),
+    m_emptyTrashButton(nullptr),
+    m_searchBox(nullptr),
+    m_searchModeEnabled(false),
+    m_messageWidget(nullptr),
+    m_view(nullptr),
+    m_filterBar(nullptr),
+    m_statusBar(nullptr),
+    m_statusBarTimer(nullptr),

     m_statusBarTimestamp(),
     m_statusBarTimestamp(),

-    m_autoGrabFocus(true),
-    m_dropDestination(),
-    m_dropEvent(0)
-#ifdef KActivities_FOUND
-    , m_activityResourceInstance(0)
+    m_autoGrabFocus(true)
+#ifdef HAVE_KACTIVITIES
+    , m_activityResourceInstance(nullptr)

 #endif
 {
     hide();
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
 #endif
 {
     hide();
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);

-    m_topLayout->setMargin(0);
-
-    m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);
-    connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)),
-            this, SLOT(dropUrls(KUrl,QDropEvent*)));
-    connect(m_urlNavigator, SIGNAL(activated()),
-            this, SLOT(activate()));
-    connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
-            this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion)));
+    m_topLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_navigatorWidget = new QWidget(this);
+    QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget);
+    navigatorLayout->setSpacing(0);
+    navigatorLayout->setContentsMargins(0, 0, 0, 0);
+    m_navigatorWidget->setWhatsThis(xi18nc("@info:whatsthis location bar",
+        "<para>This line describes the location of the files and folders "
+        "displayed below.</para><para>The name of the currently viewed "
+        "folder can be read at the very right. To the left of it is the "
+        "name of the folder that contains it. The whole line is called "
+        "the <emphasis>path</emphasis> to the current location because "
+        "following these folders from left to right leads here.</para>"
+        "<para>The path is displayed on the <emphasis>location bar</emphasis> "
+        "which is more powerful than one would expect. To learn more "
+        "about the basic and advanced features of the location bar "
+        "<link url='help:/dolphin/location-bar.html'>click here</link>. "
+        "This will open the dedicated page in the Handbook.</para>"));
+
+    m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this);
+    connect(m_urlNavigator, &KUrlNavigator::activated,
+            this, &DolphinViewContainer::activate);
+    connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,
+            this, &DolphinViewContainer::saveUrlCompletionMode);

 
     const GeneralSettings* settings = GeneralSettings::self();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());
 
     const GeneralSettings* settings = GeneralSettings::self();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());

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

     KUrlComboBox* editor = m_urlNavigator->editor();
     KUrlComboBox* editor = m_urlNavigator->editor();

-    editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode()));
+    editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode()));
+
+    m_emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("user-trash")), i18nc("@action:button", "Empty Trash"), this);
+    m_emptyTrashButton->setFlat(true);
+    connect(m_emptyTrashButton, &QPushButton::clicked, this, [this]() { Trash::empty(this); });
+    connect(&Trash::instance(), &Trash::emptinessChanged, m_emptyTrashButton, &QPushButton::setDisabled);
+    m_emptyTrashButton->setDisabled(Trash::isEmpty());
+    m_emptyTrashButton->hide();

 
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();
 
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();

-    connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
-    connect(m_searchBox, SIGNAL(searchRequest()), this, SLOT(startSearching()));
-    connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
+    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::focusViewRequest, this, &DolphinViewContainer::requestFocus);
+    m_searchBox->setWhatsThis(xi18nc("@info:whatsthis findbar",
+        "<para>This helps you find files and folders. Enter a <emphasis>"
+        "search term</emphasis> and specify search settings with the "
+        "buttons at the bottom:<list><item>Filename/Content: "
+        "Does the item you are looking for contain the search terms "
+        "within its filename or its contents?<nl/>The contents of images, "
+        "audio files and videos will not be searched.</item><item>"
+        "From Here/Everywhere: Do you want to search in this "
+        "folder and its sub-folders or everywhere?</item><item>"
+        "More Options: Click this to search by media type, access "
+        "time or rating.</item><item>More Search Tools: Install other "
+        "means to find an item.</item></list></para>"));

 
     m_messageWidget = new KMessageWidget(this);
     m_messageWidget->setCloseButtonVisible(true);
     m_messageWidget->hide();
 
 
     m_messageWidget = new KMessageWidget(this);
     m_messageWidget->setCloseButtonVisible(true);
     m_messageWidget->hide();
 

+#ifndef Q_OS_WIN
+    if (getuid() == 0) {
+
+        // We must be logged in as the root user; show a big scary warning
+        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);
+    }
+#endif
+
+    // Initialize filter bar
+    m_filterBar = new FilterBar(this);
+    m_filterBar->setVisible(settings->filterBar());
+
+    connect(m_filterBar, &FilterBar::filterChanged,
+            this, &DolphinViewContainer::setNameFilter);
+    connect(m_filterBar, &FilterBar::closeRequest,
+            this, &DolphinViewContainer::closeFilterBar);
+    connect(m_filterBar, &FilterBar::focusViewRequest,
+            this, &DolphinViewContainer::requestFocus);
+
+    // Initialize the main view

     m_view = new DolphinView(url, this);
     m_view = new DolphinView(url, this);

-    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_urlNavigator, SLOT(setUrl(KUrl)));
-    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_messageWidget, SLOT(hide()));
-    connect(m_view, SIGNAL(writeStateChanged(bool)),            this, SIGNAL(writeStateChanged(bool)));
-    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),         this, SLOT(showItemInfo(KFileItem)));
-    connect(m_view, SIGNAL(itemActivated(KFileItem)),           this, SLOT(slotItemActivated(KFileItem)));
-    connect(m_view, SIGNAL(itemsActivated(KFileItemList)),      this, SLOT(slotItemsActivated(KFileItemList)));
-    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(directoryLoadingCanceled()),         this, SLOT(slotDirectoryLoadingCanceled()));
-    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(selectionChanged(KFileItemList)),    this, SLOT(delayedStatusBarUpdate()));
-    connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)),          this, SLOT(slotViewUrlAboutToBeChanged(KUrl)));
-    connect(m_view, SIGNAL(errorMessage(QString)),              this, SLOT(showErrorMessage(QString)));
-    connect(m_view, SIGNAL(urlIsFileError(KUrl)),               this, SLOT(slotUrlIsFileError(KUrl)));
-
-    connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)),
-            this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl)));
-    connect(m_urlNavigator, SIGNAL(urlChanged(KUrl)),
-            this, SLOT(slotUrlNavigatorLocationChanged(KUrl)));
-    connect(m_urlNavigator, SIGNAL(historyChanged()),
-            this, SLOT(slotHistoryChanged()));
-    connect(m_urlNavigator, SIGNAL(returnPressed()),
-            this, SLOT(slotReturnPressed()));
+    connect(m_view, &DolphinView::urlChanged,
+            m_filterBar, &FilterBar::slotUrlChanged);
+    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) {
+        m_view->dropUrls(destination, event, m_urlNavigator->dropWidget());
+    });
+
+    connect(m_view, &DolphinView::directoryLoadingCompleted, this, [this]() {
+        m_emptyTrashButton->setVisible(m_view->url().scheme() == QLatin1String("trash"));
+    });

 
     // Initialize status bar
     m_statusBar = new DolphinStatusBar(this);
     m_statusBar->setUrl(m_view->url());
     m_statusBar->setZoomLevel(m_view->zoomLevel());
 
     // Initialize status bar
     m_statusBar = new DolphinStatusBar(this);
     m_statusBar->setUrl(m_view->url());
     m_statusBar->setZoomLevel(m_view->zoomLevel());

-    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_statusBar, SLOT(setUrl(KUrl)));
-    connect(m_view, SIGNAL(zoomLevelChanged(int,int)),          m_statusBar, SLOT(setZoomLevel(int)));
-    connect(m_view, SIGNAL(infoMessage(QString)),               m_statusBar, SLOT(setText(QString)));
-    connect(m_view, SIGNAL(operationCompletedMessage(QString)), m_statusBar, SLOT(setText(QString)));
-    connect(m_statusBar, SIGNAL(stopPressed()),                 this, SLOT(stopDirectoryLoading()));
-    connect(m_statusBar, SIGNAL(zoomLevelChanged(int)),         this, SLOT(slotStatusBarZoomLevelChanged(int)));
+    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);
 
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBarTimer->setInterval(300);

-    connect(m_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar()));
+    connect(m_statusBarTimer, &QTimer::timeout, this, &DolphinViewContainer::updateStatusBar);

 
     KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
 
     KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();

-    connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
-            this, SLOT(delayedStatusBarUpdate()));
+    connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished,
+            this, &DolphinViewContainer::delayedStatusBarUpdate);

 
 

-    // Initialize filter bar
-    m_filterBar = new FilterBar(this);
-    m_filterBar->setVisible(settings->filterBar());
-    connect(m_filterBar, SIGNAL(filterChanged(QString)),
-            this, SLOT(setNameFilter(QString)));
-    connect(m_filterBar, SIGNAL(closeRequest()),
-            this, SLOT(closeFilterBar()));
-    connect(m_filterBar, SIGNAL(focusViewRequest()),
-            this, SLOT(requestFocus()));
-    connect(m_view, SIGNAL(urlChanged(KUrl)),
-            m_filterBar, SLOT(slotUrlChanged()));
-
-    m_topLayout->addWidget(m_urlNavigator);
+    navigatorLayout->addWidget(m_urlNavigator);
+    navigatorLayout->addWidget(m_emptyTrashButton);
+
+    m_topLayout->addWidget(m_navigatorWidget);

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


@@ -175,36 +251,42 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
     setSearchModeEnabled(isSearchUrl(url));
 
 
     setSearchModeEnabled(isSearchUrl(url));
 

+    connect(DetailsModeSettings::self(), &KCoreConfigSkeleton::configChanged, this, [=]() {
+        if (view()->mode() == DolphinView::Mode::DetailsView) {
+            view()->reload();
+        }
+    });
+

     // Initialize kactivities resource instance
 
     // Initialize kactivities resource instance
 

-    #ifdef KActivities_FOUND
-    m_activityResourceInstance = new KActivities::ResourceInstance(
-            window()->winId(), url);
+#ifdef HAVE_KACTIVITIES
+    m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url);

     m_activityResourceInstance->setParent(this);
     m_activityResourceInstance->setParent(this);

-    #endif
+#endif

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

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

 {
     return m_view->url();
 }
 
 void DolphinViewContainer::setActive(bool active)
 {
 {
     return m_view->url();
 }
 
 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
+#ifdef HAVE_KACTIVITIES

     if (active) {
         m_activityResourceInstance->notifyFocusedIn();
     } else {
         m_activityResourceInstance->notifyFocusedOut();
     }
     if (active) {
         m_activityResourceInstance->notifyFocusedIn();
     } else {
         m_activityResourceInstance->notifyFocusedOut();
     }

-    #endif
+#endif

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


@@ -223,6 +305,11 @@ bool DolphinViewContainer::autoGrabFocus() const
     return m_autoGrabFocus;
 }
 
     return m_autoGrabFocus;
 }
 

+QString DolphinViewContainer::currentSearchText() const
+{
+     return m_searchBox->text();
+}
+

 const DolphinStatusBar* DolphinViewContainer::statusBar() const
 {
     return m_statusBar;
 const DolphinStatusBar* DolphinViewContainer::statusBar() const
 {
     return m_statusBar;


@@ -261,6 +348,10 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
 
     m_messageWidget->setText(msg);
 
 
     m_messageWidget->setText(msg);
 

+    // TODO: wrap at arbitrary character positions once QLabel can do this
+    // https://bugreports.qt.io/browse/QTBUG-1276
+    m_messageWidget->setWordWrap(true);
+

     switch (type) {
     case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
     case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;
     switch (type) {
     case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
     case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;


@@ -274,6 +365,9 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
     const int unwrappedWidth = m_messageWidget->sizeHint().width();
     m_messageWidget->setWordWrap(unwrappedWidth > size().width());
 
     const int unwrappedWidth = m_messageWidget->sizeHint().width();
     m_messageWidget->setWordWrap(unwrappedWidth > size().width());
 

+    if (m_messageWidget->isVisible()) {
+        m_messageWidget->hide();
+    }

     m_messageWidget->animatedShow();
 }
 
     m_messageWidget->animatedShow();
 }
 


@@ -285,7 +379,7 @@ void DolphinViewContainer::readSettings()
         // settings of the URL navigator and the filterbar.
         m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
         m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());
         // settings of the URL navigator and the filterbar.
         m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
         m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());

-        m_urlNavigator->setHomeUrl(KUrl(GeneralSettings::homeUrl()));
+        m_urlNavigator->setHomeUrl(Dolphin::homeUrl());

         setFilterBarVisible(GeneralSettings::filterBar());
     }
 
         setFilterBarVisible(GeneralSettings::filterBar());
     }
 


@@ -300,6 +394,14 @@ bool DolphinViewContainer::isFilterBarVisible() const
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {

+    m_searchBox->setVisible(enabled);
+    m_navigatorWidget->setVisible(!enabled);
+
+    if (enabled) {
+        const QUrl& locationUrl = m_urlNavigator->locationUrl();
+        m_searchBox->fromSearchUrl(locationUrl);
+    }
+

     if (enabled == isSearchModeEnabled()) {
         if (enabled && !m_searchBox->hasFocus()) {
             m_searchBox->setFocus();
     if (enabled == isSearchModeEnabled()) {
         if (enabled && !m_searchBox->hasFocus()) {
             m_searchBox->setFocus();


@@ -308,46 +410,26 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         return;
     }
 
         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 {
+    if (!enabled) {

         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.
         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.

-        const KUrl url = m_searchBox->searchPath();
-        if (url.isValid() && !url.isEmpty()) {
-            if (isSearchUrl(url)) {
-                m_urlNavigator->goHome();
-            } else {
-                m_urlNavigator->setLocationUrl(url);
-            }
+        QUrl url = m_searchBox->searchPath();
+        if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) {
+            url = Dolphin::homeUrl();

         }
         }

+        m_urlNavigator->setLocationUrl(url);

     }
     }

+
+    m_searchModeEnabled = enabled;
+
+    emit searchModeEnabledChanged(enabled);

 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 {
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 {

-    return m_searchBox->isVisible();
+    return m_searchModeEnabled;

 }
 
 QString DolphinViewContainer::placesText() const
 }
 
 QString DolphinViewContainer::placesText() const


@@ -355,32 +437,95 @@ QString DolphinViewContainer::placesText() const
     QString text;
 
     if (isSearchModeEnabled()) {
     QString text;
 
     if (isSearchModeEnabled()) {

-        text = m_searchBox->searchPath().fileName() + QLatin1String(": ") + m_searchBox->text();
+        text = i18n("Search for %1 in %2", m_searchBox->text(), m_searchBox->searchPath().fileName());

     } else {
     } else {

-        text = url().fileName();
+        text = url().adjusted(QUrl::StripTrailingSlash).fileName();

         if (text.isEmpty()) {
             text = url().host();
         }
         if (text.isEmpty()) {
             text = url().host();
         }

+        if (text.isEmpty()) {
+            text = url().scheme();
+        }

     }
 
     return text;
 }
 
     }
 
     return text;
 }
 

-void DolphinViewContainer::setUrl(const KUrl& newUrl)
+void DolphinViewContainer::reload()
+{
+    view()->reload();
+    m_messageWidget->hide();
+}
+
+QString DolphinViewContainer::captionWindowTitle() const
+{
+    if (GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) {
+        if (!url().isLocalFile()) {
+            return url().adjusted(QUrl::StripTrailingSlash).toString();
+        }
+        return url().adjusted(QUrl::StripTrailingSlash).path();
+    } else {
+        return DolphinViewContainer::caption();
+    }
+}
+
+QString DolphinViewContainer::caption() const
+{
+    if (isSearchModeEnabled()) {
+        if (currentSearchText().isEmpty()){
+            return i18n("Search");
+        } else {
+            return i18n("Search for %1", currentSearchText());
+        }
+    }
+
+    KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
+    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp);
+
+    if (!matchedPlaces.isEmpty()) {
+        return placesModel->text(matchedPlaces.first());
+    }
+
+
+    if (!url().isLocalFile()) {
+        QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);
+        QString caption;
+        if (!adjustedUrl.fileName().isEmpty()) {
+            caption = adjustedUrl.fileName();
+        } else if (!adjustedUrl.path().isEmpty() && adjustedUrl.path() != "/") {
+            caption = adjustedUrl.path();
+        } else if (!adjustedUrl.host().isEmpty()) {
+            caption = adjustedUrl.host();
+        } else {
+            caption = adjustedUrl.toString();
+        }
+        return caption;
+    }
+
+    QString fileName = url().adjusted(QUrl::StripTrailingSlash).fileName();
+    if (fileName.isEmpty()) {
+        fileName = '/';
+    }
+
+    return fileName;
+}
+
+void DolphinViewContainer::setUrl(const QUrl& newUrl)

 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
     }
 
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
     }
 

-    #ifdef KActivities_FOUND
+#ifdef HAVE_KACTIVITIES

     m_activityResourceInstance->setUri(newUrl);
     m_activityResourceInstance->setUri(newUrl);

-    #endif
+#endif

 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
 {
     Q_ASSERT(m_filterBar);
     if (visible) {
 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
 {
     Q_ASSERT(m_filterBar);
     if (visible) {

+        m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly);

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


@@ -441,6 +586,7 @@ void DolphinViewContainer::slotDirectoryLoadingStarted()
         // Trigger an undetermined progress indication. The progress
         // information in percent will be triggered by the percent() signal
         // of the directory lister later.
         // Trigger an undetermined progress indication. The progress
         // information in percent will be triggered by the percent() signal
         // of the directory lister later.

+        m_statusBar->setProgressText(QString());

         updateDirectoryLoadingProgress(-1);
     }
 }
         updateDirectoryLoadingProgress(-1);
     }
 }


@@ -453,7 +599,7 @@ void DolphinViewContainer::slotDirectoryLoadingCompleted()
     }
 
     if (isSearchUrl(url()) && m_view->itemsCount() == 0) {
     }
 
     if (isSearchUrl(url()) && m_view->itemsCount() == 0) {

-        // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead
+        // 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 {
         // 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 {


@@ -471,10 +617,19 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled()
     m_statusBar->setText(QString());
 }
 
     m_statusBar->setText(QString());
 }
 

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

 {
 {

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

 }
 
 void DolphinViewContainer::slotItemActivated(const KFileItem& item)
 }
 
 void DolphinViewContainer::slotItemActivated(const KFileItem& item)


@@ -484,13 +639,14 @@ void DolphinViewContainer::slotItemActivated(const KFileItem& item)
     // results in an active view.
     m_view->setActive(true);
 
     // results in an active view.
     m_view->setActive(true);
 

-    const KUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());
+    const QUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());

     if (!url.isEmpty()) {
     if (!url.isEmpty()) {

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

         return;
     }
 
         return;
     }
 

-    item.run();
+    KRun *run = new KRun(item.targetUrl(), this);
+    run->setShowScriptExecutionPrompt(true);

 }
 
 void DolphinViewContainer::slotItemsActivated(const KFileItemList& items)
 }
 
 void DolphinViewContainer::slotItemsActivated(const KFileItemList& items)


@@ -519,6 +675,7 @@ void DolphinViewContainer::closeFilterBar()
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {

+    m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly);

     m_view->setNameFilter(nameFilter);
     delayedStatusBarUpdate();
 }
     m_view->setNameFilter(nameFilter);
     delayedStatusBarUpdate();
 }


@@ -528,112 +685,53 @@ void DolphinViewContainer::activate()
     setActive(true);
 }
 
     setActive(true);
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
     slotReturnPressed();
 
     if (KProtocolManager::supportsListing(url)) {
         setSearchModeEnabled(isSearchUrl(url));
         m_view->setUrl(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.
 
         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, SLOT(requestFocus()));
+            QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);

         }
     } else if (KProtocolManager::isSourceProtocol(url)) {
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {

-        QString app = "konqueror";
-        if (url.protocol().startsWith(QLatin1String("http"))) {
+        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);
             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("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 {
             showMessage(i18nc("@info:status",
         } else {
             showMessage(i18nc("@info:status",

-                              "Protocol not supported by Dolphin, Konqueror has been launched"),
+                              "Protocol not supported by Dolphin, default application has been launched"),

                         Information);
         }
 
                         Information);
         }
 

-        const QString secureUrl = KShell::quoteArg(url.pathOrUrl());
-        const QString command = app + ' ' + secureUrl;
-        KRun::runCommand(command, app, app, this);
+        QDesktopServices::openUrl(url);
+        redirect(QUrl(), m_urlNavigator->locationUrl(1));

     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);
     }
 }
 
     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);
     }
 }
 

-void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
-{
-    m_dropDestination = destination;
-
-    const QMimeData* mimeData = event->mimeData();
-    QMimeData* mimeDataCopy = new QMimeData;
-    foreach (const QString& format, mimeData->formats()) {
-        mimeDataCopy->setData(format, mimeData->data(format));
-    }
-
-    m_dropEvent.reset(new QDropEvent(event->pos(),
-                                     event->possibleActions(),
-                                     mimeDataCopy,
-                                     event->mouseButtons(),
-                                     event->keyboardModifiers()));
-
-    QTimer::singleShot(0, this, SLOT(dropUrlsDelayed()));
-}
-
-void DolphinViewContainer::dropUrlsDelayed()
+void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url)

 {
 {

-    if (m_dropEvent.isNull()) {
-        return;
-    }
-
-    QString error;
-    DragAndDropHelper::dropUrls(KFileItem(), m_dropDestination, m_dropEvent.data(), error);
-    if (!error.isEmpty()) {
-        showMessage(error, Error);
-    }
-
-    delete m_dropEvent->mimeData();
-    m_dropEvent.reset();
+    m_view->markUrlsAsSelected({url});
+    m_view->markUrlAsCurrent(url); // makes the item scroll into view

 }
 
 }
 

-void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)

 {
 {

-    Q_UNUSED(oldUrl);
+    Q_UNUSED(oldUrl)

     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
 
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
 


@@ -652,20 +750,11 @@ void DolphinViewContainer::requestFocus()
     m_view->setFocus();
 }
 
     m_view->setFocus();
 }
 

-void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion)
+void DolphinViewContainer::saveUrlCompletionMode(KCompletion::CompletionMode completion)

 {
     GeneralSettings::setUrlCompletionMode(completion);
 }
 
 {
     GeneralSettings::setUrlCompletionMode(completion);
 }
 

-void DolphinViewContainer::slotHistoryChanged()
-{
-    QByteArray locationState = m_urlNavigator->locationState();
-    if (!locationState.isEmpty()) {
-        QDataStream stream(&locationState, QIODevice::ReadOnly);
-        m_view->restoreState(stream);
-    }
-}
-

 void DolphinViewContainer::slotReturnPressed()
 {
     if (!GeneralSettings::editableUrl()) {
 void DolphinViewContainer::slotReturnPressed()
 {
     if (!GeneralSettings::editableUrl()) {


@@ -675,9 +764,9 @@ void DolphinViewContainer::slotReturnPressed()
 
 void DolphinViewContainer::startSearching()
 {
 
 void DolphinViewContainer::startSearching()
 {

-    const KUrl url = m_searchBox->urlForSearching();
+    const QUrl url = m_searchBox->urlForSearching();

     if (url.isValid() && !url.isEmpty()) {
     if (url.isValid() && !url.isEmpty()) {

-        m_view->setViewPropertiesContext("search");
+        m_view->setViewPropertiesContext(QStringLiteral("search"));

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


@@ -703,10 +792,9 @@ void DolphinViewContainer::showErrorMessage(const QString& msg)
     showMessage(msg, Error);
 }
 
     showMessage(msg, Error);
 }
 

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

 {
 {

-    const QString protocol = url.protocol();
-    return protocol.contains("search") || (protocol == QLatin1String("nepomuk"));
+    return url.scheme().contains(QLatin1String("search"));

 }
 
 void DolphinViewContainer::saveViewState()
 }
 
 void DolphinViewContainer::saveViewState()


@@ -717,4 +805,11 @@ void DolphinViewContainer::saveViewState()
     m_urlNavigator->saveLocationState(locationState);
 }
 
     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);
+    }
+}