From 6d673793be149bb0ec1d2419e16a2a7e6fc7382a Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 13 May 2007 13:32:06 +0000 Subject: [PATCH] one ConfigFile for all --- .../createnetworkgamedialogimpl.cpp | 17 +- .../createnetworkgamedialogimpl.h | 6 +- .../joinnetworkgamedialogimpl.cpp | 8 +- .../joinnetworkgamedialogimpl.h | 4 +- src/gui/qt/mainwindow/mainwindowimpl.cpp | 6 +- .../qt/settingsdialog/settingsdialogimpl.cpp | 178 +++++++++--------- .../qt/settingsdialog/settingsdialogimpl.h | 5 +- 7 files changed, 111 insertions(+), 113 deletions(-) diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp index 953cb4a3..c10f90ba 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -21,8 +21,8 @@ #include "session.h" #include "configfile.h" -createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent) - : QDialog(parent) +createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, ConfigFile *c) + : QDialog(parent), myConfig(c) { setupUi(this); @@ -45,15 +45,12 @@ void createNetworkGameDialogImpl::cancel() { void createNetworkGameDialogImpl::fillFormular() { - //Formulare Füllen - ConfigFile myConfig; - //Network Game Settings - spinBox_quantityPlayers->setValue(myConfig.readConfigInt("NetNumberOfPlayers")); - spinBox_startCash->setValue(myConfig.readConfigInt("NetStartCash")); - spinBox_smallBlind->setValue(myConfig.readConfigInt("NetSmallBlind")); - spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind")); - spinBox_gameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed")); + spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NetNumberOfPlayers")); + spinBox_startCash->setValue(myConfig->readConfigInt("NetStartCash")); + spinBox_smallBlind->setValue(myConfig->readConfigInt("NetSmallBlind")); + spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig->readConfigInt("NetHandsBeforeRaiseSmallBlind")); + spinBox_gameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed")); } void createNetworkGameDialogImpl::showDialog() { diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h index db8f06ac..c4f98f11 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h @@ -27,11 +27,12 @@ #include class Session; +class ConfigFile; class createNetworkGameDialogImpl: public QDialog, public Ui::createNetworkGameDialog { Q_OBJECT public: - createNetworkGameDialogImpl(QWidget *parent = 0); + createNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *c = 0); public slots: @@ -40,6 +41,9 @@ public slots: void fillFormular(); void showDialog(); void keyPressEvent ( QKeyEvent * event ); +private: + + ConfigFile *myConfig; }; #endif diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index 8ad542b1..e8252682 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -24,14 +24,14 @@ using namespace std; -joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent) - : QDialog(parent) +joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent, ConfigFile *c) + : QDialog(parent), myConfig(c) { bool toIntTrue; setupUi(this); - spinBox_port->setValue(QString::fromUtf8(myConfig.readConfigString("ServerPort").c_str()).toInt(&toIntTrue, 10)); + spinBox_port->setValue(QString::fromUtf8(myConfig->readConfigString("ServerPort").c_str()).toInt(&toIntTrue, 10)); //Profile Name darf nicht mit einer Zahl beginnen --> XML konform QRegExp rx("[A-Z|a-z]+[A-Z|a-z|\\d]*"); @@ -42,7 +42,7 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent) lineEdit_ipAddress->setFocus(); - myServerProfilesFile = myConfig.readConfigString("DataDir")+"serverprofiles.xml"; + myServerProfilesFile = myConfig->readConfigString("DataDir")+"serverprofiles.xml"; //Anlegen wenn noch nicht existiert! QFile serverProfilesfile(QString::fromUtf8(myServerProfilesFile.c_str())); diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h index 32b70e84..cddd105a 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h @@ -34,9 +34,9 @@ class ConfigFile; class joinNetworkGameDialogImpl: public QDialog, public Ui::joinNetworkGameDialog { Q_OBJECT public: - joinNetworkGameDialogImpl(QWidget *parent = 0); + joinNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *c = 0); - ConfigFile myConfig; + ConfigFile *myConfig; std::string myServerProfilesFile; public slots: diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 6e047601..96c67838 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -494,11 +494,11 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) //Dialoge myNewGameDialog = new newGameDialogImpl(this, myConfig); - mySettingsDialog = new settingsDialogImpl(this); - myJoinNetworkGameDialog = new joinNetworkGameDialogImpl(this); + mySettingsDialog = new settingsDialogImpl(this, myConfig); + myJoinNetworkGameDialog = new joinNetworkGameDialogImpl(this, myConfig); myConnectToServerDialog = new connectToServerDialogImpl(this); myStartNetworkGameDialog = new startNetworkGameDialogImpl(this); - myCreateNetworkGameDialog = new createNetworkGameDialogImpl(this); + myCreateNetworkGameDialog = new createNetworkGameDialogImpl(this, myConfig); myWaitingForServerGameDialog = new waitForServerToStartGameDialogImpl(this); myAboutPokerthDialog = new aboutPokerthImpl(this); diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 3e61302b..6f1789bb 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -22,8 +22,8 @@ #include -settingsDialogImpl::settingsDialogImpl(QWidget *parent) - : QDialog(parent) +settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c) + : QDialog(parent), myConfig(c) { setupUi(this); @@ -34,65 +34,62 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent) playerNickIsChanged = FALSE; - //Formulare Füllen - ConfigFile myConfig; - //Player Nicks - lineEdit_humanPlayerName->setText(QString::fromUtf8(myConfig.readConfigString("MyName").c_str())); - lineEdit_humanPlayerAvatar->setText(QString::fromUtf8(myConfig.readConfigString("MyAvatar").c_str())); - lineEdit_Opponent1Name->setText(QString::fromUtf8(myConfig.readConfigString("Opponent1Name").c_str())); - lineEdit_Opponent1Avatar->setText(QString::fromUtf8(myConfig.readConfigString("Opponent1Avatar").c_str())); - lineEdit_Opponent2Name->setText(QString::fromUtf8(myConfig.readConfigString("Opponent2Name").c_str())); - lineEdit_Opponent2Avatar->setText(QString::fromUtf8(myConfig.readConfigString("Opponent2Avatar").c_str())); - lineEdit_Opponent3Name->setText(QString::fromUtf8(myConfig.readConfigString("Opponent3Name").c_str())); - lineEdit_Opponent3Avatar->setText(QString::fromUtf8(myConfig.readConfigString("Opponent3Avatar").c_str())); - lineEdit_Opponent4Name->setText(QString::fromUtf8(myConfig.readConfigString("Opponent4Name").c_str())); - lineEdit_Opponent4Avatar->setText(QString::fromUtf8(myConfig.readConfigString("Opponent4Avatar").c_str())); - lineEdit_Opponent5Name->setText(QString::fromUtf8(myConfig.readConfigString("Opponent5Name").c_str())); - lineEdit_Opponent5Avatar->setText(QString::fromUtf8(myConfig.readConfigString("Opponent5Avatar").c_str())); - lineEdit_Opponent6Name->setText(QString::fromUtf8(myConfig.readConfigString("Opponent6Name").c_str())); - lineEdit_Opponent6Avatar->setText(QString::fromUtf8(myConfig.readConfigString("Opponent6Avatar").c_str())); + lineEdit_humanPlayerName->setText(QString::fromUtf8(myConfig->readConfigString("MyName").c_str())); + lineEdit_humanPlayerAvatar->setText(QString::fromUtf8(myConfig->readConfigString("MyAvatar").c_str())); + lineEdit_Opponent1Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent1Name").c_str())); + lineEdit_Opponent1Avatar->setText(QString::fromUtf8(myConfig->readConfigString("Opponent1Avatar").c_str())); + lineEdit_Opponent2Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent2Name").c_str())); + lineEdit_Opponent2Avatar->setText(QString::fromUtf8(myConfig->readConfigString("Opponent2Avatar").c_str())); + lineEdit_Opponent3Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent3Name").c_str())); + lineEdit_Opponent3Avatar->setText(QString::fromUtf8(myConfig->readConfigString("Opponent3Avatar").c_str())); + lineEdit_Opponent4Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent4Name").c_str())); + lineEdit_Opponent4Avatar->setText(QString::fromUtf8(myConfig->readConfigString("Opponent4Avatar").c_str())); + lineEdit_Opponent5Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent5Name").c_str())); + lineEdit_Opponent5Avatar->setText(QString::fromUtf8(myConfig->readConfigString("Opponent5Avatar").c_str())); + lineEdit_Opponent6Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent6Name").c_str())); + lineEdit_Opponent6Avatar->setText(QString::fromUtf8(myConfig->readConfigString("Opponent6Avatar").c_str())); //Local Game Settings - spinBox_quantityPlayers->setValue(myConfig.readConfigInt("NumberOfPlayers")); - spinBox_startCash->setValue(myConfig.readConfigInt("StartCash")); - spinBox_smallBlind->setValue(myConfig.readConfigInt("SmallBlind")); - spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("HandsBeforeRaiseSmallBlind")); - spinBox_gameSpeed->setValue(myConfig.readConfigInt("GameSpeed")); - checkBox_pauseBetweenHands->setChecked(myConfig.readConfigInt("PauseBetweenHands")); - checkBox_showGameSettingsDialogOnNewGame->setChecked(myConfig.readConfigInt("ShowGameSettingsDialogOnNewGame")); - comboBox_engineVersion->setCurrentIndex(myConfig.readConfigInt("EngineVersion")); + spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NumberOfPlayers")); + spinBox_startCash->setValue(myConfig->readConfigInt("StartCash")); + spinBox_smallBlind->setValue(myConfig->readConfigInt("SmallBlind")); + spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig->readConfigInt("HandsBeforeRaiseSmallBlind")); + spinBox_gameSpeed->setValue(myConfig->readConfigInt("GameSpeed")); + checkBox_pauseBetweenHands->setChecked(myConfig->readConfigInt("PauseBetweenHands")); + checkBox_showGameSettingsDialogOnNewGame->setChecked(myConfig->readConfigInt("ShowGameSettingsDialogOnNewGame")); + comboBox_engineVersion->setCurrentIndex(myConfig->readConfigInt("EngineVersion")); //Network Game Settings - spinBox_netQuantityPlayers->setValue(myConfig.readConfigInt("NetNumberOfPlayers")); - spinBox_netStartCash->setValue(myConfig.readConfigInt("NetStartCash")); - spinBox_netSmallBlind->setValue(myConfig.readConfigInt("NetSmallBlind")); - spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind")); - spinBox_netGameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed")); - comboBox_netEngineVersion->setCurrentIndex(myConfig.readConfigInt("NetEngineVersion")); - spinBox_serverPort->setValue(myConfig.readConfigInt("ServerPort")); - lineEdit_serverPassword->setText(QString::fromUtf8(myConfig.readConfigString("ServerPassword").c_str())); - checkBox_useIpv6->setChecked(myConfig.readConfigInt("ServerUseIpv6")); + spinBox_netQuantityPlayers->setValue(myConfig->readConfigInt("NetNumberOfPlayers")); + spinBox_netStartCash->setValue(myConfig->readConfigInt("NetStartCash")); + spinBox_netSmallBlind->setValue(myConfig->readConfigInt("NetSmallBlind")); + spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig->readConfigInt("NetHandsBeforeRaiseSmallBlind")); + spinBox_netGameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed")); + comboBox_netEngineVersion->setCurrentIndex(myConfig->readConfigInt("NetEngineVersion")); + spinBox_serverPort->setValue(myConfig->readConfigInt("ServerPort")); + lineEdit_serverPassword->setText(QString::fromUtf8(myConfig->readConfigString("ServerPassword").c_str())); + checkBox_useIpv6->setChecked(myConfig->readConfigInt("ServerUseIpv6")); //Interface - checkBox_showLeftToolbox->setChecked(myConfig.readConfigInt("ShowLeftToolBox")); - checkBox_showRightToolbox->setChecked(myConfig.readConfigInt("ShowRightToolBox")); - checkBox_showStatusbarMessages->setChecked(myConfig.readConfigInt("ShowStatusbarMessages")); - checkBox_showIntro->setChecked(myConfig.readConfigInt("ShowIntro")); - checkBox_showFadeOutCardsAnimation->setChecked(myConfig.readConfigInt("ShowFadeOutCardsAnimation")); - checkBox_showFlipCardsAnimation->setChecked(myConfig.readConfigInt("ShowFlipCardsAnimation")); - radioButton_flipsideTux->setChecked(myConfig.readConfigInt("FlipsideTux")); - radioButton_flipsideOwn->setChecked(myConfig.readConfigInt("FlipsideOwn")); + checkBox_showLeftToolbox->setChecked(myConfig->readConfigInt("ShowLeftToolBox")); + checkBox_showRightToolbox->setChecked(myConfig->readConfigInt("ShowRightToolBox")); + checkBox_showStatusbarMessages->setChecked(myConfig->readConfigInt("ShowStatusbarMessages")); + checkBox_showIntro->setChecked(myConfig->readConfigInt("ShowIntro")); + checkBox_showFadeOutCardsAnimation->setChecked(myConfig->readConfigInt("ShowFadeOutCardsAnimation")); + checkBox_showFlipCardsAnimation->setChecked(myConfig->readConfigInt("ShowFlipCardsAnimation")); + radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux")); + radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn")); if(radioButton_flipsideOwn->isChecked()) { lineEdit_OwnFlipsideFilename->setEnabled(TRUE); pushButton_openFlipsidePicture->setEnabled(TRUE); } - lineEdit_OwnFlipsideFilename->setText(QString::fromUtf8(myConfig.readConfigString("FlipsideOwnFile").c_str())); + lineEdit_OwnFlipsideFilename->setText(QString::fromUtf8(myConfig->readConfigString("FlipsideOwnFile").c_str())); //Log - lineEdit_logDir->setText(QString::fromUtf8(myConfig.readConfigString("LogDir").c_str())); - spinBox_logStoreDuration->setValue(myConfig.readConfigInt("LogStoreDuration")); + lineEdit_logDir->setText(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())); + spinBox_logStoreDuration->setValue(myConfig->readConfigInt("LogStoreDuration")); connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); connect( lineEdit_humanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); @@ -119,13 +116,10 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = TRUE; - //Daten speichern - ConfigFile myConfig; - // Player Nicks - myConfig.writeConfigString("MyName", lineEdit_humanPlayerName->text().toUtf8().constData()); + myConfig->writeConfigString("MyName", lineEdit_humanPlayerName->text().toUtf8().constData()); if(QFile::QFile(lineEdit_humanPlayerAvatar->text()).exists() || lineEdit_humanPlayerAvatar->text() == "") { - myConfig.writeConfigString("MyAvatar", lineEdit_humanPlayerAvatar->text().toUtf8().constData()); + myConfig->writeConfigString("MyAvatar", lineEdit_humanPlayerAvatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered human player avatar picture doesn't exists.\n" @@ -134,9 +128,9 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigString("Opponent1Name", lineEdit_Opponent1Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent1Name", lineEdit_Opponent1Name->text().toUtf8().constData()); if(QFile::QFile(lineEdit_Opponent1Avatar->text()).exists() || lineEdit_Opponent1Avatar->text() == "") { - myConfig.writeConfigString("Opponent1Avatar", lineEdit_Opponent1Avatar->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent1Avatar", lineEdit_Opponent1Avatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered \"opponent 1\" avatar picture doesn't exists.\n" @@ -145,9 +139,9 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigString("Opponent2Name", lineEdit_Opponent2Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent2Name", lineEdit_Opponent2Name->text().toUtf8().constData()); if(QFile::QFile(lineEdit_Opponent2Avatar->text()).exists() || lineEdit_Opponent2Avatar->text() == "") { - myConfig.writeConfigString("Opponent2Avatar", lineEdit_Opponent2Avatar->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent2Avatar", lineEdit_Opponent2Avatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered \"opponent 2\" avatar picture doesn't exists.\n" @@ -156,9 +150,9 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigString("Opponent3Name", lineEdit_Opponent3Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent3Name", lineEdit_Opponent3Name->text().toUtf8().constData()); if(QFile::QFile(lineEdit_Opponent3Avatar->text()).exists() || lineEdit_Opponent3Avatar->text() == "") { - myConfig.writeConfigString("Opponent3Avatar", lineEdit_Opponent3Avatar->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent3Avatar", lineEdit_Opponent3Avatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered \"opponent 3\" avatar picture doesn't exists.\n" @@ -167,9 +161,9 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigString("Opponent4Name", lineEdit_Opponent4Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent4Name", lineEdit_Opponent4Name->text().toUtf8().constData()); if(QFile::QFile(lineEdit_Opponent4Avatar->text()).exists() || lineEdit_Opponent4Avatar->text() == "") { - myConfig.writeConfigString("Opponent4Avatar", lineEdit_Opponent4Avatar->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent4Avatar", lineEdit_Opponent4Avatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered \"opponent 4\" avatar picture doesn't exists.\n" @@ -178,9 +172,9 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigString("Opponent5Name", lineEdit_Opponent5Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent5Name", lineEdit_Opponent5Name->text().toUtf8().constData()); if(QFile::QFile(lineEdit_Opponent5Avatar->text()).exists() || lineEdit_Opponent5Avatar->text() == "") { - myConfig.writeConfigString("Opponent5Avatar", lineEdit_Opponent5Avatar->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent5Avatar", lineEdit_Opponent5Avatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered \"opponent 5\" avatar picture doesn't exists.\n" @@ -189,9 +183,9 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigString("Opponent6Name", lineEdit_Opponent6Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent6Name", lineEdit_Opponent6Name->text().toUtf8().constData()); if(QFile::QFile(lineEdit_Opponent6Avatar->text()).exists() || lineEdit_Opponent6Avatar->text() == "") { - myConfig.writeConfigString("Opponent6Avatar", lineEdit_Opponent6Avatar->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent6Avatar", lineEdit_Opponent6Avatar->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered \"opponent 6\" avatar picture doesn't exists.\n" @@ -201,38 +195,38 @@ void settingsDialogImpl::isAccepted() { } // Local Game Settings - myConfig.writeConfigInt("NumberOfPlayers", spinBox_quantityPlayers->value()); - myConfig.writeConfigInt("StartCash", spinBox_startCash->value()); - myConfig.writeConfigInt("SmallBlind", spinBox_smallBlind->value()); - myConfig.writeConfigInt("HandsBeforeRaiseSmallBlind", spinBox_handsBeforeRaiseSmallBlind->value()); - myConfig.writeConfigInt("GameSpeed", spinBox_gameSpeed->value()); - myConfig.writeConfigInt("EngineVersion", comboBox_engineVersion->currentIndex()); - myConfig.writeConfigInt("PauseBetweenHands", checkBox_pauseBetweenHands->isChecked()); - myConfig.writeConfigInt("ShowGameSettingsDialogOnNewGame", checkBox_showGameSettingsDialogOnNewGame->isChecked()); + myConfig->writeConfigInt("NumberOfPlayers", spinBox_quantityPlayers->value()); + myConfig->writeConfigInt("StartCash", spinBox_startCash->value()); + myConfig->writeConfigInt("SmallBlind", spinBox_smallBlind->value()); + myConfig->writeConfigInt("HandsBeforeRaiseSmallBlind", spinBox_handsBeforeRaiseSmallBlind->value()); + myConfig->writeConfigInt("GameSpeed", spinBox_gameSpeed->value()); + myConfig->writeConfigInt("EngineVersion", comboBox_engineVersion->currentIndex()); + myConfig->writeConfigInt("PauseBetweenHands", checkBox_pauseBetweenHands->isChecked()); + myConfig->writeConfigInt("ShowGameSettingsDialogOnNewGame", checkBox_showGameSettingsDialogOnNewGame->isChecked()); //Network Game Settings - myConfig.writeConfigInt("NetNumberOfPlayers", spinBox_netQuantityPlayers->value()); - myConfig.writeConfigInt("NetStartCash", spinBox_netStartCash->value()); - myConfig.writeConfigInt("NetSmallBlind", spinBox_netSmallBlind->value()); - myConfig.writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value()); - myConfig.writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value()); - myConfig.writeConfigInt("NetEngineVersion", comboBox_netEngineVersion->currentIndex()); - myConfig.writeConfigInt("ServerPort", spinBox_serverPort->value()); - myConfig.writeConfigString("ServerPassword", lineEdit_serverPassword->text().toUtf8().constData()); - myConfig.writeConfigInt("ServerUseIpv6", checkBox_useIpv6->isChecked()); + myConfig->writeConfigInt("NetNumberOfPlayers", spinBox_netQuantityPlayers->value()); + myConfig->writeConfigInt("NetStartCash", spinBox_netStartCash->value()); + myConfig->writeConfigInt("NetSmallBlind", spinBox_netSmallBlind->value()); + myConfig->writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value()); + myConfig->writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value()); + myConfig->writeConfigInt("NetEngineVersion", comboBox_netEngineVersion->currentIndex()); + myConfig->writeConfigInt("ServerPort", spinBox_serverPort->value()); + myConfig->writeConfigString("ServerPassword", lineEdit_serverPassword->text().toUtf8().constData()); + myConfig->writeConfigInt("ServerUseIpv6", checkBox_useIpv6->isChecked()); // Interface - myConfig.writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked()); - myConfig.writeConfigInt("ShowRightToolBox", checkBox_showRightToolbox->isChecked()); - myConfig.writeConfigInt("ShowStatusbarMessages", checkBox_showStatusbarMessages->isChecked()); - myConfig.writeConfigInt("ShowIntro", checkBox_showIntro->isChecked()); - myConfig.writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked()); - myConfig.writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked()); - myConfig.writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked()); - myConfig.writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked()); + myConfig->writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked()); + myConfig->writeConfigInt("ShowRightToolBox", checkBox_showRightToolbox->isChecked()); + myConfig->writeConfigInt("ShowStatusbarMessages", checkBox_showStatusbarMessages->isChecked()); + myConfig->writeConfigInt("ShowIntro", checkBox_showIntro->isChecked()); + myConfig->writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked()); + myConfig->writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked()); + myConfig->writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked()); + myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked()); if(radioButton_flipsideOwn->isChecked()) { - if(QFile::QFile(lineEdit_OwnFlipsideFilename->text()).exists() && lineEdit_OwnFlipsideFilename->text() != "") {myConfig.writeConfigString("FlipsideOwnFile", lineEdit_OwnFlipsideFilename->text().toUtf8().constData()); } + if(QFile::QFile(lineEdit_OwnFlipsideFilename->text()).exists() && lineEdit_OwnFlipsideFilename->text() != "") {myConfig->writeConfigString("FlipsideOwnFile", lineEdit_OwnFlipsideFilename->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The entered flipside picture doesn't exists.\n" "Please enter an valid picture!"), @@ -242,7 +236,7 @@ void settingsDialogImpl::isAccepted() { } // Log - if(QDir::QDir(lineEdit_logDir->text()).exists() && lineEdit_logDir->text() != "") { myConfig.writeConfigString("LogDir", lineEdit_logDir->text().toUtf8().constData()); } + if(QDir::QDir(lineEdit_logDir->text()).exists() && lineEdit_logDir->text() != "") { myConfig->writeConfigString("LogDir", lineEdit_logDir->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), tr("The log file directory doesn't exists.\n" @@ -251,7 +245,7 @@ void settingsDialogImpl::isAccepted() { settingsCorrect = FALSE; } - myConfig.writeConfigInt("LogStoreDuration", spinBox_logStoreDuration->value()); + myConfig->writeConfigInt("LogStoreDuration", spinBox_logStoreDuration->value()); //Wenn alles richtig eingegeben wurde --> Dialog schließen if(settingsCorrect) { this->hide(); } diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h index 1e1f1592..0e211429 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.h +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h @@ -25,11 +25,12 @@ #include #include +class ConfigFile; class settingsDialogImpl: public QDialog, public Ui::settingsDialog { Q_OBJECT public: - settingsDialogImpl(QWidget *parent = 0); + settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0); void setPlayerNickIsChanged(bool theValue){ playerNickIsChanged = theValue;} bool getPlayerNickIsChanged() const{ return playerNickIsChanged;} @@ -53,6 +54,8 @@ private: bool playerNickIsChanged; bool settingsCorrect; + + ConfigFile* myConfig; };