next steps implementing cardschance

pokerth_game.pro

@@ -1,27 +1,27 @@
 # QMake pro-file for PokerTH game
-
+
-isEmpty( PREFIX ){
+isEmpty( PREFIX ){
     PREFIX =/usr
-}
+}
-
+
 TEMPLATE = app
 CODECFORSRC = UTF-8
-
+
 #CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
 CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
-
+
 #####Uncomment this for RELEASE
 #QTPLUGIN += qjpeg qgif
-
+
 UI_DIR = uics
 MOC_DIR = mocs
 OBJECTS_DIR = obj
 DEFINES += ENABLE_IPV6
 DEFINES += PREFIX=\"$${PREFIX}\"
 TARGET = pokerth
-
+
 RESOURCES = src/gui/qt/resources/pokerth.qrc
-
+
 INCLUDEPATH += . \
 		src \
 		src/engine \
@@ -58,7 +58,7 @@ INCLUDEPATH += . \
 		src/gui/qt/gamelobbydialog \
 		src/gui/qt/gamelobbydialog/lobbychat \
 		src/gui/qt/timeoutmsgbox
-
+
 DEPENDPATH += . \
 		src \
 		src/config \
@@ -97,7 +97,7 @@ DEPENDPATH += . \
 		src/gui/qt/gamelobbydialog \
 		src/gui/qt/gamelobbydialog/lobbychat \
 		src/gui/qt/timeoutmsgbox
-
+
 # Input
 HEADERS += \
 		src/game.h \
@@ -186,7 +186,7 @@ HEADERS += \
 		src/gui/qt/qttools/qthelper/qthelper.h \
 		src/gui/generic/serverguiwrapper.h \
  src/gui/qt/gametable/mychancelabel.h
-
+
 FORMS += \
 		src/gui/qt/gametable.ui \
 		src/gui/qt/aboutpokerth.ui \
@@ -204,7 +204,7 @@ FORMS += \
 		src/gui/qt/gamelobbydialog.ui \
 		src/gui/qt/mymessagedialog.ui \
 		src/gui/qt/manualblindsorderdialog.ui
-
+
 SOURCES += \
 		src/pokerth.cpp \
 		src/gui/qt/chattools/chattools.cpp \
@@ -246,7 +246,7 @@ SOURCES += \
 		src/net/common/net_helper_client.cpp \
 		src/core/common/loghelper_client.cpp \
  src/gui/qt/gametable/mychancelabel.cpp
-
+
 TRANSLATIONS = \
 		ts/pokerth_bg.ts \
 		ts/pokerth_de.ts \
@@ -266,25 +266,25 @@ TRANSLATIONS = \
 		ts/pokerth_zhcn.ts \
 		ts/pokerth_fi.ts \
 		ts/pokerth_START_HERE.ts
-
+
-win32 {
+win32 {
     DEFINES += CURL_STATICLIB
     DEPENDPATH += src/net/win32/ src/core/win32
     INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer
     INCLUDEPATH += ../SDL/include/SDL ../SDL_mixer/include ../GnuTLS/include  ../curl/include ../zlib
     LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../curl/lib ../zlib
-
+
     LIBS += -lpokerth_lib
-
+
-    win32-msvc2005 {
+    win32-msvc2005 {
         LIBPATH += Release/lib ../SDL/VisualC/SDL/Release ../SDL/VisualC/SDLmain/Release ../SDL_mixer/VisualC/Release
         #LIBPATH += Debug/lib ../SDL/VisualC/SDL/Debug ../SDL/VisualC/SDLmain/Debug ../SDL_mixer/VisualC/Debug
-
+
         LIBS += -llibgnutls-openssl -llibgcrypt
         LIBS += -llibcurl
-    }
+    }
-
+
-    win32-g++ {
+    win32-g++ {
         #LIBPATH += Release/lib
         LIBPATH += Debug/lib
         LIBPATH += ../SDL/lib ../SDL_mixer/lib
@@ -296,108 +296,108 @@ win32 {
         LIBS += -llibboost_system-mgw34-mt-1_36
         LIBS += -llibboost_iostreams-mgw34-mt-1_36
         LIBS += -llibboost_zlib-mgw34-mt-1_36
-    }
+    }
-
+
     LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer -lwldap32
     RC_FILE = pokerth.rc
-}
+}
-!win32 {
+!win32 {
     DEPENDPATH += src/net/linux/ src/core/linux
-}
+}
-
+
-unix {
+unix {
     # workaround for problems with boost_filesystem exceptions
     QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
-}
+}
-
+
-unix : !mac {
+unix : !mac {
-
+
         ##### My release static build options
         #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
         #QMAKE_LFLAGS += -Wl,--gc-sections
-
+
         LIBPATH += lib
-
+
         LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
         BOOST_FS = boost_filesystem boost_filesystem-mt
         BOOST_THREAD = boost_thread boost_thread-mt
         BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
-
+
-
+
-        for(dir, LIB_DIRS){
+        for(dir, LIB_DIRS){
-            exists($$dir){
+            exists($$dir){
-                for(lib, BOOST_THREAD){
+                for(lib, BOOST_THREAD){
-                    exists($${dir}/lib$${lib}.so*){
+                    exists($${dir}/lib$${lib}.so*){
-                        message("Found $$lib")
+                        message("Found $$lib")
                         BOOST_THREAD = -l$$lib
-                    }
+                    }
-                }
+                }
-                for(lib, BOOST_FS){
+                for(lib, BOOST_FS){
-                    exists($${dir}/lib$${lib}.so*){
+                    exists($${dir}/lib$${lib}.so*){
-                        message("Found $$lib")
+                        message("Found $$lib")
                         BOOST_FS = -l$$lib
-                    }
+                    }
-                }
+                }
-                for(lib, BOOST_IOSTREAMS){
+                for(lib, BOOST_IOSTREAMS){
-                    exists($${dir}/lib$${lib}.so*){
+                    exists($${dir}/lib$${lib}.so*){
-                        message("Found $$lib")
+                        message("Found $$lib")
                         BOOST_IOSTREAMS = -l$$lib
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
         BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_IOSTREAMS
-        !count(BOOST_LIBS, 3){
+        !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)){
+        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)
         BSD = $$find(UNAME, "BSD")
-
+
         LIBS += -lpokerth_lib
         LIBS += $$BOOST_LIBS
         LIBS += -lSDL_mixer -lcurl
-        !isEmpty( BSD ){
+        !isEmpty( BSD ){
             LIBS += -lcrypto
-        }        else {
+        }        else {
             LIBS += -lgnutls-openssl -lgcrypt
-        }
+        }
         TARGETDEPS += ./lib/libpokerth_lib.a
-
+
         ##### My release static libs
         #LIBS += -lgcrypt_static -lgpg-error_static -lgnutls-openssl_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl
-
+
         #### INSTALL ####
-
+
         binary.path += $${PREFIX}/bin/
         binary.files += pokerth
-
+
         data.path += $${PREFIX}/share/pokerth/data/
         data.files += data/* 
-
+
         pixmap.path += $${PREFIX}/share/pixmaps/
         pixmap.files +=	pokerth.png
-
+
         desktop.path += $${PREFIX}/share/applications/
         desktop.files += pokerth.desktop
-
+
         INSTALLS += binary data pixmap desktop
-    }
+    }
-
+
-mac {
+mac {
     # make it universal  
     CONFIG += x86 
     CONFIG += ppc
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
-
+
     # for universal-compilation on PPC-Mac uncomment the following line
     # on Intel-Mac you have to comment this line out or build will fail.
     #	QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
-
+
     LIBPATH += lib
     LIBS += -lpokerth_lib
     # Qt static (path is standard for self-compiling qt)
@@ -423,4 +423,4 @@ mac {
     INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/
     INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
     INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
-}
+}

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?
+	//CardsChanceMonitor show/hide
-// 	if (myConfig->readConfigInt("ShowIntro")) { 
+	if (!myConfig->readConfigInt("ShowCardsChanceMonitor")) { 
-// // 		label_logo->hide();
+		tabWidget_Right->removeTab(2);
-// 		QTimer::singleShot(100, this, SLOT( paintStartSplash() )); }
+		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());