jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update banner card combo box correctly.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-03 14:49:15 +01:00
parent fa6f3e50bf
commit 1236969642
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/client/tabs/tab_deck_editor.cpp
View file

@ -1507,10 +1507,14 @@ void TabDeckEditor::actDecrement()
void TabDeckEditor::setDeck(DeckLoader *_deck) void TabDeckEditor::setDeck(DeckLoader *_deck)
{ {
qDebug() << " ORIGINAL BANNER CARD " << _deck->getBannerCard();
deckModel->setDeckList(_deck); deckModel->setDeckList(_deck);
nameEdit->setText(deckModel->getDeckList()->getName()); nameEdit->setText(deckModel->getDeckList()->getName());
commentsEdit->setText(deckModel->getDeckList()->getComments()); commentsEdit->setText(deckModel->getDeckList()->getComments());
qDebug() << deckModel->getDeckList()->getBannerCard() << " was the banner card";
bannerCardComboBox->setCurrentText(deckModel->getDeckList()->getBannerCard());
updateBannerCardComboBox();
updateHash(); updateHash();
deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder()); deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
deckView->expandAll(); deckView->expandAll();

1
cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
View file

@ -65,7 +65,6 @@ void TabDeckStorageVisual::closeRequest()
void TabDeckStorageVisual::retranslateUi() void TabDeckStorageVisual::retranslateUi()
{ {
aOpenLocalDeck->setText(tr("Open in deck editor")); aOpenLocalDeck->setText(tr("Open in deck editor"));
aDeleteLocalDeck->setText(tr("Delete")); aDeleteLocalDeck->setText(tr("Delete"));
} }

5
cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h
View file

@ -34,6 +34,8 @@ public:
public slots: public slots:
void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus); void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus);
void closeRequest() override; void closeRequest() override;
void actOpenLocalDeck(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
void actDeleteLocalDeck();
signals: signals:
void openDeckEditor(const DeckLoader *deckLoader); void openDeckEditor(const DeckLoader *deckLoader);
@ -49,9 +51,6 @@ private:
DeckListModel *deck_list_model; DeckListModel *deck_list_model;
QAction *aOpenLocalDeck, *aDeleteLocalDeck; QAction *aOpenLocalDeck, *aDeleteLocalDeck;
QString getTargetPath() const; QString getTargetPath() const;
private slots:
void actOpenLocalDeck(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
void actDeleteLocalDeck();
}; };
#endif #endif

3
common/decklist.cpp
View file

@ -368,7 +368,7 @@ DeckList::DeckList()
// TODO: https://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator // TODO: https://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator
DeckList::DeckList(const DeckList &other) DeckList::DeckList(const DeckList &other)
: QObject(), name(other.name), comments(other.comments), deckHash(other.deckHash) : QObject(), name(other.name), comments(other.comments), bannerCard(other.bannerCard), deckHash(other.deckHash)
{ {
root = new InnerDecklistNode(other.getRoot()); root = new InnerDecklistNode(other.getRoot());
@ -425,6 +425,7 @@ bool DeckList::readElement(QXmlStreamReader *xml)
comments = xml->readElementText(); comments = xml->readElementText();
else if (childName == "bannerCard") { else if (childName == "bannerCard") {
bannerCard = xml->readElementText(); bannerCard = xml->readElementText();
qDebug() << "Deckloader found the banner card " << bannerCard;
} else if (childName == "zone") { } else if (childName == "zone") {
InnerDecklistNode *newZone = getZoneObjFromName(xml->attributes().value("name").toString()); InnerDecklistNode *newZone = getZoneObjFromName(xml->attributes().value("name").toString());
newZone->readElement(xml); newZone->readElement(xml);