diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index aec97a95..0323ef11 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -2115,6 +2115,9 @@ 99999 + + 10 + Qt::Horizontal diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 55b873da..08932c50 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -2218,7 +2218,8 @@ void mainWindowImpl::disableMyButtons() { //clear userWidgets spinBox_set->setMinimum(0); horizontalSlider_bet->setMinimum(0); - spinBox_set->setValue(0); +// spinBox_set->setValue(0); + spinBox_set->clear(); horizontalSlider_bet->setValue(0); spinBox_set->setDisabled(TRUE); horizontalSlider_bet->setDisabled(TRUE); @@ -2227,6 +2228,8 @@ void mainWindowImpl::disableMyButtons() { pushButton_BetRaise->setText(""); pushButton_CallCheckSet->setText(""); pushButton_FoldAllin->setText(""); + + } void mainWindowImpl::myBetRaise() { @@ -2342,8 +2345,10 @@ void mainWindowImpl::myBet(){ 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(); + if(lineEdit_ChatInput->text() == "") { + spinBox_set->setFocus(); + spinBox_set->selectAll(); + } myActionIsBet = 1; } @@ -2357,9 +2362,11 @@ void mainWindowImpl::myRaise(){ 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(); - + if(lineEdit_ChatInput->text() == "") { + spinBox_set->setFocus(); + spinBox_set->selectAll(); + } + myActionIsRaise = 1; } diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp index 737ea687..b991e01c 100644 --- a/src/gui/qt/mainwindow/mylefttabwidget.cpp +++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp @@ -27,15 +27,17 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent) #ifdef _WIN32 QString font1String("font-family: \"Arial\";"); - int padding = 1; + int paddingTop = 1; + int paddingSide = 3; #else QString font1String("font-family: \"Nimbus Sans L\";"); - int padding = 0; + int paddingTop = 0; + int paddingSide = 0; #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; min-width: 8ex; padding: "+QString::number(padding,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } 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; min-width: 8ex; 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; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } 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; }"); } diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index 2a1b5cc3..e8c28382 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -27,15 +27,17 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) #ifdef _WIN32 QString font1String("font-family: \"Arial\";"); - int padding = 1; + int paddingTop = 1; + int paddingSide = 3; #else QString font1String("font-family: \"Nimbus Sans L\";"); - int padding = 0; + int paddingTop = 0; + int paddingSide = 0; #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; min-width: 8ex; padding: "+QString::number(padding,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } 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; min-width: 8ex; 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; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } 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; }"); }