next steps implementing cardschance

pokerth_game.pro

@@ -348,11 +348,11 @@ unix : !mac {
         }
         BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_IOSTREAMS
         !count(BOOST_LIBS, 3){
-            error(		    libboost (version >= 1.34.1)  --> http://www.boost.org/")
+            error("libboost (version >= 1.34.1)  --> http://www.boost.org/")
         }
 
         if($$system(sdl-config --version)){
-            error(		    libSDL_mixer, libSDL --> http://www.libsdl.org/")
+            error("libSDL_mixer, libSDL --> http://www.libsdl.org/")
         }
 
         UNAME = $$system(uname -s)

src/config/configfile.cpp

@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	myQtToolsInterface = CreateQtToolsWrapper();
 
 	// !!!! Revisionsnummer der Configdefaults !!!!!
-	configRev = 54;
+	configRev = 55;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -140,6 +140,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	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"));
+	configList.push_back(ConfigInfo("ShowCardsChanceMonitor", 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("EnableBetInputFocusSwitch", CONFIG_TYPE_INT, "0"));		

src/gui/qt/gametable.ui

@@ -2571,7 +2571,7 @@
               <enum>Qt::NoFocus</enum>
              </property>
              <property name="currentIndex" >
-              <number>2</number>
+              <number>0</number>
              </property>
              <widget class="QWidget" name="tab_Log" >
               <attribute name="title" >

src/gui/qt/gametable/gametableimpl.cpp

@@ -102,10 +102,11 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 		groupBox_LeftToolBox->hide(); 
 	}
 
-	//Intro abspielen?
-// 	if (myConfig->readConfigInt("ShowIntro")) { 
-// // 		label_logo->hide();
-// 		QTimer::singleShot(100, this, SLOT( paintStartSplash() )); }
+	//CardsChanceMonitor show/hide
+	if (!myConfig->readConfigInt("ShowCardsChanceMonitor")) { 
+		tabWidget_Right->removeTab(2);
+		tabWidget_Right->setCurrentIndex(0);
+	}
 			
 	// userWidgetsArray init
 	userWidgetsArray[0] = pushButton_BetRaise;
@@ -591,7 +592,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalStartVoteOnKick(int, int)), this, SLOT(startVoteOnKick(int, int)));
 	connect(this, SIGNAL(signalEndVoteOnKick()), this, SLOT(endVoteOnKick()));
 
-	refreshCardsChance();
 }
 
 gameTableImpl::~gameTableImpl() {
@@ -612,6 +612,17 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
 	if (myConfig->readConfigInt("ShowRightToolBox")) { groupBox_RightToolBox->show(); }
 	else { groupBox_RightToolBox->hide(); }
 
+	//cardschancemonitor show/hide
+	if (!myConfig->readConfigInt("ShowCardsChanceMonitor")) { 
+		tabWidget_Right->removeTab(2);
+		tabWidget_Right->setCurrentIndex(0);
+	}
+	else {
+		if(tabWidget_Right->widget(2) != tab_Chance) 
+		tabWidget_Right->insertTab(2, tab_Chance, QString(tr("Chance")));
+	}
+
+
 	//Add avatar (if set)
 	myStartWindow->getSession()->addOwnAvatar(myConfig->readConfigString("MyAvatar"));
 

src/gui/qt/settingsdialog.ui

@@ -212,7 +212,14 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="0" colspan="2" >
+           <item row="4" 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>
@@ -2764,7 +2771,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>checkBox_showStatusbarMessages</tabstop>
   <tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
   <tabstop>checkBox_showFlipCardsAnimation</tabstop>
-  <tabstop>checkBox_showBlindButtons</tabstop>
   <tabstop>checkBox_enableBetInputFocusSwitch</tabstop>
   <tabstop>radioButton_flipsideTux</tabstop>
   <tabstop>radioButton_flipsideOwn</tabstop>

src/gui/qt/settingsdialog/settingsdialogimpl.cpp

@@ -199,6 +199,7 @@ void settingsDialogImpl::exec() {
 	checkBox_antiPeekMode->setChecked(myConfig->readConfigInt("AntiPeekMode"));
 	checkBox_alternateFKeysUserActionMode->setChecked(myConfig->readConfigInt("AlternateFKeysUserActionMode"));
 	checkBox_enableBetInputFocusSwitch->setChecked(myConfig->readConfigInt("EnableBetInputFocusSwitch"));
+	checkBox_cardsChanceMonitor->setChecked(myConfig->readConfigInt("ShowCardsChanceMonitor"));
 
 	radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux"));
 	radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn"));
@@ -358,6 +359,7 @@ void settingsDialogImpl::isAccepted() {
 	myConfig->writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked());
 	myConfig->writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked());
 	myConfig->writeConfigInt("ShowBlindButtons", checkBox_showBlindButtons->isChecked());
+	myConfig->writeConfigInt("ShowCardsChanceMonitor", checkBox_cardsChanceMonitor->isChecked());
 	myConfig->writeConfigInt("AntiPeekMode", checkBox_antiPeekMode->isChecked());
 	myConfig->writeConfigInt("AlternateFKeysUserActionMode", checkBox_alternateFKeysUserActionMode->isChecked());
 	myConfig->writeConfigInt("EnableBetInputFocusSwitch", checkBox_enableBetInputFocusSwitch->isChecked());