diff --git a/pokerth_game.pro b/pokerth_game.pro index 3e6c5566..b3ec2aff 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -33,7 +33,8 @@ INCLUDEPATH += . \ src/gui/qt/settingsdialog \ src/gui/qt/settingsdialog/selectavatardialog \ src/gui/qt/startnetworkgamedialog \ - src/gui/qt/changehumanplayernamedialog + src/gui/qt/changehumanplayernamedialog \ + src/gui/qt/gamelobbydialog DEPENDPATH += . \ src \ @@ -63,7 +64,8 @@ DEPENDPATH += . \ src/gui/qt/settingsdialog \ src/gui/qt/settingsdialog/selectavatardialog \ src/gui/qt/startnetworkgamedialog \ - src/gui/qt/changehumanplayernamedialog + src/gui/qt/changehumanplayernamedialog \ + src/gui/qt/gamelobbydialog # Input HEADERS += \ @@ -136,6 +138,7 @@ HEADERS += \ src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \ src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.h \ + src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h \ src/gui/qttoolsinterface.h \ src/gui/qt/qttools/qttoolswrapper.h \ src/gui/qt/qttools/qthelper/qthelper.h \ @@ -151,7 +154,8 @@ FORMS += \ src/gui/qt/settingsdialog.ui \ src/gui/qt/selectavatardialog.ui \ src/gui/qt/startnetworkgamedialog.ui \ - src/gui/qt/changehumanplayernamedialog.ui + src/gui/qt/changehumanplayernamedialog.ui \ + src/gui/qt/gamelobbydialog.ui SOURCES += \ src/pokerth.cpp \ @@ -177,7 +181,8 @@ SOURCES += \ src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp \ src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \ - src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp + src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \ + src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp RESOURCES += src/gui/qt/resources.qrc diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui new file mode 100644 index 00000000..3c60c44f --- /dev/null +++ b/src/gui/qt/gamelobbydialog.ui @@ -0,0 +1,129 @@ + + gameLobbyDialog + + + + 0 + 0 + 476 + 470 + + + + Game Lobby + + + + 9 + + + 6 + + + + + + Game + + + + + + + + Qt::Horizontal + + + + + + + Lobby-Chat + + + + 7 + + + 0 + + + + + + + + + + + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 181 + 20 + + + + + + + + Create Game + + + + + + + Join Game + + + + + + + Cancel + + + + + + + + + treeWidget_GameList + pushButton_CreateGame + pushButton_Cancel + + + + + pushButton_Cancel + clicked() + gameLobbyDialog + reject() + + + 465 + 213 + + + 276 + 163 + + + + + diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp new file mode 100644 index 00000000..054e1818 --- /dev/null +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -0,0 +1,32 @@ +// +// C++ Implementation: gamelobbydialogimpl +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "gamelobbydialogimpl.h" + +gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) + : QDialog(parent), myConfig(c) +{ + setupUi(this); + +} + +void gameLobbyDialogImpl::exec() +{ + + QDialog::exec(); +} + + +gameLobbyDialogImpl::~gameLobbyDialogImpl() +{ +} + + diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h new file mode 100644 index 00000000..a75147cb --- /dev/null +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h @@ -0,0 +1,41 @@ +// +// C++ Interface: gamelobbydialogimpl +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#ifndef GAMELOBBYDIALOGIMPL_H +#define GAMELOBBYDIALOGIMPL_H + +#include +#include "configfile.h" + +#include +#include + +/** + @author FThauer FHammer +*/ +class gameLobbyDialogImpl: public QDialog, public Ui::gameLobbyDialog { +Q_OBJECT +public: + gameLobbyDialogImpl(QWidget *parent = 0, ConfigFile* = 0); + + ~gameLobbyDialogImpl(); + + void exec(); + +public slots: + +private: + + ConfigFile *myConfig; + +}; + +#endif diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index be68024a..f8dd2801 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -6084,9 +6084,16 @@ Game + + + Network Game + + + + - - + + @@ -6175,6 +6182,11 @@ Ctrl+L + + + Internet Game ... + + diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index ee9f177f..c2dae6c3 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -28,6 +28,7 @@ #include "createnetworkgamedialogimpl.h" #include "startnetworkgamedialogimpl.h" #include "changehumanplayernamedialogimpl.h" +#include "gamelobbydialogimpl.h" #include "startsplash.h" #include "mycardspixmaplabel.h" @@ -528,7 +529,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) myStartNetworkGameDialog = new startNetworkGameDialogImpl(this, myConfig); myCreateNetworkGameDialog = new createNetworkGameDialogImpl(this, myConfig); myAboutPokerthDialog = new aboutPokerthImpl(this); - + myGameLobbyDialog = new gameLobbyDialogImpl(this, myConfig); + myStartNetworkGameDialog->setMyW(this); // //ShortCuts @@ -578,6 +580,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) connect( actionSettings, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) ); connect( actionJoin_network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) ); connect( actionCreate_network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) ); + connect( actionInternet_Game, SIGNAL( triggered() ), this, SLOT( callGameLobbyDialog() ) ); connect( actionQuit, SIGNAL( triggered() ), this, SLOT( quitPokerTH() ) ); connect( actionFullScreen, SIGNAL( triggered() ), this, SLOT( switchFullscreen() ) ); connect( actionShowHideChat, SIGNAL( triggered() ), this, SLOT( switchChatWindow() ) ); @@ -803,6 +806,11 @@ void mainWindowImpl::callJoinNetworkGameDialog() { } } +void mainWindowImpl::callGameLobbyDialog() { + + myGameLobbyDialog->exec(); +} + void mainWindowImpl::callSettingsDialog() { mySettingsDialog->exec(); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 67372fb4..78d7f28d 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -49,6 +49,7 @@ class connectToServerDialogImpl; class createNetworkGameDialogImpl; class startNetworkGameDialogImpl; class changeHumanPlayerNameDialogImpl; +class gameLobbyDialogImpl; class QColor; @@ -168,6 +169,7 @@ public slots: void callSettingsDialog(); void callCreateNetworkGameDialog(); void callJoinNetworkGameDialog(); + void callGameLobbyDialog(); void myBetRaise(); void myFoldAllin(); @@ -378,6 +380,8 @@ private: connectToServerDialogImpl *myConnectToServerDialog; startNetworkGameDialogImpl *myStartNetworkGameDialog; createNetworkGameDialogImpl *myCreateNetworkGameDialog; + gameLobbyDialogImpl *myGameLobbyDialog; + //Sound SDLPlayer *mySDLPlayer;