Build TerminalPanel also on Windows

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 60a4a7567acb8d631a8d9617170a80e27a70ea52..44de97aa02ed14b99bd9e699a0cf0a0fcd713d3e 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -22,10 +22,13 @@
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 

+#include <panels/places/placesitemmodel.h>
+

 #include <QIcon>
 #include <QLineEdit>
 #include <KLocalizedString>
 #include <KSeparator>
 #include <QIcon>
 #include <QLineEdit>
 #include <KLocalizedString>
 #include <KSeparator>

+#include <KNS3/KMoreToolsMenuFactory>

 
 #include <QButtonGroup>
 #include <QDir>
 
 #include <QButtonGroup>
 #include <QDir>


@@ -50,19 +53,20 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),
     m_active(true),
     QWidget(parent),
     m_startedSearching(false),
     m_active(true),

-    m_topLayout(0),
-    m_searchLabel(0),
-    m_searchInput(0),
-    m_optionsScrollArea(0),
-    m_fileNameButton(0),
-    m_contentButton(0),
-    m_separator(0),
-    m_fromHereButton(0),
-    m_everywhereButton(0),
-    m_facetsToggleButton(0),
-    m_facetsWidget(0),
+    m_topLayout(nullptr),
+    m_searchLabel(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_facetsToggleButton(nullptr),
+    m_facetsWidget(nullptr),

     m_searchPath(),
     m_searchPath(),

-    m_startSearchTimer(0)
+    m_startSearchTimer(nullptr)

 {
 }
 
 {
 }
 


@@ -229,8 +233,13 @@ bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
 {
     switch (event->type()) {
     case QEvent::FocusIn:
 {
     switch (event->type()) {
     case QEvent::FocusIn:

-        setActive(true);
-        setFocus();
+        // #379135: we get the FocusIn event when we close a tab but we don't want to emit
+        // the activated() signal before the removeTab() call in DolphinTabWidget::closeTab() returns.
+        // To avoid this issue, we delay the activation of the search box.
+        QTimer::singleShot(0, this, [this] {
+            setActive(true);
+            setFocus();
+        });

         break;
 
     default:
         break;
 
     default:


@@ -244,6 +253,7 @@ void DolphinSearchBox::emitSearchRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;

+    m_saveSearchAction->setEnabled(true);

     emit searchRequest();
 }
 
     emit searchRequest();
 }
 


@@ -251,6 +261,7 @@ void DolphinSearchBox::emitCloseRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = false;
 {
     m_startSearchTimer->stop();
     m_startedSearching = false;

+    m_saveSearchAction->setEnabled(false);

     emit closeRequest();
 }
 
     emit closeRequest();
 }
 


@@ -293,6 +304,18 @@ void DolphinSearchBox::slotFacetChanged()
     emit searchRequest();
 }
 
     emit searchRequest();
 }
 

+void DolphinSearchBox::slotSearchSaved()
+{
+    const QUrl searchURL = urlForSearching();
+    if (searchURL.isValid()) {
+        PlacesItemModel model;
+        const QString label = i18n("Search for %1 in %2", text(), searchPath().fileName());
+        model.createPlacesItem(label,
+                               searchURL,
+                               QStringLiteral("folder-saved-search-symbolic"));
+    }
+}
+

 void DolphinSearchBox::initButton(QToolButton* button)
 {
     button->installEventFilter(this);
 void DolphinSearchBox::initButton(QToolButton* button)
 {
     button->installEventFilter(this);


@@ -350,6 +373,14 @@ void DolphinSearchBox::init()
             this, &DolphinSearchBox::slotSearchTextChanged);
     setFocusProxy(m_searchInput);
 
             this, &DolphinSearchBox::slotSearchTextChanged);
     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->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);
+

     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setMargin(0);
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setMargin(0);


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

     // Create "Facets" widgets
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     // Create "Facets" widgets
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);


@@ -404,8 +449,10 @@ 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->addStretch(1);
+    optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));

     optionsLayout->addWidget(m_facetsToggleButton);
     optionsLayout->addWidget(m_facetsToggleButton);

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

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