diff --git a/data/gfx/gui/table/danuxi1/playeraction_blue.png b/data/gfx/gui/table/danuxi1/playeraction_blue.png
index cf556e50..3550e598 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_blue.png and b/data/gfx/gui/table/danuxi1/playeraction_blue.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_blue_checked.png b/data/gfx/gui/table/danuxi1/playeraction_blue_checked.png
index 420fc8ac..ec92d385 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_blue_checked.png and b/data/gfx/gui/table/danuxi1/playeraction_blue_checked.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_blue_checked_hover.png b/data/gfx/gui/table/danuxi1/playeraction_blue_checked_hover.png
index 50b8fee4..453d54b4 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_blue_checked_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_blue_checked_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_blue_hover.png b/data/gfx/gui/table/danuxi1/playeraction_blue_hover.png
index f927a09d..fad5c33a 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_blue_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_blue_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_green.png b/data/gfx/gui/table/danuxi1/playeraction_green.png
index 0170ba08..114a5a96 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_green.png and b/data/gfx/gui/table/danuxi1/playeraction_green.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_green_checked.png b/data/gfx/gui/table/danuxi1/playeraction_green_checked.png
index 81aa9f92..99e4e5b9 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_green_checked.png and b/data/gfx/gui/table/danuxi1/playeraction_green_checked.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_green_checked_hover.png b/data/gfx/gui/table/danuxi1/playeraction_green_checked_hover.png
index 90749126..3ce7d153 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_green_checked_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_green_checked_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_green_hover.png b/data/gfx/gui/table/danuxi1/playeraction_green_hover.png
index f65927f3..06ca4a67 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_green_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_green_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_orange.png b/data/gfx/gui/table/danuxi1/playeraction_orange.png
index 61bf5db2..4725f16c 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_orange.png and b/data/gfx/gui/table/danuxi1/playeraction_orange.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_orange_checked.png b/data/gfx/gui/table/danuxi1/playeraction_orange_checked.png
index 7d53015a..312a5585 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_orange_checked.png and b/data/gfx/gui/table/danuxi1/playeraction_orange_checked.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_orange_checked_hover.png b/data/gfx/gui/table/danuxi1/playeraction_orange_checked_hover.png
index 62195e87..48676b09 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_orange_checked_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_orange_checked_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_orange_hover.png b/data/gfx/gui/table/danuxi1/playeraction_orange_hover.png
index 0bb75db7..dd2704c9 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_orange_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_orange_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_red.png b/data/gfx/gui/table/danuxi1/playeraction_red.png
index 0de38821..e6913355 100755
Binary files a/data/gfx/gui/table/danuxi1/playeraction_red.png and b/data/gfx/gui/table/danuxi1/playeraction_red.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_red_checked.png b/data/gfx/gui/table/danuxi1/playeraction_red_checked.png
index caec1e90..4d912372 100755
Binary files a/data/gfx/gui/table/danuxi1/playeraction_red_checked.png and b/data/gfx/gui/table/danuxi1/playeraction_red_checked.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_red_checked_hover.png b/data/gfx/gui/table/danuxi1/playeraction_red_checked_hover.png
index bc9e880c..b3045e57 100755
Binary files a/data/gfx/gui/table/danuxi1/playeraction_red_checked_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_red_checked_hover.png differ
diff --git a/data/gfx/gui/table/danuxi1/playeraction_red_hover.png b/data/gfx/gui/table/danuxi1/playeraction_red_hover.png
index f62819c9..7cd5eb2c 100644
Binary files a/data/gfx/gui/table/danuxi1/playeraction_red_hover.png and b/data/gfx/gui/table/danuxi1/playeraction_red_hover.png differ
diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml
index 23e5aa20..1db1cb6a 100644
--- a/data/gfx/gui/table/default/defaulttablestyle.xml
+++ b/data/gfx/gui/table/default/defaulttablestyle.xml
@@ -25,22 +25,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/gfx/gui/table/default/playeraction_blue.png b/data/gfx/gui/table/default/playeraction_blue.png
index cf556e50..3550e598 100644
Binary files a/data/gfx/gui/table/default/playeraction_blue.png and b/data/gfx/gui/table/default/playeraction_blue.png differ
diff --git a/data/gfx/gui/table/default/playeraction_blue_checked.png b/data/gfx/gui/table/default/playeraction_blue_checked.png
index 420fc8ac..ec92d385 100644
Binary files a/data/gfx/gui/table/default/playeraction_blue_checked.png and b/data/gfx/gui/table/default/playeraction_blue_checked.png differ
diff --git a/data/gfx/gui/table/default/playeraction_blue_checked_hover.png b/data/gfx/gui/table/default/playeraction_blue_checked_hover.png
index 50b8fee4..453d54b4 100644
Binary files a/data/gfx/gui/table/default/playeraction_blue_checked_hover.png and b/data/gfx/gui/table/default/playeraction_blue_checked_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_blue_hover.png b/data/gfx/gui/table/default/playeraction_blue_hover.png
index f927a09d..fad5c33a 100644
Binary files a/data/gfx/gui/table/default/playeraction_blue_hover.png and b/data/gfx/gui/table/default/playeraction_blue_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_green.png b/data/gfx/gui/table/default/playeraction_green.png
index 0170ba08..114a5a96 100644
Binary files a/data/gfx/gui/table/default/playeraction_green.png and b/data/gfx/gui/table/default/playeraction_green.png differ
diff --git a/data/gfx/gui/table/default/playeraction_green_checked.png b/data/gfx/gui/table/default/playeraction_green_checked.png
index 81aa9f92..99e4e5b9 100644
Binary files a/data/gfx/gui/table/default/playeraction_green_checked.png and b/data/gfx/gui/table/default/playeraction_green_checked.png differ
diff --git a/data/gfx/gui/table/default/playeraction_green_checked_hover.png b/data/gfx/gui/table/default/playeraction_green_checked_hover.png
index 90749126..3ce7d153 100644
Binary files a/data/gfx/gui/table/default/playeraction_green_checked_hover.png and b/data/gfx/gui/table/default/playeraction_green_checked_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_green_hover.png b/data/gfx/gui/table/default/playeraction_green_hover.png
index f65927f3..06ca4a67 100644
Binary files a/data/gfx/gui/table/default/playeraction_green_hover.png and b/data/gfx/gui/table/default/playeraction_green_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_orange.png b/data/gfx/gui/table/default/playeraction_orange.png
index 61bf5db2..4725f16c 100644
Binary files a/data/gfx/gui/table/default/playeraction_orange.png and b/data/gfx/gui/table/default/playeraction_orange.png differ
diff --git a/data/gfx/gui/table/default/playeraction_orange_checked.png b/data/gfx/gui/table/default/playeraction_orange_checked.png
index 7d53015a..312a5585 100644
Binary files a/data/gfx/gui/table/default/playeraction_orange_checked.png and b/data/gfx/gui/table/default/playeraction_orange_checked.png differ
diff --git a/data/gfx/gui/table/default/playeraction_orange_checked_hover.png b/data/gfx/gui/table/default/playeraction_orange_checked_hover.png
index 62195e87..48676b09 100644
Binary files a/data/gfx/gui/table/default/playeraction_orange_checked_hover.png and b/data/gfx/gui/table/default/playeraction_orange_checked_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_orange_hover.png b/data/gfx/gui/table/default/playeraction_orange_hover.png
index 0bb75db7..dd2704c9 100644
Binary files a/data/gfx/gui/table/default/playeraction_orange_hover.png and b/data/gfx/gui/table/default/playeraction_orange_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_red.png b/data/gfx/gui/table/default/playeraction_red.png
index 0de38821..e6913355 100644
Binary files a/data/gfx/gui/table/default/playeraction_red.png and b/data/gfx/gui/table/default/playeraction_red.png differ
diff --git a/data/gfx/gui/table/default/playeraction_red_checked.png b/data/gfx/gui/table/default/playeraction_red_checked.png
index caec1e90..4d912372 100644
Binary files a/data/gfx/gui/table/default/playeraction_red_checked.png and b/data/gfx/gui/table/default/playeraction_red_checked.png differ
diff --git a/data/gfx/gui/table/default/playeraction_red_checked_hover.png b/data/gfx/gui/table/default/playeraction_red_checked_hover.png
index bc9e880c..b3045e57 100644
Binary files a/data/gfx/gui/table/default/playeraction_red_checked_hover.png and b/data/gfx/gui/table/default/playeraction_red_checked_hover.png differ
diff --git a/data/gfx/gui/table/default/playeraction_red_hover.png b/data/gfx/gui/table/default/playeraction_red_hover.png
index f62819c9..7cd5eb2c 100644
Binary files a/data/gfx/gui/table/default/playeraction_red_hover.png and b/data/gfx/gui/table/default/playeraction_red_hover.png differ
diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui
index 11862d79..058157f4 100644
--- a/src/gui/qt/gametable.ui
+++ b/src/gui/qt/gametable.ui
@@ -2714,13 +2714,13 @@
- 160
+ 168
188
- 160
+ 168
188
@@ -2765,13 +2765,13 @@
- 85
+ 95
25
- 85
+ 95
25
@@ -2814,14 +2814,14 @@
- 160
- 35
+ 168
+ 43
- 160
- 35
+ 168
+ 43
@@ -2839,14 +2839,14 @@
- 160
- 35
+ 168
+ 43
- 160
- 35
+ 168
+ 43
@@ -2864,14 +2864,14 @@
- 160
- 35
+ 168
+ 43
- 160
- 35
+ 168
+ 43
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 5bca38bd..52be9b39 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -1308,11 +1308,11 @@ void gameTableImpl::provideMyActions(int mode) {
if(currentHand->getCurrentRound() == 0) { // preflop
if (currentGame->getSeatsList()->front()->getMyCash()+currentGame->getSeatsList()->front()->getMySet() > currentHand->getCurrentBeRo()->getHighestSet()) {
- pushButtonBetRaiseString = RaiseString+" $"+QString::number(getMyBetAmount());
+ pushButtonBetRaiseString = RaiseString+"\n$"+QString::number(getMyBetAmount());
}
if (currentGame->getSeatsList()->front()->getMySet()== currentHand->getCurrentBeRo()->getHighestSet() && currentGame->getSeatsList()->front()->getMyButton() == 3) { pushButtonCallCheckString = CheckString; }
- else { pushButtonCallCheckString = CallString+" $"+QString::number(getMyCallAmount()); }
+ else { pushButtonCallCheckString = CallString+"\n$"+QString::number(getMyCallAmount()); }
pushButtonFoldString = FoldString;
pushButtonAllInString = AllInString;
@@ -1326,12 +1326,12 @@ void gameTableImpl::provideMyActions(int mode) {
if (currentHand->getCurrentBeRo()->getHighestSet() == 0) {
pushButtonCallCheckString = CheckString;
- pushButtonBetRaiseString = BetString+" $"+QString::number(getMyBetAmount());
+ pushButtonBetRaiseString = BetString+"\n$"+QString::number(getMyBetAmount());
}
if (currentHand->getCurrentBeRo()->getHighestSet() > 0 && currentHand->getCurrentBeRo()->getHighestSet() > currentGame->getSeatsList()->front()->getMySet()) {
- pushButtonCallCheckString = CallString+" $"+QString::number(getMyCallAmount());
+ pushButtonCallCheckString = CallString+"\n$"+QString::number(getMyCallAmount());
if (currentGame->getSeatsList()->front()->getMyCash()+currentGame->getSeatsList()->front()->getMySet() > currentHand->getCurrentBeRo()->getHighestSet()) {
- pushButtonBetRaiseString = RaiseString+" $"+QString::number(getMyBetAmount());
+ pushButtonBetRaiseString = RaiseString+"\n$"+QString::number(getMyBetAmount());
}
}
pushButtonAllInString = AllInString;
@@ -1339,7 +1339,7 @@ void gameTableImpl::provideMyActions(int mode) {
if(mode == 0) {
if( currentHand->getSeatsList()->front()->getMyAction() != PLAYER_ACTION_FOLD ) {
- pushButtonBetRaiseString = BetString+" $"+QString::number(getMyBetAmount());
+ pushButtonBetRaiseString = BetString+"\n$"+QString::number(getMyBetAmount());
pushButtonCallCheckString = CheckString;
if( (currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND ) || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = FoldString; }
else { pushButtonFoldString = CheckString+" / "+FoldString; }
@@ -1401,7 +1401,7 @@ void gameTableImpl::provideMyActions(int mode) {
//if value changed on bet/raise button --> uncheck to prevent unwanted actions
- QString lastBetValueString = lastPushButtonBetRaiseString;
+ QString lastBetValueString = lastPushButtonBetRaiseString.simplified();
int index = lastBetValueString.indexOf("$");
lastBetValueString.remove(0, index+1);
bool ok;
@@ -1575,7 +1575,7 @@ int gameTableImpl::getMyCallAmount() {
int gameTableImpl::getBetRaisePushButtonValue() {
- QString betValueString = pushButton_BetRaise->text();
+ QString betValueString = pushButton_BetRaise->text().simplified();
int index = betValueString.indexOf("$");
betValueString.remove(0, index+1);
bool ok;
@@ -2954,23 +2954,23 @@ void gameTableImpl::lineEditBetValueChanged(QString valueString) {
bool ok;
int betValue = QString(valueString).toInt(&ok, 10);
- QString betRaise = pushButton_BetRaise->text().section(" ",0 ,0);
+ QString betRaise = pushButton_BetRaise->text().section("\n",0 ,0);
if(betValue >= horizontalSlider_bet->minimum()) {
if(betValue > horizontalSlider_bet->maximum()) { // print the maximum
- pushButton_BetRaise->setText(betRaise + " $" + QString::number(horizontalSlider_bet->maximum()));
+ pushButton_BetRaise->setText(betRaise + "\n$" + QString::number(horizontalSlider_bet->maximum()));
betSliderChangedByInput = TRUE;
horizontalSlider_bet->setValue(horizontalSlider_bet->maximum());
}
else { // really print the value
- pushButton_BetRaise->setText(betRaise + " $" + valueString);
+ pushButton_BetRaise->setText(betRaise + "\n$" + valueString);
betSliderChangedByInput = TRUE;
horizontalSlider_bet->setValue(betValue);
}
}
else { // print the minimum
- pushButton_BetRaise->setText(betRaise + " $" + QString::number(horizontalSlider_bet->minimum()));
+ pushButton_BetRaise->setText(betRaise + "\n$" + QString::number(horizontalSlider_bet->minimum()));
betSliderChangedByInput = TRUE;
horizontalSlider_bet->setValue(horizontalSlider_bet->minimum());
}
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index cc84c64b..6a6cec75 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -871,7 +871,7 @@ void settingsDialogImpl::showCurrentGameTableStylePreview()
QString MaintainerEMail = tr("Maintainer EMail");
QString CreateDate = tr("Create Date");
- label_gameTableStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"+CreateDate+": "+style.getStyleCreateDate()+"");
+ label_gameTableStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"+CreateDate+": "+style.getStyleCreateDate()+"");
}
}
@@ -961,7 +961,7 @@ void settingsDialogImpl::showCurrentCardDeckStylePreview()
QString MaintainerEMail = tr("Maintainer EMail");
QString CreateDate = tr("Create Date");
- label_cardDeckStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"+CreateDate+": "+style.getStyleCreateDate()+"");
+ label_cardDeckStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"+CreateDate+": "+style.getStyleCreateDate()+"");
}
}
diff --git a/src/gui/qt/styles/carddeckstylereader.cpp b/src/gui/qt/styles/carddeckstylereader.cpp
index f805b94e..77c07e4c 100644
--- a/src/gui/qt/styles/carddeckstylereader.cpp
+++ b/src/gui/qt/styles/carddeckstylereader.cpp
@@ -110,8 +110,8 @@ void CardDeckStyleReader::showLeftItemsErrorMessage(QString style, QStringList f
{
QString items = failedItems.join(", ");
- QMessageBox::warning(myW, tr("Game Table Style Error"),
- tr("Selected game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
+ QMessageBox::warning(myW, tr("Card Deck Style Error"),
+ tr("Selected card deck style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are missing. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
QMessageBox::Ok);
}
diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp
index 9a6973c1..7d8b1929 100644
--- a/src/gui/qt/styles/gametablestylereader.cpp
+++ b/src/gui/qt/styles/gametablestylereader.cpp
@@ -459,7 +459,7 @@ void GameTableStyleReader::showLeftItemsErrorMessage(QString style, QStringList
QString items = failedItems.join(", ");
QMessageBox::warning(myW, tr("Game Table Style Error"),
- tr("Selected game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
+ tr("Selected game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are missing. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
QMessageBox::Ok);
}