mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-24 15:43:54 -07:00
Use modelReset from new grouping in deck_list_model in VDE (#6100)
This commit is contained in:
parent
ec94c29ed9
commit
b8dedb568c
2 changed files with 19 additions and 0 deletions
|
|
@ -179,6 +179,7 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_
|
||||||
mainLayout->addWidget(scrollArea);
|
mainLayout->addWidget(scrollArea);
|
||||||
mainLayout->addWidget(cardSizeWidget);
|
mainLayout->addWidget(cardSizeWidget);
|
||||||
|
|
||||||
|
connect(deckListModel, &DeckListModel::modelReset, this, &VisualDeckEditorWidget::decklistModelReset);
|
||||||
connect(deckListModel, &DeckListModel::dataChanged, this, &VisualDeckEditorWidget::decklistDataChanged);
|
connect(deckListModel, &DeckListModel::dataChanged, this, &VisualDeckEditorWidget::decklistDataChanged);
|
||||||
connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &VisualDeckEditorWidget::onCardAddition);
|
connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &VisualDeckEditorWidget::onCardAddition);
|
||||||
connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &VisualDeckEditorWidget::onCardRemoval);
|
connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &VisualDeckEditorWidget::onCardRemoval);
|
||||||
|
|
@ -199,6 +200,16 @@ void VisualDeckEditorWidget::retranslateUi()
|
||||||
tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)"));
|
tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void VisualDeckEditorWidget::clearAllDisplayWidgets()
|
||||||
|
{
|
||||||
|
for (auto idx : indexToWidgetMap.keys()) {
|
||||||
|
auto displayWidget = indexToWidgetMap.value(idx);
|
||||||
|
zoneContainerLayout->removeWidget(displayWidget);
|
||||||
|
indexToWidgetMap.remove(idx);
|
||||||
|
delete displayWidget;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void VisualDeckEditorWidget::cleanupInvalidZones(DeckCardZoneDisplayWidget *displayWidget)
|
void VisualDeckEditorWidget::cleanupInvalidZones(DeckCardZoneDisplayWidget *displayWidget)
|
||||||
{
|
{
|
||||||
zoneContainerLayout->removeWidget(displayWidget);
|
zoneContainerLayout->removeWidget(displayWidget);
|
||||||
|
|
@ -332,6 +343,12 @@ void VisualDeckEditorWidget::actChangeActiveSortCriteria()
|
||||||
emit activeSortCriteriaChanged(selectedCriteria);
|
emit activeSortCriteriaChanged(selectedCriteria);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void VisualDeckEditorWidget::decklistModelReset()
|
||||||
|
{
|
||||||
|
clearAllDisplayWidgets();
|
||||||
|
constructZoneWidgetsFromDeckListModel();
|
||||||
|
}
|
||||||
|
|
||||||
void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight)
|
void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight)
|
||||||
{
|
{
|
||||||
// Might use these at some point.
|
// Might use these at some point.
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ class VisualDeckEditorWidget : public QWidget
|
||||||
public:
|
public:
|
||||||
explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel);
|
explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel);
|
||||||
void retranslateUi();
|
void retranslateUi();
|
||||||
|
void clearAllDisplayWidgets();
|
||||||
void resizeEvent(QResizeEvent *event) override;
|
void resizeEvent(QResizeEvent *event) override;
|
||||||
|
|
||||||
void setDeckList(const DeckList &_deckListModel);
|
void setDeckList(const DeckList &_deckListModel);
|
||||||
|
|
@ -60,6 +61,7 @@ protected slots:
|
||||||
void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
|
void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
|
||||||
void actChangeActiveGroupCriteria();
|
void actChangeActiveGroupCriteria();
|
||||||
void actChangeActiveSortCriteria();
|
void actChangeActiveSortCriteria();
|
||||||
|
void decklistModelReset();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DeckListModel *deckListModel;
|
DeckListModel *deckListModel;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue