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

No banner card equals an empty CardInfoPtr.

Browse source
This commit is contained in:
Lukas Brübach 2024-12-24 11:12:19 +01:00
parent 5a6374386d
commit d7bd0b8b07
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/CMakeLists.txt
View file

@ -161,7 +161,7 @@ set(cockatrice_SOURCES
src/game/zones/view_zone.cpp src/game/zones/view_zone.cpp
src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
${VERSION_STRING_CPP} ${VERSION_STRING_CPP}
) )

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

@ -47,8 +47,8 @@ private:
DeckListModel *deck_list_model; DeckListModel *deck_list_model;
QAction *aOpenLocalDeck, *aDeleteLocalDeck; QAction *aOpenLocalDeck, *aDeleteLocalDeck;
QString getTargetPath() const; QString getTargetPath() const;
private slots: private slots:
void actOpenLocalDeck(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); void actOpenLocalDeck(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
void actDeleteLocalDeck(); void actDeleteLocalDeck();
}; };

5
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -49,7 +49,10 @@ QStringList VisualDeckStorageWidget::getBannerCardsForDecks()
auto *display = new DeckPreviewCardPictureWidget(flowWidget, true); auto *display = new DeckPreviewCardPictureWidget(flowWidget, true);
qDebug() << "Banner card is: " << deckLoader->getBannerCard(); qDebug() << "Banner card is: " << deckLoader->getBannerCard();
display->setCard(CardDatabaseManager::getInstance()->getCard(deckLoader->getBannerCard())); auto bannerCard = deckLoader->getBannerCard().isEmpty()
? CardInfoPtr()
: CardDatabaseManager::getInstance()->getCard(deckLoader->getBannerCard());
display->setCard(bannerCard);
display->setOverlayText(deckLoader->getName().isEmpty() ? QFileInfo(deckLoader->getLastFileName()).fileName() display->setOverlayText(deckLoader->getName().isEmpty() ? QFileInfo(deckLoader->getLastFileName()).fileName()
: deckLoader->getName()); : deckLoader->getName());
display->setFontSize(24); display->setFontSize(24);