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

[DeckEditor] Address zone-management review feedback

Browse source 
- Expose DecklistNodeTree::hasZoneName and use it in validateNewZoneName
  so the uniqueness scan covers custom zones on every board, not just the
  standard ones.
- Hide the board selector in the rename dialog path where it is not used.
- Emit deckHashChanged after refreshDeckHash so the deck hash label stays
  current after zone create/rename/move/remove.
This commit is contained in:
Lukas Brübach 2026-08-30 22:26:41 +02:00 • committed by GitHub
parent ff97b73af9
commit 48ae7cf0ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
View file

@ -470,20 +470,13 @@ QString DeckStateManager::validateNewZoneName(const QString &zoneName) const
const auto *tree = deckList->getTree();
// Top-level zones (boards and legacy zones) claim their names too.
for (int i = 0; i < tree->getRoot()->size(); i++) {
if (tree->getRoot()->at(i)->getName() == trimmedZoneName) {
return tr("A zone with this name already exists.");
}
}
// Custom zone names are unique across the whole deck.
for (const QString &board : InnerDecklistNode::boardZoneNames()) {
for (const auto *customZone : tree->getCustomZones(board)) {
if (customZone->getName() == trimmedZoneName) {
return tr("A zone with this name already exists.");
}
}
// Reuse the tree's own uniqueness contract: any top-level zone and any
// custom zone on *every* board claims the name (hasZoneName also reserves
// the standard board names, which we already rejected with a dedicated
// message above). Scanning only the standard boards here would miss a
// custom zone an imported deck carries under `tokens`.
if (tree->hasZoneName(trimmedZoneName)) {
return tr("A zone with this name already exists.");
}
return {};
@ -558,6 +551,7 @@ bool DeckStateManager::modifyTree(const QString &reason, const std::function<boo
historyManager->save(memento);
deckListModel->rebuildTree();
deckList->refreshDeckHash();
emit deckListModel->deckHashChanged();
doCardModified();
}

3
cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
View file

@ -50,6 +50,9 @@ DeckZoneDialog::DeckZoneDialog(QWidget *parent,
if (allowBoardSelection) {
layout->addWidget(boardLabel);
layout->addWidget(boardCombo);
} else {
boardLabel->hide();
boardCombo->hide();
}
layout->addWidget(buttonBox);

10
libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
View file

@ -115,6 +115,15 @@ public:
*/
QList<const InnerDecklistNode *> getCustomZones(const QString &boardZoneName) const;
/**
* @brief Checks whether a zone name is taken anywhere in the deck.
*
* Covers the standard board names and any top-level or nested custom zone.
* @param zoneName The checked name.
* @return true if the name is reserved or already in use.
*/
bool hasZoneName(const QString &zoneName) const;
/**
* @brief Applies a function to every card in the deck tree. This can modify the cards.
*
@ -129,7 +138,6 @@ private:
InnerDecklistNode *findBoardZone(const QString &boardZoneName) const;
InnerDecklistNode *findOrCreateBoardZone(const QString &boardZoneName);
InnerDecklistNode *findCustomZoneByName(const QString &zoneName) const;
bool hasZoneName(const QString &zoneName) const;
};
#endif // COCKATRICE_DECKLIST_NODE_TREE_H