This commit is contained in:
doitux
2007-03-21 00:41:29 +00:00
parent 62e72617ba
commit fd58b87316
2 changed files with 124 additions and 160 deletions
+120 -158
View File
@@ -40,7 +40,7 @@
#include "log.h" #include "log.h"
#include "configfile.h" #include "configfile.h"
#include <net/socket_msg.h> #include <net/socket_msg.h>
#define FORMATLEFT(X) "<p align='center'>(X)" #define FORMATLEFT(X) "<p align='center'>(X)"
#define FORMATRIGHT(X) "(X)</p>" #define FORMATRIGHT(X) "(X)</p>"
@@ -498,100 +498,62 @@ mainWindowImpl::~mainWindowImpl() {}
void mainWindowImpl::callNewGameDialog() { void mainWindowImpl::callNewGameDialog() {
//wenn Dialogfenster gezeigt werden soll //wenn Dialogfenster gezeigt werden soll
if(myConfig->readConfigInt("ShowGameSettingsDialogOnNewGame")){ if(myConfig->readConfigInt("ShowGameSettingsDialogOnNewGame")){
newGameDialogImpl *v = new newGameDialogImpl(this); newGameDialogImpl *v = new newGameDialogImpl(this);
v->exec(); v->exec();
if (v->result() == QDialog::Accepted ) { startNewLocalGame(v); }
if (v->result() == QDialog::Accepted ) {
// Start new local game - terminate existing network game.
mySession->terminateNetworkClient();
mySession->terminateNetworkServer();
if(actualGame) {
mySession->deleteGame();
actualGame = 0;
}
guiGameSpeed = v->spinBox_gameSpeed->value();
// debugMode = v->checkBox_debugMode->isChecked();
//Speeds
setSpeeds();
//restliche Singleshots killen!!!
stopTimer();
label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
//Tools und Board aufhellen und enablen
QPalette tempPalette = groupBox_board->palette();
tempPalette.setColor(QPalette::Window, active);
groupBox_board->setPalette(tempPalette);
groupBox_right_tools->setDisabled(FALSE);
groupBox_left_tools->setDisabled(FALSE);
//positioning Slider
horizontalSlider_speed->setValue(guiGameSpeed);
//Start Game!!!
mySession->startGame(v->spinBox_quantityPlayers->value(), v->spinBox_startCash->value(), v->spinBox_smallBlind->value());
}
} }
// sonst mit gespeicherten Werten starten // sonst mit gespeicherten Werten starten
else { else { startNewLocalGame(); }
}
// COPY AND PASTE WARNING, see above!!! void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
// TODO
// Start new local game - terminate existing network game.
mySession->terminateNetworkClient();
mySession->terminateNetworkServer();
if(actualGame) { // Start new local game - terminate existing network game.
mySession->deleteGame(); mySession->terminateNetworkClient();
actualGame = 0; mySession->terminateNetworkServer();
}
if(actualGame) {
guiGameSpeed = myConfig->readConfigInt("GameSpeed"); mySession->deleteGame();
//Speeds actualGame = 0;
setSpeeds(); }
//restliche Singleshots killen!!!
//restliche Singleshots killen!!! stopTimer();
stopTimer();
label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
// debugMode = v->checkBox_debugMode->isChecked();
//Tools und Board aufhellen und enablen
QPalette tempPalette = groupBox_board->palette();
tempPalette.setColor(QPalette::Window, active);
groupBox_board->setPalette(tempPalette);
groupBox_right_tools->setDisabled(FALSE);
groupBox_left_tools->setDisabled(FALSE);
//positioning Slider label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
horizontalSlider_speed->setValue(guiGameSpeed); label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
//Tools und Board aufhellen und enablen
QPalette tempPalette = groupBox_board->palette();
tempPalette.setColor(QPalette::Window, active);
groupBox_board->setPalette(tempPalette);
groupBox_right_tools->setDisabled(FALSE);
groupBox_left_tools->setDisabled(FALSE);
//positioning Slider
horizontalSlider_speed->setValue(guiGameSpeed);
//get values from local game dialog
if(v) {
//Speeds
guiGameSpeed = v->spinBox_gameSpeed->value();
setSpeeds();
//Start Game!!!
mySession->startGame(v->spinBox_quantityPlayers->value(), v->spinBox_startCash->value(), v->spinBox_smallBlind->value());
}
// start with default values
else {
//Speeds
guiGameSpeed = myConfig->readConfigInt("GameSpeed");
setSpeeds();
//Start Game!!! //Start Game!!!
mySession->startGame(myConfig->readConfigInt("NumberOfPlayers"), myConfig->readConfigInt("StartCash"), myConfig->readConfigInt("SmallBlind")); mySession->startGame(myConfig->readConfigInt("NumberOfPlayers"), myConfig->readConfigInt("StartCash"), myConfig->readConfigInt("SmallBlind"));
} }
} }
void mainWindowImpl::callAboutPokerthDialog() { void mainWindowImpl::callAboutPokerthDialog() {
aboutPokerthImpl *v = new aboutPokerthImpl(this); aboutPokerthImpl *v = new aboutPokerthImpl(this);
@@ -2026,85 +1988,85 @@ void mainWindowImpl::paintStartSplash() {
void mainWindowImpl::networkError(int errorID, int osErrorID) { void mainWindowImpl::networkError(int errorID, int osErrorID) {
switch (errorID) { switch (errorID) {
case ERR_SOCK_SERVERADDR_NOT_SET: case ERR_SOCK_SERVERADDR_NOT_SET:
{QMessageBox::warning(this, tr("Network Error"), {QMessageBox::warning(this, tr("Network Error"),
tr("Server address was not set."), tr("Server address was not set."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_INVALID_PORT: case ERR_SOCK_INVALID_PORT:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("An invalid port was set (ports 0-1023 are not allowed)."), tr("An invalid port was set (ports 0-1023 are not allowed)."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_CREATION_FAILED: case ERR_SOCK_CREATION_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Could not create a socket for TCP communication."), tr("Could not create a socket for TCP communication."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_SET_ADDR_FAILED: case ERR_SOCK_SET_ADDR_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Could not set the IP address."), tr("Could not set the IP address."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_SET_PORT_FAILED: case ERR_SOCK_SET_PORT_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Could not set the port for this type of address."), tr("Could not set the port for this type of address."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_RESOLVE_FAILED: case ERR_SOCK_RESOLVE_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("The server name could not be resolved."), tr("The server name could not be resolved."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_BIND_FAILED: case ERR_SOCK_BIND_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Bind failed - please choose a different port."), tr("Bind failed - please choose a different port."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_LISTEN_FAILED: case ERR_SOCK_LISTEN_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Internal network error: \"listen\" failed."), tr("Internal network error: \"listen\" failed."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_ACCEPT_FAILED: case ERR_SOCK_ACCEPT_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Server execution was terminated."), tr("Server execution was terminated."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_CONNECT_FAILED: case ERR_SOCK_CONNECT_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Could not connect to the server."), tr("Could not connect to the server."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_SELECT_FAILED: case ERR_SOCK_SELECT_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Internal network error: \"select\" failed."), tr("Internal network error: \"select\" failed."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_RECV_FAILED: case ERR_SOCK_RECV_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Internal network error: \"recv\" failed."), tr("Internal network error: \"recv\" failed."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_SEND_FAILED: case ERR_SOCK_SEND_FAILED:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Internal network error: \"send\" failed."), tr("Internal network error: \"send\" failed."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
case ERR_SOCK_CONN_RESET: case ERR_SOCK_CONN_RESET:
{ QMessageBox::warning(this, tr("Network Error"), { QMessageBox::warning(this, tr("Network Error"),
tr("Connection was closed by server."), tr("Connection was closed by server."),
QMessageBox::Close); } QMessageBox::Close); }
break; break;
default: { QMessageBox::warning(this, tr("Network Error"), default: { QMessageBox::warning(this, tr("Network Error"),
tr("DEFAULT ERROR"), tr("DEFAULT ERROR"),
QMessageBox::Close); } QMessageBox::Close); }
} }
// close dialogs // close dialogs
myConnectToServerDialog->reject(); myConnectToServerDialog->reject();
myWaitingForServerGameDialog->reject(); myWaitingForServerGameDialog->reject();
} }
void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) { void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
+4 -2
View File
@@ -38,6 +38,7 @@ class BoardInterface;
// class HandInterface; // class HandInterface;
class PlayerInterface; class PlayerInterface;
class MyCardsPixmapLabel; class MyCardsPixmapLabel;
class newGameDialogImpl;
class joinNetworkGameDialogImpl; class joinNetworkGameDialogImpl;
class connectToServerDialogImpl; class connectToServerDialogImpl;
class createNetworkGameDialogImpl; class createNetworkGameDialogImpl;
@@ -165,6 +166,7 @@ public slots:
void handSwitchRounds(); void handSwitchRounds();
void startNewHand(); void startNewHand();
void startNewLocalGame(newGameDialogImpl* =0);
void stopTimer(); void stopTimer();
@@ -173,14 +175,14 @@ public slots:
void userWidgetsBackgroudColor(); void userWidgetsBackgroudColor();
void breakButtonClicked(); void breakButtonClicked();
void keyPressEvent ( QKeyEvent * event ); void keyPressEvent ( QKeyEvent*);
void switchLeftToolBox(); void switchLeftToolBox();
void switchRightToolBox(); void switchRightToolBox();
void switchFullscreen(); void switchFullscreen();
void paintStartSplash(); void paintStartSplash();
void networkError(int errorID, int osErrorID); void networkError(int, int);
private: private: