connectToServerDialog added
This commit is contained in:
doitux
+6
-3
@@ -10,7 +10,8 @@ FORMS += mainwindow.ui \
|
||||
aboutpokerth.ui \
|
||||
newgamedialog.ui \
|
||||
settingsdialog.ui \
|
||||
joinnetworkgamedialog.ui
|
||||
joinnetworkgamedialog.ui \
|
||||
connecttoserverdialog.ui
|
||||
HEADERS += tinystr.h \
|
||||
tinyxml.h \
|
||||
mainwindowimpl.h \
|
||||
@@ -18,6 +19,7 @@ HEADERS += tinystr.h \
|
||||
aboutpokerthimpl.h \
|
||||
settingsdialogimpl.h \
|
||||
joinnetworkgamedialog.h \
|
||||
connecttoserverdialog.h \
|
||||
configfile.h \
|
||||
log.h \
|
||||
guiinterface.h \
|
||||
@@ -54,6 +56,7 @@ SOURCES += pokerth.cpp \
|
||||
aboutpokerthimpl.cpp \
|
||||
settingsdialogimpl.cpp \
|
||||
joinnetworkgamedialog.cpp \
|
||||
connecttoserverdialog.cpp \
|
||||
configfile.cpp \
|
||||
log.cpp \
|
||||
guiinterface.cpp \
|
||||
@@ -83,8 +86,8 @@ SOURCES += pokerth.cpp \
|
||||
TEMPLATE = vcapp
|
||||
RESOURCES = src/gui/qt/deck.qrc
|
||||
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/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/engine/network_engine
|
||||
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/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/engine/network_engine
|
||||
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/engine/network_engine
|
||||
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/engine/network_engine
|
||||
CONFIG += qt release
|
||||
UI_DIR = uics
|
||||
TARGET = bin/pokerth
|
||||
|
||||
@@ -49,7 +49,7 @@ p, li { white-space: pre-wrap; }
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Coded in C++ / QT4</p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">© 2006, FHammer &amp; FThauer</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">© 2006-2007, FHammer &amp; FThauer</span></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
@@ -90,15 +90,15 @@ p, li { white-space: pre-wrap; }
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Projectpage: </span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> <a href="http://sourceforge.net/projects/pokerth"><span style=" text-decoration: underline; color:#0000ff;">http://sourceforge.net/projects/pokerth</span></a></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> <a href="http://www.pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">IRC: </span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #pokerth (irc.freenode.net)</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #pokerth (irc.freenode.net)</p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Authors: </span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Felix Hammer (<a href="mailto:f.hammer@web.de"><span style=" text-decoration: underline; color:#0000ff;">f.hammer@web.de</span></a>)</p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Florian Thauer (<a href="mailto:f.thauer@web.de"><span style=" text-decoration: underline; color:#0000ff;">f.thauer@web.de</span></a>)</p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Lothar May (<a href="mailto:l-may@gmx.de"><span style=" text-decoration: underline; color:#0000ff;">l-may@gmx.de</span></a>)</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
<ui version="4.0" >
|
||||
<class>connectToServerDialog</class>
|
||||
<widget class="QDialog" name="connectToServerDialog" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>260</width>
|
||||
<height>118</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Connect to Server</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="QLabel" name="label" >
|
||||
<property name="text" >
|
||||
<string>Connecting to Server ...</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" >
|
||||
<widget class="QProgressBar" name="progressBar" >
|
||||
<property name="value" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" >
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="margin" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton" >
|
||||
<property name="text" >
|
||||
<string>Cancel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -0,0 +1,32 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2006 by FThauer FHammer *
|
||||
* f.thauer@web.de *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
#include "connecttoserverdialog.h"
|
||||
// #include "configfile.h"
|
||||
|
||||
connectToServerDialogImpl::connectToServerDialogImpl(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
|
||||
setupUi(this);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2006 by FThauer FHammer *
|
||||
* f.thauer@web.de *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
#ifndef CONNECTTOSERVERDIALOGIMPL_H
|
||||
#define CONNECTTOSERVERDIALOGIMPL_H
|
||||
|
||||
#include "ui_connecttoserverdialog.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <QtGui>
|
||||
#include <QtCore>
|
||||
|
||||
|
||||
class connectToServerDialogImpl: public QDialog, public Ui::connectToServerDialog {
|
||||
Q_OBJECT
|
||||
public:
|
||||
connectToServerDialogImpl(QWidget *parent = 0);
|
||||
|
||||
public slots:
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -206,18 +206,34 @@
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>pushButton</sender>
|
||||
<sender>pushButton_3</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>joinNetworkGameDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>512</x>
|
||||
<y>446</y>
|
||||
<x>124</x>
|
||||
<y>141</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>405</x>
|
||||
<y>443</y>
|
||||
<x>49</x>
|
||||
<y>433</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>pushButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>joinNetworkGameDialog</receiver>
|
||||
<slot>hide()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>531</x>
|
||||
<y>430</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>411</x>
|
||||
<y>429</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "aboutpokerthimpl.h"
|
||||
#include "settingsdialogimpl.h"
|
||||
#include "joinnetworkgamedialog.h"
|
||||
#include "connecttoserverdialog.h"
|
||||
|
||||
|
||||
#include "startsplash.h"
|
||||
@@ -545,6 +546,15 @@ void mainWindowImpl::callJoinNetworkGameDialog() {
|
||||
|
||||
joinNetworkGameDialogImpl *v = new joinNetworkGameDialogImpl();
|
||||
v->exec();
|
||||
|
||||
if (v->result() == QDialog::Rejected ) {
|
||||
|
||||
//Dialog mit Statusbalken
|
||||
connectToServerDialogImpl *w = new connectToServerDialogImpl();
|
||||
w->exec();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void mainWindowImpl::callSettingsDialog() {
|
||||
|
||||
Reference in New Issue
Block a user