aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #809 from poixen/search_new_fix

Browse source 
Re-added some search and filter code
This commit is contained in:
Zach 2015-03-11 10:54:46 -04:00
commit b1736c7599
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/carddatabasemodel.cpp
View file

@ -146,14 +146,17 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
{ {
CardInfo const *info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow); CardInfo const *info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
bool show = false; if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken()))
if (!cardName.isEmpty()) { return false;
if (info->getName().contains(cardName, Qt::CaseInsensitive))
show = true;
} else
return true;// search is empty, show all
return show; if (!cardName.isEmpty())
if (!info->getName().contains(cardName, Qt::CaseInsensitive))
return false;
if (filterTree != NULL)
return filterTree->acceptsCard(info);
return true;
} }
void CardDatabaseDisplayModel::clearSearch() void CardDatabaseDisplayModel::clearSearch()