aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #715 from ZeldaZach/dialog_spec_view

Browse source 
Game list informs better of what spectators can do
This commit is contained in:
Zach 2015-02-09 16:38:45 -05:00
commit e02f9e7dd0
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/dlg_creategame.cpp
View file

@ -72,12 +72,12 @@ void DlgCreateGame::sharedCtor()
QGroupBox *joinRestrictionsGroupBox = new QGroupBox(tr("Joining restrictions")); QGroupBox *joinRestrictionsGroupBox = new QGroupBox(tr("Joining restrictions"));
joinRestrictionsGroupBox->setLayout(joinRestrictionsLayout); joinRestrictionsGroupBox->setLayout(joinRestrictionsLayout);
spectatorsAllowedCheckBox = new QCheckBox(tr("&Spectators allowed")); spectatorsAllowedCheckBox = new QCheckBox(tr("&Spectators can watch"));
spectatorsAllowedCheckBox->setChecked(true); spectatorsAllowedCheckBox->setChecked(true);
connect(spectatorsAllowedCheckBox, SIGNAL(stateChanged(int)), this, SLOT(spectatorsAllowedChanged(int))); connect(spectatorsAllowedCheckBox, SIGNAL(stateChanged(int)), this, SLOT(spectatorsAllowedChanged(int)));
spectatorsNeedPasswordCheckBox = new QCheckBox(tr("Spectators &need a password to join")); spectatorsNeedPasswordCheckBox = new QCheckBox(tr("Spectators &need a password to watch"));
spectatorsCanTalkCheckBox = new QCheckBox(tr("Spectators can &chat")); spectatorsCanTalkCheckBox = new QCheckBox(tr("Spectators can &chat"));
spectatorsSeeEverythingCheckBox = new QCheckBox(tr("Spectators see &everything")); spectatorsSeeEverythingCheckBox = new QCheckBox(tr("Spectators can see &hands"));
QVBoxLayout *spectatorsLayout = new QVBoxLayout; QVBoxLayout *spectatorsLayout = new QVBoxLayout;
spectatorsLayout->addWidget(spectatorsAllowedCheckBox); spectatorsLayout->addWidget(spectatorsAllowedCheckBox);
spectatorsLayout->addWidget(spectatorsNeedPasswordCheckBox); spectatorsLayout->addWidget(spectatorsNeedPasswordCheckBox);

18
cockatrice/src/gamesmodel.cpp
View file

@ -176,10 +176,20 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
if (g.spectators_allowed()) { if (g.spectators_allowed()) {
QString result; QString result;
result.append(QString::number(g.spectators_count())); result.append(QString::number(g.spectators_count()));
if (g.spectators_can_chat())
result.append(", ").append(tr("chat")); if (g.spectators_can_chat() && g.spectators_omniscient())
if (g.spectators_omniscient()) {
result.append(", ").append(tr("see everything")); result.append(" (").append(tr("can chat")).append(" & ").append(tr("see hands")).append(")");
}
else if (g.spectators_can_chat())
{
result.append(" (").append(tr("can chat")).append(")");
}
else if (g.spectators_omniscient())
{
result.append(" (").append(tr("can see hands")).append(")");
}
return result; return result;
} }
return QVariant(tr("not allowed")); return QVariant(tr("not allowed"));