diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 10cd5f59..71c5aaee 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) myQtToolsInterface = CreateQtToolsWrapper(); // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 65; + configRev = 66; //standard defaults logOnOffDefault = "1"; @@ -134,7 +134,6 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) /*configList.push_back(ConfigInfo("InternetServerAddressIRCChannelUpdateDone", CONFIG_TYPE_INT, "1"));*/ //HACK configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowRightToolBox", CONFIG_TYPE_INT, "1")); - configList.push_back(ConfigInfo("ShowIntro", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowFadeOutCardsAnimation", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowFlipCardsAnimation", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowBlindButtons", CONFIG_TYPE_INT, "1")); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 5b567793..7ecab172 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -177,13 +177,6 @@ - - - - Show intro on startup - - - @@ -191,27 +184,6 @@ - - - - Show right toolbox - - - - - - - Show fade-out animation for non-winning cards - - - - - - - Reverse order of F-Keys (F1 - F4) - - - @@ -233,14 +205,35 @@ - + + + + Show right toolbox + + + + + + + Show fade-out animation for non-winning cards + + + + + + + Reverse order of F-Keys (F1 - F4) + + + + Show buttons for small blind and big blind - + Don't translate poker strings like check, call, raise from game table style @@ -3401,11 +3394,7 @@ p, li { white-space: pre-wrap; } listWidget comboBox_switchLanguage - checkBox_showIntro checkBox_showLeftToolbox - checkBox_showRightToolbox - checkBox_showFadeOutCardsAnimation - checkBox_alternateFKeysUserActionMode checkBox_enableBetInputFocusSwitch radioButton_flipsideTux radioButton_flipsideOwn diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 5b1ce317..43a19916 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -220,7 +220,6 @@ void settingsDialogImpl::exec() { comboBox_switchLanguage->setCurrentIndex(comboBox_switchLanguage->findData(QString::fromUtf8(myConfig->readConfigString("Language").c_str()).section('_', 0, 0))); checkBox_showLeftToolbox->setChecked(myConfig->readConfigInt("ShowLeftToolBox")); checkBox_showRightToolbox->setChecked(myConfig->readConfigInt("ShowRightToolBox")); - checkBox_showIntro->setChecked(myConfig->readConfigInt("ShowIntro")); checkBox_showFadeOutCardsAnimation->setChecked(myConfig->readConfigInt("ShowFadeOutCardsAnimation")); checkBox_showFlipCardsAnimation->setChecked(myConfig->readConfigInt("ShowFlipCardsAnimation")); checkBox_showBlindButtons->setChecked(myConfig->readConfigInt("ShowBlindButtons")); @@ -507,7 +506,6 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigString("Language", comboBox_switchLanguage->itemData(comboBox_switchLanguage->currentIndex()).toString().toUtf8().constData()); myConfig->writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked()); myConfig->writeConfigInt("ShowRightToolBox", checkBox_showRightToolbox->isChecked()); - myConfig->writeConfigInt("ShowIntro", checkBox_showIntro->isChecked()); myConfig->writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked()); myConfig->writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked()); myConfig->writeConfigInt("ShowBlindButtons", checkBox_showBlindButtons->isChecked());