diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index e252c10f..3befd6f7 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -2054,6 +2054,9 @@ Qt::NoFocus + + true + Qt::ScrollBarAlwaysOff @@ -2840,6 +2843,9 @@ Qt::NoFocus + + true + Qt::ScrollBarAlwaysOff diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 663b0ff8..5fed0d00 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -1907,7 +1907,7 @@ void mainWindowImpl::provideMyActions(int mode) { //if value changed on bet/raise button --> uncheck to prevent unwanted actions QString lastBetValueString = lastPushButtonBetRaiseString.section(" ",1 ,1); int index = lastBetValueString.indexOf("$"); - lastBetValueString.remove(index,index); + lastBetValueString.remove(index,1); bool ok; int lastBetValue = lastBetValueString.toInt(&ok,10); @@ -2074,9 +2074,10 @@ int mainWindowImpl::getBetRaisePushButtonValue() { QString betValueString = pushButton_BetRaise->text().section(" ",1 ,1); int index = betValueString.indexOf("$"); - betValueString.remove(index,index); + betValueString.remove(index,1); bool ok; int betValue = betValueString.toInt(&ok,10); + return betValue; } diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp index df722df9..409b3b96 100644 --- a/src/gui/qt/mainwindow/mylefttabwidget.cpp +++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp @@ -30,10 +30,17 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent) int paddingTop = 1; int paddingSide = 7; #else - QString font1String("font-family: \"Nimbus Sans L\";"); - int paddingTop = 0; - int paddingSide = 9; + #ifdef __APPLE__ + QString font1String("font-family: \"Lucida Grande\";"); + int paddingTop = 1; + int paddingSide = 9; + #else + QString font1String("font-family: \"Nimbus Sans L\";"); + int paddingTop = 0; + int paddingSide = 9; + #endif #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; }"); diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index 0c7dcd6e..d807969d 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -31,10 +31,17 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) int paddingTop = 1; int paddingSide = 7; #else - QString font1String("font-family: \"Nimbus Sans L\";"); - int paddingTop = 0; - int paddingSide = 9; + #ifdef __APPLE__ + QString font1String("font-family: \"Lucida Grande\";"); + int paddingTop = 1; + int paddingSide = 9; + #else + QString font1String("font-family: \"Nimbus Sans L\";"); + int paddingTop = 0; + int paddingSide = 9; + #endif #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; }");