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

some specatator list fixes - debug output removed

Browse Source
This commit is contained in:
doitux
2013-09-09 10:36:27 +02:00
parent b0e4018883
commit f8a2718e97
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+13 -9
View File
@@ -565,6 +565,15 @@ void gameLobbyDialogImpl::gameSelected(const QModelIndex &index)
++i; ++i;
} }
treeWidget_connectedSpectators->clear();
PlayerIdList::const_iterator s = info.spectators.begin();
PlayerIdList::const_iterator s_end = info.spectators.end();
while (s != s_end) {
PlayerInfo playerInfo(mySession->getClientPlayerInfo(*s));
addConnectedSpectator(*s, QString::fromUtf8(playerInfo.playerName.c_str()));
++s;
}
#ifdef __APPLE__ #ifdef __APPLE__
// Dirty workaround for a Qt redraw bug on Mac OS. // Dirty workaround for a Qt redraw bug on Mac OS.
treeWidget_connectedPlayers->setFocus(); treeWidget_connectedPlayers->setFocus();
@@ -792,7 +801,7 @@ void gameLobbyDialogImpl::gameAddPlayer(unsigned gameId, unsigned playerId)
void gameLobbyDialogImpl::gameAddSpectator(unsigned, unsigned) void gameLobbyDialogImpl::gameAddSpectator(unsigned, unsigned)
{ {
qDebug("jojo GameADDSpecator");
} }
void gameLobbyDialogImpl::gameRemovePlayer(unsigned gameId, unsigned playerId) void gameLobbyDialogImpl::gameRemovePlayer(unsigned gameId, unsigned playerId)
@@ -833,7 +842,7 @@ void gameLobbyDialogImpl::gameRemovePlayer(unsigned gameId, unsigned playerId)
void gameLobbyDialogImpl::gameRemoveSpectator(unsigned, unsigned) void gameLobbyDialogImpl::gameRemoveSpectator(unsigned, unsigned)
{ {
qDebug("jojo GameRemoveSpecator");
} }
void gameLobbyDialogImpl::updateStats(ServerStats /*stats*/) void gameLobbyDialogImpl::updateStats(ServerStats /*stats*/)
@@ -863,6 +872,7 @@ void gameLobbyDialogImpl::clearDialog()
myGameListSortFilterProxyModel->clear(); myGameListSortFilterProxyModel->clear();
treeView_GameList->show(); treeView_GameList->show();
treeWidget_connectedPlayers->clear(); treeWidget_connectedPlayers->clear();
treeWidget_connectedSpectators->clear();
pushButton_Leave->hide(); pushButton_Leave->hide();
pushButton_Kick->hide(); pushButton_Kick->hide();
@@ -987,12 +997,9 @@ void gameLobbyDialogImpl::blinkingStartButtonAnimation()
void gameLobbyDialogImpl::joinedNetworkGame(unsigned playerId, QString playerName, bool isGameAdmin) void gameLobbyDialogImpl::joinedNetworkGame(unsigned playerId, QString playerName, bool isGameAdmin)
{ {
// Update dialog // Update dialog
inGame = true; inGame = true;
joinedGameDialogUpdate(); joinedGameDialogUpdate();
myPlayerId = playerId; myPlayerId = playerId;
isGameAdministrator = isGameAdmin; isGameAdministrator = isGameAdmin;
addConnectedPlayer(playerId, playerName, isGameAdmin); addConnectedPlayer(playerId, playerName, isGameAdmin);
@@ -1043,7 +1050,6 @@ void gameLobbyDialogImpl::addConnectedPlayer(unsigned playerId, QString playerNa
void gameLobbyDialogImpl::addConnectedSpectator(unsigned spectatorId, QString spectatorName) { void gameLobbyDialogImpl::addConnectedSpectator(unsigned spectatorId, QString spectatorName) {
qDebug("JOJO add spect");
QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_connectedSpectators, 0); QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_connectedSpectators, 0);
item->setData(0, Qt::UserRole, spectatorId); item->setData(0, Qt::UserRole, spectatorId);
item->setData(0, Qt::DisplayRole, spectatorName); item->setData(0, Qt::DisplayRole, spectatorName);
@@ -1107,7 +1113,6 @@ void gameLobbyDialogImpl::updatePlayer(unsigned playerId, QString newPlayerName)
void gameLobbyDialogImpl::removePlayer(unsigned playerId, QString) void gameLobbyDialogImpl::removePlayer(unsigned playerId, QString)
{ {
qDebug("JOJO remove player");
QTreeWidgetItemIterator it(treeWidget_connectedPlayers); QTreeWidgetItemIterator it(treeWidget_connectedPlayers);
while (*it) { while (*it) {
if ((*it)->data(0, Qt::UserRole) == playerId) { if ((*it)->data(0, Qt::UserRole) == playerId) {
@@ -1122,7 +1127,6 @@ void gameLobbyDialogImpl::removePlayer(unsigned playerId, QString)
void gameLobbyDialogImpl::removeSpectator(unsigned spectatorId, QString) void gameLobbyDialogImpl::removeSpectator(unsigned spectatorId, QString)
{ {
qDebug("JOJO remove spect");
QTreeWidgetItemIterator it(treeWidget_connectedSpectators); QTreeWidgetItemIterator it(treeWidget_connectedSpectators);
while (*it) { while (*it) {
if ((*it)->data(0, Qt::UserRole) == spectatorId) { if ((*it)->data(0, Qt::UserRole) == spectatorId) {
@@ -1267,7 +1271,6 @@ 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_GameTiming->setText(QString::number(info.data.playerActionTimeoutSec)+" "+tr("sec (action)")+"\n"+QString::number(info.data.delayBetweenHandsSec)+" "+tr("sec (hand delay)")); label_GameTiming->setText(QString::number(info.data.playerActionTimeoutSec)+" "+tr("sec (action)")+"\n"+QString::number(info.data.delayBetweenHandsSec)+" "+tr("sec (hand delay)"));
} }
void gameLobbyDialogImpl::leftGameDialogUpdate() void gameLobbyDialogImpl::leftGameDialogUpdate()
@@ -1291,6 +1294,7 @@ void gameLobbyDialogImpl::leftGameDialogUpdate()
label_GameTiming->setText(""); label_GameTiming->setText("");
treeWidget_connectedPlayers->clear(); treeWidget_connectedPlayers->clear();
treeWidget_connectedSpectators->clear();
pushButton_StartGame->hide(); pushButton_StartGame->hide();
pushButton_Leave->hide(); pushButton_Leave->hide();
pushButton_Kick->hide(); pushButton_Kick->hide();