diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index db7891c7..78900e4a 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -1781,7 +1781,7 @@ void mainWindowImpl::provideMyActions(int mode) { break; case 1: { - if (currentHand->getCurrentBeRo()->getHighestSet() == 0 && pushButton_Fold->isCheckable()) { + if (currentHand->getCurrentBeRo()->getHighestSet() == 0 && pushButton_Fold->isCheckable() ) { pushButtonFoldString = "Check / Fold"; } else { pushButtonFoldString = "Fold"; } @@ -1864,6 +1864,25 @@ void mainWindowImpl::provideMyActions(int mode) { spinBox_set->setDisabled(TRUE); } + if(mode == 0) { + if( currentHand->getSeatsList()->front()->getMyAction() != PLAYER_ACTION_FOLD ) { + pushButtonBetRaiseString = "Bet"; + pushButtonCallCheckString = "Check"; + if( currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = "Fold"; } + else { pushButtonFoldString = "Check / Fold"; } + } + else { + pushButtonBetRaiseString = ""; + pushButtonCallCheckString = ""; + pushButtonFoldString = ""; + pushButton_AllIn->setDisabled(TRUE); + horizontalSlider_bet->setDisabled(TRUE); + spinBox_set->setDisabled(TRUE); + + myButtonsCheckable(FALSE); + } + } + pushButton_Fold->setText(pushButtonFoldString); pushButton_BetRaise->setText(pushButtonBetRaiseString); pushButton_CallCheck->setText(pushButtonCallCheckString); @@ -3492,6 +3511,8 @@ void mainWindowImpl::localGameModification() { //Set the playing mode to "manual" radioButton_manualAction->click(); + //clear log + textBrowser_Log->clear(); } void mainWindowImpl::networkGameModification() { @@ -3507,6 +3528,8 @@ void mainWindowImpl::networkGameModification() { //Set the playing mode to "manual" radioButton_manualAction->click(); + //clear log + textBrowser_Log->clear(); } void mainWindowImpl::mouseOverFlipCards(bool front) { diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index 483bce1b..97c49364 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -33,15 +33,24 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) this->setTabText(0, " "+this->tabText(0)+" "); this->setTabText(1, " "+this->tabText(1)+" "); + QFontMetrics tempMetrics = this->fontMetrics(); + int minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(0)+"W")); + if(minimumTabWidth < tempMetrics.width(QString("W"+this->tabText(1)+"W")); ) minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(1)+"W")); + + QString minimumTabWidthString(" min-width:"+QString::number(minimumTabWidth,10)+"px;"); + #else QString font1String("font-family: \"Nimbus Sans L\";"); int paddingTop = 0; int paddingSide = 10; + + QString minimumTabWidthString(""); + #endif QTabBar *myTabBar = this->tabBar(); - myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); + myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px; "+minimumTabWidthString+"} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); }