LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up instrument search code

Browse source 
- Removes the clear button in favor of the builtin clear button functionality in QLineEdit
- Makes the code behave the same in new wizard  and instrument dialog
This commit is contained in:
Dag Henning Liodden Sørbø 2017-11-10 20:42:09 +01:00
parent 528c1318b9
commit 7b0ed69919
6 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mscore/instrwidget.cpp
View file

@ -422,7 +422,6 @@ void InstrumentsWidget::buildTemplateList()
{
// clear search if instrument list is updated
search->clear();
filterInstruments(instrumentList, search->text());
populateInstrumentList(instrumentList);
populateGenreCombo(instrumentGenreFilter);
@ -875,25 +874,12 @@ void InstrumentsWidget::on_linkedButton_clicked()
void InstrumentsWidget::on_search_textChanged(const QString &searchPhrase)
{
if (searchPhrase.isEmpty())
return;
filterInstruments(instrumentList, searchPhrase);
instrumentGenreFilter->blockSignals(true);
instrumentGenreFilter->setCurrentIndex(0);
instrumentGenreFilter->blockSignals(false);
filterInstruments(instrumentList, searchPhrase);
}
//---------------------------------------------------------
// on_clearSearch_clicked
//---------------------------------------------------------
void InstrumentsWidget::on_clearSearch_clicked()
{
search->clear();
QString genre = instrumentGenreFilter->currentData().toString();
filterInstrumentsByGenre(instrumentList, genre);
}
//---------------------------------------------------------
// on_instrumentGenreFilter_currentTextChanged

1
mscore/instrwidget.h
View file

@ -132,7 +132,6 @@ class InstrumentsWidget : public QWidget, public Ui::InstrumentsWidget {
void expandOrCollapse(const QModelIndex &);
void on_search_textChanged(const QString &searchPhrase);
void on_clearSearch_clicked();
void on_instrumentGenreFilter_currentIndexChanged(int);
void filterInstrumentsByGenre(QTreeWidget *, QString);

15
mscore/instrwidget.ui
View file

@ -101,18 +101,8 @@
<property name="placeholderText">
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearSearch">
<property name="accessibleName">
<string>Clear</string>
</property>
<property name="accessibleDescription">
<string>Clear Search box</string>
</property>
<property name="text">
<string>Clear</string>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
@ -369,7 +359,6 @@
<tabstop>instrumentGenreFilter</tabstop>
<tabstop>instrumentList</tabstop>
<tabstop>search</tabstop>
<tabstop>clearSearch</tabstop>
<tabstop>addButton</tabstop>
<tabstop>removeButton</tabstop>
<tabstop>upButton</tabstop>

9
mscore/selectinstr.ui
View file

@ -63,12 +63,8 @@
<property name="placeholderText">
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearSearch">
<property name="text">
<string>Clear</string>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
@ -91,7 +87,6 @@
<tabstop>instrumentGenreFilter</tabstop>
<tabstop>instrumentList</tabstop>
<tabstop>search</tabstop>
<tabstop>clearSearch</tabstop>
</tabstops>
<resources/>
<connections>

11
mscore/selinstrument.cpp
View file

@ -54,7 +54,6 @@ void SelectInstrument::buildTemplateList()
{
// clear search if instrument list is updated
search->clear();
filterInstruments(instrumentList, search->text());
populateInstrumentList(instrumentList);
populateGenreCombo(instrumentGenreFilter);
@ -113,21 +112,13 @@ const InstrumentTemplate* SelectInstrument::instrTemplate() const
void SelectInstrument::on_search_textChanged(const QString &searchPhrase)
{
filterInstruments(instrumentList, searchPhrase);
instrumentGenreFilter->blockSignals(true);
instrumentGenreFilter->setCurrentIndex(0);
instrumentGenreFilter->blockSignals(false);
filterInstruments(instrumentList, searchPhrase);
}
//---------------------------------------------------------
// on_clearSearch_clicked
//---------------------------------------------------------
void SelectInstrument::on_clearSearch_clicked()
{
search->clear();
filterInstruments (instrumentList);
}
//---------------------------------------------------------
// on_instrumentGenreFilter_currentTextChanged
//---------------------------------------------------------

1
mscore/selinstrument.h
View file

@ -43,7 +43,6 @@ class SelectInstrument : public QDialog, private Ui::SelectInstrument {
void on_instrumentList_itemDoubleClicked(QTreeWidgetItem* item, int);
void on_search_textChanged(const QString &searchPhrase);
void on_clearSearch_clicked();
void on_instrumentGenreFilter_currentIndexChanged(int);
void filterInstrumentsByGenre(QTreeWidget *, QString);