mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-25 11:56:11 -07:00
[DeckEditor] Address zone-management review feedback
- 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:
parent
f1923e7c13
commit
17ed97be13
3 changed files with 20 additions and 15 deletions
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,9 @@ DeckZoneDialog::DeckZoneDialog(QWidget *parent,
|
|||
if (allowBoardSelection) {
|
||||
layout->addWidget(boardLabel);
|
||||
layout->addWidget(boardCombo);
|
||||
} else {
|
||||
boardLabel->hide();
|
||||
boardCombo->hide();
|
||||
}
|
||||
layout->addWidget(buttonBox);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue