mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-11 04:23:29 -08:00
Address review findings
This commit is contained in:
parent
fae49848b3
commit
bed2a67a2f
1 changed files with 21 additions and 17 deletions
|
|
@ -15,6 +15,7 @@
|
||||||
#include <QGroupBox>
|
#include <QGroupBox>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
|
#include <QList>
|
||||||
#include <QMapIterator>
|
#include <QMapIterator>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
@ -288,32 +289,35 @@ void DlgCreateGame::actReset()
|
||||||
|
|
||||||
void DlgCreateGame::actOK()
|
void DlgCreateGame::actOK()
|
||||||
{
|
{
|
||||||
GameCreationOptions options;
|
|
||||||
options.description = descriptionEdit->text();
|
|
||||||
options.password = passwordEdit->text();
|
|
||||||
options.maxPlayers = maxPlayersEdit->value();
|
|
||||||
options.onlyBuddies = onlyBuddiesCheckBox->isChecked();
|
|
||||||
options.onlyRegistered = onlyRegisteredCheckBox->isChecked();
|
|
||||||
options.spectatorsAllowed = spectatorsAllowedCheckBox->isChecked();
|
|
||||||
options.spectatorsNeedPassword = spectatorsNeedPasswordCheckBox->isChecked();
|
|
||||||
options.spectatorsCanTalk = spectatorsCanTalkCheckBox->isChecked();
|
|
||||||
options.spectatorsSeeEverything = spectatorsSeeEverythingCheckBox->isChecked();
|
|
||||||
options.joinAsJudge = createGameAsJudgeCheckBox->isChecked();
|
|
||||||
options.joinAsSpectator = createGameAsSpectatorCheckBox->isChecked();
|
|
||||||
options.startingLifeTotal = startingLifeTotalEdit->value();
|
|
||||||
options.shareDecklistsOnLoad = shareDecklistsOnLoadCheckBox->isChecked();
|
|
||||||
options.shufflePlayers = shufflePlayersCheckBox->isChecked();
|
|
||||||
|
|
||||||
auto _gameTypes = QString();
|
auto _gameTypes = QString();
|
||||||
|
QList<int> gameTypeIds;
|
||||||
QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
|
QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
|
||||||
while (gameTypeCheckBoxIterator.hasNext()) {
|
while (gameTypeCheckBoxIterator.hasNext()) {
|
||||||
gameTypeCheckBoxIterator.next();
|
gameTypeCheckBoxIterator.next();
|
||||||
if (gameTypeCheckBoxIterator.value()->isChecked()) {
|
if (gameTypeCheckBoxIterator.value()->isChecked()) {
|
||||||
options.gameTypeIds.append(gameTypeCheckBoxIterator.key());
|
gameTypeIds.append(gameTypeCheckBoxIterator.key());
|
||||||
_gameTypes += gameTypeCheckBoxIterator.value()->text() + ", ";
|
_gameTypes += gameTypeCheckBoxIterator.value()->text() + ", ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GameCreationOptions options{
|
||||||
|
.description = descriptionEdit->text(),
|
||||||
|
.password = passwordEdit->text(),
|
||||||
|
.maxPlayers = maxPlayersEdit->value(),
|
||||||
|
.onlyBuddies = onlyBuddiesCheckBox->isChecked(),
|
||||||
|
.onlyRegistered = onlyRegisteredCheckBox->isChecked(),
|
||||||
|
.spectatorsAllowed = spectatorsAllowedCheckBox->isChecked(),
|
||||||
|
.spectatorsNeedPassword = spectatorsNeedPasswordCheckBox->isChecked(),
|
||||||
|
.spectatorsCanTalk = spectatorsCanTalkCheckBox->isChecked(),
|
||||||
|
.spectatorsSeeEverything = spectatorsSeeEverythingCheckBox->isChecked(),
|
||||||
|
.joinAsJudge = createGameAsJudgeCheckBox->isChecked(),
|
||||||
|
.joinAsSpectator = createGameAsSpectatorCheckBox->isChecked(),
|
||||||
|
.startingLifeTotal = startingLifeTotalEdit->value(),
|
||||||
|
.shareDecklistsOnLoad = shareDecklistsOnLoadCheckBox->isChecked(),
|
||||||
|
.shufflePlayers = shufflePlayersCheckBox->isChecked(),
|
||||||
|
.gameTypeIds = gameTypeIds,
|
||||||
|
};
|
||||||
|
|
||||||
Command_CreateGame cmd = options.toCreateGameCommand();
|
Command_CreateGame cmd = options.toCreateGameCommand();
|
||||||
|
|
||||||
SettingsCache::instance().game().setRememberGameSettings(rememberGameSettings->isChecked());
|
SettingsCache::instance().game().setRememberGameSettings(rememberGameSettings->isChecked());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue