diff --git a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml
index 01f5f703..ac4da849 100644
--- a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml
+++ b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml
@@ -46,8 +46,10 @@
-
-
+
+
+
+
diff --git a/data/gfx/gui/table/danuxi1/playerBottomSeatActive.png b/data/gfx/gui/table/danuxi1/playerBottomSeatActive.png
new file mode 100644
index 00000000..66421b36
Binary files /dev/null and b/data/gfx/gui/table/danuxi1/playerBottomSeatActive.png differ
diff --git a/data/gfx/gui/table/danuxi1/playerSeatActive.png b/data/gfx/gui/table/danuxi1/playerSeatActive.png
deleted file mode 100644
index 37af3750..00000000
Binary files a/data/gfx/gui/table/danuxi1/playerSeatActive.png and /dev/null differ
diff --git a/data/gfx/gui/table/danuxi1/playerSeatInactive.png b/data/gfx/gui/table/danuxi1/playerSeatInactive.png
deleted file mode 100644
index d6d5312a..00000000
Binary files a/data/gfx/gui/table/danuxi1/playerSeatInactive.png and /dev/null differ
diff --git a/data/gfx/gui/table/danuxi1/playerTopSeatActive.png b/data/gfx/gui/table/danuxi1/playerTopSeatActive.png
new file mode 100644
index 00000000..35cacc85
Binary files /dev/null and b/data/gfx/gui/table/danuxi1/playerTopSeatActive.png differ
diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml
index 9cbfaa64..bc3142c9 100644
--- a/data/gfx/gui/table/default/defaulttablestyle.xml
+++ b/data/gfx/gui/table/default/defaulttablestyle.xml
@@ -46,8 +46,10 @@
-
-
+
+
+
+
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 97343af1..c56644af 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -905,7 +905,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
userWidgetsArray[j]->show();
}
}
- myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[(*it_c)->getMyID()]);
+ myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[(*it_c)->getMyID()]);
}
//Groupbox verdunkeln wenn der Spiele inactive ist.
@@ -919,7 +919,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
holeCardsArray[0][0]->signalFastFlipCards(FALSE);
holeCardsArray[0][1]->signalFastFlipCards(FALSE);
}
- myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[(*it_c)->getMyID()]);
+ myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[(*it_c)->getMyID()]);
}
}
}
@@ -938,7 +938,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
holeCardsArray[0][0]->signalFastFlipCards(FALSE);
holeCardsArray[0][1]->signalFastFlipCards(FALSE);
}
- myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]);
+ myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]);
}
break;
//active but fold
@@ -949,7 +949,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
userWidgetsArray[j]->show();
}
}
- myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]);
+ myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]);
}
break;
//active in action
@@ -959,7 +959,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
break;
//active not in action
case 3: {
- myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]);
+ myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]);
}
break;
default: {}
@@ -3212,7 +3212,7 @@ void gameTableImpl::refreshGameTableStyle()
for (i=0; isetPlayerSeatInActiveStyle(groupBoxArray[i]);
+ myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[i]);
}
//Human player button
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0);
diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp
index f98deec4..9bc2b5fb 100644
--- a/src/gui/qt/styles/gametablestylereader.cpp
+++ b/src/gui/qt/styles/gametablestylereader.cpp
@@ -152,8 +152,10 @@ void GameTableStyleReader::readStyleFile(QString file) {
else if (itemsList->ValueStr() == "RadioButtonCheckedHover") { RadioButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "RadioButtonUnchecked") { RadioButtonUnchecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "RadioButtonUncheckedHover") { RadioButtonUncheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
- else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
- else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "PlayerTopSeatInactive") { PlayerTopSeatInactive = currentDir+QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "PlayerTopSeatActive") { PlayerTopSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "PlayerBottomSeatInactive") { PlayerBottomSeatInactive = currentDir+QString::fromUtf8(tempString1.c_str()); }
+ else if (itemsList->ValueStr() == "PlayerBottomSeatActive") { PlayerBottomSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "Table") { Table = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "HandRanking") { HandRanking = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ToolBoxBackground") { ToolBoxBackground = currentDir+QString::fromUtf8(tempString1.c_str()); }
@@ -259,8 +261,10 @@ void GameTableStyleReader::readStyleFile(QString file) {
if(RadioButtonCheckedHover == "") { wrongItems << "RadioButtonCheckedHover"; }
if(RadioButtonUnchecked == "") { wrongItems << "RadioButtonUnchecked"; }
if(RadioButtonUncheckedHover == "") { wrongItems << "RadioButtonUncheckedHover"; }
- if(PlayerSeatActive == "") { wrongItems << "PlayerSeatActive"; }
- if(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; }
+ if(PlayerTopSeatActive == "") { wrongItems << "PlayerTopSeatActive"; }
+ if(PlayerTopSeatInactive == "") { wrongItems << "PlayerTopSeatInactive"; }
+ if(PlayerBottomSeatActive == "") { wrongItems << "PlayerBottomSeatActive"; }
+ if(PlayerBottomSeatInactive == "") { wrongItems << "PlayerBottomSeatInactive"; }
if(Table == "") { wrongItems << "Table"; }
if(HandRanking == "") { wrongItems << "HandRanking"; }
if(ToolBoxBackground == "") { wrongItems << "ToolBoxBackground"; }
@@ -418,14 +422,26 @@ void GameTableStyleReader::setVoteStringsStyle(QLabel *l)
l->setStyleSheet("QLabel { color: #"+TabWidgetTextColor+"; font-size: 11px;}");
}
-void GameTableStyleReader::setPlayerSeatInActiveStyle(QGroupBox *ps)
+void GameTableStyleReader::setPlayerSeatInactiveStyle(QGroupBox *ps)
{
- ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerSeatInActive+") }");
+ // check if seat is on top or bottom line
+ if(ps->objectName() == "groupBox2" || ps->objectName() == "groupBox1" || ps->objectName() == "groupBox0" || ps->objectName() == "groupBox9" || ps->objectName() == "groupBox8") {
+ ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerBottomSeatInactive+") }");
+ }
+ else {
+ ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerTopSeatInactive+") }");
+ }
}
void GameTableStyleReader::setPlayerSeatActiveStyle(QGroupBox *ps)
{
- ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerSeatActive+") }");
+// check if seat is on top or bottom line
+ if(ps->objectName() == "groupBox2" || ps->objectName() == "groupBox1" || ps->objectName() == "groupBox0" || ps->objectName() == "groupBox9" || ps->objectName() == "groupBox8") {
+ ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerBottomSeatActive+") }");
+ }
+ else {
+ ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerTopSeatActive+") }");
+ }
}
void GameTableStyleReader::setBetValueInputStyle(QLineEdit *bv)
diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h
index 2f68a5e2..84506d9f 100644
--- a/src/gui/qt/styles/gametablestylereader.h
+++ b/src/gui/qt/styles/gametablestylereader.h
@@ -61,7 +61,7 @@ public:
void setTableBackground(gameTableImpl*);
void setCardHolderStyle(QLabel*, int /*bero*/);
void setPlayerSeatActiveStyle(QGroupBox*);
- void setPlayerSeatInActiveStyle(QGroupBox*);
+ void setPlayerSeatInactiveStyle(QGroupBox*);
void setToolBoxBackground(QGroupBox*);
//set fonts + colors
@@ -144,8 +144,10 @@ private:
QString RadioButtonCheckedHover;
QString RadioButtonUnchecked;
QString RadioButtonUncheckedHover;
- QString PlayerSeatInActive;
- QString PlayerSeatActive;
+ QString PlayerTopSeatInactive;
+ QString PlayerTopSeatActive;
+ QString PlayerBottomSeatInactive;
+ QString PlayerBottomSeatActive;
QString Table;
QString HandRanking;
QString ToolBoxBackground;