sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding option to disable focus switch to bet-input-field (default disabled now)

Browse Source
This commit is contained in:
doitux
2007-11-07 09:18:37 +00:00
parent e009f37df8
commit abdd751944
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+2 -1
View File
@@ -53,7 +53,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
}
// !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 48;
configRev = 49;
//standard defaults
logOnOffDefault = "1";
@@ -157,6 +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("FlipsideTux", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("FlipsideOwnFile", CONFIG_TYPE_STRING, ""));
src/gui/qt/mainwindow/mainwindowimpl.cpp
+11 -10
View File
@@ -1935,7 +1935,7 @@ void mainWindowImpl::meInAction() {
horizontalSlider_bet->setEnabled(TRUE);
spinBox_set->setEnabled(TRUE);
myActionIsRaise = 0;
myActionIsBet = 0;
@@ -2023,6 +2023,11 @@ void mainWindowImpl::myBetRaise() {
myBet();
}
else {}
if(lineEdit_ChatInput->text() == "" && !myConfig->readConfigInt("DisableBetInputFocusSwitch")) {
spinBox_set->setFocus();
spinBox_set->selectAll();
}
}
void mainWindowImpl::myCallCheck() {
@@ -2127,10 +2132,6 @@ void mainWindowImpl::myBet(){
// spinBox_set->setValue(spinBox_set->minimum());
horizontalSlider_bet->setSingleStep(10);
if(lineEdit_ChatInput->text() == "") {
spinBox_set->setFocus();
spinBox_set->selectAll();
}
myActionIsBet = 1;
}
@@ -2148,10 +2149,6 @@ void mainWindowImpl::myRaise(){
// spinBox_set->setValue(spinBox_set->minimum());
horizontalSlider_bet->setSingleStep(10);
if(lineEdit_ChatInput->text() == "") {
spinBox_set->setFocus();
spinBox_set->selectAll();
}
myActionIsRaise = 1;
@@ -3340,7 +3337,11 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
bool ctrlPressed = FALSE;
if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return ) { if(spinBox_set->hasFocus()) pushButton_BetRaise->click(); } //ENTER
if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return ) /*ENTER*/ {
if(spinBox_set->hasFocus()) {
pushButton_BetRaise->click();
}
}
if (event->key() == Qt::Key_F1) {
if (myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0) {
pushButton_Fold->click();
src/gui/qt/settingsdialog.ui
+18 -2
View File
@@ -151,7 +151,7 @@
</property>
</widget>
</item>
<item row="12" column="0" >
<item row="13" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Flipside of Cards</string>
@@ -272,7 +272,7 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item row="13" column="0" >
<item row="14" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -285,6 +285,22 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item row="12" column="0" >
<widget class="QGroupBox" name="groupBox_5" >
<property name="title" >
<string>Network / Internet Game</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QCheckBox" name="checkBox_disableBetInputFocusSwitch" >
<property name="text" >
<string>Don't switch keyboard focus to bet-input-field</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_6" >
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+3
View File
@@ -181,6 +181,8 @@ 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"));
radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux"));
radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn"));
if(radioButton_flipsideOwn->isChecked()) {
@@ -315,6 +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("FlipsideTux", radioButton_flipsideTux->isChecked());
myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked());