From b09614967872298a8ecc2f059663de74ec2d8fdc Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 26 Mar 2009 09:47:14 +0000
Subject: [PATCH] fixed startwindowbg issues - changed disitribute pot
 animation to blinking playernames

---
 src/config/configfile.cpp                  |  6 +++---
 src/game_defs.h                            |  2 +-
 src/gui/qt/gametable/gametableimpl.cpp     |  4 ++--
 src/gui/qt/startwindow.ui                  | 10 +++++-----
 src/gui/qt/startwindow/startwindowimpl.cpp |  5 ++++-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 57cab935..65992cdc 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 = 59;
+	configRev = 60;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -152,8 +152,8 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	configList.push_back(ConfigInfo("PlayGameActions", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("PlayLobbyChatNotification", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("PlayNetworkGameNotification", CONFIG_TYPE_INT, "1"));
-	configList.push_back(ConfigInfo("NumberOfPlayers", CONFIG_TYPE_INT, "7"));
-	configList.push_back(ConfigInfo("StartCash", CONFIG_TYPE_INT, "3000"));
+	configList.push_back(ConfigInfo("NumberOfPlayers", CONFIG_TYPE_INT, "10"));
+	configList.push_back(ConfigInfo("StartCash", CONFIG_TYPE_INT, "5000"));
 	configList.push_back(ConfigInfo("FirstSmallBlind", CONFIG_TYPE_INT, "10"));
 	configList.push_back(ConfigInfo("RaiseBlindsAtHands", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("RaiseBlindsAtMinutes", CONFIG_TYPE_INT, "0"));
diff --git a/src/game_defs.h b/src/game_defs.h
index d912b783..1a99d6e8 100644
--- a/src/game_defs.h
+++ b/src/game_defs.h
@@ -33,7 +33,7 @@
 #define POKERTH_VERSION			((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR)
 
 #define POKERTH_BETA_REVISION	0
-#define POKERTH_BETA_RELEASE_STRING	"0.6.4"
+#define POKERTH_BETA_RELEASE_STRING	"0.6.5"
 
 enum ServerNetworkMode {
 	NETWORK_MODE_TCP = 1,
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 4a328191..c83b87f8 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -2270,7 +2270,7 @@ void gameTableImpl::postRiverRunAnimation5() {
 			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
 				if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { 
 
-// 					cashTopLabelArray[(*it_c)->getMyID()]->setText("");
+					playerNameLabelArray[(*it_c)->getMyID()]->setText("");
 				}
 			}
 		}
@@ -2280,7 +2280,7 @@ void gameTableImpl::postRiverRunAnimation5() {
 			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
 				if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { 
 
-// 					cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); 
+					playerNameLabelArray[(*it_c)->getMyID()]->setText(QString::fromUtf8((*it_c)->getMyName().c_str()));
 				}
 			}
 		}
diff --git a/src/gui/qt/startwindow.ui b/src/gui/qt/startwindow.ui
index a3547e7e..e2c0fded 100644
--- a/src/gui/qt/startwindow.ui
+++ b/src/gui/qt/startwindow.ui
@@ -6,19 +6,19 @@
     <x>0</x>
     <y>0</y>
     <width>450</width>
-    <height>380</height>
+    <height>350</height>
    </rect>
   </property>
   <property name="minimumSize" >
    <size>
     <width>450</width>
-    <height>380</height>
+    <height>350</height>
    </size>
   </property>
   <property name="maximumSize" >
    <size>
     <width>450</width>
-    <height>380</height>
+    <height>350</height>
    </size>
   </property>
   <property name="windowTitle" >
@@ -55,7 +55,7 @@
     <item row="1" column="1" >
      <layout class="QVBoxLayout" name="verticalLayout" >
       <property name="spacing" >
-       <number>-1</number>
+       <number>6</number>
       </property>
       <item>
        <widget class="QPushButton" name="pushButtonStart_Local_Game" >
@@ -173,7 +173,7 @@
      <x>0</x>
      <y>0</y>
      <width>450</width>
-     <height>30</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuPokerTH" >
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 1f8b3859..d01b44dd 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -72,7 +72,10 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 	//Widgets Grafiken per Stylesheets setzen
 	QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
 	this->setWindowIcon(QIcon(myAppDataPath+"gfx/gui/misc/windowicon.png")); 
-	this->setStyleSheet("QMainWindow { background-image: url(" + myAppDataPath +"gfx/gui/misc/startwindowbg.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
+
+	this->setStatusBar(0);
+
+	centralwidget->setStyleSheet("QWidget { background-image: url(" + myAppDataPath +"gfx/gui/misc/startwindowbg.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
 	
 	pushButtonStart_Local_Game->setStyleSheet("QPushButton { padding-left: 3px; padding-right: 3px; text-align: left; font-weight: bold;}");
 	pushButtonInternet_Game->setStyleSheet("QPushButton { padding-left: 3px; padding-right: 3px; text-align: left; font-weight: bold;}");