diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 58edfce7..1f796270 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -2460,7 +2460,7 @@ - show + Show! diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 40387dfd..4b8ff8d6 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -2645,9 +2645,11 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) { pushButton_Fold->click(); } } - if (event->key() == Qt::Key_F5) { radioButton_manualAction->click(); } - if (event->key() == Qt::Key_F6) { radioButton_autoCheckFold->click(); } - if (event->key() == Qt::Key_F7) { radioButton_autoCheckCallAny->click(); } + if (event->key() == Qt::Key_F5) { pushButton_showMyCards->click(); } + + if (event->key() == Qt::Key_F6) { radioButton_manualAction->click(); } + if (event->key() == Qt::Key_F7) { radioButton_autoCheckFold->click(); } + if (event->key() == Qt::Key_F8) { radioButton_autoCheckCallAny->click(); } if (event->key() == Qt::Key_Shift) { if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_LOCAL) { pushButton_break->click(); @@ -3261,6 +3263,7 @@ void gameTableImpl::refreshCardsChance(GameState bero) void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear) { if(clear) { + pushButton_showMyCards->setFKeyText(""); pushButton_AllIn->setFKeyText(""); pushButton_BetRaise->setFKeyText(""); pushButton_CallCheck->setFKeyText(""); @@ -3279,6 +3282,7 @@ void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear) if(!pushButton_CallCheck->text().isEmpty()) pushButton_CallCheck->setFKeyText("F3"); if(!pushButton_Fold->text().isEmpty()) pushButton_Fold->setFKeyText("F4"); } + if(!pushButton_showMyCards->text().isEmpty()) pushButton_showMyCards->setFKeyText("F5"); } } @@ -3453,5 +3457,8 @@ void gameTableImpl::showShowMyCardsButton() void gameTableImpl::sendShowMyCardsSignal() { - pushButton_showMyCards->hide(); + if(pushButton_showMyCards->isVisible()) { + qDebug() << "show!"; + pushButton_showMyCards->hide(); + } } diff --git a/src/gui/qt/gametable/myactionbutton.cpp b/src/gui/qt/gametable/myactionbutton.cpp index 90b5cb7c..16a601d3 100644 --- a/src/gui/qt/gametable/myactionbutton.cpp +++ b/src/gui/qt/gametable/myactionbutton.cpp @@ -15,7 +15,7 @@ using namespace std; MyActionButton::MyActionButton(QGroupBox* parent) - : QPushButton(parent) + : QPushButton(parent) { } @@ -27,18 +27,21 @@ MyActionButton::~MyActionButton() void MyActionButton::paintEvent(QPaintEvent * event) { - QPushButton::paintEvent(event); + QPushButton::paintEvent(event); - QPainter painter(this); - painter.setPen(QColor("#"+myStyle->getFKeyIndicatorColor())); - painter.setOpacity(0.5); - QFont f= painter.font(); - f.setPixelSize(9); - painter.setFont(f); - if(objectName()==("pushButton_AllIn")) { - painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText); - } - else { - painter.drawText(8,15,15,15,Qt::AlignLeft,fKeyText); - } + QPainter painter(this); + painter.setPen(QColor("#"+myStyle->getFKeyIndicatorColor())); + painter.setOpacity(0.5); + QFont f= painter.font(); + f.setPixelSize(9); + painter.setFont(f); + if(objectName()==("pushButton_AllIn")) { + painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText); + } + else if(objectName()==("pushButton_showMyCards")){ + painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText); + } + else { + painter.drawText(8,15,15,15,Qt::AlignLeft,fKeyText); + } }