diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 1ad9c646..5ad78b77 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -53,7 +53,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; } } // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 49; + configRev = 50; //standard defaults logOnOffDefault = "1"; @@ -157,7 +157,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) configList.push_back(ConfigInfo("ShowBlindButtons", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("AntiPeekMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("AlternateFKeysUserActionMode", CONFIG_TYPE_INT, "0")); - configList.push_back(ConfigInfo("DisableBetInputFocusSwitch", CONFIG_TYPE_INT, "1")); + configList.push_back(ConfigInfo("EnableBetInputFocusSwitch", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("FlipsideTux", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("FlipsideOwnFile", CONFIG_TYPE_STRING, "")); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index a3314ce2..60c9d583 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -946,7 +946,7 @@ void mainWindowImpl::joinGameLobby() { myNick.replace(QString::fromUtf8("Ò"),"O"); myNick.replace(QString::fromUtf8("Ú"),"U"); myNick.replace(QString::fromUtf8("Ù"),"U"); - myNick.remove(QRegExp("[^A-Z^a-z^0-9|\\-_\\\\^]*")); + myNick.remove(QRegExp("[^A-Z^a-z^0-9|\\-_\\\\^`]*")); myNick = myNick.mid(0,16); mySession->setIrcNick(myNick.toUtf8().constData()); @@ -1935,6 +1935,11 @@ void mainWindowImpl::meInAction() { horizontalSlider_bet->setEnabled(TRUE); spinBox_set->setEnabled(TRUE); + + if((mySession->getGameType() == Session::GAME_TYPE_INTERNET || mySession->getGameType() == Session::GAME_TYPE_NETWORK) && lineEdit_ChatInput->text() == "" && myConfig->readConfigInt("EnableBetInputFocusSwitch")) { + spinBox_set->setFocus(); + spinBox_set->selectAll(); + } myActionIsRaise = 0; myActionIsBet = 0; @@ -2024,10 +2029,11 @@ void mainWindowImpl::myBetRaise() { } else {} - if(lineEdit_ChatInput->text() == "" && !myConfig->readConfigInt("DisableBetInputFocusSwitch")) { + if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) { spinBox_set->setFocus(); spinBox_set->selectAll(); } + } void mainWindowImpl::myCallCheck() { diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp index c94493e6..df722df9 100644 --- a/src/gui/qt/mainwindow/mylefttabwidget.cpp +++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp @@ -28,20 +28,16 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent) #ifdef _WIN32 QString font1String("font-family: \"Arial\";"); int paddingTop = 1; - int paddingSide = 10; - - this->setTabText(0, " "+this->tabText(0)+" "); - this->setTabText(1, " "+this->tabText(1)+" "); - + int paddingSide = 7; #else QString font1String("font-family: \"Nimbus Sans L\";"); int paddingTop = 0; - int paddingSide = 10; + int paddingSide = 9; #endif - QTabBar *myTabBar = this->tabBar(); myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); + } diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index 297ed0f1..0c7dcd6e 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -29,35 +29,18 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) #ifdef _WIN32 QString font1String("font-family: \"Arial\";"); int paddingTop = 1; - int paddingSide = 10; - -// this->setTabText(0, " "+this->tabText(0)+" "); -// this->setTabText(1, " "+this->tabText(1)+" "); -/* - QFontMetrics tempMetrics = this->fontMetrics(); - int minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(0)+"W")); - if(minimumTabWidth < tempMetrics.width(QString("W"+this->tabText(1)+"W"))) minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(1)+"W"));*/ - -// QString minimumTabWidthString(" min-width:"+QString::number(minimumTabWidth,10)+"ex;"); - QString minimumTabWidthString(""); - + int paddingSide = 7; #else QString font1String("font-family: \"Nimbus Sans L\";"); int paddingTop = 0; - int paddingSide = 10; - - - QString minimumTabWidthString(""); - + int paddingSide = 9; #endif - QTabBar *myTabBar = this->tabBar(); - myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px; "+minimumTabWidthString+"} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); + myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); } - MyRightTabWidget::~MyRightTabWidget() { } diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index e99acb7e..f73c7094 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -151,6 +151,22 @@ + + + + Network / Internet Game + + + + + + Switch keyboard focus to bet-input-field if it's your turn + + + + + + @@ -280,27 +296,11 @@ p, li { white-space: pre-wrap; } 400 - 81 + 111 - - - - Network / Internet Game - - - - - - Don't switch keyboard focus to bet-input-field - - - - - - diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index d7ba80a6..c5fddb46 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -181,7 +181,7 @@ void settingsDialogImpl::exec() { checkBox_showBlindButtons->setChecked(myConfig->readConfigInt("ShowBlindButtons")); checkBox_antiPeekMode->setChecked(myConfig->readConfigInt("AntiPeekMode")); checkBox_alternateFKeysUserActionMode->setChecked(myConfig->readConfigInt("AlternateFKeysUserActionMode")); - checkBox_disableBetInputFocusSwitch->setChecked(myConfig->readConfigInt("DisableBetInputFocusSwitch")); + checkBox_enableBetInputFocusSwitch->setChecked(myConfig->readConfigInt("EnableBetInputFocusSwitch")); radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux")); radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn")); @@ -317,7 +317,7 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("ShowBlindButtons", checkBox_showBlindButtons->isChecked()); myConfig->writeConfigInt("AntiPeekMode", checkBox_antiPeekMode->isChecked()); myConfig->writeConfigInt("AlternateFKeysUserActionMode", checkBox_alternateFKeysUserActionMode->isChecked()); - myConfig->writeConfigInt("DisableBetInputFocusSwitch", checkBox_disableBetInputFocusSwitch->isChecked()); + myConfig->writeConfigInt("EnableBetInputFocusSwitch", checkBox_enableBetInputFocusSwitch->isChecked()); myConfig->writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked()); myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked());