From a52de5f9674650ffdbd4dab8c011b1720a750a07 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 19 Sep 2008 19:37:12 +0000 Subject: [PATCH] --- .../gamelobbydialog/gamelobbydialogimpl.cpp | 66 ------------------- src/gui/qt/gametable/gametableimpl.cpp | 4 +- .../startnetworkgamedialogimpl.cpp | 11 +++- .../startnetworkgamedialogimpl.h | 5 +- src/gui/qt/startwindow/startwindowimpl.cpp | 2 +- 5 files changed, 16 insertions(+), 72 deletions(-) diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 4b4235ce..430beceb 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -457,72 +457,6 @@ void gameLobbyDialogImpl::clearDialog() label_openGamesCounter->setText("| "+tr("running games: %1").arg(0)); label_runningGamesCounter->setText("| "+tr("open games: %1").arg(0)); - -// QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_GameList, 0); -// item->setData(0, Qt::DisplayRole, "43324434"); -// item->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item->setData(2, Qt::DisplayRole, "33223"); -// -// QTreeWidgetItem *item1 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item1->setData(0, Qt::DisplayRole, "43324434"); -// item1->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item1->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item2 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item2->setData(0, Qt::DisplayRole, "43324434"); -// item2->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item2->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item3 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item3->setData(0, Qt::DisplayRole, "43324434"); -// item3->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item3->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item4 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item4->setData(0, Qt::DisplayRole, "43324434"); -// item4->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item4->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item5 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item5->setData(0, Qt::DisplayRole, "43324434"); -// item5->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item5->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item6 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item6->setData(0, Qt::DisplayRole, "43324434"); -// item6->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item6->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item7 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item7->setData(0, Qt::DisplayRole, "43324434"); -// item7->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item7->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item8 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item8->setData(0, Qt::DisplayRole, "43324434"); -// item8->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item8->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item9 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item9->setData(0, Qt::DisplayRole, "43324434"); -// item9->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item9->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item10 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item10->setData(0, Qt::DisplayRole, "43324434"); -// item10->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item10->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item11 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item11->setData(0, Qt::DisplayRole, "43324434"); -// item11->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item11->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item12 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item12->setData(0, Qt::DisplayRole, "43324434"); -// item12->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item12->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item13 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item13->setData(0, Qt::DisplayRole, "43324434"); -// item13->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item13->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item14 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item14->setData(0, Qt::DisplayRole, "43324434"); -// item14->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item14->setData(2, Qt::DisplayRole, "33223"); -// QTreeWidgetItem *item15 = new QTreeWidgetItem(treeWidget_GameList, 0); -// item15->setData(0, Qt::DisplayRole, "43324434"); -// item15->setData(1, Qt::DisplayRole, "sfdsfsdfsd"); -// item15->setData(2, Qt::DisplayRole, "33223"); } void gameLobbyDialogImpl::checkPlayerQuantity() { diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index bf70ef40..541afa57 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -2942,15 +2942,15 @@ void gameTableImpl::closeGameTable() { mySession->terminateNetworkClient(); stopTimer(); if (myServerGuiInterface.get()) myServerGuiInterface->getSession().terminateNetworkServer(); - this->hide(); myStartWindow->show(); + this->hide(); } } else { mySession->terminateNetworkClient(); stopTimer(); - this->hide(); myStartWindow->show(); + this->hide(); } } diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index 9e7724a0..dcf9ca5a 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -18,13 +18,14 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "startnetworkgamedialogimpl.h" +#include "startwindowimpl.h" #include "session.h" #include "configfile.h" #include "chattools.h" #include -startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFile *config) - : QDialog(parent), myW(NULL), keyUpDownChatCounter(0), myPlayerId(0), isAdmin(false), myConfig(config), mySession(NULL), myChat(NULL) +startNetworkGameDialogImpl::startNetworkGameDialogImpl(startWindowImpl *parent, ConfigFile *config) + : QDialog(parent), myW(NULL), myStartWindow(parent), keyUpDownChatCounter(0), myPlayerId(0), isAdmin(false), myConfig(config), mySession(NULL), myChat(NULL) { #ifdef __APPLE__ setWindowModality(Qt::ApplicationModal); @@ -240,3 +241,9 @@ void startNetworkGameDialogImpl::accept() myW->show(); QDialog::accept(); } + +void startNetworkGameDialogImpl::reject() +{ + myStartWindow->show(); + QDialog::reject(); +} diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h index 10c63f94..5c5824d4 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h @@ -30,11 +30,12 @@ class Session; class ConfigFile; class ChatTools; +class startWindowImpl; class startNetworkGameDialogImpl: public QDialog, public Ui::startNetworkGameDialog { Q_OBJECT public: - startNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *config = 0); + startNetworkGameDialogImpl(startWindowImpl *parent = 0, ConfigFile *config = 0); void setSession(Session *session); @@ -47,6 +48,7 @@ public slots: void cancel(); void refresh(int actionID); void accept(); + void reject(); void joinedNetworkGame(unsigned playerId, QString playerName, int rights); void addConnectedPlayer(unsigned playerId, QString playerName, int rights); void updatePlayer(unsigned playerId, QString newPlayerName); @@ -74,6 +76,7 @@ public slots: private: gameTableImpl* myW; + startWindowImpl* myStartWindow; int maxPlayerNumber; int keyUpDownChatCounter; unsigned myPlayerId; diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 082daf17..3fdfd07f 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -874,4 +874,4 @@ QStringList startWindowImpl::getPlayerNicksList() { } return list; -} \ No newline at end of file +}