sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed startwindowbg issues - changed disitribute pot animation to blinking playernames

Browse Source
This commit is contained in:
doitux
2009-03-26 09:47:14 +00:00
parent d7bfab7d4e
commit b096149678
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+3 -3
View File
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
myQtToolsInterface = CreateQtToolsWrapper(); myQtToolsInterface = CreateQtToolsWrapper();
// !!!! Revisionsnummer der Configdefaults !!!!! // !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 59; configRev = 60;
//standard defaults //standard defaults
logOnOffDefault = "1"; 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("PlayGameActions", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("PlayLobbyChatNotification", 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("PlayNetworkGameNotification", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("NumberOfPlayers", CONFIG_TYPE_INT, "7")); configList.push_back(ConfigInfo("NumberOfPlayers", CONFIG_TYPE_INT, "10"));
configList.push_back(ConfigInfo("StartCash", CONFIG_TYPE_INT, "3000")); configList.push_back(ConfigInfo("StartCash", CONFIG_TYPE_INT, "5000"));
configList.push_back(ConfigInfo("FirstSmallBlind", CONFIG_TYPE_INT, "10")); configList.push_back(ConfigInfo("FirstSmallBlind", CONFIG_TYPE_INT, "10"));
configList.push_back(ConfigInfo("RaiseBlindsAtHands", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("RaiseBlindsAtHands", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("RaiseBlindsAtMinutes", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("RaiseBlindsAtMinutes", CONFIG_TYPE_INT, "0"));
src/game_defs.h
+1 -1
View File
@@ -33,7 +33,7 @@
#define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR)
#define POKERTH_BETA_REVISION 0 #define POKERTH_BETA_REVISION 0
#define POKERTH_BETA_RELEASE_STRING "0.6.4" #define POKERTH_BETA_RELEASE_STRING "0.6.5"
enum ServerNetworkMode { enum ServerNetworkMode {
NETWORK_MODE_TCP = 1, NETWORK_MODE_TCP = 1,
src/gui/qt/gametable/gametableimpl.cpp
+2 -2
View File
@@ -2270,7 +2270,7 @@ void gameTableImpl::postRiverRunAnimation5() {
for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) { 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() ) { 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++) { 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() ) { 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()));
} }
} }
} }
src/gui/qt/startwindow.ui
+5 -5
View File
@@ -6,19 +6,19 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>450</width> <width>450</width>
<height>380</height> <height>350</height>
</rect> </rect>
</property> </property>
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>450</width> <width>450</width>
<height>380</height> <height>350</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>450</width> <width>450</width>
<height>380</height> <height>350</height>
</size> </size>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@@ -55,7 +55,7 @@
<item row="1" column="1" > <item row="1" column="1" >
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QVBoxLayout" name="verticalLayout" >
<property name="spacing" > <property name="spacing" >
<number>-1</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="pushButtonStart_Local_Game" > <widget class="QPushButton" name="pushButtonStart_Local_Game" >
@@ -173,7 +173,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>450</width> <width>450</width>
<height>30</height> <height>23</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuPokerTH" > <widget class="QMenu" name="menuPokerTH" >
src/gui/qt/startwindow/startwindowimpl.cpp
+4 -1
View File
@@ -72,7 +72,10 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
//Widgets Grafiken per Stylesheets setzen //Widgets Grafiken per Stylesheets setzen
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
this->setWindowIcon(QIcon(myAppDataPath+"gfx/gui/misc/windowicon.png")); 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;}"); 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;}"); pushButtonInternet_Game->setStyleSheet("QPushButton { padding-left: 3px; padding-right: 3px; text-align: left; font-weight: bold;}");