Merge pull request #8271 from Piccirello/gui-search-separators

Only add Search combobox separators as needed
This commit is contained in:
sledgehammer999 2018-01-18 01:25:38 +02:00 committed by GitHub
commit df81e84fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -144,7 +144,6 @@ void SearchWidget::fillCatCombobox()
{ {
m_ui->comboCategory->clear(); m_ui->comboCategory->clear();
m_ui->comboCategory->addItem(SearchEngine::categoryFullName("all"), QVariant("all")); m_ui->comboCategory->addItem(SearchEngine::categoryFullName("all"), QVariant("all"));
m_ui->comboCategory->insertSeparator(1);
using QStrPair = QPair<QString, QString>; using QStrPair = QPair<QString, QString>;
QList<QStrPair> tmpList; QList<QStrPair> tmpList;
@ -156,6 +155,9 @@ void SearchWidget::fillCatCombobox()
qDebug("Supported category: %s", qUtf8Printable(p.second)); qDebug("Supported category: %s", qUtf8Printable(p.second));
m_ui->comboCategory->addItem(p.first, QVariant(p.second)); m_ui->comboCategory->addItem(p.first, QVariant(p.second));
} }
if (m_ui->comboCategory->count() > 1)
m_ui->comboCategory->insertSeparator(1);
} }
void SearchWidget::fillPluginComboBox() void SearchWidget::fillPluginComboBox()
@ -164,7 +166,6 @@ void SearchWidget::fillPluginComboBox()
m_ui->selectPlugin->addItem(tr("Only enabled"), QVariant("enabled")); m_ui->selectPlugin->addItem(tr("Only enabled"), QVariant("enabled"));
m_ui->selectPlugin->addItem(tr("All plugins"), QVariant("all")); m_ui->selectPlugin->addItem(tr("All plugins"), QVariant("all"));
m_ui->selectPlugin->addItem(tr("Select..."), QVariant("multi")); m_ui->selectPlugin->addItem(tr("Select..."), QVariant("multi"));
m_ui->selectPlugin->insertSeparator(3);
using QStrPair = QPair<QString, QString>; using QStrPair = QPair<QString, QString>;
QList<QStrPair> tmpList; QList<QStrPair> tmpList;
@ -174,6 +175,9 @@ void SearchWidget::fillPluginComboBox()
foreach (const QStrPair &p, tmpList) foreach (const QStrPair &p, tmpList)
m_ui->selectPlugin->addItem(p.first, QVariant(p.second)); m_ui->selectPlugin->addItem(p.first, QVariant(p.second));
if (m_ui->selectPlugin->count() > 3)
m_ui->selectPlugin->insertSeparator(3);
} }
QString SearchWidget::selectedCategory() const QString SearchWidget::selectedCategory() const