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

[TabDeckEditor] Refactor: consolidate add/decrement card signals (#6961)

Browse source
This commit is contained in:
RickyRister 2026-06-02 20:13:39 -07:00 • committed by GitHub
parent 3fa377a11c
commit f52dc6dda8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 40 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
View file

@ -29,14 +29,10 @@ void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeck
// connect signals
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, deckEditor,
&AbstractTabDeckEditor::updateCard);
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::addCardToMainDeck, deckEditor,
&AbstractTabDeckEditor::actAddCard);
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::addCardToSideboard, deckEditor,
&AbstractTabDeckEditor::actAddCardToSideboard);
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromMainDeck, deckEditor,
&AbstractTabDeckEditor::actDecrementCard);
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, deckEditor,
&AbstractTabDeckEditor::actDecrementCardFromSideboard);
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardAdded, deckEditor,
&AbstractTabDeckEditor::addCard);
connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardDecremented, deckEditor,
&AbstractTabDeckEditor::decrementCard);
}
CardDatabase *DeckEditorCardDatabaseDockWidget::getDatabase() const

8
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -158,23 +158,23 @@ void DeckEditorDatabaseDisplayWidget::actAddCard()
void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck()
{
highlightAllSearchEdit();
emit addCardToMainDeck(currentCard());
emit cardAdded(currentCard(), DECK_ZONE_MAIN);
}
void DeckEditorDatabaseDisplayWidget::actAddCardToSideboard()
{
highlightAllSearchEdit();
emit addCardToSideboard(currentCard());
emit cardAdded(currentCard(), DECK_ZONE_SIDE);
}
void DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck()
{
emit decrementCardFromMainDeck(currentCard());
emit cardDecremented(currentCard(), DECK_ZONE_MAIN);
}
void DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard()
{
emit decrementCardFromSideboard(currentCard());
emit cardDecremented(currentCard(), DECK_ZONE_SIDE);
}
ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const

6
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -48,10 +48,8 @@ public slots:
void copyDatabaseCellContents();
signals:
void addCardToMainDeck(const ExactCard &card);
void addCardToSideboard(const ExactCard &card);
void decrementCardFromMainDeck(const ExactCard &card);
void decrementCardFromSideboard(const ExactCard &card);
void cardAdded(const ExactCard &card, const QString &zoneName);
void cardDecremented(const ExactCard &card, const QString &zoneName);
void cardChanged(const ExactCard &_card);
private: