diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index 5c5ae4c6..8ff557e5 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -44,6 +44,8 @@ createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, Conf #endif setupUi(this); this->installEventFilter(this); + spinBox_netDelayBetweenHands->installEventFilter(this); + spinBox_netTimeOutPlayerAction->installEventFilter(this); comboBox_gameType->setItemData(0, GAME_TYPE_NORMAL, Qt::UserRole); comboBox_gameType->setItemData(1, GAME_TYPE_REGISTERED_ONLY, Qt::UserRole); @@ -119,12 +121,11 @@ void createInternetGameDialogImpl::fillFormular(bool guestMode, QString playerNa void createInternetGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { - - +#ifndef ANDROID if (event->key() == 16777220) { pushButton_createGame->click(); //ENTER } - +#endif } void createInternetGameDialogImpl::clearGamePassword(bool clear) @@ -253,6 +254,7 @@ bool createInternetGameDialogImpl::eventFilter(QObject *obj, QEvent *event) //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { + if(spinBox_startCash->hasFocus()) { spinBox_startCash->clearFocus(); } @@ -271,8 +273,10 @@ bool createInternetGameDialogImpl::eventFilter(QObject *obj, QEvent *event) if(lineEdit_Password->hasFocus()) { lineEdit_Password->clearFocus(); } + event->ignore(); return false; + } else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) { this->reject(); return true; diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp index 566aba2d..11f72ae0 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -122,11 +122,11 @@ void createNetworkGameDialogImpl::showDialog() void createNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { - - +#ifndef ANDROID if (event->key() == 16777220) { pushButton_createGame->click(); //ENTER } +#endif } diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index 03de4c92..7aa05a8c 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -308,10 +308,11 @@ void joinNetworkGameDialogImpl::deleteServerProfile() void joinNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { -// std::cout << "key" << event->key(); +#ifndef ANDROID if (event->key() == 16777220) { pushButton_connect->click(); //ENTER } +#endif } void joinNetworkGameDialogImpl::checkIp()