diff --git a/data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png b/data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png new file mode 100644 index 00000000..e84626d2 Binary files /dev/null and b/data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png differ diff --git a/data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png b/data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png new file mode 100644 index 00000000..0b158716 Binary files /dev/null and b/data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png differ diff --git a/data/gfx/gui/table/default/playeraction_03_0.6.png b/data/gfx/gui/table/default/playeraction_03_0.6.png new file mode 100644 index 00000000..82de5f83 Binary files /dev/null and b/data/gfx/gui/table/default/playeraction_03_0.6.png differ diff --git a/data/gfx/gui/table/default/playeraction_05_0.6.png b/data/gfx/gui/table/default/playeraction_05_0.6.png new file mode 100644 index 00000000..e74d1522 Binary files /dev/null and b/data/gfx/gui/table/default/playeraction_05_0.6.png differ diff --git a/data/gfx/gui/table/default/playeraction_07_0.6.png b/data/gfx/gui/table/default/playeraction_07_0.6.png new file mode 100644 index 00000000..f30e1899 Binary files /dev/null and b/data/gfx/gui/table/default/playeraction_07_0.6.png differ diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 0d0e1c05..cb56547f 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -32,1070 +32,6 @@ - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 230 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - 230 - 195 - - - - - 197 - 195 - - - - - 6 - - - 6 - - - 6 - - - 6 - - - 1 - - - 1 - - - - - Qt::NoFocus - - - 0 - - - - Hands - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::AlignCenter - - - - - - - - Chat - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - Qt::NoFocus - - - Qt::ScrollBarAlwaysOff - - - - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 106 - 40 - - - - - - - - true - - - - 310 - 195 - - - - - 310 - 195 - - - - - - - - - 25 - 80 - 50 - 34 - - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 25 - 25 - 40 - 40 - - - - true - - - Qt::AlignCenter - - - - - - 232 - 44 - 55 - 21 - - - - - 40 - 0 - - - - Qt::NoFocus - - - 5 - - - - - - 25 - 120 - 50 - 50 - - - - - - - true - - - - - - 95 - 156 - 118 - 16 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 95 - 20 - 118 - 16 - - - - Qt::AlignHCenter|Qt::AlignTop - - - - - - 95 - 40 - 118 - 111 - - - - - - 9 - 35 - 100 - 40 - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - Qt::NoTextInteraction - - - - - - - 232 - 122 - 55 - 55 - - - - Qt::NoFocus - - - - - - 232 - 70 - 55 - 55 - - - - Qt::NoFocus - - - - - - 232 - 18 - 55 - 55 - - - - Qt::NoFocus - - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 106 - 40 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 230 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - 230 - 195 - - - - - 197 - 195 - - - - - 6 - - - 6 - - - 6 - - - 6 - - - 1 - - - 1 - - - - - Qt::NoFocus - - - 0 - - - - Log - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - Qt::NoFocus - - - Qt::ScrollBarAlwaysOff - - - - - - - - Away - - - - - - Qt::NoFocus - - - Manual Action (default) - - - true - - - - - - - Qt::NoFocus - - - Auto-Check / Auto-Fold - - - - - - - Qt::NoFocus - - - Auto-Check / Auto-Call-Any - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 199 - 199 - 199 - - - - - - - - Speed: - - - - - - - - 16 - 0 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 199 - 199 - 199 - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - - Qt::NoFocus - - - 1 - - - 11 - - - Qt::Horizontal - - - - - - - true - - - - 40 - 20 - - - - Qt::NoFocus - - - Stop - - - - - - - - - - - - @@ -1920,6 +856,19 @@ + + + + Qt::Vertical + + + + 982 + 16 + + + + @@ -2666,19 +1615,1347 @@ - + Qt::Vertical - 20 - 40 + 982 + 16 + + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 260 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 0 + + + + + + + + + 260 + 195 + + + + + 260 + 195 + + + + + 6 + + + 6 + + + 6 + + + 6 + + + 1 + + + 1 + + + + + Qt::NoFocus + + + 0 + + + + Hands + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::AlignCenter + + + + + + + + Chat + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + Qt::NoFocus + + + Qt::ScrollBarAlwaysOff + + + + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 41 + 197 + + + + + + + + true + + + + + + + 26 + + + 26 + + + 20 + + + 26 + + + 10 + + + + + + 40 + 40 + + + + + 40 + 40 + + + + true + + + Qt::AlignCenter + + + + + + + Qt::AlignCenter + + + + + + + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 16 + 20 + + + + + + + + 0 + + + 0 + + + + + + 40 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 102 + 153 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 102 + 153 + 0 + + + + + + + + + 118 + 111 + 107 + + + + + + + 255 + 255 + 255 + + + + + + + + Qt::NoFocus + + + 99999 + + + 5 + + + 99990 + + + + + + + + + + + + 102 + 153 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 40 + 100 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 40 + 100 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 40 + 100 + 0 + + + + + + + 40 + 100 + 0 + + + + + + + + Qt::NoFocus + + + 99999 + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 1 + 25 + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 16 + 20 + + + + + + + + + + 0 + + + + + + 0 + 0 + + + + + 140 + 35 + + + + + 140 + 35 + + + + Qt::NoFocus + + + + + + + + 0 + 0 + + + + + 140 + 35 + + + + + 140 + 35 + + + + Qt::NoFocus + + + + + + + + 0 + 0 + + + + + 140 + 35 + + + + + 140 + 35 + + + + Qt::NoFocus + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 140 + 0 + + + + + + + + + + + + + 118 + 111 + + + + + + 9 + 35 + 100 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + Qt::NoTextInteraction + + + + + + + + + 50 + 34 + + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + true + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 31 + 197 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 260 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 0 + + + + + + + + + 260 + 195 + + + + + 260 + 195 + + + + + 6 + + + 6 + + + 6 + + + 6 + + + 1 + + + 1 + + + + + Qt::NoFocus + + + 0 + + + + Log + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + Qt::NoFocus + + + Qt::ScrollBarAlwaysOff + + + + + + + + Away + + + + + + Qt::NoFocus + + + Manual Action (default) + + + true + + + + + + + Qt::NoFocus + + + Auto-Check / Auto-Fold + + + + + + + Qt::NoFocus + + + Auto-Check / Auto-Call-Any + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 199 + 199 + 199 + + + + + + + + Speed: + + + + + + + + 16 + 0 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 199 + 199 + 199 + + + + + + + + + + + + + + + + 0 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 40 + 100 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 40 + 100 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 40 + 100 + 0 + + + + + + + 40 + 100 + 0 + + + + + + + + Qt::NoFocus + + + 1 + + + 11 + + + Qt::Horizontal + + + + + + + true + + + + 40 + 20 + + + + Qt::NoFocus + + + Stop + + + + + + + + + + + + @@ -2850,8 +3127,40 @@ 624 - 831 - 636 + 808 + 638 + + + + + horizontalSlider_bet + valueChanged(int) + spinBox_set + setValue(int) + + + 585 + 509 + + + 579 + 479 + + + + + spinBox_set + valueChanged(int) + horizontalSlider_bet + setValue(int) + + + 621 + 479 + + + 621 + 509 diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index cb502a78..983c79c2 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -207,9 +207,10 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) userWidgetsArray[1] = pushButton_CallCheckSet; userWidgetsArray[2] = pushButton_FoldAllin; userWidgetsArray[3] = spinBox_set; + userWidgetsArray[4] = horizontalSlider_bet; //hide userWidgets - for(i=0; i<4; i++) { + for(i=0; i<5; i++) { userWidgetsArray[i]->hide(); } @@ -481,12 +482,12 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); } - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + 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.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); - pushButton_CallCheckSet->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); - pushButton_FoldAllin->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); + pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); + pushButton_CallCheckSet->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); + pushButton_FoldAllin->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); // away radiobuttons QString radioButtonString("QRadioButton { color: #F0F0F0; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }"); @@ -1147,7 +1148,7 @@ void mainWindowImpl::initGui(int speed) groupBox_LeftToolBox->setDisabled(FALSE); //show human player buttons - for(int i=0; i<3; i++) { + for(int i=0; i<5; i++) { userWidgetsArray[i]->show(); } @@ -1642,7 +1643,7 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { if((*it_c)->getMyTurn()) { //Groupbox glow wenn der Spiele dran ist. if((*it_c)->getMyID()==0) { - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow.png) }"); + groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }"); } else { groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }"); @@ -1652,9 +1653,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //Groupbox auf Hintergrundfarbe setzen wenn der Spiele nicht dran aber aktiv ist. if((*it_c)->getMyActiveStatus()) { if((*it_c)->getMyID()==0) { - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //show buttons - for(j=0; j<3; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->show(); } } @@ -1665,9 +1666,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //Groupbox verdunkeln wenn der Spiele inactive ist. else { if((*it_c)->getMyID()==0) { - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //hide buttons - for(j=0; j<4; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->hide(); } } @@ -1697,9 +1698,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //inactive case 0: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //hide buttons - for(j=0; j<4; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->hide(); } } @@ -1711,9 +1712,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active but fold case 1: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //show buttons - for(j=0; j<3; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->show(); } } @@ -1725,7 +1726,7 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active in action case 2: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }"); } else { groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }"); @@ -1735,7 +1736,7 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active not in action case 3: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); } else { groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); @@ -2095,8 +2096,12 @@ void mainWindowImpl::dealRiverCards2() { void mainWindowImpl::meInAction() { //fix buttons if escape is pressed during raise or bet - spinBox_set->hide(); - pushButton_BetRaise->show(); +// spinBox_set->hide(); +// pushButton_BetRaise->show(); + + horizontalSlider_bet->setEnabled(TRUE); + spinBox_set->setEnabled(TRUE); + myActionIsRaise = 0; myActionIsBet = 0; @@ -2201,9 +2206,13 @@ void mainWindowImpl::disableMyButtons() { //clear userWidgets spinBox_set->setMinimum(0); + horizontalSlider_bet->setMinimum(0); spinBox_set->setValue(0); - spinBox_set->hide(); - pushButton_BetRaise->show(); + horizontalSlider_bet->setValue(0); + spinBox_set->setDisabled(TRUE); + horizontalSlider_bet->setDisabled(TRUE); +// spinBox_set->hide(); +// pushButton_BetRaise->show(); pushButton_BetRaise->setText(""); pushButton_CallCheckSet->setText(""); pushButton_FoldAllin->setText(""); @@ -2290,8 +2299,8 @@ void mainWindowImpl::myCall(){ void mainWindowImpl::myBet(){ - pushButton_BetRaise->hide(); - spinBox_set->show(); +// pushButton_BetRaise->hide(); +// spinBox_set->show(); pushButton_CallCheckSet->setText("Set"); pushButton_FoldAllin->setText("All-In"); @@ -2299,8 +2308,9 @@ void mainWindowImpl::myBet(){ HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); spinBox_set->setMinimum(currentHand->getSmallBlind()*2); - + horizontalSlider_bet->setMinimum(currentHand->getSmallBlind()*2); spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); + horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); spinBox_set->setValue(spinBox_set->minimum()); spinBox_set->setFocus(); spinBox_set->selectAll(); @@ -2310,12 +2320,11 @@ void mainWindowImpl::myBet(){ void mainWindowImpl::myRaise(){ - pushButton_BetRaise->hide(); - spinBox_set->show(); +// pushButton_BetRaise->hide(); +// spinBox_set->show(); pushButton_CallCheckSet->setText("Set"); pushButton_FoldAllin->setText("All-In"); - HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); spinBox_set->setMinimum(currentHand->getCurrentBeRo()->getHighestSet() - currentHand->getSeatsList()->front()->getMySet() + currentHand->getCurrentBeRo()->getMinimumRaise()); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 625efaaa..a7679e75 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -382,7 +382,7 @@ private: QTimer *blinkingStartButtonAnimationTimer; - QWidget *userWidgetsArray[4]; + QWidget *userWidgetsArray[5]; QLabel *buttonLabelArray[MAX_NUMBER_OF_PLAYERS]; QLabel *cashLabelArray[MAX_NUMBER_OF_PLAYERS]; QLabel *cashTopLabelArray[MAX_NUMBER_OF_PLAYERS];