From 50a6bb8c12796d71e78bd0a90661ee586be9cd29 Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 1 Feb 2007 02:18:59 +0000 Subject: [PATCH] --- src/gui/qt/aboutpokerthimpl.cpp | 4 +- src/gui/qt/aboutpokerthimpl.h | 2 +- src/gui/qt/mainwindowimpl.cpp | 12 +- src/gui/qt/mainwindowimpl.h | 2 +- src/gui/qt/newgamedialog.ui | 176 ++++++++++-------------------- src/gui/qt/newgamedialogimpl.cpp | 4 +- src/gui/qt/newgamedialogimpl.h | 2 +- src/gui/qt/settingsdialogimpl.cpp | 4 +- src/gui/qt/settingsdialogimpl.h | 2 +- src/pokerth.cpp | 1 + 10 files changed, 73 insertions(+), 136 deletions(-) diff --git a/src/gui/qt/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerthimpl.cpp index f86ca8e4..394366aa 100755 --- a/src/gui/qt/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerthimpl.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "aboutpokerthimpl.h" -aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, const char *name) - : QDialog(parent, name) +aboutPokerthImpl::aboutPokerthImpl(QWidget *parent) + : QDialog(parent) { setupUi(this); diff --git a/src/gui/qt/aboutpokerthimpl.h b/src/gui/qt/aboutpokerthimpl.h index 1ccb3152..5173fb78 100755 --- a/src/gui/qt/aboutpokerthimpl.h +++ b/src/gui/qt/aboutpokerthimpl.h @@ -26,7 +26,7 @@ class aboutPokerthImpl: public QDialog, public Ui::aboutPokerth { Q_OBJECT public: - aboutPokerthImpl(QWidget *parent = 0, const char *name = 0); + aboutPokerthImpl(QWidget *parent = 0); }; #endif diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp index 9e2135f3..751ec111 100755 --- a/src/gui/qt/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindowimpl.cpp @@ -47,8 +47,8 @@ const int maxQuantityPlayersConst = 5; using namespace std; -mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) - : QMainWindow(parent, name), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(0), breakAfterActualHand(FALSE) +mainWindowImpl::mainWindowImpl(QMainWindow *parent) + : QMainWindow(parent), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(0), breakAfterActualHand(FALSE) { int i; @@ -57,13 +57,6 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) QFont tmpFont("Nimbus Sans L",9); QApplication::setFont(tmpFont); - // Programmverzeichnis erstellen - QDir progDir1; - QDir progDir2; - progDir1.setPath(QDir::home().absPath()+"/.pokerth/"); - - if ( !progDir1.exists() ) { progDir1.mkdir(progDir1.absPath()); } - myConfig = new ConfigFile; setupUi(this); @@ -177,6 +170,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) //Toolbox verstecken? if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); } + //Intro abspielen? if (myConfig->readConfigInt("ShowIntro", 1)) { label_logo->hide(); QTimer::singleShot(100, this, SLOT( paintStartSplash() )); } diff --git a/src/gui/qt/mainwindowimpl.h b/src/gui/qt/mainwindowimpl.h index 365b5432..c4e442a1 100755 --- a/src/gui/qt/mainwindowimpl.h +++ b/src/gui/qt/mainwindowimpl.h @@ -44,7 +44,7 @@ class QColor; class mainWindowImpl: public QMainWindow, public Ui::mainWindow { Q_OBJECT public: - mainWindowImpl(QMainWindow *parent = 0, const char *name = 0 ); + mainWindowImpl(QMainWindow *parent = 0 ); void setGame(Game*); void setHand(HandInterface*); diff --git a/src/gui/qt/newgamedialog.ui b/src/gui/qt/newgamedialog.ui index adef66db..af341efc 100755 --- a/src/gui/qt/newgamedialog.ui +++ b/src/gui/qt/newgamedialog.ui @@ -5,8 +5,8 @@ 0 0 - 277 - 243 + 280 + 241 @@ -39,18 +39,15 @@ 1 - - 1 - 4 - - + + - Hands before raise Small Blind + Game Speed: @@ -64,26 +61,6 @@ - - - - Game-Speed - - - - - - - 5 - - - 2 - - - 5 - - - @@ -97,6 +74,40 @@ + + + + 5 + + + 2 + + + 5 + + + + + + + Number of Players: + + + + + + + Start Cash: + + + + + + + Small Blind: + + + @@ -110,24 +121,10 @@ - + - Number of Players - - - - - - - Small Blind - - - - - - - Start Cash + Hands before raise Small Blind: @@ -135,103 +132,48 @@ - - - 0 + + + Qt::Horizontal - - 6 + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - O&K - - - Alt+K - - - true - - - true - - - - - - - Cancel - - - - - - true - - - - + - - qPixmapFromMimeSource - - spinBox_quantityPlayers - spinBox_startCash - spinBox_smallBlind - spinBox_gameSpeed - buttonOk - buttonCancel - - buttonOk - clicked() + buttonBox + accepted() newGameDialog accept() - 120 - 201 + 248 + 254 - 137 - 100 + 157 + 274 - buttonCancel - clicked() + buttonBox + rejected() newGameDialog reject() - 201 - 201 + 316 + 260 - 137 - 100 + 286 + 274 diff --git a/src/gui/qt/newgamedialogimpl.cpp b/src/gui/qt/newgamedialogimpl.cpp index 43132510..24dde5dc 100755 --- a/src/gui/qt/newgamedialogimpl.cpp +++ b/src/gui/qt/newgamedialogimpl.cpp @@ -20,8 +20,8 @@ #include "newgamedialogimpl.h" #include "configfile.h" -newGameDialogImpl::newGameDialogImpl(QWidget *parent, const char *name) - : QDialog(parent, name) +newGameDialogImpl::newGameDialogImpl(QWidget *parent) + : QDialog(parent) { setupUi(this); diff --git a/src/gui/qt/newgamedialogimpl.h b/src/gui/qt/newgamedialogimpl.h index 39820ae1..d147bda0 100755 --- a/src/gui/qt/newgamedialogimpl.h +++ b/src/gui/qt/newgamedialogimpl.h @@ -30,7 +30,7 @@ class newGameDialogImpl: public QDialog, public Ui::newGameDialog { Q_OBJECT public: - newGameDialogImpl(QWidget *parent = 0, const char *name = 0); + newGameDialogImpl(QWidget *parent = 0); public slots: diff --git a/src/gui/qt/settingsdialogimpl.cpp b/src/gui/qt/settingsdialogimpl.cpp index 757427a3..f4513735 100644 --- a/src/gui/qt/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialogimpl.cpp @@ -22,8 +22,8 @@ #include -settingsDialogImpl::settingsDialogImpl(QWidget *parent, const char *name) - : QDialog(parent, name) +settingsDialogImpl::settingsDialogImpl(QWidget *parent) + : QDialog(parent) { setupUi(this); diff --git a/src/gui/qt/settingsdialogimpl.h b/src/gui/qt/settingsdialogimpl.h index 69709edc..bcadec17 100644 --- a/src/gui/qt/settingsdialogimpl.h +++ b/src/gui/qt/settingsdialogimpl.h @@ -29,7 +29,7 @@ class settingsDialogImpl: public QDialog, public Ui::settingsDialog { Q_OBJECT public: - settingsDialogImpl(QWidget *parent = 0, const char *name = 0); + settingsDialogImpl(QWidget *parent = 0); void setPlayerNickIsChanged(bool theValue){ playerNickIsChanged = theValue;} bool getPlayerNickIsChanged() const{ return playerNickIsChanged;} diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 1db62fa7..39098beb 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -42,6 +42,7 @@ int main( int argc, char **argv ) /////// can be removed for non-qt-guis //////////// QApplication a( argc, argv ); + a.setStyle(new QPlastiqueStyle); Q_INIT_RESOURCE(deck); ///////////////////////////////////////////////////