diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp index c10f90ba..5eb7dc08 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -35,6 +35,13 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, Config } + +void createNetworkGameDialogImpl::exec() { + + fillFormular(); + QDialog::exec(); +} + void createNetworkGameDialogImpl::createGame() { } diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h index c4f98f11..b21d3384 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h @@ -34,6 +34,8 @@ Q_OBJECT public: createNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *c = 0); + void exec(); + public slots: void createGame(); diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index e8252682..5340e62c 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -31,6 +31,19 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent, ConfigFile setupUi(this); +// QShortcut *connectKey = new QShortcut(QKeySequence(Qt::Key_Enter), this); +// connect( connectKey, SIGNAL(activated() ), pushButton_connect, SLOT( click() ) ); + + connect( pushButton_connect, SIGNAL( clicked() ), this, SLOT( startClient() ) ); + connect( pushButton_save, SIGNAL( clicked() ), this, SLOT( saveServerProfile() ) ); + connect( pushButton_delete, SIGNAL( clicked() ), this, SLOT( deleteServerProfile() ) ); + + connect( treeWidget, SIGNAL( itemClicked ( QTreeWidgetItem*, int) ), this, SLOT( itemFillForm (QTreeWidgetItem*, int) ) ); + +} + +void joinNetworkGameDialogImpl::exec() { + spinBox_port->setValue(QString::fromUtf8(myConfig->readConfigString("ServerPort").c_str()).toInt(&toIntTrue, 10)); //Profile Name darf nicht mit einer Zahl beginnen --> XML konform @@ -65,18 +78,8 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent, ConfigFile //Liste Füllen fillServerProfileList(); - - - -// QShortcut *connectKey = new QShortcut(QKeySequence(Qt::Key_Enter), this); -// connect( connectKey, SIGNAL(activated() ), pushButton_connect, SLOT( click() ) ); - - connect( pushButton_connect, SIGNAL( clicked() ), this, SLOT( startClient() ) ); - connect( pushButton_save, SIGNAL( clicked() ), this, SLOT( saveServerProfile() ) ); - connect( pushButton_delete, SIGNAL( clicked() ), this, SLOT( deleteServerProfile() ) ); - - connect( treeWidget, SIGNAL( itemClicked ( QTreeWidgetItem*, int) ), this, SLOT( itemFillForm (QTreeWidgetItem*, int) ) ); - + QDialog::exec(); + } void joinNetworkGameDialogImpl::startClient() { diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h index cddd105a..d81cf6c1 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h @@ -39,6 +39,8 @@ public: ConfigFile *myConfig; std::string myServerProfilesFile; + void exec(); + public slots: void startClient(); diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp index 6544f672..50b8a5c2 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp @@ -26,12 +26,17 @@ newGameDialogImpl::newGameDialogImpl(QWidget *parent, ConfigFile *c) setupUi(this); - //Game Settings + +} + +void newGameDialogImpl::exec() { + spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NumberOfPlayers")); spinBox_startCash->setValue(myConfig->readConfigInt("StartCash")); spinBox_smallBlind->setValue(myConfig->readConfigInt("SmallBlind")); spinBox_gameSpeed->setValue(myConfig->readConfigInt("GameSpeed")); spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig->readConfigInt("HandsBeforeRaiseSmallBlind")); + QDialog::exec(); + } - diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h index a07df299..6e80c790 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h @@ -33,6 +33,8 @@ Q_OBJECT public: newGameDialogImpl(QWidget *parent = 0, ConfigFile* = 0); + void exec(); + public slots: private: diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 6f1789bb..90f5a0f6 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -28,6 +28,29 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c) setupUi(this); + connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); + connect( lineEdit_humanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent3Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent4Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent5Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent6Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( pushButton_openFlipsidePicture, SIGNAL( clicked() ), this, SLOT( setFlipsidePicFileName()) ); + connect( pushButton_openLogDir, SIGNAL( clicked() ), this, SLOT( setLogDir()) ); + connect( pushButton_openAvatarFile0, SIGNAL( clicked() ), this, SLOT( setAvatarFile0()) ); + connect( pushButton_openAvatarFile1, SIGNAL( clicked() ), this, SLOT( setAvatarFile1()) ); + connect( pushButton_openAvatarFile2, SIGNAL( clicked() ), this, SLOT( setAvatarFile2()) ); + connect( pushButton_openAvatarFile3, SIGNAL( clicked() ), this, SLOT( setAvatarFile3()) ); + connect( pushButton_openAvatarFile4, SIGNAL( clicked() ), this, SLOT( setAvatarFile4()) ); + connect( pushButton_openAvatarFile5, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) ); + connect( pushButton_openAvatarFile6, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) ); + +} + +void settingsDialogImpl::exec() { + + // stackedWidget->removeWidget(page_4); // listWidget->takeItem(2); // page_4->hide(); @@ -90,28 +113,11 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c) //Log lineEdit_logDir->setText(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())); spinBox_logStoreDuration->setValue(myConfig->readConfigInt("LogStoreDuration")); - - connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); - connect( lineEdit_humanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( lineEdit_Opponent3Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( lineEdit_Opponent4Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( lineEdit_Opponent5Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( lineEdit_Opponent6Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); - connect( pushButton_openFlipsidePicture, SIGNAL( clicked() ), this, SLOT( setFlipsidePicFileName()) ); - connect( pushButton_openLogDir, SIGNAL( clicked() ), this, SLOT( setLogDir()) ); - connect( pushButton_openAvatarFile0, SIGNAL( clicked() ), this, SLOT( setAvatarFile0()) ); - connect( pushButton_openAvatarFile1, SIGNAL( clicked() ), this, SLOT( setAvatarFile1()) ); - connect( pushButton_openAvatarFile2, SIGNAL( clicked() ), this, SLOT( setAvatarFile2()) ); - connect( pushButton_openAvatarFile3, SIGNAL( clicked() ), this, SLOT( setAvatarFile3()) ); - connect( pushButton_openAvatarFile4, SIGNAL( clicked() ), this, SLOT( setAvatarFile4()) ); - connect( pushButton_openAvatarFile5, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) ); - connect( pushButton_openAvatarFile6, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) ); + + QDialog::exec(); } - void settingsDialogImpl::isAccepted() { settingsCorrect = TRUE; diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h index 0e211429..d827f09b 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.h +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h @@ -31,6 +31,8 @@ class settingsDialogImpl: public QDialog, public Ui::settingsDialog { Q_OBJECT public: settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0); + + void exec(); void setPlayerNickIsChanged(bool theValue){ playerNickIsChanged = theValue;} bool getPlayerNickIsChanged() const{ return playerNickIsChanged;}