From be90c8141a13ac03de8f59a98fd9265c68541c39 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 3 Jun 2007 22:41:53 +0000 Subject: [PATCH] --- src/config/configfile.cpp | 3 ++- .../joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp | 9 +++++++++ src/gui/qt/mainwindow/mainwindowimpl.cpp | 3 +++ src/gui/qt/settingsdialog.ui | 4 ++-- src/gui/qt/settingsdialog/settingsdialogimpl.cpp | 2 ++ src/session.cpp | 2 +- src/session.h | 6 ++++++ 7 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 15bf3ffb..75fa1f7a 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -49,7 +49,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; } } // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 24; + configRev = 25; //standard defaults logOnOffDefault = "1"; @@ -163,6 +163,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) configList.push_back(ConfigInfo("NetTimeOutPlayerAction", CONFIG_TYPE_INT, "20")); configList.push_back(ConfigInfo("ServerPassword", CONFIG_TYPE_STRING, "")); configList.push_back(ConfigInfo("ServerUseIpv6", CONFIG_TYPE_INT, "0")); + configList.push_back(ConfigInfo("ServerUseSctp", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("ServerPort", CONFIG_TYPE_INT, "7234")); configList.push_back(ConfigInfo("MyName", CONFIG_TYPE_STRING, "Human Player")); configList.push_back(ConfigInfo("MyAvatar", CONFIG_TYPE_STRING, "")); diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index 0d80c159..c19d6322 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -127,6 +127,12 @@ void joinNetworkGameDialogImpl::fillServerProfileList() { profile->QueryIntAttribute("IsIpv6", &tempInt ); if( tempInt == 1 ) { isIpv6 = "yes"; } item->setData(3, 0, QString::fromUtf8(isIpv6.c_str())); + + string isSctp = "no"; + int tempInt1 = 0; + profile->QueryIntAttribute("IsSctp", &tempInt1 ); + if( tempInt1 == 1 ) { isSctp = "yes"; } + item->setData(4, 0, QString::fromUtf8(isSctp.c_str())); treeWidget->addTopLevelItem(item); } @@ -159,6 +165,7 @@ void joinNetworkGameDialogImpl::itemFillForm (QTreeWidgetItem* item, int column) 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)); } @@ -200,6 +207,7 @@ void joinNetworkGameDialogImpl::saveServerProfile() { profile1->SetAttribute("Password", lineEdit_password->text().toUtf8().constData()); profile1->SetAttribute("Port", spinBox_port->value()); profile1->SetAttribute("IsIpv6", checkBox_ipv6->isChecked()); + profile1->SetAttribute("IsSctp", checkBox_sctp->isChecked()); } break; case QMessageBox::No: @@ -220,6 +228,7 @@ void joinNetworkGameDialogImpl::saveServerProfile() { 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/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 39b6c514..2bb0b14a 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -511,6 +511,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) myWaitingForServerGameDialog = new waitForServerToStartGameDialogImpl(this); myAboutPokerthDialog = new aboutPokerthImpl(this); + //dialog settings +// mySettingsDialog->checkBox_useSctp->setEnabled(mySession->hasSctp()); +// myJoinNetworkGameDialog->checkBox_sctp->setEnabled(mySession->hasSctp()); // //ShortCuts // QShortcut *quitPokerTHKeys = new QShortcut(QKeySequence(Qt::Key_Control + Qt::Key_Q), this); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index eefc9620..7d31b7db 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -39,7 +39,7 @@ - 3 + 0 @@ -725,7 +725,7 @@ p, li { white-space: pre-wrap; } 9 - 6 + 15 diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 4bb2f32d..bf2140f2 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -109,6 +109,7 @@ void settingsDialogImpl::exec() { 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")); @@ -187,6 +188,7 @@ void settingsDialogImpl::isAccepted() { 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()); // Interface myConfig->writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked()); diff --git a/src/session.cpp b/src/session.cpp index 1e55e64c..4b46895e 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -34,7 +34,7 @@ using namespace std; Session::Session(GuiInterface *g, ConfigFile *c) -: currentGameID(0), myNetClient(0), myNetServer(0), myGui(g), myConfig(c) +: currentGameID(0), myNetClient(0), myNetServer(0), myGui(g), myConfig(c), thisHasSctp(0) { } diff --git a/src/session.h b/src/session.h index f6945640..49d7dc64 100755 --- a/src/session.h +++ b/src/session.h @@ -63,6 +63,10 @@ public: bool isNetworkClientRunning() const; // TODO hack + void setHasSctp ( bool theValue ) { thisHasSctp = theValue; } + bool hasSctp() const { return thisHasSctp; } + + private: int currentGameID; @@ -74,6 +78,8 @@ private: GuiInterface *myGui; ConfigFile *myConfig; + bool thisHasSctp; + };