Move search and filter bar close buttons to the right

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 838a8b38cd21669c1caa39bea692efe837bdb42f..f0d8c541653478c3b71f18cc0df3a2548baeea54 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -17,10 +17,12 @@
 *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA           *
 * **************************************************************************/
 
 *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA           *
 * **************************************************************************/
 

+#include "global.h"

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

+#include "dolphinquery.h"

 #include "panels/places/placesitemmodel.h"
 
 #include <KLocalizedString>
 #include "panels/places/placesitemmodel.h"
 
 #include <KLocalizedString>


@@ -37,9 +39,11 @@
 #include <QFontDatabase>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QFontDatabase>
 #include <QHBoxLayout>
 #include <QIcon>

+#include <QKeyEvent>

 #include <QLabel>
 #include <QLineEdit>
 #include <QScrollArea>
 #include <QLabel>
 #include <QLineEdit>
 #include <QScrollArea>

+#include <QShowEvent>

 #include <QTimer>
 #include <QToolButton>
 #include <QUrlQuery>
 #include <QTimer>
 #include <QToolButton>
 #include <QUrlQuery>


@@ -57,7 +61,6 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     m_separator(nullptr),
     m_fromHereButton(nullptr),
     m_everywhereButton(nullptr),
     m_separator(nullptr),
     m_fromHereButton(nullptr),
     m_everywhereButton(nullptr),

-    m_facetsToggleButton(nullptr),

     m_facetsWidget(nullptr),
     m_searchPath(),
     m_startSearchTimer(nullptr)
     m_facetsWidget(nullptr),
     m_searchPath(),
     m_startSearchTimer(nullptr)


@@ -85,34 +88,36 @@ void DolphinSearchBox::setSearchPath(const QUrl& url)
         return;
     }
 
         return;
     }
 

+    const QUrl cleanedUrl = url.adjusted(QUrl::RemoveUserInfo | QUrl::StripTrailingSlash);
+
+    if (cleanedUrl.path() == QDir::homePath()) {
+        m_fromHereButton->setChecked(false);
+        m_everywhereButton->setChecked(true);
+        if (!m_searchPath.isEmpty()) {
+            return;
+        }
+    } else {
+        m_everywhereButton->setChecked(false);
+        m_fromHereButton->setChecked(true);
+    }
+

     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.height() * 8;
 
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.height() * 8;
 

-    const QUrl cleanedUrl = url.adjusted(QUrl::RemoveUserInfo | QUrl::StripTrailingSlash);

     QString location = cleanedUrl.fileName();
     if (location.isEmpty()) {
         location = cleanedUrl.toString(QUrl::PreferLocalFile);
     }
     QString location = cleanedUrl.fileName();
     if (location.isEmpty()) {
         location = cleanedUrl.toString(QUrl::PreferLocalFile);
     }

-    if (m_fromHereButton->isChecked() && cleanedUrl.path() == QDir::homePath()) {
-        m_fromHereButton->setChecked(false);
-        m_everywhereButton->setChecked(true);
-    } else {
-        m_fromHereButton->setChecked(true);
-        m_everywhereButton->setChecked(false);
-    }
-

     const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
     m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));
     m_fromHereButton->setToolTip(i18nc("action:button", "Limit search to '%1' and its subfolders", cleanedUrl.toString(QUrl::PreferLocalFile)));
     const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
     m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));
     m_fromHereButton->setToolTip(i18nc("action:button", "Limit search to '%1' and its subfolders", cleanedUrl.toString(QUrl::PreferLocalFile)));

-
-    setFacetsVisible(SearchSettings::showFacetsWidget());

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

-    return m_searchPath;
+    return m_everywhereButton->isChecked() ? QUrl::fromLocalFile(QDir::homePath()) : m_searchPath;

 }
 
 QUrl DolphinSearchBox::urlForSearching() const
 }
 
 QUrl DolphinSearchBox::urlForSearching() const


@@ -130,13 +135,8 @@ QUrl DolphinSearchBox::urlForSearching() const
             query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
         }
 
             query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
         }
 

-        QString encodedUrl;
-        if (m_everywhereButton->isChecked()) {
-            encodedUrl = QDir::homePath();
-        } else {
-            encodedUrl = m_searchPath.url();
-        }
-        query.addQueryItem(QStringLiteral("url"), encodedUrl);
+        query.addQueryItem(QStringLiteral("url"), searchPath().url());
+        query.addQueryItem(QStringLiteral("title"), queryTitle(m_searchInput->text()));

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


@@ -147,16 +147,23 @@ QUrl DolphinSearchBox::urlForSearching() const
 void DolphinSearchBox::fromSearchUrl(const QUrl& url)
 {
     if (url.scheme() == QLatin1String("baloosearch")) {
 void DolphinSearchBox::fromSearchUrl(const QUrl& url)
 {
     if (url.scheme() == QLatin1String("baloosearch")) {

-        fromBalooSearchUrl(url);
+        const DolphinQuery query = DolphinQuery::fromBalooSearchUrl(url);
+        updateFromQuery(query);

     } else if (url.scheme() == QLatin1String("filenamesearch")) {
         const QUrlQuery query(url);
         setText(query.queryItemValue(QStringLiteral("search")));
     } else if (url.scheme() == QLatin1String("filenamesearch")) {
         const QUrlQuery query(url);
         setText(query.queryItemValue(QStringLiteral("search")));

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

         setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
         m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
     } else {
         setText(QString());
         setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
         m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
     } else {
         setText(QString());

+        m_searchPath = QUrl();

         setSearchPath(url);
     }
         setSearchPath(url);
     }

+
+    updateFacetsVisible();

 }
 
 void DolphinSearchBox::selectAll()
 }
 
 void DolphinSearchBox::selectAll()


@@ -194,12 +201,11 @@ void DolphinSearchBox::showEvent(QShowEvent* event)
         m_searchInput->setFocus();
         m_startedSearching = false;
     }
         m_searchInput->setFocus();
         m_startedSearching = false;
     }

-    updateFacetsToggleButton();

 }
 
 void DolphinSearchBox::hideEvent(QHideEvent* event)
 {
 }
 
 void DolphinSearchBox::hideEvent(QHideEvent* event)
 {

-    Q_UNUSED(event);
+    Q_UNUSED(event)

     m_startedSearching = false;
     m_startSearchTimer->stop();
 }
     m_startedSearching = false;
     m_startSearchTimer->stop();
 }


@@ -214,6 +220,9 @@ void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
             m_searchInput->clear();
         }
     }
             m_searchInput->clear();
         }
     }

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

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


@@ -278,12 +287,7 @@ void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();
 void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();

-    emit returnPressed();
-}
-
-void DolphinSearchBox::slotFacetsButtonToggled()
-{
-    setFacetsVisible(m_facetsToggleButton->isChecked());
+    emit focusViewRequest();

 }
 
 void DolphinSearchBox::slotFacetChanged()
 }
 
 void DolphinSearchBox::slotFacetChanged()


@@ -328,28 +332,18 @@ void DolphinSearchBox::loadSettings()
         m_fileNameButton->setChecked(true);
     }
 
         m_fileNameButton->setChecked(true);
     }
 

-    setFacetsVisible(SearchSettings::showFacetsWidget());
+    updateFacetsVisible();

 }
 
 void DolphinSearchBox::saveSettings()
 {
     SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
     SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));
 }
 
 void DolphinSearchBox::saveSettings()
 {
     SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
     SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));

-    if (isIndexingEnabled()) {
-        SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
-    }

     SearchSettings::self()->save();
 }
 
 void DolphinSearchBox::init()
 {
     SearchSettings::self()->save();
 }
 
 void DolphinSearchBox::init()
 {

-    // Create close button
-    QToolButton* closeButton = new QToolButton(this);
-    closeButton->setAutoRaise(true);
-    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
-    closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
-    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
-

     // Create search box
     m_searchInput = new QLineEdit(this);
     m_searchInput->setPlaceholderText(i18n("Search..."));
     // Create search box
     m_searchInput = new QLineEdit(this);
     m_searchInput->setPlaceholderText(i18n("Search..."));


@@ -370,11 +364,18 @@ void DolphinSearchBox::init()
     m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
     connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
 
     m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
     connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
 

+    // Create close button
+    QToolButton* closeButton = new QToolButton(this);
+    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();
     searchInputLayout->setContentsMargins(0, 0, 0, 0);
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setContentsMargins(0, 0, 0, 0);

-    searchInputLayout->addWidget(closeButton);

     searchInputLayout->addWidget(m_searchInput);
     searchInputLayout->addWidget(m_searchInput);

+    searchInputLayout->addWidget(closeButton);

 
     // Create "Filename" and "Content" button
     m_fileNameButton = new QToolButton(this);
 
     // Create "Filename" and "Content" button
     m_fileNameButton = new QToolButton(this);


@@ -421,27 +422,23 @@ void DolphinSearchBox::init()
         m_menuFactory->fillMenuFromGroupingNames(moreSearchToolsButton->menu(), { "files-find" }, this->m_searchPath);
     } );
 
         m_menuFactory->fillMenuFromGroupingNames(moreSearchToolsButton->menu(), { "files-find" }, this->m_searchPath);
     } );
 

-    // Create "Facets" widgets
-    m_facetsToggleButton = new QToolButton(this);
-    m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    initButton(m_facetsToggleButton);
-    connect(m_facetsToggleButton, &QToolButton::clicked, this, &DolphinSearchBox::slotFacetsButtonToggled);
-
+    // Create "Facets" widget

     m_facetsWidget = new DolphinFacetsWidget(this);
     m_facetsWidget->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_facetsWidget = new DolphinFacetsWidget(this);
     m_facetsWidget->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);

+    m_facetsWidget->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

     connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);
 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
     optionsLayout->setContentsMargins(0, 0, 0, 0);
     connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);
 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
     optionsLayout->setContentsMargins(0, 0, 0, 0);

+    optionsLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);
     optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));
     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);
     optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));

-    optionsLayout->addWidget(m_facetsToggleButton);

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


@@ -461,6 +458,7 @@ void DolphinSearchBox::init()
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setContentsMargins(0, 0, 0, 0);
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setContentsMargins(0, 0, 0, 0);

+    m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->addWidget(m_facetsWidget);
     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->addWidget(m_facetsWidget);


@@ -475,6 +473,12 @@ void DolphinSearchBox::init()
     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
 }
 
     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
 }
 

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

 QUrl DolphinSearchBox::balooUrlForSearching() const
 {
 #ifdef HAVE_BALOO
 QUrl DolphinSearchBox::balooUrlForSearching() const
 {
 #ifdef HAVE_BALOO


@@ -483,11 +487,7 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
     Baloo::Query query;
     query.addType(m_facetsWidget->facetType());
 
     Baloo::Query query;
     query.addType(m_facetsWidget->facetType());
 

-    QStringList queryStrings;
-    QString ratingQuery = m_facetsWidget->ratingTerm();
-    if (!ratingQuery.isEmpty()) {
-        queryStrings << ratingQuery;
-    }
+    QStringList queryStrings = m_facetsWidget->searchTerms();

 
     if (m_contentButton->isChecked()) {
         queryStrings << text;
 
     if (m_contentButton->isChecked()) {
         queryStrings << text;


@@ -501,18 +501,14 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
 
     query.setSearchString(queryStrings.join(QLatin1Char(' ')));
 
 
     query.setSearchString(queryStrings.join(QLatin1Char(' ')));
 

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

 #else
     return QUrl();
 #endif
 }
 
 #else
     return QUrl();
 #endif
 }
 

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

 {
 {

-#ifdef HAVE_BALOO
-    const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
-

     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);


@@ -524,75 +520,37 @@ void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)
         setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
     }
 
         setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
     }
 

-    setText(query.searchString());
+    setText(query.text());

 
 

-    QStringList types = query.types();
-    if (!types.isEmpty()) {
-        m_facetsWidget->setFacetType(types.first());
+    if (query.hasContentSearch()) {
+        m_contentButton->setChecked(true);
+    } else if (query.hasFileName())  {
+        m_fileNameButton->setChecked(true);

     }
 
     }
 

-    const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts);
-    foreach (const QString& subTerm, subTerms) {
-        if (subTerm.startsWith(QLatin1String("filename:"))) {
-            const QString value = subTerm.mid(9);
-            setText(value);
-        } else if (m_facetsWidget->isRatingTerm(subTerm)) {
-            m_facetsWidget->setRatingTerm(subTerm);
-        }
+    m_facetsWidget->resetSearchTerms();
+    m_facetsWidget->setFacetType(query.type());
+    const QStringList searchTerms = query.searchTerms();
+    for (const QString& searchTerm : searchTerms) {
+        m_facetsWidget->setSearchTerm(searchTerm);

     }
 
     m_startSearchTimer->stop();
     blockSignals(false);
     }
 
     m_startSearchTimer->stop();
     blockSignals(false);

-#else
-    Q_UNUSED(url);
-#endif

 }
 
 }
 

-void DolphinSearchBox::setFacetsVisible(bool visible)
+void DolphinSearchBox::updateFacetsVisible()

 {
     const bool indexingEnabled = isIndexingEnabled();
     m_facetsWidget->setEnabled(indexingEnabled);
 {
     const bool indexingEnabled = isIndexingEnabled();
     m_facetsWidget->setEnabled(indexingEnabled);

-    m_facetsWidget->setVisible(indexingEnabled && visible);
-    updateFacetsToggleButton();
-}
-
-void DolphinSearchBox::updateFacetsToggleButton()
-{
-    const bool facetsEnabled = m_facetsWidget->isEnabled();
-    const bool facetsVisible = m_facetsWidget->isVisible();
-
-    m_facetsToggleButton->setEnabled(facetsEnabled);
-    m_facetsToggleButton->setChecked(facetsVisible);
-
-    m_facetsToggleButton->setIcon(QIcon::fromTheme(
-           facetsVisible ? QStringLiteral("arrow-up-double") :
-                           QStringLiteral("arrow-down-double")));
-
-    m_facetsToggleButton->setText(
-           facetsVisible ? i18nc("@action:button", "Fewer Options") :
-                           i18nc("@action:button", "More Options"));
-
-    if (facetsEnabled) {
-        m_facetsToggleButton->setToolTip(QString());
-    } else {
-#ifdef HAVE_BALOO
-        const Baloo::IndexerConfig searchInfo;
-        if (!searchInfo.fileIndexingEnabled()) {
-            m_facetsToggleButton->setToolTip(i18nc("@info:tooltip", "Advanced search options are not available because the file indexing service is disabled."));
-        } else {
-            m_facetsToggleButton->setToolTip(i18nc("@info:tooltip", "Advanced search options are not available because this location is not indexed."));
-        }
-#else
-        m_facetsToggleButton->setToolTip(i18nc("@info:tooltip", "Advanced search options are not available because this version of Dolphin does not support the Baloo file indexer."));
-#endif
-    }
+    m_facetsWidget->setVisible(indexingEnabled);

 }
 
 bool DolphinSearchBox::isIndexingEnabled() const
 {
 #ifdef HAVE_BALOO
     const Baloo::IndexerConfig searchInfo;
 }
 
 bool DolphinSearchBox::isIndexingEnabled() const
 {
 #ifdef HAVE_BALOO
     const Baloo::IndexerConfig searchInfo;

-    return searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
+    return searchInfo.fileIndexingEnabled() && !searchPath().isEmpty() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());

 #else
     return false;
 #endif
 #else
     return false;
 #endif