From 9e95209e696958e04c74376d04de342e44195999 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Tue, 7 Apr 2009 19:10:11 +0000
Subject: [PATCH] remove statusbar config item

---
 src/config/configfile.cpp                     |  3 +-
 src/gui/qt/settingsdialog.ui                  | 43 +++++++------------
 .../qt/settingsdialog/settingsdialogimpl.cpp  |  2 -
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index d9a9e279..d8acf1bc 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 = 63;
+	configRev = 64;
 
 	//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("ShowStatusbarMessages", 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"));
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 13b97c15..f30b5471 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -198,13 +198,6 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="1" >
-            <widget class="QCheckBox" name="checkBox_showStatusbarMessages" >
-             <property name="text" >
-              <string>Show statusbar messages</string>
-             </property>
-            </widget>
-           </item>
            <item row="2" column="0" >
             <widget class="QCheckBox" name="checkBox_showFadeOutCardsAnimation" >
              <property name="text" >
@@ -212,13 +205,6 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
-            <widget class="QCheckBox" name="checkBox_showFlipCardsAnimation" >
-             <property name="text" >
-              <string>Show flip-card animation</string>
-             </property>
-            </widget>
-           </item>
            <item row="3" column="0" >
             <widget class="QCheckBox" name="checkBox_alternateFKeysUserActionMode" >
              <property name="text" >
@@ -226,27 +212,34 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="1" >
+           <item row="4" column="0" >
+            <widget class="QCheckBox" name="checkBox_showBlindButtons" >
+             <property name="text" >
+              <string>Show buttons for small blind and big blind</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1" >
+            <widget class="QCheckBox" name="checkBox_showFlipCardsAnimation" >
+             <property name="text" >
+              <string>Show flip-card animation</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" >
             <widget class="QCheckBox" name="checkBox_antiPeekMode" >
              <property name="text" >
               <string>Show own cards only on mouse click</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="1" >
+           <item row="3" column="1" >
             <widget class="QCheckBox" name="checkBox_cardsChanceMonitor" >
              <property name="text" >
               <string>Show cards chance monitor</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="0" >
-            <widget class="QCheckBox" name="checkBox_showBlindButtons" >
-             <property name="text" >
-              <string>Show buttons for small blind and big blind</string>
-             </property>
-            </widget>
-           </item>
           </layout>
          </item>
          <item row="4" column="0" >
@@ -3404,13 +3397,9 @@ p, li { white-space: pre-wrap; }
   <tabstop>checkBox_showIntro</tabstop>
   <tabstop>checkBox_showLeftToolbox</tabstop>
   <tabstop>checkBox_showRightToolbox</tabstop>
-  <tabstop>checkBox_showStatusbarMessages</tabstop>
   <tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
-  <tabstop>checkBox_showFlipCardsAnimation</tabstop>
   <tabstop>checkBox_alternateFKeysUserActionMode</tabstop>
-  <tabstop>checkBox_antiPeekMode</tabstop>
   <tabstop>checkBox_showBlindButtons</tabstop>
-  <tabstop>checkBox_cardsChanceMonitor</tabstop>
   <tabstop>checkBox_enableBetInputFocusSwitch</tabstop>
   <tabstop>radioButton_flipsideTux</tabstop>
   <tabstop>radioButton_flipsideOwn</tabstop>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index f585e2c9..39b33377 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_showStatusbarMessages->setChecked(myConfig->readConfigInt("ShowStatusbarMessages"));
 	checkBox_showIntro->setChecked(myConfig->readConfigInt("ShowIntro"));
 	checkBox_showFadeOutCardsAnimation->setChecked(myConfig->readConfigInt("ShowFadeOutCardsAnimation"));
 	checkBox_showFlipCardsAnimation->setChecked(myConfig->readConfigInt("ShowFlipCardsAnimation"));
@@ -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("ShowStatusbarMessages", checkBox_showStatusbarMessages->isChecked());	
 	myConfig->writeConfigInt("ShowIntro", checkBox_showIntro->isChecked());
 	myConfig->writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked());
 	myConfig->writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked());