diff --git a/pokerth.pro b/pokerth.pro index 4989d99c..ddb270b5 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -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 diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui index 67cfb833..9ff9bc8c 100755 --- a/src/gui/qt/aboutpokerth.ui +++ b/src/gui/qt/aboutpokerth.ui @@ -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> @@ -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> +<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> diff --git a/src/gui/qt/connecttoserverdialog.ui b/src/gui/qt/connecttoserverdialog.ui new file mode 100644 index 00000000..0a304ffc --- /dev/null +++ b/src/gui/qt/connecttoserverdialog.ui @@ -0,0 +1,89 @@ + + connectToServerDialog + + + + 0 + 0 + 260 + 118 + + + + Connect to Server + + + + 9 + + + 6 + + + + + Connecting to Server ... + + + Qt::AlignCenter + + + + + + + 0 + + + Qt::Horizontal + + + + + + + 5 + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialog.cpp b/src/gui/qt/connecttoserverdialog/connecttoserverdialog.cpp new file mode 100644 index 00000000..050519fd --- /dev/null +++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialog.cpp @@ -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); + + + +} + diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialog.h b/src/gui/qt/connecttoserverdialog/connecttoserverdialog.h new file mode 100644 index 00000000..b05a7122 --- /dev/null +++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialog.h @@ -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 +#include +#include + + +class connectToServerDialogImpl: public QDialog, public Ui::connectToServerDialog { +Q_OBJECT +public: + connectToServerDialogImpl(QWidget *parent = 0); + +public slots: + +}; + +#endif diff --git a/src/gui/qt/joinnetworkgamedialog.ui b/src/gui/qt/joinnetworkgamedialog.ui index 92ea1133..28c2f66e 100644 --- a/src/gui/qt/joinnetworkgamedialog.ui +++ b/src/gui/qt/joinnetworkgamedialog.ui @@ -206,18 +206,34 @@ - pushButton + pushButton_3 clicked() joinNetworkGameDialog reject() - 512 - 446 + 124 + 141 - 405 - 443 + 49 + 433 + + + + + pushButton + clicked() + joinNetworkGameDialog + hide() + + + 531 + 430 + + + 411 + 429 diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 8fe2852a..1d9e7b9f 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -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() {