From 2e5f212db7dddb2f761ebf91509e5f8a4bd4b9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 16 Nov 2025 11:52:28 +0100 Subject: [PATCH] Remove shift hotkey. Took 4 minutes --- .../src/interface/widgets/server/game_selector.cpp | 9 ++------- cockatrice/src/interface/widgets/server/game_selector.h | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index 3ddfc7551..077027e0d 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -130,7 +130,7 @@ GameSelector::GameSelector(AbstractClient *_client, connect(spectateButton, &QPushButton::clicked, this, &GameSelector::actSpectate); connect(gameListView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &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::addToListEventReceived, this, &GameSelector::processAddToListEvent); @@ -252,16 +252,11 @@ void GameSelector::actJoin() } void GameSelector::actJoinAsJudge() -{ - return joinGame(false, true); -} - -void GameSelector::actJoinAsPlayerOrJudge() { if (!(tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge)) { return joinGame(); } - return joinGame(false, (QApplication::keyboardModifiers() & Qt::ShiftModifier) != 0); + return joinGame(false, true); } void GameSelector::actSpectate() diff --git a/cockatrice/src/interface/widgets/server/game_selector.h b/cockatrice/src/interface/widgets/server/game_selector.h index c71a5c7e9..4a6be58b5 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.h +++ b/cockatrice/src/interface/widgets/server/game_selector.h @@ -57,8 +57,10 @@ private slots: * @brief Joins the currently selected game as a player. */ void actJoin(); + /** + * @brief Joins the currently selected game as a judge. + */ void actJoinAsJudge(); - void actJoinAsPlayerOrJudge(); /** * @brief Joins the currently selected game as a spectator.