diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 2920044a..3ef5d3ab 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -3992,7 +3992,7 @@ 0 0 874 - 30 + 29 @@ -4061,8 +4061,24 @@ 616 - 717 - 614 + 716 + 627 + + + + + spinBox_set + editingFinished() + pushButton_set + click() + + + 572 + 498 + + + 533 + 501 diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp index cd3e65d3..13b81186 100755 --- a/src/gui/qt/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindowimpl.cpp @@ -1422,15 +1422,13 @@ void mainWindowImpl::postRiverRunAnimation6() { if (playersPositiveCashCounter==1) { callNewGameDialog(); + //Bei Cancel nichts machen!!! + return; } - //sonst - else { - - } + postRiverRunAnimation6Timer->start(newRoundSpeed); } - void mainWindowImpl::flipHolecardsAllIn() { int i; @@ -1466,8 +1464,6 @@ void mainWindowImpl::flipHolecardsAllIn() { } - - void mainWindowImpl::startNewHand() { if( !breakAfterActualHand){ actualGame->startHand(); diff --git a/src/gui/qt/settingsdialogimpl.cpp b/src/gui/qt/settingsdialogimpl.cpp index b34163c0..2a367e3f 100644 --- a/src/gui/qt/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialogimpl.cpp @@ -108,7 +108,7 @@ void settingsDialogImpl::setFlipsidePicFileName() { QString fileName = QFileDialog::getOpenFileName(this, tr("Select your Flipside Picture"), QDir::homePath(), - tr("Images (*.png *.xpm)")); + tr("Images (*.bmp *.png *.xpm)")); if (!fileName.isEmpty()) lineEdit_OwnFlipsideFilename->setText(fileName);