sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qslider (no allin possible) bugfix, fadeout android bugfix, gui tweaks

Browse Source 
for android
This commit is contained in:
doitux
2012-05-22 00:48:35 +02:00
parent 93aaabdef3
commit 4bb22ff89c
14 changed files with 920 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+20 -4
View File
@@ -46,7 +46,9 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
//wait start game message
waitStartGameMsgBox = new MyMessageBox(this);
waitStartGameMsgBox->setText(tr("Starting game. Please wait ..."));
waitStartGameMsgBox->setWindowModality(Qt::NonModal);
#ifndef ANDROID
waitRejoinStartGameMsgBox->setWindowModality(Qt::NonModal);
#endif
#ifdef __APPLE__
waitStartGameMsgBox->setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
#endif
@@ -55,7 +57,9 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
//wait start game message for rejoin
waitRejoinStartGameMsgBox = new MyMessageBox(this);
waitRejoinStartGameMsgBox->setText(tr("Waiting for the start of the next hand to rejoin the game ..."));
waitRejoinStartGameMsgBox->setWindowModality(Qt::NonModal);
#ifndef ANDROID
waitRejoinStartGameMsgBox->setWindowModality(Qt::NonModal);
#endif
#ifdef __APPLE__
waitRejoinStartGameMsgBox->setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
#endif
@@ -1712,7 +1716,13 @@ void gameLobbyDialogImpl::showAutoStartTimer()
autoStartTimerOverlay->setGeometry(((scrollArea_gameInfos->geometry().width()-190)/2), ((scrollArea_gameInfos->geometry().height()-50)/2), 190, 50);
QString string(tr("The game will start in<br><b>%1</b> seconds.").arg(6));
autoStartTimerOverlay->setText("<span style='color:#008B00; font-size:10px;'>"+string+"</span>");
QString fontsize;
#ifdef ANDROID
fontsize="16px";
#else
fontsize="10px";
#endif
autoStartTimerOverlay->setText("<span style='color:#008B00; font-size:"+fontsize+";'>"+string+"</span>");
autoStartTimerCounter = 6;
autoStartTimer->start(1000);
@@ -1723,7 +1733,13 @@ void gameLobbyDialogImpl::updateAutoStartTimer()
--autoStartTimerCounter;
if(autoStartTimerCounter) {
QString string(tr("The game will start in<br><b>%1</b> seconds.").arg(autoStartTimerCounter));
autoStartTimerOverlay->setText("<span style='color:#008B00; font-size:10px;'>"+string+"</span>");
QString fontsize;
#ifdef ANDROID
fontsize="16px";
#else
fontsize="10px";
#endif
autoStartTimerOverlay->setText("<span style='color:#008B00; font-size:"+fontsize+";'>"+string+"</span>");
} else {
autoStartTimer->stop();
autoStartTimerOverlay->hide();