KFileItemListWidget: wrong selection when renamed file ends with a dot

[dolphin.git] / src / search / dolphinsearchbox.cpp

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 9143ddcb770023038ef245b2d61d05836216c7b6..ee425501d876628c044895933b1cecfdf5f9114b 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -4,21 +4,22 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 

-#include "global.h"

 #include "dolphinsearchbox.h"
 #include "dolphinsearchbox.h"

+#include "global.h"

 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"

+#include "dolphinplacesmodelsingleton.h"

 #include "dolphinquery.h"
 #include "dolphinquery.h"

-#include "panels/places/placesitemmodel.h"

 
 

+#include "config-dolphin.h"
+#include <KIO/ApplicationLauncherJob>

 #include <KLocalizedString>
 #include <KLocalizedString>

-#include <KNS3/KMoreToolsMenuFactory>

 #include <KSeparator>
 #include <KSeparator>

-#include <config-baloo.h>
-#ifdef HAVE_BALOO
-#include <Baloo/Query>
+#include <KService>
+#if HAVE_BALOO

 #include <Baloo/IndexerConfig>
 #include <Baloo/IndexerConfig>

+#include <Baloo/Query>

 #endif
 
 #include <QButtonGroup>
 #endif
 
 #include <QButtonGroup>


@@ -27,7 +28,6 @@
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QKeyEvent>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QKeyEvent>

-#include <QLabel>

 #include <QLineEdit>
 #include <QScrollArea>
 #include <QShowEvent>
 #include <QLineEdit>
 #include <QScrollArea>
 #include <QShowEvent>


@@ -35,22 +35,23 @@
 #include <QToolButton>
 #include <QUrlQuery>
 
 #include <QToolButton>
 #include <QUrlQuery>
 

-DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
-    QWidget(parent),
-    m_startedSearching(false),
-    m_active(true),
-    m_topLayout(nullptr),
-    m_searchInput(nullptr),
-    m_saveSearchAction(nullptr),
-    m_optionsScrollArea(nullptr),
-    m_fileNameButton(nullptr),
-    m_contentButton(nullptr),
-    m_separator(nullptr),
-    m_fromHereButton(nullptr),
-    m_everywhereButton(nullptr),
-    m_facetsWidget(nullptr),
-    m_searchPath(),
-    m_startSearchTimer(nullptr)
+DolphinSearchBox::DolphinSearchBox(QWidget *parent)
+    : AnimatedHeightWidget(parent)
+    , m_startedSearching(false)
+    , m_active(true)
+    , m_topLayout(nullptr)
+    , m_searchInput(nullptr)
+    , m_saveSearchAction(nullptr)
+    , m_optionsScrollArea(nullptr)
+    , m_fileNameButton(nullptr)
+    , m_contentButton(nullptr)
+    , m_separator(nullptr)
+    , m_fromHereButton(nullptr)
+    , m_everywhereButton(nullptr)
+    , m_facetsWidget(nullptr)
+    , m_searchPath()
+    , m_startSearchTimer(nullptr)
+    , m_initialized(false)

 {
 }
 
 {
 }
 


@@ -59,9 +60,11 @@ DolphinSearchBox::~DolphinSearchBox()
     saveSettings();
 }
 
     saveSettings();
 }
 

-void DolphinSearchBox::setText(const QString& text)
+void DolphinSearchBox::setText(const QString &text)

 {
 {

-    m_searchInput->setText(text);
+    if (m_searchInput->text() != text) {
+        m_searchInput->setText(text);
+    }

 }
 
 QString DolphinSearchBox::text() const
 }
 
 QString DolphinSearchBox::text() const


@@ -69,9 +72,9 @@ QString DolphinSearchBox::text() const
     return m_searchInput->text();
 }
 
     return m_searchInput->text();
 }
 

-void DolphinSearchBox::setSearchPath(const QUrl& url)
+void DolphinSearchBox::setSearchPath(const QUrl &url)

 {
 {

-    if (url == m_searchPath) {
+    if (url == m_searchPath || !m_initialized) {

         return;
     }
 
         return;
     }
 


@@ -117,13 +120,13 @@ QUrl DolphinSearchBox::urlForSearching() const
         url.setScheme(QStringLiteral("filenamesearch"));
 
         QUrlQuery query;
         url.setScheme(QStringLiteral("filenamesearch"));
 
         QUrlQuery query;

-        query.addQueryItem(QStringLiteral("search"), m_searchInput->text());
+        query.addQueryItem(QStringLiteral("search"), QUrl::toPercentEncoding(m_searchInput->text()));

         if (m_contentButton->isChecked()) {
             query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
         }
 
         if (m_contentButton->isChecked()) {
             query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
         }
 

-        query.addQueryItem(QStringLiteral("url"), searchPath().url());
-        query.addQueryItem(QStringLiteral("title"), queryTitle(m_searchInput->text()));
+        query.addQueryItem(QStringLiteral("url"), QUrl::toPercentEncoding(searchPath().url()));
+        query.addQueryItem(QStringLiteral("title"), QUrl::toPercentEncoding(queryTitle(m_searchInput->text())));

 
         url.setQuery(query);
     }
 
         url.setQuery(query);
     }


@@ -131,18 +134,18 @@ QUrl DolphinSearchBox::urlForSearching() const
     return url;
 }
 
     return url;
 }
 

-void DolphinSearchBox::fromSearchUrl(const QUrl& url)
+void DolphinSearchBox::fromSearchUrl(const QUrl &url)

 {
     if (DolphinQuery::supportsScheme(url.scheme())) {
         const DolphinQuery query = DolphinQuery::fromSearchUrl(url);
         updateFromQuery(query);
     } else if (url.scheme() == QLatin1String("filenamesearch")) {
         const QUrlQuery query(url);
 {
     if (DolphinQuery::supportsScheme(url.scheme())) {
         const DolphinQuery query = DolphinQuery::fromSearchUrl(url);
         updateFromQuery(query);
     } else if (url.scheme() == QLatin1String("filenamesearch")) {
         const QUrlQuery query(url);

-        setText(query.queryItemValue(QStringLiteral("search")));
+        setText(query.queryItemValue(QStringLiteral("search"), QUrl::FullyDecoded));

         if (m_searchPath.scheme() != url.scheme()) {
             m_searchPath = QUrl();
         }
         if (m_searchPath.scheme() != url.scheme()) {
             m_searchPath = QUrl();
         }

-        setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
+        setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url"), QUrl::FullyDecoded), QString(), QUrl::AssumeLocalFile));

         m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
     } else {
         setText(QString());
         m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
     } else {
         setText(QString());


@@ -174,15 +177,15 @@ bool DolphinSearchBox::isActive() const
     return m_active;
 }
 
     return m_active;
 }
 

-bool DolphinSearchBox::event(QEvent* event)
+void DolphinSearchBox::setVisible(bool visible, Animated animated)

 {
 {

-    if (event->type() == QEvent::Polish) {
+    if (visible) {

         init();
     }
         init();
     }

-    return QWidget::event(event);
+    AnimatedHeightWidget::setVisible(visible, animated);

 }
 
 }
 

-void DolphinSearchBox::showEvent(QShowEvent* event)
+void DolphinSearchBox::showEvent(QShowEvent *event)

 {
     if (!event->spontaneous()) {
         m_searchInput->setFocus();
 {
     if (!event->spontaneous()) {
         m_searchInput->setFocus();


@@ -190,29 +193,30 @@ void DolphinSearchBox::showEvent(QShowEvent* event)
     }
 }
 
     }
 }
 

-void DolphinSearchBox::hideEvent(QHideEvent* event)
+void DolphinSearchBox::hideEvent(QHideEvent *event)

 {
     Q_UNUSED(event)
     m_startedSearching = false;
 {
     Q_UNUSED(event)
     m_startedSearching = false;

-    m_startSearchTimer->stop();
+    if (m_startSearchTimer) {
+        m_startSearchTimer->stop();
+    }

 }
 
 }
 

-void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
+void DolphinSearchBox::keyReleaseEvent(QKeyEvent *event)

 {
     QWidget::keyReleaseEvent(event);
     if (event->key() == Qt::Key_Escape) {
         if (m_searchInput->text().isEmpty()) {
 {
     QWidget::keyReleaseEvent(event);
     if (event->key() == Qt::Key_Escape) {
         if (m_searchInput->text().isEmpty()) {

-            Q_EMIT closeRequest();
+            emitCloseRequest();

         } else {
             m_searchInput->clear();
         }
         } else {
             m_searchInput->clear();
         }

-    }
-    else if (event->key() == Qt::Key_Down) {
+    } else if (event->key() == Qt::Key_Down) {

         Q_EMIT focusViewRequest();
     }
 }
 
         Q_EMIT focusViewRequest();
     }
 }
 

-bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
+bool DolphinSearchBox::eventFilter(QObject *obj, QEvent *event)

 {
     switch (event->type()) {
     case QEvent::FocusIn:
 {
     switch (event->type()) {
     case QEvent::FocusIn:


@@ -260,11 +264,12 @@ void DolphinSearchBox::slotConfigurationChanged()
     }
 }
 
     }
 }
 

-void DolphinSearchBox::slotSearchTextChanged(const QString& text)
+void DolphinSearchBox::slotSearchTextChanged(const QString &text)

 {
 {

-

     if (text.isEmpty()) {
     if (text.isEmpty()) {

-        m_startSearchTimer->stop();
+        // Restore URL when search box is cleared by closing and reopening the box.
+        emitCloseRequest();
+        Q_EMIT openRequest();

     } else {
         m_startSearchTimer->start();
     }
     } else {
         m_startSearchTimer->start();
     }


@@ -273,6 +278,10 @@ void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 
 void DolphinSearchBox::slotReturnPressed()
 {
 
 void DolphinSearchBox::slotReturnPressed()
 {

+    if (m_searchInput->text().isEmpty()) {
+        return;
+    }
+

     emitSearchRequest();
     Q_EMIT focusViewRequest();
 }
     emitSearchRequest();
     Q_EMIT focusViewRequest();
 }


@@ -288,15 +297,12 @@ void DolphinSearchBox::slotSearchSaved()
 {
     const QUrl searchURL = urlForSearching();
     if (searchURL.isValid()) {
 {
     const QUrl searchURL = urlForSearching();
     if (searchURL.isValid()) {

-        PlacesItemModel model;

         const QString label = i18n("Search for %1 in %2", text(), searchPath().fileName());
         const QString label = i18n("Search for %1 in %2", text(), searchPath().fileName());

-        model.createPlacesItem(label,
-                               searchURL,
-                               QStringLiteral("folder-saved-search-symbolic"));
+        DolphinPlacesModelSingleton::instance().placesModel()->addPlace(label, searchURL, QStringLiteral("folder-saved-search-symbolic"));

     }
 }
 
     }
 }
 

-void DolphinSearchBox::initButton(QToolButton* button)
+void DolphinSearchBox::initButton(QToolButton *button)

 {
     button->installEventFilter(this);
     button->setAutoExclusive(true);
 {
     button->installEventFilter(this);
     button->setAutoExclusive(true);


@@ -324,48 +330,54 @@ void DolphinSearchBox::loadSettings()
 
 void DolphinSearchBox::saveSettings()
 {
 
 void DolphinSearchBox::saveSettings()
 {

-    SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
-    SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));
-    SearchSettings::self()->save();
+    if (m_initialized) {
+        SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
+        SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));
+        SearchSettings::self()->save();
+    }

 }
 
 void DolphinSearchBox::init()
 {
 }
 
 void DolphinSearchBox::init()
 {

+    if (m_initialized) {
+        return; // This object is already initialised.
+    }
+
+    QWidget *contentsContainer = prepareContentsContainer();
+

     // Create search box
     // Create search box

-    m_searchInput = new QLineEdit(this);
-    m_searchInput->setPlaceholderText(i18n("Search..."));
+    m_searchInput = new QLineEdit(contentsContainer);
+    m_searchInput->setPlaceholderText(i18n("Search…"));

     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonEnabled(true);
     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonEnabled(true);
     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));

-    connect(m_searchInput, &QLineEdit::returnPressed,
-            this, &DolphinSearchBox::slotReturnPressed);
-    connect(m_searchInput, &QLineEdit::textChanged,
-            this, &DolphinSearchBox::slotSearchTextChanged);
+    connect(m_searchInput, &QLineEdit::returnPressed, this, &DolphinSearchBox::slotReturnPressed);
+    connect(m_searchInput, &QLineEdit::textChanged, this, &DolphinSearchBox::slotSearchTextChanged);

     setFocusProxy(m_searchInput);
 
     // Add "Save search" button inside search box
     m_saveSearchAction = new QAction(this);
     setFocusProxy(m_searchInput);
 
     // Add "Save search" button inside search box
     m_saveSearchAction = new QAction(this);

-    m_saveSearchAction->setIcon (QIcon::fromTheme(QStringLiteral("document-save-symbolic")));
+    m_saveSearchAction->setIcon(QIcon::fromTheme(QStringLiteral("document-save-symbolic")));

     m_saveSearchAction->setText(i18nc("action:button", "Save this search to quickly access it again in the future"));
     m_saveSearchAction->setEnabled(false);
     m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
     connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
 
     // Create close button
     m_saveSearchAction->setText(i18nc("action:button", "Save this search to quickly access it again in the future"));
     m_saveSearchAction->setEnabled(false);
     m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
     connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
 
     // Create close button

-    QToolButton* closeButton = new QToolButton(this);
+    QToolButton *closeButton = new QToolButton(contentsContainer);

     closeButton->setAutoRaise(true);
     closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
     // Apply layout for the search input
     closeButton->setAutoRaise(true);
     closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
     // Apply layout for the search input

-    QHBoxLayout* searchInputLayout = new QHBoxLayout();
+    QHBoxLayout *searchInputLayout = new QHBoxLayout();

     searchInputLayout->setContentsMargins(0, 0, 0, 0);
     searchInputLayout->addWidget(m_searchInput);
     searchInputLayout->addWidget(closeButton);
 
     // Create "Filename" and "Content" button
     searchInputLayout->setContentsMargins(0, 0, 0, 0);
     searchInputLayout->addWidget(m_searchInput);
     searchInputLayout->addWidget(closeButton);
 
     // Create "Filename" and "Content" button

-    m_fileNameButton = new QToolButton(this);
+    m_fileNameButton = new QToolButton(contentsContainer);

     m_fileNameButton->setText(i18nc("action:button", "Filename"));
     initButton(m_fileNameButton);
 
     m_fileNameButton->setText(i18nc("action:button", "Filename"));
     initButton(m_fileNameButton);
 


@@ -373,44 +385,49 @@ void DolphinSearchBox::init()
     m_contentButton->setText(i18nc("action:button", "Content"));
     initButton(m_contentButton);
 
     m_contentButton->setText(i18nc("action:button", "Content"));
     initButton(m_contentButton);
 

-    QButtonGroup* searchWhatGroup = new QButtonGroup(this);
+    QButtonGroup *searchWhatGroup = new QButtonGroup(contentsContainer);

     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
 
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
 

-    m_separator = new KSeparator(Qt::Vertical, this);
+    m_separator = new KSeparator(Qt::Vertical, contentsContainer);

 
     // Create "From Here" and "Your files" buttons
 
     // Create "From Here" and "Your files" buttons

-    m_fromHereButton = new QToolButton(this);
+    m_fromHereButton = new QToolButton(contentsContainer);

     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 
     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 

-    m_everywhereButton = new QToolButton(this);
+    m_everywhereButton = new QToolButton(contentsContainer);

     m_everywhereButton->setText(i18nc("action:button", "Your files"));
     m_everywhereButton->setToolTip(i18nc("action:button", "Search in your home directory"));
     m_everywhereButton->setIcon(QIcon::fromTheme(QStringLiteral("user-home")));
     m_everywhereButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     initButton(m_everywhereButton);
 
     m_everywhereButton->setText(i18nc("action:button", "Your files"));
     m_everywhereButton->setToolTip(i18nc("action:button", "Search in your home directory"));
     m_everywhereButton->setIcon(QIcon::fromTheme(QStringLiteral("user-home")));
     m_everywhereButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     initButton(m_everywhereButton);
 

-    QButtonGroup* searchLocationGroup = new QButtonGroup(this);
+    QButtonGroup *searchLocationGroup = new QButtonGroup(contentsContainer);

     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 

-    auto moreSearchToolsButton = new QToolButton(this);
-    moreSearchToolsButton->setAutoRaise(true);
-    moreSearchToolsButton->setPopupMode(QToolButton::InstantPopup);
-    moreSearchToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));
-    moreSearchToolsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    moreSearchToolsButton->setText(i18n("More Search Tools"));
-    moreSearchToolsButton->setMenu(new QMenu(this));
-    connect(moreSearchToolsButton->menu(), &QMenu::aboutToShow, moreSearchToolsButton->menu(), [this, moreSearchToolsButton]()
-    {
-        m_menuFactory.reset(new KMoreToolsMenuFactory("dolphin/search-tools"));
-        moreSearchToolsButton->menu()->clear();
-        m_menuFactory->fillMenuFromGroupingNames(moreSearchToolsButton->menu(), { "files-find" }, this->m_searchPath);
-    } );
+    KService::Ptr kfind = KService::serviceByDesktopName(QStringLiteral("org.kde.kfind"));
+
+    QToolButton *kfindToolsButton = nullptr;
+    if (kfind) {
+        kfindToolsButton = new QToolButton(contentsContainer);
+        kfindToolsButton->setAutoRaise(true);
+        kfindToolsButton->setPopupMode(QToolButton::InstantPopup);
+        kfindToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));
+        kfindToolsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        kfindToolsButton->setText(i18n("Open %1", kfind->name()));
+        kfindToolsButton->setIcon(QIcon::fromTheme(kfind->icon()));
+
+        connect(kfindToolsButton, &QToolButton::clicked, this, [this, kfind] {
+            auto *job = new KIO::ApplicationLauncherJob(kfind);
+            job->setUrls({m_searchPath});
+            job->start();
+        });
+    }

 
     // Create "Facets" widget
 
     // Create "Facets" widget

-    m_facetsWidget = new DolphinFacetsWidget(this);
+    m_facetsWidget = new DolphinFacetsWidget(contentsContainer);

     m_facetsWidget->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_facetsWidget->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
     m_facetsWidget->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_facetsWidget->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);


@@ -418,10 +435,10 @@ void DolphinSearchBox::init()
 
     // Put the options into a QScrollArea. This prevents increasing the view width
     // in case that not enough width for the options is available.
 
     // Put the options into a QScrollArea. This prevents increasing the view width
     // in case that not enough width for the options is available.

-    QWidget* optionsContainer = new QWidget(this);
+    QWidget *optionsContainer = new QWidget(contentsContainer);

 
     // Apply layout for the options
 
     // Apply layout for the options

-    QHBoxLayout* optionsLayout = new QHBoxLayout(optionsContainer);
+    QHBoxLayout *optionsLayout = new QHBoxLayout(optionsContainer);

     optionsLayout->setContentsMargins(0, 0, 0, 0);
     optionsLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->setContentsMargins(0, 0, 0, 0);
     optionsLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
     optionsLayout->addWidget(m_fileNameButton);


@@ -429,11 +446,13 @@ void DolphinSearchBox::init()
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);

-    optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));
-    optionsLayout->addWidget(moreSearchToolsButton);
+    optionsLayout->addWidget(new KSeparator(Qt::Vertical, contentsContainer));
+    if (kfindToolsButton) {
+        optionsLayout->addWidget(kfindToolsButton);
+    }

     optionsLayout->addStretch(1);
 
     optionsLayout->addStretch(1);
 

-    m_optionsScrollArea = new QScrollArea(this);
+    m_optionsScrollArea = new QScrollArea(contentsContainer);

     m_optionsScrollArea->setFrameShape(QFrame::NoFrame);
     m_optionsScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_optionsScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_optionsScrollArea->setFrameShape(QFrame::NoFrame);
     m_optionsScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_optionsScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);


@@ -442,8 +461,8 @@ void DolphinSearchBox::init()
     m_optionsScrollArea->setWidget(optionsContainer);
     m_optionsScrollArea->setWidgetResizable(true);
 
     m_optionsScrollArea->setWidget(optionsContainer);
     m_optionsScrollArea->setWidgetResizable(true);
 

-    m_topLayout = new QVBoxLayout(this);
-    m_topLayout->setContentsMargins(0, 0, 0, 0);
+    m_topLayout = new QVBoxLayout(contentsContainer);
+    m_topLayout->setContentsMargins(0, Dolphin::LAYOUT_SPACING_SMALL, 0, 0);

     m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);


@@ -452,22 +471,23 @@ void DolphinSearchBox::init()
     loadSettings();
 
     // The searching should be started automatically after the user did not change
     loadSettings();
 
     // The searching should be started automatically after the user did not change

-    // the text within one second
+    // the text for a while

     m_startSearchTimer = new QTimer(this);
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer = new QTimer(this);
     m_startSearchTimer->setSingleShot(true);

-    m_startSearchTimer->setInterval(1000);
+    m_startSearchTimer->setInterval(500);

     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);

+
+    m_initialized = true;

 }
 
 }
 

-QString DolphinSearchBox::queryTitle(const QString& text) const
+QString DolphinSearchBox::queryTitle(const QString &text) const

 {
 {

-    return i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
-                             "Query Results from '%1'", text);
+    return i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.", "Query Results from '%1'", text);

 }
 
 QUrl DolphinSearchBox::balooUrlForSearching() const
 {
 }
 
 QUrl DolphinSearchBox::balooUrlForSearching() const
 {

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     const QString text = m_searchInput->text();
 
     Baloo::Query query;
     const QString text = m_searchInput->text();
 
     Baloo::Query query;


@@ -493,7 +513,7 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
 #endif
 }
 
 #endif
 }
 

-void DolphinSearchBox::updateFromQuery(const DolphinQuery& query)
+void DolphinSearchBox::updateFromQuery(const DolphinQuery &query)

 {
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
 {
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.


@@ -506,21 +526,18 @@ void DolphinSearchBox::updateFromQuery(const DolphinQuery& query)
         setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
     }
 
         setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
     }
 

-    // If the input box has focus, do not update to avoid messing with user typing
-    if (!m_searchInput->hasFocus()) {
-        setText(query.text());
-    }
+    setText(query.text());

 
     if (query.hasContentSearch()) {
         m_contentButton->setChecked(true);
 
     if (query.hasContentSearch()) {
         m_contentButton->setChecked(true);

-    } else if (query.hasFileName())  {
+    } else if (query.hasFileName()) {

         m_fileNameButton->setChecked(true);
     }
 
     m_facetsWidget->resetSearchTerms();
     m_facetsWidget->setFacetType(query.type());
     const QStringList searchTerms = query.searchTerms();
         m_fileNameButton->setChecked(true);
     }
 
     m_facetsWidget->resetSearchTerms();
     m_facetsWidget->setFacetType(query.type());
     const QStringList searchTerms = query.searchTerms();

-    for (const QString& searchTerm : searchTerms) {
+    for (const QString &searchTerm : searchTerms) {

         m_facetsWidget->setSearchTerm(searchTerm);
     }
 
         m_facetsWidget->setSearchTerm(searchTerm);
     }
 


@@ -533,14 +550,26 @@ void DolphinSearchBox::updateFacetsVisible()
     const bool indexingEnabled = isIndexingEnabled();
     m_facetsWidget->setEnabled(indexingEnabled);
     m_facetsWidget->setVisible(indexingEnabled);
     const bool indexingEnabled = isIndexingEnabled();
     m_facetsWidget->setEnabled(indexingEnabled);
     m_facetsWidget->setVisible(indexingEnabled);

+
+    // The m_facetsWidget might have changed visibility. We smoothly animate towards the updated height.
+    if (isVisible() && isEnabled()) {
+        setVisible(true, WithAnimation);
+    }

 }
 
 bool DolphinSearchBox::isIndexingEnabled() const
 {
 }
 
 bool DolphinSearchBox::isIndexingEnabled() const
 {

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     const Baloo::IndexerConfig searchInfo;
     return searchInfo.fileIndexingEnabled() && !searchPath().isEmpty() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
 #else
     return false;
 #endif
 }
     const Baloo::IndexerConfig searchInfo;
     return searchInfo.fileIndexingEnabled() && !searchPath().isEmpty() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
 #else
     return false;
 #endif
 }

+
+int DolphinSearchBox::preferredHeight() const
+{
+    return m_initialized ? m_topLayout->sizeHint().height() : 0;
+}
+
+#include "moc_dolphinsearchbox.cpp"