jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 16:24:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[DeckDockWidget] Refactor to move down some methods in AbstractTabDeckEditor (#6444)

Browse source 
* move actSwapCard down

* rename method

* move actAddCard down
This commit is contained in:
RickyRister 2025-12-22 05:48:55 -08:00 • committed by GitHub
parent c12f4e9d2a
commit e80f13b78e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

36
cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
View file

@ -140,23 +140,9 @@ void AbstractTabDeckEditor::onDeckHistoryClearRequested()
* @param card Card to add.
* @param zoneName Zone to add the card to.
*/
void AbstractTabDeckEditor::addCardHelper(const ExactCard &card, QString zoneName)
void AbstractTabDeckEditor::addCardHelper(const ExactCard &card, const QString &zoneName)
{
if (!card)
return;
if (card.getInfo().getIsToken())
zoneName = DECK_ZONE_TOKENS;
onDeckHistorySaveRequested(QString(tr("Added (%1): %2 (%3) %4"))
.arg(zoneName, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(),
card.getPrinting().getProperty("num")));
QModelIndex newCardIndex = deckDockWidget->deckModel->addCard(card, zoneName);
deckDockWidget->expandAll();
deckDockWidget->deckView->clearSelection();
deckDockWidget->deckView->setCurrentIndex(newCardIndex);
setModified(true);
deckDockWidget->actAddCard(card, zoneName);
databaseDisplayDockWidget->searchEdit->setSelection(0, databaseDisplayDockWidget->searchEdit->text().length());
}
@ -193,24 +179,6 @@ void AbstractTabDeckEditor::actDecrementCardFromSideboard(const ExactCard &card)
emit decrementCard(card, DECK_ZONE_SIDE);
}
/**
* @brief Swaps a card in a deck zone.
* @param card Card to swap.
* @param zoneName Zone to swap in.
*/
void AbstractTabDeckEditor::actSwapCard(const ExactCard &card, const QString &zoneName)
{
QString providerId = card.getPrinting().getUuid();
QString collectorNumber = card.getPrinting().getProperty("num");
QModelIndex foundCard = deckDockWidget->deckModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
if (!foundCard.isValid()) {
foundCard = deckDockWidget->deckModel->findCard(card.getName(), zoneName);
}
deckDockWidget->swapCard(foundCard);
}
/**
* @brief Opens a deck in this tab.
* @param deck The deck

6
cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
View file

@ -77,7 +77,6 @@ class QAction;
*
* - actAddCard(const ExactCard &card) — Adds a card to the deck.
* - actDecrementCard(const ExactCard &card) — Removes a single instance of a card from the deck.
* - actSwapCard(const ExactCard &card, const QString &zone) — Swaps a card between zones.
* - actRemoveCard() — Removes the currently selected card from the deck.
* - actSaveDeckAs() — Performs a "Save As" action for the deck.
* - updateCard(const ExactCard &card) — Updates the currently displayed card info in the dock.
@ -320,10 +319,7 @@ protected:
bool isBlankNewDeck() const;
/** @brief Helper function to add a card to a specific deck zone. */
void addCardHelper(const ExactCard &card, QString zoneName);
/** @brief Swaps a card in the deck view. */
void actSwapCard(const ExactCard &card, const QString &zoneName);
void addCardHelper(const ExactCard &card, const QString &zoneName);
/** @brief Opens a deck from a file. */
virtual void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation);

2
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -191,7 +191,7 @@ void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
// Double click = swap
if (event->type() == QEvent::MouseButtonDblClick && event->button() == Qt::LeftButton) {
actSwapCard(card, zoneName);
deckDockWidget->actSwapCard(card, zoneName);
idx = deckDockWidget->deckModel->findCard(card.getName(), zoneName);
sel->setCurrentIndex(idx, QItemSelectionModel::ClearAndSelect);
return;