Move "Show in Groups" toggle action into Sort menu

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index dfd733e5da2093eb5d496a91a0135275fb8d6a43..ee425501d876628c044895933b1cecfdf5f9114b 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -36,7 +36,7 @@
 #include <QUrlQuery>
 
 DolphinSearchBox::DolphinSearchBox(QWidget *parent)
 #include <QUrlQuery>
 
 DolphinSearchBox::DolphinSearchBox(QWidget *parent)

-    : QWidget(parent)
+    : AnimatedHeightWidget(parent)

     , m_startedSearching(false)
     , m_active(true)
     , m_topLayout(nullptr)
     , m_startedSearching(false)
     , m_active(true)
     , m_topLayout(nullptr)


@@ -51,6 +51,7 @@ DolphinSearchBox::DolphinSearchBox(QWidget *parent)
     , m_facetsWidget(nullptr)
     , m_searchPath()
     , m_startSearchTimer(nullptr)
     , m_facetsWidget(nullptr)
     , m_searchPath()
     , m_startSearchTimer(nullptr)

+    , m_initialized(false)

 {
 }
 
 {
 }
 


@@ -73,7 +74,7 @@ QString DolphinSearchBox::text() const
 
 void DolphinSearchBox::setSearchPath(const QUrl &url)
 {
 
 void DolphinSearchBox::setSearchPath(const QUrl &url)
 {

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

         return;
     }
 
         return;
     }
 


@@ -119,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);
     }


@@ -140,11 +141,11 @@ void DolphinSearchBox::fromSearchUrl(const QUrl &url)
         updateFromQuery(query);
     } else if (url.scheme() == QLatin1String("filenamesearch")) {
         const QUrlQuery query(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());


@@ -176,12 +177,12 @@ 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)


@@ -196,7 +197,9 @@ 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)


@@ -327,15 +330,23 @@ 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 = new QLineEdit(contentsContainer);

     m_searchInput->setPlaceholderText(i18n("Search…"));
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonEnabled(true);
     m_searchInput->setPlaceholderText(i18n("Search…"));
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonEnabled(true);


@@ -353,7 +364,7 @@ void DolphinSearchBox::init()
     connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
 
     // Create close button
     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"));
     closeButton->setAutoRaise(true);
     closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));


@@ -366,7 +377,7 @@ void DolphinSearchBox::init()
     searchInputLayout->addWidget(closeButton);
 
     // Create "Filename" and "Content" button
     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);
 


@@ -374,25 +385,25 @@ 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);
 


@@ -400,7 +411,7 @@ void DolphinSearchBox::init()
 
     QToolButton *kfindToolsButton = nullptr;
     if (kfind) {
 
     QToolButton *kfindToolsButton = nullptr;
     if (kfind) {

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

         kfindToolsButton->setAutoRaise(true);
         kfindToolsButton->setPopupMode(QToolButton::InstantPopup);
         kfindToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));
         kfindToolsButton->setAutoRaise(true);
         kfindToolsButton->setPopupMode(QToolButton::InstantPopup);
         kfindToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));


@@ -416,7 +427,7 @@ void DolphinSearchBox::init()
     }
 
     // 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);


@@ -424,7 +435,7 @@ 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
     QHBoxLayout *optionsLayout = new QHBoxLayout(optionsContainer);
 
     // Apply layout for the options
     QHBoxLayout *optionsLayout = new QHBoxLayout(optionsContainer);


@@ -435,13 +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(new KSeparator(Qt::Vertical, contentsContainer));

     if (kfindToolsButton) {
         optionsLayout->addWidget(kfindToolsButton);
     }
     optionsLayout->addStretch(1);
 
     if (kfindToolsButton) {
         optionsLayout->addWidget(kfindToolsButton);
     }
     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);


@@ -450,7 +461,7 @@ 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 = 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->setContentsMargins(0, Dolphin::LAYOUT_SPACING_SMALL, 0, 0);
     m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
     m_topLayout->addLayout(searchInputLayout);


@@ -465,6 +476,8 @@ void DolphinSearchBox::init()
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer->setInterval(500);
     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer->setInterval(500);
     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


@@ -537,6 +550,11 @@ 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


@@ -549,4 +567,9 @@ bool DolphinSearchBox::isIndexingEnabled() const
 #endif
 }
 
 #endif
 }
 

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

 #include "moc_dolphinsearchbox.cpp"
 #include "moc_dolphinsearchbox.cpp"