diff --git a/data/gfx/gui/misc/radiobutton_checked.png b/data/gfx/gui/misc/radiobutton_checked.png index b43921e3..613fc624 100644 Binary files a/data/gfx/gui/misc/radiobutton_checked.png and b/data/gfx/gui/misc/radiobutton_checked.png differ diff --git a/data/gfx/gui/misc/radiobutton_checked_hover.png b/data/gfx/gui/misc/radiobutton_checked_hover.png index 684bc5f4..6239c23a 100644 Binary files a/data/gfx/gui/misc/radiobutton_checked_hover.png and b/data/gfx/gui/misc/radiobutton_checked_hover.png differ diff --git a/data/gfx/gui/misc/radiobutton_pressed.png b/data/gfx/gui/misc/radiobutton_pressed.png index 8a4aaa2e..149bc663 100644 Binary files a/data/gfx/gui/misc/radiobutton_pressed.png and b/data/gfx/gui/misc/radiobutton_pressed.png differ diff --git a/data/gfx/gui/misc/radiobutton_unchecked.png b/data/gfx/gui/misc/radiobutton_unchecked.png index 93b091cd..6ac3f963 100644 Binary files a/data/gfx/gui/misc/radiobutton_unchecked.png and b/data/gfx/gui/misc/radiobutton_unchecked.png differ diff --git a/data/gfx/gui/misc/radiobutton_unchecked_hover.png b/data/gfx/gui/misc/radiobutton_unchecked_hover.png index d39e4366..e6841e61 100644 Binary files a/data/gfx/gui/misc/radiobutton_unchecked_hover.png and b/data/gfx/gui/misc/radiobutton_unchecked_hover.png differ diff --git a/data/gfx/gui/table/default/playeraction_03.png b/data/gfx/gui/table/default/playeraction_03.png deleted file mode 100644 index af21dad7..00000000 Binary files a/data/gfx/gui/table/default/playeraction_03.png and /dev/null differ diff --git a/data/gfx/gui/table/default/playeraction_05.png b/data/gfx/gui/table/default/playeraction_05.png deleted file mode 100644 index aa624bb9..00000000 Binary files a/data/gfx/gui/table/default/playeraction_05.png and /dev/null differ diff --git a/data/gfx/gui/table/default/playeraction_07.png b/data/gfx/gui/table/default/playeraction_07.png deleted file mode 100644 index 962171c6..00000000 Binary files a/data/gfx/gui/table/default/playeraction_07.png and /dev/null differ diff --git a/data/gfx/gui/table/default/playeraction_05_0.6.png b/data/gfx/gui/table/default/playeraction_blue.png old mode 100644 new mode 100755 similarity index 100% rename from data/gfx/gui/table/default/playeraction_05_0.6.png rename to data/gfx/gui/table/default/playeraction_blue.png diff --git a/data/gfx/gui/table/default/playeraction_05_0.6_checked.png b/data/gfx/gui/table/default/playeraction_blue_checked.png old mode 100644 new mode 100755 similarity index 100% rename from data/gfx/gui/table/default/playeraction_05_0.6_checked.png rename to data/gfx/gui/table/default/playeraction_blue_checked.png diff --git a/data/gfx/gui/table/default/playeraction_03_0.6.png b/data/gfx/gui/table/default/playeraction_green.png old mode 100644 new mode 100755 similarity index 100% rename from data/gfx/gui/table/default/playeraction_03_0.6.png rename to data/gfx/gui/table/default/playeraction_green.png diff --git a/data/gfx/gui/table/default/playeraction_03_0.6_checked.png b/data/gfx/gui/table/default/playeraction_green_checked.png old mode 100644 new mode 100755 similarity index 100% rename from data/gfx/gui/table/default/playeraction_03_0.6_checked.png rename to data/gfx/gui/table/default/playeraction_green_checked.png diff --git a/data/gfx/gui/table/default/playeraction_07_0.6.png b/data/gfx/gui/table/default/playeraction_red.png old mode 100644 new mode 100755 similarity index 100% rename from data/gfx/gui/table/default/playeraction_07_0.6.png rename to data/gfx/gui/table/default/playeraction_red.png diff --git a/data/gfx/gui/table/default/playeraction_07_0.6_checked.png b/data/gfx/gui/table/default/playeraction_red_checked.png old mode 100644 new mode 100755 similarity index 100% rename from data/gfx/gui/table/default/playeraction_07_0.6_checked.png rename to data/gfx/gui/table/default/playeraction_red_checked.png diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index bbcaf472..77c2ee64 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -398,9 +398,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //Human player button - pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6_checked.png); }"); - pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6_checked.png); }"); - pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6_checked.png); }"); + pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png); }"); + pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png); }"); + pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked.png); }"); lineEdit_betValue->setStyleSheet("QLineEdit { "+ font2String +" font-size: "+betValueFontSize+"px; font-weight: bold; background-color: #1D3B00; color: #F0F0F0; } QLineEdit:disabled { background-color: #316300; color: #6d7b5f }"); @@ -3619,9 +3619,9 @@ void mainWindowImpl::myButtonsCheckable(bool state) { pushButton_AllIn->setCheckable(TRUE); //design - pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87FF97;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6_checked.png); }"); - pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87CDFF;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6_checked.png); }"); - pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #FF8787;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6_checked.png); }"); + pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87FF97;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png); }"); + pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87CDFF;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png); }"); + pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #FF8787;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked.png); }"); myButtonsAreCheckable = TRUE; } @@ -3634,9 +3634,9 @@ void mainWindowImpl::myButtonsCheckable(bool state) { pushButton_AllIn->setCheckable(FALSE); //design - pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6_checked.png); }"); - pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6_checked.png); }"); - pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6_checked.png); }"); + pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png); }"); + pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png); }"); + pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked.png); }"); myButtonsAreCheckable = FALSE; }