add GameLobbyDialog

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
 

src/gui/qt/gamelobbydialog.ui

@@ -0,0 +1,129 @@
+<ui version="4.0" >
+ <class>gameLobbyDialog</class>
+ <widget class="QDialog" name="gameLobbyDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>476</width>
+    <height>470</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Game Lobby</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QTreeWidget" name="treeWidget_GameList" >
+     <column>
+      <property name="text" >
+       <string>Game</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Lobby-Chat</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>7</number>
+      </property>
+      <property name="spacing" >
+       <number>0</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QTextBrowser" name="textBrowser_ChatDisplay" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLineEdit" name="lineEdit_ChatInput" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>181</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_CreateGame" >
+       <property name="text" >
+        <string>Create Game</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_JoinGame" >
+       <property name="text" >
+        <string>Join Game</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_Cancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>treeWidget_GameList</tabstop>
+  <tabstop>pushButton_CreateGame</tabstop>
+  <tabstop>pushButton_Cancel</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton_Cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>gameLobbyDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>465</x>
+     <y>213</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>276</x>
+     <y>163</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -0,0 +1,32 @@
+//
+// C++ Implementation: gamelobbydialogimpl
+//
+// Description: 
+//
+//
+// Author: FThauer FHammer <webmaster@pokerth.net>, (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()
+{
+}
+
+

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h

@@ -0,0 +1,41 @@
+//
+// C++ Interface: gamelobbydialogimpl
+//
+// Description: 
+//
+//
+// Author: FThauer FHammer <webmaster@pokerth.net>, (C) 2007
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#ifndef GAMELOBBYDIALOGIMPL_H
+#define GAMELOBBYDIALOGIMPL_H
+
+#include <ui_gamelobbydialog.h>
+#include "configfile.h"
+
+#include <QtGui>
+#include <QtCore>
+
+/**
+	@author FThauer FHammer <webmaster@pokerth.net>
+*/
+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

src/gui/qt/mainwindow.ui

@@ -6084,9 +6084,16 @@
     <property name="title" >
      <string>Game</string>
     </property>
+    <widget class="QMenu" name="menuNetwork_Game" >
+     <property name="title" >
+      <string>Network Game</string>
+     </property>
+     <addaction name="actionCreate_network_Game" />
+     <addaction name="actionJoin_network_Game" />
+    </widget>
     <addaction name="actionNewGame" />
-    <addaction name="actionCreate_network_Game" />
+    <addaction name="menuNetwork_Game" />
-    <addaction name="actionJoin_network_Game" />
+    <addaction name="actionInternet_Game" />
     <addaction name="actionSettings" />
     <addaction name="actionAboutPokerth" />
     <addaction name="actionQuit" />
@@ -6175,6 +6182,11 @@
     <string>Ctrl+L</string>
    </property>
   </action>
+  <action name="actionInternet_Game" >
+   <property name="text" >
+    <string>Internet Game ...</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

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();

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;