diff --git a/data/gfx/gui/misc/actionpics/action_call.png b/data/gfx/gui/misc/actionpics/action_call.png
index 5566174e..cc0a82e4 100644
Binary files a/data/gfx/gui/misc/actionpics/action_call.png and b/data/gfx/gui/misc/actionpics/action_call.png differ
diff --git a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml
index e996ff29..d6b435c0 100644
--- a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml
+++ b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml
@@ -59,13 +59,22 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml
index 1db1cb6a..42e6009f 100644
--- a/data/gfx/gui/table/default/defaulttablestyle.xml
+++ b/data/gfx/gui/table/default/defaulttablestyle.xml
@@ -63,13 +63,22 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui
index 058157f4..23751164 100644
--- a/src/gui/qt/gametable.ui
+++ b/src/gui/qt/gametable.ui
@@ -1528,7 +1528,7 @@
- 535
+ 580
94
@@ -1541,273 +1541,357 @@
QGroupBox {border-style:none;}
-
-
-
- 440
- 42
- 90
- 36
-
+
+
+ 0
-
-
- 90
- 0
-
+
+ 0
-
-
- 90
- 16777215
-
-
-
-
- 0
-
-
- 2
-
-
- 0
-
- -
-
-
- -
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
-
-
-
- 0
- 15
- 120
- 62
-
-
-
-
- 4
-
-
- 0
-
- -
-
-
-
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
+
-
+
+
+
0
-
- 2
-
-
+
0
-
-
-
+
+ 8
+
+
+ 0
+
+
+ 8
+
+
-
+
+
+
+ 145
+ 0
+
+
+
+
+
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ Qt::AlignCenter
- -
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
-
+
+
+ 3
-
-
- -
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+ 2
-
+
+ 0
+
+
-
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 75
+ 0
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
-
-
-
-
-
-
- 440
- 15
- 91
- 22
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
-
-
- 140
- 5
- 54
- 82
-
-
-
- true
-
-
-
-
-
- 195
- 5
- 54
- 82
-
-
-
- true
-
-
-
-
-
- 250
- 5
- 54
- 82
-
-
-
- true
-
-
-
-
-
- 305
- 5
- 54
- 82
-
-
-
- true
-
-
-
-
-
- 360
- 5
- 54
- 82
-
-
-
- true
-
-
-
-
-
- 143
- 8
- 48
- 76
-
-
-
- true
-
-
-
-
-
- 198
- 8
- 48
- 76
-
-
-
- true
-
-
-
-
-
- 253
- 8
- 48
- 76
-
-
-
- true
-
-
-
-
-
- 308
- 8
- 48
- 76
-
-
-
- true
-
-
-
-
-
- 363
- 8
- 48
- 76
-
-
-
- true
-
-
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 3
+ 91
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 3
+ 91
+
+
+
+
+ -
+
+
+ 0
+
+
+ 8
+
+
+ 8
+
+
-
+
+
+
+ 142
+ 0
+
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 90
+ 0
+
+
+
+
+ 3
+
+
+ 2
+
+
+ 0
+
+
-
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 45
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 285
+ 0
+
+
+
+
+
+ 230
+ 10
+ 48
+ 76
+
+
+
+ true
+
+
+
+
+
+ 65
+ 10
+ 48
+ 76
+
+
+
+ true
+
+
+
+
+
+ 62
+ 7
+ 54
+ 82
+
+
+
+ true
+
+
+
+
+
+ 7
+ 7
+ 54
+ 82
+
+
+
+ true
+
+
+
+
+
+ 10
+ 10
+ 48
+ 76
+
+
+
+ true
+
+
+
+
+
+ 227
+ 7
+ 54
+ 82
+
+
+
+ true
+
+
+
+
+
+ 117
+ 7
+ 54
+ 82
+
+
+
+ true
+
+
+
+
+
+ 120
+ 10
+ 48
+ 76
+
+
+
+ true
+
+
+
+
+
+ 172
+ 7
+ 54
+ 82
+
+
+
+ true
+
+
+
+
+
+ 175
+ 10
+ 48
+ 76
+
+
+
+ true
+
+
+
+
+
-
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 990c0c21..df6baba2 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -327,12 +327,17 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
//raise actionLable above just inserted mypixmaplabel
for (i=0; iraise(); }
+ //raise board cards
+ for (i=0; i<5; i++) { boardCardsArray[i]->raise(); }
+
//fix for away string bug in righttabwidget on windows
#if (defined _WIN32) || (defined __APPLE__)
tabWidget_Right->setTabText(0, " "+tabWidget_Right->tabText(0)+" ");
tabWidget_Right->setTabText(1, " "+tabWidget_Right->tabText(1)+" ");
+ tabWidget_Right->setTabText(2, " "+tabWidget_Right->tabText(2)+" ");
tabWidget_Left->setTabText(0, " "+tabWidget_Left->tabText(0)+" ");
tabWidget_Left->setTabText(1, " "+tabWidget_Left->tabText(1)+" ");
+ tabWidget_Left->setTabText(2, " "+tabWidget_Left->tabText(2)+" ");
#endif
//resize stop-button depending on translation
@@ -648,11 +653,11 @@ void gameTableImpl::initGui(int speed)
//kill running Singleshots!!!
stopTimer();
- label_Pot->setText("Pot");
- label_Total->setText("Total:");
- label_Sets->setText("Bets:");
- label_handNumber->setText("Hand:");
- label_gameNumber->setText("Game:");
+ label_Pot->setText(PotString);
+ label_Total->setText(TotalString+":");
+ label_Sets->setText(BetsString+":");
+ label_handNumber->setText(HandString+":");
+ label_gameNumber->setText(GameString+":");
groupBox_RightToolBox->setDisabled(FALSE);
groupBox_LeftToolBox->setDisabled(FALSE);
@@ -971,16 +976,16 @@ void gameTableImpl::refreshGameLabels(int gameState) {
switch(gameState) {
case 0: {
- textLabel_handLabel->setText("Preflop");
+ textLabel_handLabel->setText(PreflopString);
} break;
case 1: {
- textLabel_handLabel->setText("Flop");
+ textLabel_handLabel->setText(FlopString);
} break;
case 2: {
- textLabel_handLabel->setText("Turn");
+ textLabel_handLabel->setText(TurnString);
} break;
case 3: {
- textLabel_handLabel->setText("River");
+ textLabel_handLabel->setText(RiverString);
} break;
case 4: {
textLabel_handLabel->setText("");
@@ -2187,7 +2192,7 @@ void gameTableImpl::postRiverRunAnimation5() {
}
}
else {
- label_Pot->setText("Pot");
+ label_Pot->setText(PotString);
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() ) {
@@ -3248,6 +3253,24 @@ void gameTableImpl::refreshGameTableStyle()
else { FoldString = myGameTableStyle->getActionFoldI18NString(); }
if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getActionAllInI18NString() == "NULL") { AllInString = "All-In"; }
else { AllInString = myGameTableStyle->getActionAllInI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getPotI18NString() == "NULL") { PotString = "Pot"; }
+ else { PotString = myGameTableStyle->getPotI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getTotalI18NString() == "NULL") { TotalString = "Total"; }
+ else { TotalString = myGameTableStyle->getTotalI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getBetsI18NString() == "NULL") { BetsString = "Bets"; }
+ else { BetsString = myGameTableStyle->getBetsI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getGameI18NString() == "NULL") { GameString = "Game"; }
+ else { GameString = myGameTableStyle->getGameI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getHandI18NString() == "NULL") { HandString = "Hand"; }
+ else { HandString = myGameTableStyle->getHandI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getPreflopI18NString() == "NULL") { PreflopString = "Preflop"; }
+ else { PreflopString = myGameTableStyle->getPreflopI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getFlopI18NString() == "NULL") { FlopString = "Flop"; }
+ else { FlopString = myGameTableStyle->getFlopI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getTurnI18NString() == "NULL") { TurnString = "Turn"; }
+ else { TurnString = myGameTableStyle->getTurnI18NString(); }
+ if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getRiverI18NString() == "NULL") { RiverString = "River"; }
+ else { RiverString = myGameTableStyle->getRiverI18NString(); }
}
diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h
index f2f789d6..aea89f15 100755
--- a/src/gui/qt/gametable/gametableimpl.h
+++ b/src/gui/qt/gametable/gametableimpl.h
@@ -424,6 +424,15 @@ private:
QString CallString;
QString CheckString;
QString FoldString;
+ QString PotString;
+ QString TotalString;
+ QString BetsString;
+ QString GameString;
+ QString HandString;
+ QString PreflopString;
+ QString FlopString;
+ QString TurnString;
+ QString RiverString;
friend class GuiWrapper;
};
diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp
index 3784b150..ddd6b70f 100644
--- a/src/gui/qt/styles/gametablestylereader.cpp
+++ b/src/gui/qt/styles/gametablestylereader.cpp
@@ -170,6 +170,15 @@ void GameTableStyleReader::readStyleFile(QString file) {
else if (itemsList->ValueStr() == "ActionCallI18NString") { ActionCallI18NString = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionCheckI18NString") { ActionCheckI18NString = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionFoldI18NString") { ActionFoldI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "PotI18NString") { PotI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "TotalI18NString") { TotalI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "BetsI18NString") { BetsI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "GameI18NString") { GameI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "HandI18NString") { HandI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "PreflopI18NString") { PreflopI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "FlopI18NString") { FlopI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "TurnI18NString") { TurnI18NString = QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "RiverI18NString") { RiverI18NString = QString::fromUtf8(tempString1.c_str()); }
// COLORS
else if (itemsList->ValueStr() == "FKeyIndicatorColor") { FKeyIndicatorColor = QString::fromUtf8(tempString1.c_str()); }
@@ -382,6 +391,15 @@ void GameTableStyleReader::readStyleFile(QString file) {
if(ActionCallI18NString == "") { leftItems << "ActionCallI18NString"; }
if(ActionCheckI18NString == "") { leftItems << "ActionCheckI18NString"; }
if(ActionFoldI18NString == "") { leftItems << "ActionFoldI18NString"; }
+ if(PotI18NString == "") { leftItems << "PotI18NString"; }
+ if(TotalI18NString == "") { leftItems << "TotalI18NString"; }
+ if(BetsI18NString == "") { leftItems << "BetsI18NString"; }
+ if(GameI18NString == "") { leftItems << "GameI18NString"; }
+ if(HandI18NString == "") { leftItems << "HandI18NString"; }
+ if(PreflopI18NString == "") { leftItems << "PreflopI18NString"; }
+ if(FlopI18NString == "") { leftItems << "FlopI18NString"; }
+ if(TurnI18NString == "") { leftItems << "TurnI18NString"; }
+ if(RiverI18NString == "") { leftItems << "RiverI18NString"; }
// COLORS
if(FKeyIndicatorColor == "") { leftItems << "FKeyIndicatorColor"; }
diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h
index 1102b8e5..f2068e47 100644
--- a/src/gui/qt/styles/gametablestylereader.h
+++ b/src/gui/qt/styles/gametablestylereader.h
@@ -112,6 +112,15 @@ public:
QString getActionCallI18NString() const { return ActionCallI18NString; }
QString getActionCheckI18NString() const { return ActionCheckI18NString; }
QString getActionFoldI18NString() const { return ActionFoldI18NString; }
+ QString getRiverI18NString() const { return RiverI18NString; }
+ QString getTurnI18NString() const { return TurnI18NString; }
+ QString getFlopI18NString() const { return FlopI18NString; }
+ QString getPreflopI18NString() const { return PreflopI18NString; }
+ QString getHandI18NString() const { return HandI18NString; }
+ QString getGameI18NString() const { return GameI18NString; }
+ QString getBetsI18NString() const { return BetsI18NString; }
+ QString getTotalI18NString() const { return TotalI18NString; }
+ QString getPotI18NString() const { return PotI18NString; }
private:
//style values
@@ -181,6 +190,15 @@ private:
QString ActionCallI18NString;
QString ActionCheckI18NString;
QString ActionFoldI18NString;
+ QString PotI18NString;
+ QString TotalI18NString;
+ QString BetsI18NString;
+ QString GameI18NString;
+ QString HandI18NString;
+ QString PreflopI18NString;
+ QString FlopI18NString;
+ QString TurnI18NString;
+ QString RiverI18NString;
// COLORS
QString FKeyIndicatorColor;