diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index 376b9cdc..4317b8bb 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -32,6 +32,7 @@ createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, Conf connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); + connect( checkBox_Password, SIGNAL( toggled(bool) ), this, SLOT( clearGamePassword(bool)) ); //temporarely unused until ai is enabled in network // label_5->hide(); // spinBox_gameSpeed->hide(); @@ -83,3 +84,8 @@ void createInternetGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { if (event->key() == 16777220) { pushButton_createGame->click(); } //ENTER } + +void createInternetGameDialogImpl::clearGamePassword(bool clear) { + + if(!clear) { lineEdit_Password->clear(); } +} \ No newline at end of file diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h index 8c1fb0ed..b0229585 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h @@ -42,6 +42,8 @@ public slots: void fillFormular(); void showDialog(); void keyPressEvent ( QKeyEvent * event ); + void clearGamePassword(bool); + private: ConfigFile *myConfig; diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui index c6055382..51697e26 100644 --- a/src/gui/qt/gamelobbydialog.ui +++ b/src/gui/qt/gamelobbydialog.ui @@ -5,8 +5,8 @@ 0 0 - 730 - 584 + 683 + 567 @@ -19,30 +19,304 @@ 6 - - - - Qt::Vertical + + + + 0 - + + 6 + + + + + Lobby-Chat + + + + 7 + + + 0 + + + + + + + + + + + + + + Qt::Horizontal + + + + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 2 + 238 + + + + + + + + Qt::Vertical + + + + + + - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - + + + - 1 - 20 + 400 + 0 - + + + Game + + + + + Player + + + + + Private + + + - + + + + false + + + Game Info + + + + 9 + + + 6 + + + + + Qt::Vertical + + + + 125 + 71 + + + + + + + + + 221 + 0 + + + + + Connected Players + + + + + + + + 0 + + + 6 + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 16 + 27 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Start Game + + + + + + + Kick + + + + + + + + + Leave + + + + + + + 0 + + + 6 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +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;">Hands to raise small blind:</span></p></body></html> + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +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;">Maximum number of players:</span></p></body></html> + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +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;">Small Blind:</span></p></body></html> + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +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;">Start Cash:</span></p></body></html> + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +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;">Timeout for player action (sec):</span></p></body></html> + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + 0 @@ -79,184 +353,6 @@ - - - - - Game - - - - - Player - - - - - - - - Game Info - - - - 9 - - - 6 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 0 - - - 6 - - - - - TextLabel - - - - - - - TextLabel - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -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;">Hands to raise small blind:</span></p></body></html> - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -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;">Small Blind:</span></p></body></html> - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -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;">Start Cash:</span></p></body></html> - - - - - - - TextLabel - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - - 221 - 0 - - - - - In Game - - - - - - - - - - - Lobby-Chat - - - - 7 - - - 0 - - - - - - - - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 4fadad09..5d170b11 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -24,6 +24,16 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) connect( treeWidget_GameList, SIGNAL( itemClicked ( QTreeWidgetItem*, int) ), this, SLOT( gameSelected(QTreeWidgetItem*, int) ) ); pushButton_JoinGame->setEnabled(false); + + pushButton_Leave->hide(); + pushButton_Kick->hide(); + pushButton_StartGame->hide(); + + + treeWidget_GameList->setColumnWidth(0,250); + treeWidget_GameList->setColumnWidth(1,75); + treeWidget_GameList->setColumnWidth(2,70); + } void gameLobbyDialogImpl::exec() @@ -87,6 +97,9 @@ void gameLobbyDialogImpl::gameSelected(QTreeWidgetItem* item, int) pushButton_JoinGame->setEnabled(true); currentGameName = item->text(0); + + groupBox_GameInfo->setEnabled(TRUE); + groupBox_GameInfo->setTitle("Game Info - " + item->text(0)); } void gameLobbyDialogImpl::addGame(QString gameName)