diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui index 1aec3c4c..7cbf62c4 100644 --- a/src/gui/qt/createnetworkgamedialog.ui +++ b/src/gui/qt/createnetworkgamedialog.ui @@ -5,7 +5,7 @@ 0 0 - 335 + 309 274 diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp index a194a1f1..8a2ea31b 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -32,6 +32,10 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, Config connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); + //temporarely unused until ai is enabled in network + label_5->hide(); + spinBox_gameSpeed->hide(); + } @@ -57,7 +61,8 @@ void createNetworkGameDialogImpl::fillFormular() { spinBox_startCash->setValue(myConfig->readConfigInt("NetStartCash")); spinBox_smallBlind->setValue(myConfig->readConfigInt("NetSmallBlind")); spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig->readConfigInt("NetHandsBeforeRaiseSmallBlind")); - spinBox_gameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed")); + //temporarely unused until ai is enabled in network +// spinBox_gameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed")); spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction")); } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 6f453d0b..344e9cbd 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -506,7 +506,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) myChangeHumanPlayerNameDialog = new changeHumanPlayerNameDialogImpl(this, myConfig); myJoinNetworkGameDialog = new joinNetworkGameDialogImpl(this, myConfig); myConnectToServerDialog = new connectToServerDialogImpl(this); - myStartNetworkGameDialog = new startNetworkGameDialogImpl(this); + myStartNetworkGameDialog = new startNetworkGameDialogImpl(this, myConfig); myCreateNetworkGameDialog = new createNetworkGameDialogImpl(this, myConfig); myWaitingForServerGameDialog = new waitForServerToStartGameDialogImpl(this); myAboutPokerthDialog = new aboutPokerthImpl(this); @@ -716,7 +716,9 @@ void mainWindowImpl::callCreateNetworkGameDialog() { gameData.startMoney = myCreateNetworkGameDialog->spinBox_startCash->value(); gameData.smallBlind = myCreateNetworkGameDialog->spinBox_smallBlind->value(); gameData.handsBeforeRaise = myCreateNetworkGameDialog->spinBox_handsBeforeRaiseSmallBlind->value(); - gameData.guiSpeed = myCreateNetworkGameDialog->spinBox_gameSpeed->value(); + //temporarely static until ai is enabled in network +// gameData.guiSpeed = myCreateNetworkGameDialog->spinBox_gameSpeed->value(); + gameData.guiSpeed = 4; myStartNetworkGameDialog->treeWidget->clear(); diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index d785d606..23d3cdea 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -53,6 +53,12 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva connect( checkBox_showIntro, SIGNAL( clicked() ), this, SLOT( callSelectAvatarDialog()) ); + //temporarely unused until ai is enabled in network + label_36->hide(); + spinBox_netGameSpeed->hide(); + + label_18->hide(); + comboBox_netEngineVersion->hide(); } void settingsDialogImpl::exec() { @@ -104,8 +110,9 @@ void settingsDialogImpl::exec() { spinBox_netStartCash->setValue(myConfig->readConfigInt("NetStartCash")); spinBox_netSmallBlind->setValue(myConfig->readConfigInt("NetSmallBlind")); spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig->readConfigInt("NetHandsBeforeRaiseSmallBlind")); - spinBox_netGameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed")); - comboBox_netEngineVersion->setCurrentIndex(myConfig->readConfigInt("NetEngineVersion")); + //temporarely unused until ai is enabled in network +// spinBox_netGameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed")); +// comboBox_netEngineVersion->setCurrentIndex(myConfig->readConfigInt("NetEngineVersion")); spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction")); spinBox_serverPort->setValue(myConfig->readConfigInt("ServerPort")); lineEdit_serverPassword->setText(QString::fromUtf8(myConfig->readConfigString("ServerPassword").c_str())); @@ -185,8 +192,9 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("NetStartCash", spinBox_netStartCash->value()); myConfig->writeConfigInt("NetSmallBlind", spinBox_netSmallBlind->value()); myConfig->writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value()); - myConfig->writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value()); - myConfig->writeConfigInt("NetEngineVersion", comboBox_netEngineVersion->currentIndex()); + //temporarely unused until ai is enabled in network +// myConfig->writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value()); +// myConfig->writeConfigInt("NetEngineVersion", comboBox_netEngineVersion->currentIndex()); myConfig->writeConfigInt("NetTimeOutPlayerAction", spinBox_netTimeOutPlayerAction->value()); myConfig->writeConfigInt("ServerPort", spinBox_serverPort->value()); myConfig->writeConfigString("ServerPassword", lineEdit_serverPassword->text().toUtf8().constData()); diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index bb243ae7..b1042179 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -18,11 +18,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "startnetworkgamedialogimpl.h" -#include "session.h" -// #include "configfile.h" +// #include "session.h" +#include "configfile.h" -startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent) - : QDialog(parent) +startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFile *config) + : QDialog(parent), myConfig(config) { setupUi(this); @@ -69,11 +69,17 @@ void startNetworkGameDialogImpl::playerSelected(QTreeWidgetItem*, int) { void startNetworkGameDialogImpl::kickPlayer() { -// if() + QTreeWidgetItem *item = treeWidget->currentItem(); QString playerName = item->text(0); -// kickplayerFunktion(playerName.toStdString()); - + if(playerName == QString::fromUtf8(myConfig->readConfigString("MyName").c_str())) { + { QMessageBox::warning(this, tr("Server Error"), + tr("You should not kick yourself from this game!"), + QMessageBox::Close); } + } + else { +// kickplayerFunktion(playerName.toStdString()); + } pushButton_Kick->setEnabled(FALSE); } diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h index 2f1e8d3b..1324bd6a 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h @@ -26,12 +26,13 @@ #include #include -class Session; +// class Session; +class ConfigFile; class startNetworkGameDialogImpl: public QDialog, public Ui::startNetworkGameDialog { Q_OBJECT public: - startNetworkGameDialogImpl(QWidget *parent = 0); + startNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *config = 0); public slots: @@ -52,6 +53,7 @@ public slots: private: int maxPlayerNumber; + ConfigFile *myConfig; }; #endif