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/generic/serverguiwrapper.cpp
+2 -2
View File
@@ -133,9 +133,9 @@ void ServerGuiWrapper::SignalNetClientLoginShow()
if (myClientcb) myClientcb->SignalNetClientLoginShow();
}
void ServerGuiWrapper::SignalNetClientRejoinPossible(const std::string &gameName)
void ServerGuiWrapper::SignalNetClientRejoinPossible(unsigned gameId)
{
if (myClientcb) myClientcb->SignalNetClientRejoinPossible(gameName);
if (myClientcb) myClientcb->SignalNetClientRejoinPossible(gameId);
}
void ServerGuiWrapper::SignalNetClientPostRiverShowCards(unsigned playerId)
src/gui/generic/serverguiwrapper.h
+1 -1
View File
@@ -139,7 +139,7 @@ public:
void SignalNetClientServerListShow();
void SignalNetClientLoginShow();
void SignalNetClientRejoinPossible(const std::string &gameName);
void SignalNetClientRejoinPossible(unsigned gameId);
void SignalNetClientPostRiverShowCards(unsigned playerId);
void SignalNetServerSuccess(int actionID);
src/gui/qt/guiwrapper.cpp
+2 -2
View File
@@ -294,9 +294,9 @@ void GuiWrapper::SignalNetClientLoginShow()
{
myStartWindow->signalNetClientLoginShow();
}
void GuiWrapper::SignalNetClientRejoinPossible(const string &gameName)
void GuiWrapper::SignalNetClientRejoinPossible(unsigned gameId)
{
myStartWindow->signalNetClientRejoinPossible(QString::fromUtf8(gameName.c_str()));
myStartWindow->signalNetClientRejoinPossible(gameId);
}
void GuiWrapper::SignalNetClientPostRiverShowCards(unsigned playerId)
{
src/gui/qt/guiwrapper.h
+1 -1
View File
@@ -119,7 +119,7 @@ public:
void SignalNetClientServerListShow();
void SignalNetClientServerListClear();
void SignalNetClientLoginShow();
void SignalNetClientRejoinPossible(const std::string &gameName);
void SignalNetClientRejoinPossible(unsigned gameId);
void SignalNetClientPostRiverShowCards(unsigned playerId);
void SignalNetClientGameInfo(int actionID);
void SignalNetClientError(int errorID, int osErrorID);
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;
}
}
src/gui/qt/startwindow/startwindowimpl.h
+2 -2
View File
@@ -77,7 +77,7 @@ signals:
void signalNetClientServerListClear();
void signalNetClientServerListAdd(unsigned serverId);
void signalNetClientLoginShow();
void signalNetClientRejoinPossible(QString gameName);
void signalNetClientRejoinPossible(unsigned gameId);
void signalNetClientGameInfo(int actionID);
void signalNetClientError(int errorID, int osErrorID);
void signalNetClientNotification(int notificationId);
@@ -121,7 +121,7 @@ public slots:
void callJoinNetworkGameDialog();
void showLobbyDialog();
void callInternetGameLoginDialog();
void callRejoinPossibleDialog(QString);
void callRejoinPossibleDialog(unsigned);
void joinGameLobby();
void showClientDialog();
void showNetworkStartDialog();
src/net/clientcallback.h
+1 -1
View File
@@ -68,7 +68,7 @@ public:
virtual void SignalNetClientServerListShow() = 0;
virtual void SignalNetClientLoginShow() = 0;
virtual void SignalNetClientRejoinPossible(const std::string &gameName) = 0;
virtual void SignalNetClientRejoinPossible(unsigned gameId) = 0;
virtual void SignalNetClientPostRiverShowCards(unsigned playerId) = 0;
virtual void SignalLobbyPlayerJoined(unsigned playerId, const std::string &nickName) = 0;