diff --git a/pokerth_game.pro b/pokerth_game.pro index 30b1ddda..1ff0ceb6 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -7,8 +7,8 @@ isEmpty( PREFIX ) { TEMPLATE = app CODECFORSRC = UTF-8 -CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release -#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug +#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release +CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug #####Uncomment this for RELEASE #QTPLUGIN += qjpeg qgif diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 90bf2204..da27e72c 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -3,8 +3,8 @@ TEMPLATE = lib CODECFORSRC = UTF-8 -CONFIG += staticlib thread exceptions rtti stl warn_on release -#CONFIG += staticlib thread exceptions rtti stl warn_on debug +#CONFIG += staticlib thread exceptions rtti stl warn_on release +CONFIG += staticlib thread exceptions rtti stl warn_on debug UI_DIR = uics TARGET = lib/pokerth_lib diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 1eb1afd5..27144b80 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -208,6 +208,7 @@ void gameLobbyDialogImpl::refresh(int actionID) { { treeWidget_GameList->clear(); this->accept(); + myW->show(); // TODO doitux: hier gametable holen } } diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index f5c41791..806d7d89 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -123,6 +123,11 @@ void GuiWrapper::logPlayerWinGame(std::string playerName, int gameID) { myLog->s void GuiWrapper::flushLogAtGame(int gameID) { myLog->signalFlushLogAtGame(gameID); } void GuiWrapper::flushLogAtHand() { myLog->signalFlushLogAtHand(); } +void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr game) { myW->signalNetClientGameStart(game); } + + + + ////////// this is for startwindow //////////////////// @@ -161,7 +166,7 @@ void GuiWrapper::SignalNetClientGameListUpdateAdmin(unsigned gameId, unsigned ad void GuiWrapper::SignalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId) { myStartWindow->signalNetClientGameListPlayerJoined(gameId, playerId); } void GuiWrapper::SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId) { myStartWindow->signalNetClientGameListPlayerLeft(gameId, playerId); } -void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr game) { myStartWindow->signalNetClientGameStart(game); } + void GuiWrapper::SignalNetClientWaitDialog() { myStartWindow->signalShowClientDialog(); } void GuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { myW->signalNetClientChatMsg(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); } void GuiWrapper::SignalNetServerSuccess(int /*actionID*/) { } diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index 3819cfdc..9e7724a0 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -234,3 +234,9 @@ bool startNetworkGameDialogImpl::eventFilter(QObject *obj, QEvent *event) void startNetworkGameDialogImpl::receiveChatMsg(QString playerName, QString message) { myChat->receiveMessage(playerName, message); } + +void startNetworkGameDialogImpl::accept() +{ + myW->show(); + QDialog::accept(); +} diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h index f4fd9fba..10c63f94 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h @@ -46,6 +46,7 @@ public slots: void startGame(); void cancel(); void refresh(int actionID); + void accept(); void joinedNetworkGame(unsigned playerId, QString playerName, int rights); void addConnectedPlayer(unsigned playerId, QString playerName, int rights); void updatePlayer(unsigned playerId, QString newPlayerName);