check if settingsdialog is called from ingame and disable reset settings

button
This commit is contained in:
doitux
2012-01-06 09:34:26 +00:00
parent cd3eaaf2b9
commit bc8f9b9b89
6 changed files with 40 additions and 10 deletions
+7 -3
View File
@@ -110,7 +110,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
connect( pushButton_Join_Network_Game, SIGNAL( clicked() ), this, SLOT( callJoinNetworkGameDialog() ) );
connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) );
connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) );
connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialogFromStartwindow() ) );
connect(this, SIGNAL(signalShowClientDialog()), this, SLOT(showClientDialog()));
@@ -587,10 +587,14 @@ void startWindowImpl::callAboutPokerthDialog()
myAboutPokerthDialog->exec();
}
void startWindowImpl::callSettingsDialog()
void startWindowImpl::callSettingsDialogFromStartwindow()
{
callSettingsDialog(false);
}
mySettingsDialog->exec();
void startWindowImpl::callSettingsDialog(bool ingame)
{
mySettingsDialog->exec(ingame);
if (mySettingsDialog->result() == QDialog::Accepted && mySettingsDialog->getSettingsCorrect()) {
myGuiInterface->getMyW()->applySettings(mySettingsDialog);