mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-13 13:30:00 -08:00
Merge branch 'Cockatrice:master' into feature/continuumatrice-product-migration
This commit is contained in:
commit
8b9e79758b
69 changed files with 2093 additions and 478 deletions
|
|
@ -21,7 +21,7 @@
|
|||
class QObject;
|
||||
|
||||
CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
|
||||
: QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr),
|
||||
: QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr), cardModel(nullptr),
|
||||
collator(NaturalSort::makeNaturalSortCollator())
|
||||
{
|
||||
filterTree = nullptr;
|
||||
|
|
@ -37,6 +37,7 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
|
|||
|
||||
void CardDatabaseDisplayModel::setSourceModel(QAbstractItemModel *model)
|
||||
{
|
||||
cardModel = qobject_cast<CardDatabaseModel *>(model);
|
||||
QSortFilterProxyModel::setSourceModel(model);
|
||||
|
||||
connect(model, &QAbstractItemModel::rowsInserted, this, [this]() { dirty(); });
|
||||
|
|
@ -46,6 +47,25 @@ void CardDatabaseDisplayModel::setSourceModel(QAbstractItemModel *model)
|
|||
connect(model, &QAbstractItemModel::modelReset, this, [this]() { dirty(); });
|
||||
}
|
||||
|
||||
QVariant CardDatabaseDisplayModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
if (role == CardInfoRole) {
|
||||
return QVariant::fromValue(cardInfoAt(index));
|
||||
}
|
||||
|
||||
return QSortFilterProxyModel::data(index, role);
|
||||
}
|
||||
|
||||
CardInfoPtr CardDatabaseDisplayModel::cardInfoAt(const QModelIndex &index) const
|
||||
{
|
||||
if (!index.isValid() || cardModel == nullptr) {
|
||||
return {};
|
||||
}
|
||||
|
||||
const QModelIndex sourceIndex = mapToSource(index);
|
||||
return sourceIndex.isValid() ? cardModel->getCard(sourceIndex.row()) : CardInfoPtr();
|
||||
}
|
||||
|
||||
QMap<wchar_t, wchar_t> CardDatabaseDisplayModel::characterTranslation = {{L'“', L'\"'},
|
||||
{L'”', L'\"'},
|
||||
{L'‘', L'\''},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue