diff --git a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp index d4549595..dd441df3 100644 --- a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp +++ b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp @@ -16,6 +16,7 @@ internetGameLoginDialogImpl::internetGameLoginDialogImpl(QWidget *parent, Config void internetGameLoginDialogImpl::regUserToggled(bool b) { checkBox_guest->setChecked(!b); + okButtonCheck(); } void internetGameLoginDialogImpl::guestUserToggled(bool b) { @@ -27,6 +28,8 @@ void internetGameLoginDialogImpl::guestUserToggled(bool b) { lineEdit_password->clear(); lineEdit_username->clear(); } + + okButtonCheck(); } void internetGameLoginDialogImpl::exec() { diff --git a/src/gui/qt/joinnetworkgamedialog.ui b/src/gui/qt/joinnetworkgamedialog.ui index 21e40df5..faaad98b 100644 --- a/src/gui/qt/joinnetworkgamedialog.ui +++ b/src/gui/qt/joinnetworkgamedialog.ui @@ -1,7 +1,8 @@ - + + joinNetworkGameDialog - - + + 0 0 @@ -9,254 +10,156 @@ 458 - + Join Network Game - - + + 9 - - 9 - - - 9 - - - 9 - - + 6 - - 6 - - - - + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 198 + 0 + + + + Connect + + + + + + + Close + + + + + + + + Connect to Network Game - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - - Server Profiles + + + + + Profile Name: + + + lineEdit_profileName - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - - true - - - 15 - - - false - - - true - - - true - - - true - - - - Name - - - - - Address - - - - - Port - - - - - IPv6 - - - - - SCTP - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Save - - - - - - - Delete - - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 + + + + myServerProfile1 + + + + - - - Use SCTP + + + IP Address / Domain Name: + + + lineEdit_ipAddress - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" 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;"> <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol"><span style=" text-decoration: underline; color:#0000ff;">What is this?</span></a></p></body></html> + + + + + + Port: - - true + + spinBox_port - - - Qt::Horizontal + + + 80 - - - 40 - 20 - + + 65535 - + + 7234 + + - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Use IPv6 - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" 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;"> <a href="http://en.wikipedia.org/wiki/Ipv6"><span style=" text-decoration: underline; color:#0000ff;">What is this?</span></a></p></body></html> +</style></head><body style=" 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;"> <a href="http://en.wikipedia.org/wiki/Ipv6"><span style=" text-decoration: underline; color:#0000ff;">What is this?</span></a></p></body></html> - + true - + Qt::Horizontal - + 131 20 @@ -266,157 +169,142 @@ p, li { white-space: pre-wrap; } - - - - Qt::Horizontal + + + + 6 - - QSizePolicy::Fixed + + 0 - - - 16 - 57 - - - + + + + Use SCTP + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" 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;"> <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol"><span style=" text-decoration: underline; color:#0000ff;">What is this?</span></a></p></body></html> + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - - - 60 - - - QLineEdit::Password - - - - - - - Password (optional): - - - lineEdit_password - - - - - - - 80 - - - 65535 - - - 7234 - - - - - - - Port: - - - spinBox_port - - - - - - - IP Address / Domain Name: - - - lineEdit_ipAddress - - - - - - - Profile Name: - - - lineEdit_profileName - - - - - - - myServerProfile1 + + + + Server Profiles + + + 9 + + + 6 + + + + + true + + + 15 + + + false + + + true + + + true + + + true + + + + Name + + + + + Address + + + + + Port + + + + + IPv6 + + + + + SCTP + + + + + + + + 6 + + + 0 + + + + + Save + + + + + + + Delete + + + + + + - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 198 - 0 - - - - Connect - - - - - - - Close - - - - - lineEdit_ipAddress - lineEdit_password - lineEdit_profileName - spinBox_port checkBox_ipv6 checkBox_sctp treeWidget @@ -433,11 +321,11 @@ p, li { white-space: pre-wrap; } joinNetworkGameDialog accept() - + 376 447 - + 33 422 @@ -449,11 +337,11 @@ p, li { white-space: pre-wrap; } joinNetworkGameDialog reject() - + 548 429 - + 483 428 @@ -465,11 +353,11 @@ p, li { white-space: pre-wrap; } pushButton_connect click() - + 113 206 - + 394 427 diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index 4ebc89f6..515f0c95 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -170,7 +170,6 @@ void joinNetworkGameDialogImpl::itemFillForm (QTreeWidgetItem* item, int /*colum lineEdit_profileName->setText(QString::fromUtf8(profile->Attribute("Name"))); lineEdit_ipAddress->setText(QString::fromUtf8(profile->Attribute("Address"))); - lineEdit_password->setText(QString::fromUtf8(profile->Attribute("Password"))); spinBox_port->setValue(QString::fromUtf8(profile->Attribute("Port")).toInt(&toIntTrue, 10)); checkBox_ipv6->setChecked(QString::fromUtf8(profile->Attribute("IsIpv6")).toInt(&toIntTrue, 10)); checkBox_sctp->setChecked(QString::fromUtf8(profile->Attribute("IsSctp")).toInt(&toIntTrue, 10)); @@ -211,8 +210,7 @@ void joinNetworkGameDialogImpl::saveServerProfile() { TiXmlElement * profile1 = new TiXmlElement( lineEdit_profileName->text().toUtf8().constData() ); profiles->LinkEndChild( profile1 ); profile1->SetAttribute("Name", lineEdit_profileName->text().toUtf8().constData()); - profile1->SetAttribute("Address", lineEdit_ipAddress->text().toUtf8().constData()); - profile1->SetAttribute("Password", lineEdit_password->text().toUtf8().constData()); + profile1->SetAttribute("Address", lineEdit_ipAddress->text().toUtf8().constData()); profile1->SetAttribute("Port", spinBox_port->value()); profile1->SetAttribute("IsIpv6", checkBox_ipv6->isChecked()); profile1->SetAttribute("IsSctp", checkBox_sctp->isChecked()); @@ -233,7 +231,6 @@ void joinNetworkGameDialogImpl::saveServerProfile() { profiles->LinkEndChild( profile2 ); profile2->SetAttribute("Name", lineEdit_profileName->text().toUtf8().constData()); profile2->SetAttribute("Address", lineEdit_ipAddress->text().toUtf8().constData()); - profile2->SetAttribute("Password", lineEdit_password->text().toUtf8().constData()); profile2->SetAttribute("Port", spinBox_port->value()); profile2->SetAttribute("IsIpv6", checkBox_ipv6->isChecked()); profile2->SetAttribute("IsSctp", checkBox_sctp->isChecked()); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 345d2838..c37a44f3 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -125,7 +125,7 @@ - 0 + 5 @@ -1363,80 +1363,48 @@ p, li { white-space: pre-wrap; } Network Server Settings - - - 6 - - - 0 - - - 6 - - - 6 - - - 6 - - - - - 60 - - - QLineEdit::Password - - + + + + + + + Server Port: + + + spinBox_serverPort + + + + + + + + 0 + 0 + + + + 80 + + + 65535 + + + 7234 + + + + - - - Server Password: - - - lineEdit_serverPassword - - - - - - - 80 - - - 65535 - - - 7234 - - - - - - - Server Port: - - - spinBox_serverPort - - - - - - - Use SCTP - - - - Use IPv6 - + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> @@ -1446,7 +1414,14 @@ p, li { white-space: pre-wrap; } - + + + + Use SCTP + + + + <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> @@ -1611,30 +1586,13 @@ p, li { white-space: pre-wrap; } - - - Server Password: - - - lineEdit_InternetServerPassword - - - - - - - QLineEdit::Password - - - - Avatar Server: - + @@ -3390,7 +3348,6 @@ p, li { white-space: pre-wrap; } spinBox_netDelayBetweenHands spinBox_netTimeOutPlayerAction spinBox_serverPort - lineEdit_serverPassword checkBox_useIpv6 checkBox_useSctp groupBox_automaticServerConfig @@ -3398,7 +3355,6 @@ p, li { white-space: pre-wrap; } groupBox_manualServerConfig lineEdit_InternetServerAddress spinBox_InternetServerPort - lineEdit_InternetServerPassword checkBox_useAvatarServer lineEdit_avatarServerAddress checkBox_InternetServerUseIpv6 diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 7fbda5af..dc85cd3c 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -183,7 +183,6 @@ void settingsDialogImpl::exec() { spinBox_netDelayBetweenHands->setValue(myConfig->readConfigInt("NetDelayBetweenHands")); spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction")); spinBox_serverPort->setValue(myConfig->readConfigInt("ServerPort")); - lineEdit_serverPassword->setText(QString::fromUtf8(myConfig->readConfigString("ServerPassword").c_str())); checkBox_useIpv6->setChecked(myConfig->readConfigInt("ServerUseIpv6")); checkBox_useSctp->setChecked(myConfig->readConfigInt("ServerUseSctp")); @@ -193,7 +192,6 @@ void settingsDialogImpl::exec() { lineEdit_InternetServerListAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerListAddress").c_str())); lineEdit_InternetServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerAddress").c_str())); spinBox_InternetServerPort->setValue(myConfig->readConfigInt("InternetServerPort")); - lineEdit_InternetServerPassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerPassword").c_str())); checkBox_InternetServerUseIpv6->setChecked(myConfig->readConfigInt("InternetServerUseIpv6")); checkBox_InternetServerUseSctp->setChecked(myConfig->readConfigInt("InternetServerUseSctp")); if(myConfig->readConfigInt("UseAvatarServer")) { @@ -486,7 +484,6 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("NetDelayBetweenHands", spinBox_netDelayBetweenHands->value()); myConfig->writeConfigInt("NetTimeOutPlayerAction", spinBox_netTimeOutPlayerAction->value()); myConfig->writeConfigInt("ServerPort", spinBox_serverPort->value()); - myConfig->writeConfigString("ServerPassword", lineEdit_serverPassword->text().toUtf8().constData()); myConfig->writeConfigInt("ServerUseIpv6", checkBox_useIpv6->isChecked()); myConfig->writeConfigInt("ServerUseSctp", checkBox_useSctp->isChecked()); @@ -516,7 +513,6 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("InternetServerConfigMode", 1); myConfig->writeConfigString("InternetServerAddress", lineEdit_InternetServerAddress->text().toUtf8().constData()); myConfig->writeConfigInt("InternetServerPort", spinBox_InternetServerPort->value()); - myConfig->writeConfigString("InternetServerPassword", lineEdit_InternetServerPassword->text().toUtf8().constData()); } if(checkBox_useAvatarServer->isChecked()) { myConfig->writeConfigInt("UseAvatarServer", 1);