Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow multiple simultaneous searches #22127

Merged
merged 1 commit into from
Jan 11, 2025
+62 −35
Merged

Allow multiple simultaneous searches #22127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ void MainWindow::displaySearchTab(bool enable)
if (!m_searchWidget)
{
m_searchWidget = new SearchWidget(app(), this);
connect(m_searchWidget, &SearchWidget::activeSearchFinished, this, [this](const bool failed)
connect(m_searchWidget, &SearchWidget::searchFinished, this, [this](const bool failed)
{
if (app()->desktopIntegration()->isNotificationsEnabled() && (currentTabWidget() != m_searchWidget))
{
Expand Down
74 changes: 47 additions & 27 deletions src/gui/search/searchwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ SearchWidget::SearchWidget(IGUIApplication *app, QWidget *parent)
, m_ui {new Ui::SearchWidget()}
{
m_ui->setupUi(this);

m_ui->stopButton->hide();
m_ui->tabWidget->tabBar()->installEventFilter(this);

const QString searchPatternHint = u"<html><head/><body><p>"
Expand Down Expand Up @@ -134,6 +136,9 @@ SearchWidget::SearchWidget(IGUIApplication *app, QWidget *parent)
// Fill in category combobox
onPluginChanged();

connect(m_ui->pluginsButton, &QPushButton::clicked, this, &SearchWidget::pluginsButtonClicked);
connect(m_ui->searchButton, &QPushButton::clicked, this, &SearchWidget::searchButtonClicked);
connect(m_ui->stopButton, &QPushButton::clicked, this, &SearchWidget::stopButtonClicked);
connect(m_ui->lineEditSearchPattern, &LineEdit::returnPressed, m_ui->searchButton, &QPushButton::click);
connect(m_ui->lineEditSearchPattern, &LineEdit::textEdited, this, &SearchWidget::searchTextEdited);
connect(m_ui->selectPlugin, qOverload<int>(&QComboBox::currentIndexChanged)
Expand Down Expand Up @@ -268,13 +273,27 @@ void SearchWidget::tabChanged(const int index)
m_currentSearchTab = (index >= 0)
? static_cast<SearchJobWidget *>(m_ui->tabWidget->widget(index))
: nullptr;

if (!m_isNewQueryString)
{
if (m_currentSearchTab && (m_currentSearchTab->status() == SearchJobWidget::Status::Ongoing))
{
m_ui->searchButton->hide();
m_ui->stopButton->show();
}
else
{
m_ui->stopButton->hide();
m_ui->searchButton->show();
}
}
}

void SearchWidget::selectMultipleBox([[maybe_unused]] const int index)
{
const auto itemText = m_ui->selectPlugin->itemData(m_ui->selectPlugin->currentIndex()).toString();
if (itemText == u"multi")
on_pluginsButton_clicked();
pluginsButtonClicked();
}

void SearchWidget::toggleFocusBetweenLineEdits()
Expand All @@ -299,17 +318,21 @@ void SearchWidget::showTabMenu(const int index)
searchJobWidget->status() != SearchJobWidget::Status::Ongoing)
{
menu->addAction(tr("Refresh"), this, [this, searchJobWidget] { refreshTab(searchJobWidget); });
menu->addSeparator();
}
else
{
menu->addAction(tr("Stop"), this, [searchJobWidget] { searchJobWidget->cancelSearch(); });
}

menu->addSeparator();
menu->addAction(tr("Close tab"), this, [this, index] { closeTab(index); });
menu->addAction(tr("Close all tabs"), this, &SearchWidget::closeAllTabs);

menu->setAttribute(Qt::WA_DeleteOnClose);
menu->popup(QCursor::pos());
}

void SearchWidget::on_pluginsButton_clicked()
void SearchWidget::pluginsButtonClicked()
{
auto *dlg = new PluginSelectDialog(SearchPluginManager::instance(), this);
dlg->setAttribute(Qt::WA_DeleteOnClose);
Expand All @@ -329,18 +352,8 @@ void SearchWidget::giveFocusToSearchInput()
}

// Function called when we click on search button
void SearchWidget::on_searchButton_clicked()
void SearchWidget::searchButtonClicked()
{
if (m_activeSearchTab)
{
m_activeSearchTab->cancelSearch();
if (!m_isNewQueryString)
{
m_ui->searchButton->setText(tr("Search"));
return;
}
}

m_isNewQueryString = false;

const QString pattern = m_ui->lineEditSearchPattern->text().trimmed();
Expand Down Expand Up @@ -372,33 +385,38 @@ void SearchWidget::on_searchButton_clicked()

connect(newTab, &SearchJobWidget::statusChanged, this, [this, newTab]() { tabStatusChanged(newTab); });

m_ui->searchButton->setText(tr("Stop"));
m_activeSearchTab = newTab;
tabStatusChanged(newTab);
}

void SearchWidget::tabStatusChanged(QWidget *tab)
void SearchWidget::stopButtonClicked()
{
m_currentSearchTab->cancelSearch();
m_ui->stopButton->hide();
m_ui->searchButton->show();
}

void SearchWidget::tabStatusChanged(SearchJobWidget *tab)
{
const int tabIndex = m_ui->tabWidget->indexOf(tab);
m_ui->tabWidget->setTabToolTip(tabIndex, tab->statusTip());
m_ui->tabWidget->setTabIcon(tabIndex, UIThemeManager::instance()->getIcon(
statusIconName(static_cast<SearchJobWidget *>(tab)->status())));

if ((tab == m_activeSearchTab) && (m_activeSearchTab->status() != SearchJobWidget::Status::Ongoing))
if (tab->status() != SearchJobWidget::Status::Ongoing)
{
emit activeSearchFinished(m_activeSearchTab->status() == SearchJobWidget::Status::Error);
if (tab == m_currentSearchTab)
{
m_ui->stopButton->hide();
m_ui->searchButton->show();
}

m_activeSearchTab = nullptr;
m_ui->searchButton->setText(tr("Search"));
emit searchFinished(tab->status() == SearchJobWidget::Status::Error);
}
}

void SearchWidget::closeTab(const int index)
{
const QWidget *tab = m_ui->tabWidget->widget(index);
if (tab == m_activeSearchTab)
m_ui->searchButton->setText(tr("Search"));

delete tab;
}

Expand All @@ -419,8 +437,10 @@ void SearchWidget::refreshTab(SearchJobWidget *searchJobWidget)
// Re-launch search
auto *searchHandler = SearchPluginManager::instance()->startSearch(searchJobWidget->searchPattern(), selectedCategory(), selectedPlugins());
searchJobWidget->assignSearchHandler(searchHandler);
if (!m_isNewQueryString)
m_ui->searchButton->setText(tr("Stop"));
m_activeSearchTab = searchJobWidget;
if (!m_isNewQueryString && (m_ui->tabWidget->currentWidget() == searchJobWidget))
{
m_ui->searchButton->hide();
m_ui->stopButton->show();
}
tabStatusChanged(searchJobWidget);
}
14 changes: 7 additions & 7 deletions src/gui/search/searchwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,17 @@ class SearchWidget : public GUIApplicationComponent<QWidget>
void giveFocusToSearchInput();

signals:
void activeSearchFinished(bool failed);

private slots:
void on_searchButton_clicked();
void on_pluginsButton_clicked();
void searchFinished(bool failed);

private:
bool eventFilter(QObject *object, QEvent *event) override;

void pluginsButtonClicked();
void searchButtonClicked();
void stopButtonClicked();

void tabChanged(int index);
void tabStatusChanged(QWidget *tab);
void tabStatusChanged(SearchJobWidget *tab);

void closeTab(int index);
void closeAllTabs();
Expand All @@ -86,6 +87,5 @@ private slots:

Ui::SearchWidget *m_ui = nullptr;
QPointer<SearchJobWidget> m_currentSearchTab; // Selected tab
QPointer<SearchJobWidget> m_activeSearchTab; // Tab with running search
bool m_isNewQueryString = false;
};
7 changes: 7 additions & 0 deletions src/gui/search/searchwidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="stopButton">
<property name="text">
<string>Stop</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down
Loading