dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename filter to search_field

Browse Source
This commit is contained in:
Jonas Kvinge
2021-06-28 00:11:45 +02:00
parent a2e7173983
commit a97d784f26
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/collection/collectionfilterwidget.cpp
View File

@@ -67,7 +67,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
QString available_fields = Song::kFtsColumns.join(", ").replace(QRegularExpression("\\bfts"), ""); QString available_fields = Song::kFtsColumns.join(", ").replace(QRegularExpression("\\bfts"), "");
ui_->filter->setToolTip( ui_->search_field->setToolTip(
QString("<html><head/><body><p>") + QString("<html><head/><body><p>") +
tr("Prefix a word with a field name to limit the search to that field, e.g.:") + tr("Prefix a word with a field name to limit the search to that field, e.g.:") +
QString(" ") + QString(" ") +
@@ -87,7 +87,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
QString("</p></body></html>") QString("</p></body></html>")
); );
QObject::connect(ui_->filter, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed); QObject::connect(ui_->search_field, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
QObject::connect(filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout); QObject::connect(filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout);
filter_delay_->setInterval(kFilterDelay); filter_delay_->setInterval(kFilterDelay);
@@ -135,7 +135,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
collection_menu_->addSeparator(); collection_menu_->addSeparator();
ui_->options->setMenu(collection_menu_); ui_->options->setMenu(collection_menu_);
QObject::connect(ui_->filter, &QSearchField::textChanged, this, &CollectionFilterWidget::FilterTextChanged); QObject::connect(ui_->search_field, &QSearchField::textChanged, this, &CollectionFilterWidget::FilterTextChanged);
ReloadSettings(); ReloadSettings();
@@ -150,7 +150,7 @@ void CollectionFilterWidget::ReloadSettings() {
int iconsize = s.value(AppearanceSettingsPage::kIconSizeConfigureButtons, 20).toInt(); int iconsize = s.value(AppearanceSettingsPage::kIconSizeConfigureButtons, 20).toInt();
s.endGroup(); s.endGroup();
ui_->options->setIconSize(QSize(iconsize, iconsize)); ui_->options->setIconSize(QSize(iconsize, iconsize));
ui_->filter->setIconSize(iconsize); ui_->search_field->setIconSize(iconsize);
} }
@@ -294,8 +294,8 @@ void CollectionFilterWidget::ShowGroupingManager() {
void CollectionFilterWidget::FocusOnFilter(QKeyEvent *event) { void CollectionFilterWidget::FocusOnFilter(QKeyEvent *event) {
ui_->filter->setFocus(); ui_->search_field->setFocus();
QApplication::sendEvent(ui_->filter, event); QApplication::sendEvent(ui_->search_field, event);
} }
@@ -393,20 +393,20 @@ void CollectionFilterWidget::CheckCurrentGrouping(const CollectionModel::Groupin
} }
void CollectionFilterWidget::SetFilterHint(const QString &hint) { void CollectionFilterWidget::SetFilterHint(const QString &hint) {
ui_->filter->setPlaceholderText(hint); ui_->search_field->setPlaceholderText(hint);
} }
void CollectionFilterWidget::SetQueryMode(QueryOptions::QueryMode query_mode) { void CollectionFilterWidget::SetQueryMode(QueryOptions::QueryMode query_mode) {
ui_->filter->clear(); ui_->search_field->clear();
ui_->filter->setEnabled(query_mode == QueryOptions::QueryMode_All); ui_->search_field->setEnabled(query_mode == QueryOptions::QueryMode_All);
model_->SetFilterQueryMode(query_mode); model_->SetFilterQueryMode(query_mode);
} }
void CollectionFilterWidget::ShowInCollection(const QString &search) { void CollectionFilterWidget::ShowInCollection(const QString &search) {
ui_->filter->setText(search); ui_->search_field->setText(search);
} }
void CollectionFilterWidget::SetAgeFilterEnabled(bool enabled) { void CollectionFilterWidget::SetAgeFilterEnabled(bool enabled) {
@@ -435,7 +435,7 @@ void CollectionFilterWidget::keyReleaseEvent(QKeyEvent *e) {
break; break;
case Qt::Key_Escape: case Qt::Key_Escape:
ui_->filter->clear(); ui_->search_field->clear();
e->accept(); e->accept();
break; break;
} }
@@ -463,9 +463,9 @@ void CollectionFilterWidget::FilterTextChanged(const QString &text) {
void CollectionFilterWidget::FilterDelayTimeout() { void CollectionFilterWidget::FilterDelayTimeout() {
emit Filter(ui_->filter->text()); emit Filter(ui_->search_field->text());
if (filter_applies_to_model_) { if (filter_applies_to_model_) {
model_->SetFilterText(ui_->filter->text()); model_->SetFilterText(ui_->search_field->text());
} }
} }

2
src/collection/collectionfilterwidget.ui
View File

@@ -30,7 +30,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSearchField" name="filter" native="true"> <widget class="QSearchField" name="search_field" native="true">
<property name="placeholderText" stdset="0"> <property name="placeholderText" stdset="0">
<string>Enter search terms here</string> <string>Enter search terms here</string>
</property> </property>