From abdd751944c207bbecb2406a80f16cacef0be4e8 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Wed, 7 Nov 2007 09:18:37 +0000
Subject: [PATCH] adding option to disable focus switch to bet-input-field
 (default disabled now)

---
 src/config/configfile.cpp                     |  3 ++-
 src/gui/qt/mainwindow/mainwindowimpl.cpp      | 21 ++++++++++---------
 src/gui/qt/settingsdialog.ui                  | 20 ++++++++++++++++--
 .../qt/settingsdialog/settingsdialogimpl.cpp  |  3 +++
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 15c69db8..1ad9c646 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 = 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, ""));
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 0b77cb89..55c55782 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -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();
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 7e511695..e99acb7e 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -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" >
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 10e21916..d7ba80a6 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -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());