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

Merge pull request #376 from rkfg/hand_name

Browse Source 
Show the winning hand after the round

@TODO: to be tested in an internet game
This commit is contained in:
Kai Philipp
2020-01-15 00:55:04 +01:00
committed by GitHub
parent 7c538fc436 382b533488
commit 20793e24a1
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable.ui
+9 -2
View File
@@ -2222,13 +2222,13 @@ p, li { white-space: pre-wrap; }
<property name="minimumSize">
<size>
<width>600</width>
<height>94</height>
<height>114</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
<height>94</height>
<height>114</height>
</size>
</property>
<property name="styleSheet">
@@ -2631,6 +2631,13 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item row="1" column="0" colspan="5">
<widget class="QLabel" name="label_WinningCombination">
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
src/gui/qt/gametable/gametableimpl.cpp
+4
View File
@@ -2530,6 +2530,7 @@ void gameTableImpl::postRiverRunAnimation2()
if(nonfoldPlayersCounter!=1) {
label_WinningCombination->setText(CardsValue::determineHandName(currentGame->getCurrentHand()->getCurrentBeRo()->getHighestCardsValue(), activePlayerList).c_str());
if(!flipHolecardsAllInAlreadyDone) {
for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
@@ -3017,6 +3018,8 @@ void gameTableImpl::nextRoundCleanGui()
resetMyButtonsCheckStateMemory();
clearMyButtons();
pushButton_showMyCards->hide();
label_WinningCombination->clear();
update();
}
void gameTableImpl::stopTimer()
@@ -4117,6 +4120,7 @@ void gameTableImpl::refreshGameTableStyle()
myGameTableStyle->setBigFontBoardStyle(textLabel_handLabel);
myGameTableStyle->setBigFontBoardStyle(label_Pot);
#endif
myGameTableStyle->setBigFontBoardStyle(label_WinningCombination);
myGameTableStyle->setCardHolderStyle(label_CardHolder0,0);
myGameTableStyle->setCardHolderStyle(label_CardHolder1,0);
myGameTableStyle->setCardHolderStyle(label_CardHolder2,0);
src/gui/qt/gui_800x480/gametable_800x480.ui
+9 -2
View File
@@ -2745,13 +2745,13 @@ p, li { white-space: pre-wrap; }
<property name="minimumSize">
<size>
<width>390</width>
<height>82</height>
<height>102</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>390</width>
<height>82</height>
<height>102</height>
</size>
</property>
<property name="styleSheet">
@@ -3039,6 +3039,13 @@ p, li { white-space: pre-wrap; }
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_WinningCombination">
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>