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

invite-only too early timeout-animation bugfix

Browse Source
This commit is contained in:
doitux
2010-10-08 20:30:52 +00:00
parent 2503fb03fe
commit a54f46365c
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+14 -10
View File
@@ -861,16 +861,16 @@ void gameLobbyDialogImpl::joinedNetworkGame(unsigned playerId, QString playerNam
showInfoMsgBoxTimer->start(1000); showInfoMsgBoxTimer->start(1000);
} }
// if(!myGameListSelectionModel->hasSelection() && mySession->getClientGameInfo(mySession->getClientCurrentGameId()).data.gameType == GAME_TYPE_INVITE_ONLY) { // if(!myGameListSelectionModel->hasSelection() && mySession->getClientGameInfo(mySession->getClientCurrentGameId()).data.gameType == GAME_TYPE_INVITE_ONLY) {
// int it = 0; // int it = 0;
// while (myGameListModel->item(it)) { // while (myGameListModel->item(it)) {
// if (myGameListModel->item(it, 0)->data(Qt::UserRole) == mySession->getClientCurrentGameId()) { // if (myGameListModel->item(it, 0)->data(Qt::UserRole) == mySession->getClientCurrentGameId()) {
// gameSelected(treeView_GameList->model()->index(it,0), true); // gameSelected(treeView_GameList->model()->index(it,0), true);
// break; // break;
// } // }
// it++; // it++;
// } // }
// } // }
} }
@@ -1090,6 +1090,10 @@ void gameLobbyDialogImpl::joinedGameDialogUpdate() {
label_StartCash->setText(QString("%L1").arg(info.data.startMoney)); label_StartCash->setText(QString("%L1").arg(info.data.startMoney));
updateDialogBlinds(info.data); updateDialogBlinds(info.data);
label_TimeoutForPlayerAction->setText(QString::number(info.data.playerActionTimeoutSec)); label_TimeoutForPlayerAction->setText(QString::number(info.data.playerActionTimeoutSec));
QTreeWidgetItem *header = treeWidget_connectedPlayers->headerItem();
header->setText(0, tr("Connected players - Max. %1").arg(info.data.maxNumberOfPlayers));
header->setData(0, Qt::UserRole, info.data.maxNumberOfPlayers);
} }
void gameLobbyDialogImpl::leftGameDialogUpdate() { void gameLobbyDialogImpl::leftGameDialogUpdate() {
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+2 -2
View File
@@ -39,13 +39,13 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
#endif #endif
setupUi(this); setupUi(this);
//temporarely remove sql log features if(!SQLITE_LOG) {//temporarely remove sql log features
pushButton_deleteLog->hide(); pushButton_deleteLog->hide();
pushButton_saveLogAs->hide(); pushButton_saveLogAs->hide();
pushButton_exportLogTxt->hide(); pushButton_exportLogTxt->hide();
pushButton_exportLogHtml->hide(); pushButton_exportLogHtml->hide();
treeWidget_logFiles->hide(); treeWidget_logFiles->hide();
//////////////////////////////////// }
myManualBlindsOrderDialog = new manualBlindsOrderDialogImpl; myManualBlindsOrderDialog = new manualBlindsOrderDialogImpl;