From 82822c4814a1375e6a77e25ee99d3ef6bb7d1df8 Mon Sep 17 00:00:00 2001 From: doitux Date: Mon, 15 Jan 2007 09:07:34 +0000 Subject: [PATCH] --- src/gui/qt/mainwindow.ui | 4 ++-- src/gui/qt/mainwindowimpl.cpp | 5 +++-- src/gui/qt/mainwindowimpl.h | 3 ++- src/gui/qt/newgamedialog.ui | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 2cee13df..dd154060 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -1843,10 +1843,10 @@ - 0 + 1 - 10 + 11 5 diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp index 3bc24aaa..80bfb5b9 100755 --- a/src/gui/qt/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindowimpl.cpp @@ -193,7 +193,7 @@ void mainWindowImpl::callNewGameDialog() { label_Pot->setText("

Pot Total

"); label_Sets->setText("

Sets:

"); - gameSpeed = v->spinBox_gameSpeed->value()*10; + guiGameSpeed = v->spinBox_gameSpeed->value(); // debugMode = v->checkBox_debugMode->isChecked(); //Tools und Board aufhellen und enablen @@ -205,7 +205,7 @@ void mainWindowImpl::callNewGameDialog() { //Speeds setSpeeds(); //positioning Slider - horizontalSlider_speed->setValue(gameSpeed/10); + horizontalSlider_speed->setValue(guiGameSpeed); //Start Game!!! mySession->startGame(v->spinBox_quantityPlayers->value(), v->spinBox_startCash->value(), v->spinBox_smallBlind->value()); @@ -1256,6 +1256,7 @@ void mainWindowImpl::timerBlockerFalse() { void mainWindowImpl::setSpeeds() { + gameSpeed = (11-guiGameSpeed)*10; dealCardsSpeed = (gameSpeed/2)*10; //milliseconds postRiverRunAnimationSpeed = gameSpeed*18; winnerBlinkSpeed = gameSpeed*3; //milliseconds diff --git a/src/gui/qt/mainwindowimpl.h b/src/gui/qt/mainwindowimpl.h index e2f9a7f6..94899ea1 100755 --- a/src/gui/qt/mainwindowimpl.h +++ b/src/gui/qt/mainwindowimpl.h @@ -85,7 +85,7 @@ public: public slots: - void setGameSpeed(const int theValue) { gameSpeed = theValue*10; setSpeeds(); } // Achtung Faktor 10!!! + void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!! void callNewGameDialog() ; void callAboutPokerthDialog(); @@ -179,6 +179,7 @@ private: int distributePotAnimCounter; //Speed + int guiGameSpeed; int gameSpeed; int dealCardsSpeed; int postRiverRunAnimationSpeed; diff --git a/src/gui/qt/newgamedialog.ui b/src/gui/qt/newgamedialog.ui index 47b4be57..f9714ebf 100755 --- a/src/gui/qt/newgamedialog.ui +++ b/src/gui/qt/newgamedialog.ui @@ -104,7 +104,7 @@ - 10 + 11 1 @@ -113,7 +113,7 @@ 1 - 7 + 4