fly/flightgear
1
0
Fork 0
Code Activity

Better searching for aircraft in the launcher.

Browse source 
Search more fields from the package.
This commit is contained in:
James Turner 2016-11-13 22:51:35 +01:00
parent eaf779deb2
commit a3c4b2d953
1 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/GUI/QtLauncher.cxx
View file

@ -349,6 +349,12 @@ public:
invalidate(); invalidate();
} }
void setAircraftFilterString(QString s)
{
m_filterString = s;
invalidate();
}
public slots: public slots:
void setRatingFilterEnabled(bool e) void setRatingFilterEnabled(bool e)
{ {
@ -380,7 +386,7 @@ protected:
return true; return true;
} }
if (!QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent)) { if (!filterAircraft(index)) {
return false; return false;
} }
@ -404,9 +410,37 @@ protected:
} }
private: private:
bool filterAircraft(const QModelIndex& sourceIndex) const
{
if (m_filterString.isEmpty()) {
return true;
}
QString baseName = sourceIndex.data(Qt::DisplayRole).toString();
if (baseName.contains(m_filterString, Qt::CaseInsensitive)) {
return true;
}
QString longDesc = sourceIndex.data(AircraftLongDescriptionRole).toString();
if (longDesc.contains(m_filterString, Qt::CaseInsensitive)) {
return true;
}
const int variantCount = sourceIndex.data(AircraftVariantCountRole).toInt();
for (int variant = 0; variant < variantCount; ++variant) {
QString desc = sourceIndex.data(AircraftVariantDescriptionRole + variant).toString();
if (desc.contains(m_filterString, Qt::CaseInsensitive)) {
return true;
}
}
return false;
}
bool m_ratingsFilter; bool m_ratingsFilter;
bool m_onlyShowInstalled; bool m_onlyShowInstalled;
int m_ratings[4]; int m_ratings[4];
QString m_filterString;
}; };
class NoOfficialHangarMessage : public QWidget class NoOfficialHangarMessage : public QWidget
@ -594,7 +628,7 @@ QtLauncher::QtLauncher() :
connect(m_ui->onlyShowInstalledCheck, &QAbstractButton::toggled, connect(m_ui->onlyShowInstalledCheck, &QAbstractButton::toggled,
m_aircraftProxy, &AircraftProxyModel::setInstalledFilterEnabled); m_aircraftProxy, &AircraftProxyModel::setInstalledFilterEnabled);
connect(m_ui->aircraftFilter, &QLineEdit::textChanged, connect(m_ui->aircraftFilter, &QLineEdit::textChanged,
m_aircraftProxy, &QSortFilterProxyModel::setFilterFixedString); m_aircraftProxy, &AircraftProxyModel::setAircraftFilterString);
connect(m_ui->runButton, SIGNAL(clicked()), this, SLOT(onRun())); connect(m_ui->runButton, SIGNAL(clicked()), this, SLOT(onRun()));
connect(m_ui->quitButton, SIGNAL(clicked()), this, SLOT(onQuit())); connect(m_ui->quitButton, SIGNAL(clicked()), this, SLOT(onQuit()));