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

rejoin dialog with gameId instead of gameName string

Browse Source
This commit is contained in:
doitux
2011-08-08 19:50:28 +00:00
parent ade189fdc5
commit a23ccb10f1
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/startwindow/startwindowimpl.cpp
+7 -4
View File
@@ -114,7 +114,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
connect(this, SIGNAL(signalNetClientServerListAdd(unsigned)), myServerListDialog, SLOT(addServerItem(unsigned)));
connect(this, SIGNAL(signalNetClientLoginShow()), this, SLOT(callInternetGameLoginDialog()));
connect(this, SIGNAL(signalNetClientRejoinPossible(QString)), this, SLOT(callRejoinPossibleDialog(QString)));
connect(this, SIGNAL(signalNetClientRejoinPossible(unsigned)), this, SLOT(callRejoinPossibleDialog(unsigned)));
connect(this, SIGNAL(signalNetClientSelfJoined(unsigned, QString, bool)), myStartNetworkGameDialog, SLOT(joinedNetworkGame(unsigned, QString, bool)));
connect(this, SIGNAL(signalNetClientPlayerJoined(unsigned, QString, bool)), myStartNetworkGameDialog, SLOT(addConnectedPlayer(unsigned, QString, bool)));
@@ -370,12 +370,15 @@ void startWindowImpl::callInternetGameLoginDialog()
}
void startWindowImpl::callRejoinPossibleDialog(QString gameName)
void startWindowImpl::callRejoinPossibleDialog(unsigned gameId)
{
// assert(mySession);
// GameInfo info(mySession->getClientGameInfo(gameId));
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Question);
msgBox.setWindowTitle("Rejoin possible!");
msgBox.setText(QString("There is an existing session with the game: %1").arg(gameName));
msgBox.setText(QString("There is an existing session with the game: %1").arg("QString::fromUtf8(info.name.c_str())"));
msgBox.setInformativeText("Do you want to rejoin this game?");
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
@@ -384,7 +387,7 @@ void startWindowImpl::callRejoinPossibleDialog(QString gameName)
switch (ret) {
case QMessageBox::Yes:; //rejoin
break;
case QMessageBox::No:; //lobby
case QMessageBox::No: showClientDialog();
break;
}
}