mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-28 09:33:55 -07:00
Rebase
This commit is contained in:
parent
0babdd1a7d
commit
d6124ad484
1 changed files with 2 additions and 4 deletions
|
|
@ -433,7 +433,7 @@ void DeckEditorDeckDockWidget::requestBracketEstimate()
|
||||||
bracketInfoButton->setEnabled(false);
|
bracketInfoButton->setEnabled(false);
|
||||||
bracketValueLabel->setText(tr("Calculating…"));
|
bracketValueLabel->setText(tr("Calculating…"));
|
||||||
|
|
||||||
requestId = CommanderSpellbookApiAccessor::instance().estimateBracket(*deckModel->getDeckList(), this);
|
requestId = CommanderSpellbookApiAccessor::instance().estimateBracket(*deckStateManager->getModel()->getDeckList(), this);
|
||||||
|
|
||||||
connect(&CommanderSpellbookApiAccessor::instance(), &CommanderSpellbookApiAccessor::estimateBracketFinished, this,
|
connect(&CommanderSpellbookApiAccessor::instance(), &CommanderSpellbookApiAccessor::estimateBracketFinished, this,
|
||||||
&DeckEditorDeckDockWidget::onEstimateBracketFinished);
|
&DeckEditorDeckDockWidget::onEstimateBracketFinished);
|
||||||
|
|
@ -501,8 +501,6 @@ void DeckEditorDeckDockWidget::initializeFormats()
|
||||||
deckStateManager->setFormat(""); // clear format if deselected
|
deckStateManager->setFormat(""); // clear format if deselected
|
||||||
}
|
}
|
||||||
|
|
||||||
emit deckModified();
|
|
||||||
|
|
||||||
const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0);
|
const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0);
|
||||||
const bool commanderSpellbookIntegrationEnabled =
|
const bool commanderSpellbookIntegrationEnabled =
|
||||||
SettingsCache::instance().getDeckEditorCommanderSpellbookIntegrationEnabled() !=
|
SettingsCache::instance().getDeckEditorCommanderSpellbookIntegrationEnabled() !=
|
||||||
|
|
@ -528,7 +526,7 @@ void DeckEditorDeckDockWidget::initializeFormats()
|
||||||
|
|
||||||
void DeckEditorDeckDockWidget::maybeAutoEstimateBracket()
|
void DeckEditorDeckDockWidget::maybeAutoEstimateBracket()
|
||||||
{
|
{
|
||||||
const QString formatKey = deckModel->getDeckList()->getGameFormat();
|
const QString formatKey = deckStateManager->getModel()->getDeckList()->getGameFormat();
|
||||||
|
|
||||||
const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0);
|
const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue