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

Merge pull request #1267 from Cockatrice/revert-1261-fix_982

Browse source 
Revert "Confirmation dialog on close"
This commit is contained in:
ctrlaltca 2015-07-16 12:30:37 +02:00
commit 61b2b46b79
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cockatrice/src/tab_supervisor.cpp
View file

@ -136,20 +136,17 @@ void TabSupervisor::retranslateUi()
bool TabSupervisor::closeRequest() bool TabSupervisor::closeRequest()
{ {
if (getGameCount()) if (getGameCount()) {
{ if (QMessageBox::question(this, tr("Are you sure?"), tr("There are still open games. Are you sure you want to quit?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
if (QMessageBox::question(this, tr("Are you sure?"), tr("There are still open games. Are you sure you want to quit?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No)
return false;
}
else
{
if (QMessageBox::question(this, tr("Close Cockatrice"), tr("Are you sure you want to close Cockatrice?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No)
return false; return false;
}
} }
foreach(TabDeckEditor *tab, deckEditorTabs) foreach(TabDeckEditor *tab, deckEditorTabs)
if (!tab->confirmClose()) {
if(!tab->confirmClose())
return false; return false;
}
return true; return true;
} }

4
cockatrice/src/window_main.cpp
View file

@ -71,7 +71,7 @@ void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &even
client->disconnectFromServer(); client->disconnectFromServer();
QString reasonStr; QString reasonStr;
switch (event.reason()) { switch (event.reason()) {
case Event_ConnectionClosed::USER_LIMIT_REACHED: reasonStr = tr("The server has reached its maximum user capacity, please check back later."); break; case Event_ConnectionClosed::USER_LIMIT_REACHED: reasonStr = tr("The server has reached its maximum user capacity, please check back later."); break;
case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: reasonStr = tr("There are too many concurrent connections from your address."); break; case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: reasonStr = tr("There are too many concurrent connections from your address."); break;
case Event_ConnectionClosed::BANNED: { case Event_ConnectionClosed::BANNED: {
reasonStr = tr("Banned by moderator"); reasonStr = tr("Banned by moderator");
@ -632,7 +632,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
{ {
// workaround Qt bug where closeEvent gets called twice // workaround Qt bug where closeEvent gets called twice
static bool bClosingDown=false; static bool bClosingDown=false;
if (bClosingDown) if(bClosingDown)
return; return;
bClosingDown=true; bClosingDown=true;