mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-27 08:24:39 -07:00
Merge branch 'master' into tooomm-qt5
This commit is contained in:
commit
4fba3c31f2
275 changed files with 66660 additions and 44237 deletions
|
|
@ -12,6 +12,7 @@ CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromE
|
|||
connect(db, &CardDatabase::cardRemoved, this, &CardDatabaseModel::cardRemoved);
|
||||
connect(db, &CardDatabase::cardDatabaseEnabledSetsChanged, this,
|
||||
&CardDatabaseModel::cardDatabaseEnabledSetsChanged);
|
||||
connect(db, &CardDatabase::cardDatabaseReset, this, &CardDatabaseModel::resetCardList);
|
||||
|
||||
cardDatabaseEnabledSetsChanged();
|
||||
}
|
||||
|
|
@ -151,3 +152,18 @@ void CardDatabaseModel::cardRemoved(CardInfoPtr card)
|
|||
cardList.removeAt(row);
|
||||
endRemoveRows();
|
||||
}
|
||||
|
||||
void CardDatabaseModel::resetCardList()
|
||||
{
|
||||
beginResetModel();
|
||||
cardList.clear();
|
||||
cardListSet.clear();
|
||||
for (const CardInfoPtr &card : db->getCardList()) {
|
||||
if (checkCardHasAtLeastOneEnabledSet(card)) {
|
||||
cardList.append(card);
|
||||
cardListSet.insert(card);
|
||||
connect(card.data(), &CardInfo::cardInfoChanged, this, &CardDatabaseModel::cardInfoChanged);
|
||||
}
|
||||
}
|
||||
endResetModel();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ private slots:
|
|||
void cardRemoved(CardInfoPtr card);
|
||||
void cardInfoChanged(const CardInfoPtr &card);
|
||||
void cardDatabaseEnabledSetsChanged();
|
||||
void resetCardList();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue