mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-09 17:44:01 -07:00
Remove shift hotkey.
Took 4 minutes
This commit is contained in:
parent
e727f3bd61
commit
2e5f212db7
2 changed files with 5 additions and 8 deletions
|
|
@ -130,7 +130,7 @@ GameSelector::GameSelector(AbstractClient *_client,
|
||||||
connect(spectateButton, &QPushButton::clicked, this, &GameSelector::actSpectate);
|
connect(spectateButton, &QPushButton::clicked, this, &GameSelector::actSpectate);
|
||||||
connect(gameListView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
|
connect(gameListView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
|
||||||
&GameSelector::actSelectedGameChanged);
|
&GameSelector::actSelectedGameChanged);
|
||||||
connect(gameListView, &QTreeView::activated, this, &GameSelector::actJoinAsPlayerOrJudge);
|
connect(gameListView, &QTreeView::activated, this, &GameSelector::actJoin);
|
||||||
|
|
||||||
connect(client, &AbstractClient::ignoreListReceived, this, &GameSelector::ignoreListReceived);
|
connect(client, &AbstractClient::ignoreListReceived, this, &GameSelector::ignoreListReceived);
|
||||||
connect(client, &AbstractClient::addToListEventReceived, this, &GameSelector::processAddToListEvent);
|
connect(client, &AbstractClient::addToListEventReceived, this, &GameSelector::processAddToListEvent);
|
||||||
|
|
@ -252,16 +252,11 @@ void GameSelector::actJoin()
|
||||||
}
|
}
|
||||||
|
|
||||||
void GameSelector::actJoinAsJudge()
|
void GameSelector::actJoinAsJudge()
|
||||||
{
|
|
||||||
return joinGame(false, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GameSelector::actJoinAsPlayerOrJudge()
|
|
||||||
{
|
{
|
||||||
if (!(tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge)) {
|
if (!(tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge)) {
|
||||||
return joinGame();
|
return joinGame();
|
||||||
}
|
}
|
||||||
return joinGame(false, (QApplication::keyboardModifiers() & Qt::ShiftModifier) != 0);
|
return joinGame(false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GameSelector::actSpectate()
|
void GameSelector::actSpectate()
|
||||||
|
|
|
||||||
|
|
@ -57,8 +57,10 @@ private slots:
|
||||||
* @brief Joins the currently selected game as a player.
|
* @brief Joins the currently selected game as a player.
|
||||||
*/
|
*/
|
||||||
void actJoin();
|
void actJoin();
|
||||||
|
/**
|
||||||
|
* @brief Joins the currently selected game as a judge.
|
||||||
|
*/
|
||||||
void actJoinAsJudge();
|
void actJoinAsJudge();
|
||||||
void actJoinAsPlayerOrJudge();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Joins the currently selected game as a spectator.
|
* @brief Joins the currently selected game as a spectator.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue