mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
Consolidate closeReplay action into leaveGame (#6239)
This commit is contained in:
parent
c42e953199
commit
8ebfc40de5
2 changed files with 10 additions and 14 deletions
|
|
@ -323,10 +323,11 @@ void TabGame::retranslateUi()
|
|||
}
|
||||
}
|
||||
if (aLeaveGame) {
|
||||
aLeaveGame->setText(tr("&Leave game"));
|
||||
}
|
||||
if (aCloseReplay) {
|
||||
aCloseReplay->setText(tr("C&lose replay"));
|
||||
if (replayManager->replay) {
|
||||
aLeaveGame->setText(tr("C&lose replay"));
|
||||
} else {
|
||||
aLeaveGame->setText(tr("&Leave game"));
|
||||
}
|
||||
}
|
||||
if (aFocusChat) {
|
||||
aFocusChat->setText(tr("&Focus Chat"));
|
||||
|
|
@ -444,9 +445,6 @@ void TabGame::refreshShortcuts()
|
|||
if (aLeaveGame) {
|
||||
aLeaveGame->setShortcuts(shortcuts.getShortcut("Player/aLeaveGame"));
|
||||
}
|
||||
if (aCloseReplay) {
|
||||
aCloseReplay->setShortcuts(shortcuts.getShortcut("Player/aCloseReplay"));
|
||||
}
|
||||
if (aResetLayout) {
|
||||
aResetLayout->setShortcuts(shortcuts.getShortcut("Player/aResetLayout"));
|
||||
}
|
||||
|
|
@ -979,7 +977,6 @@ void TabGame::createMenuItems()
|
|||
connect(aLeaveGame, &QAction::triggered, this, &TabGame::closeRequest);
|
||||
aFocusChat = new QAction(this);
|
||||
connect(aFocusChat, &QAction::triggered, sayEdit, qOverload<>(&LineEditCompleter::setFocus));
|
||||
aCloseReplay = nullptr;
|
||||
|
||||
phasesMenu = new TearOffMenu(this);
|
||||
|
||||
|
|
@ -1029,13 +1026,12 @@ void TabGame::createReplayMenuItems()
|
|||
aGameInfo = nullptr;
|
||||
aConcede = nullptr;
|
||||
aFocusChat = nullptr;
|
||||
aLeaveGame = nullptr;
|
||||
aCloseReplay = new QAction(this);
|
||||
connect(aCloseReplay, &QAction::triggered, this, &TabGame::closeRequest);
|
||||
aLeaveGame = new QAction(this);
|
||||
connect(aLeaveGame, &QAction::triggered, this, &TabGame::closeRequest);
|
||||
|
||||
phasesMenu = nullptr;
|
||||
gameMenu = new QMenu(this);
|
||||
gameMenu->addAction(aCloseReplay);
|
||||
gameMenu->addAction(aLeaveGame);
|
||||
|
||||
aCardMenu = nullptr;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue