sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
doitux
2007-02-18 00:51:40 +00:00
parent fc25ae5a8b
commit 4e69e4d7e6
6 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth.pro
+7 -4
View File
@@ -52,7 +52,8 @@ HEADERS += tinystr.h \
genericsocket.h \ genericsocket.h \
socket_helper.h \ socket_helper.h \
socket_msg.h \ socket_msg.h \
socket_startup.h socket_startup.h \
thread.h
SOURCES += pokerth.cpp \ SOURCES += pokerth.cpp \
tinystr.cpp \ tinystr.cpp \
tinyxml.cpp \ tinyxml.cpp \
@@ -94,15 +95,17 @@ SOURCES += pokerth.cpp \
socket_startup.cpp \ socket_startup.cpp \
clientstate.cpp \ clientstate.cpp \
clientthread.cpp \ clientthread.cpp \
socket_helper_cmn.cpp socket_helper_cmn.cpp \
thread.cpp
TEMPLATE = vcapp TEMPLATE = vcapp
RESOURCES = src/gui/qt/deck.qrc RESOURCES = src/gui/qt/deck.qrc
TEMPLATE = app TEMPLATE = app
DEPENDPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ DEPENDPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ src/core/
INCLUDEPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ INCLUDEPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ src/core/
CONFIG += qt release CONFIG += qt release
UI_DIR = uics UI_DIR = uics
TARGET = bin/pokerth TARGET = bin/pokerth
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
QT += QT +=
LIBS += -lboost_thread-mt
src/gui/qt/guiwrapper.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ GuiWrapper::GuiWrapper() : myLog(0), myW(0)
{ {
myW = new mainWindowImpl; myW = new mainWindowImpl(this);
myW->show(); myW->show();
myLog = new Log(myW); myLog = new Log(myW);
src/gui/qt/joinnetworkgamedialog.ui
+27 -27
View File
@@ -95,7 +95,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="5" > <item row="3" column="0" colspan="5" >
<widget class="QPushButton" name="pushButton_3" > <widget class="QPushButton" name="pushButton_connect" >
<property name="text" > <property name="text" >
<string>Connect</string> <string>Connect</string>
</property> </property>
@@ -118,10 +118,10 @@
</spacer> </spacer>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLineEdit" name="lineEdit" /> <widget class="QLineEdit" name="lineEdit_ipAddress" />
</item> </item>
<item row="0" column="4" > <item row="0" column="4" >
<widget class="QLineEdit" name="lineEdit_2" /> <widget class="QLineEdit" name="lineEdit_password" />
</item> </item>
<item row="0" column="3" > <item row="0" column="3" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
@@ -131,7 +131,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="4" > <item row="1" column="4" >
<widget class="QSpinBox" name="spinBox" /> <widget class="QSpinBox" name="spinBox_port" />
</item> </item>
<item row="1" column="3" > <item row="1" column="3" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
@@ -162,7 +162,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="5" > <item row="2" column="0" colspan="5" >
<widget class="QCheckBox" name="checkBox" > <widget class="QCheckBox" name="checkBox_ipv6" >
<property name="text" > <property name="text" >
<string>Use IPv6</string> <string>Use IPv6</string>
</property> </property>
@@ -193,7 +193,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton" > <widget class="QPushButton" name="pushButton_close" >
<property name="text" > <property name="text" >
<string>Close</string> <string>Close</string>
</property> </property>
@@ -206,34 +206,34 @@
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>pushButton_3</sender> <sender>pushButton_connect</sender>
<signal>clicked()</signal>
<receiver>joinNetworkGameDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>79</x>
<y>145</y>
</hint>
<hint type="destinationlabel" >
<x>33</x>
<y>422</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushButton_close</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>joinNetworkGameDialog</receiver> <receiver>joinNetworkGameDialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>124</x> <x>548</x>
<y>141</y> <y>429</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>49</x> <x>483</x>
<y>433</y> <y>428</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>joinNetworkGameDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel" >
<x>513</x>
<y>431</y>
</hint>
<hint type="destinationlabel" >
<x>449</x>
<y>431</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+9 -1
View File
@@ -26,7 +26,15 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
setupUi(this); setupUi(this);
connect( pushButton_connect, SIGNAL( clicked() ), this, SLOT( startClient() ) );
} }
void joinNetworkGameDialogImpl::startClient() {
ClientThread *myClientThread = new ClientThread();
myClientThread->Init(lineEdit_ipAddress->text().toStdString(), spinBox_port->value(), checkBox_ipv6->isChecked(), lineEdit_password->text().toStdString());
myClientThread->Run();
}
src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
+3
View File
@@ -22,6 +22,8 @@
#include "ui_joinnetworkgamedialog.h" #include "ui_joinnetworkgamedialog.h"
#include "clientthread.h"
#include <iostream> #include <iostream>
#include <QtGui> #include <QtGui>
#include <QtCore> #include <QtCore>
@@ -34,6 +36,7 @@ public:
public slots: public slots:
void startClient();
}; };
#endif #endif
src/gui/qt/mainwindow/mainwindowimpl.cpp
+1 -1
View File
@@ -547,7 +547,7 @@ void mainWindowImpl::callJoinNetworkGameDialog() {
joinNetworkGameDialogImpl *v = new joinNetworkGameDialogImpl(); joinNetworkGameDialogImpl *v = new joinNetworkGameDialogImpl();
v->exec(); v->exec();
if (v->result() == QDialog::Rejected ) { if (v->result() == QDialog::Accepted ) {
//Dialog mit Statusbalken //Dialog mit Statusbalken
connectToServerDialogImpl *w = new connectToServerDialogImpl(); connectToServerDialogImpl *w = new connectToServerDialogImpl();