diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp index c8b085029..79982129b 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp @@ -1507,10 +1507,14 @@ void TabDeckEditor::actDecrement() void TabDeckEditor::setDeck(DeckLoader *_deck) { + qDebug() << " ORIGINAL BANNER CARD " << _deck->getBannerCard(); deckModel->setDeckList(_deck); nameEdit->setText(deckModel->getDeckList()->getName()); commentsEdit->setText(deckModel->getDeckList()->getComments()); + qDebug() << deckModel->getDeckList()->getBannerCard() << " was the banner card"; + bannerCardComboBox->setCurrentText(deckModel->getDeckList()->getBannerCard()); + updateBannerCardComboBox(); updateHash(); deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder()); deckView->expandAll(); diff --git a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index e1cd2207a..831e7ed97 100644 --- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -65,7 +65,6 @@ void TabDeckStorageVisual::closeRequest() void TabDeckStorageVisual::retranslateUi() { - aOpenLocalDeck->setText(tr("Open in deck editor")); aDeleteLocalDeck->setText(tr("Delete")); } diff --git a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h index 3de7834e5..4d8538826 100644 --- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h +++ b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h @@ -34,6 +34,8 @@ public: public slots: void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus); void closeRequest() override; + void actOpenLocalDeck(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); + void actDeleteLocalDeck(); signals: void openDeckEditor(const DeckLoader *deckLoader); @@ -49,9 +51,6 @@ private: DeckListModel *deck_list_model; QAction *aOpenLocalDeck, *aDeleteLocalDeck; QString getTargetPath() const; -private slots: - void actOpenLocalDeck(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); - void actDeleteLocalDeck(); }; #endif diff --git a/common/decklist.cpp b/common/decklist.cpp index 53b52b5e1..6ffaa7725 100644 --- a/common/decklist.cpp +++ b/common/decklist.cpp @@ -368,7 +368,7 @@ DeckList::DeckList() // TODO: https://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator 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()); @@ -425,6 +425,7 @@ bool DeckList::readElement(QXmlStreamReader *xml) comments = xml->readElementText(); else if (childName == "bannerCard") { bannerCard = xml->readElementText(); + qDebug() << "Deckloader found the banner card " << bannerCard; } else if (childName == "zone") { InnerDecklistNode *newZone = getZoneObjFromName(xml->attributes().value("name").toString()); newZone->readElement(xml);