diff --git a/data/gfx/gui/misc/cup.png b/data/gfx/gui/misc/cup.png new file mode 100644 index 00000000..4521fe1f Binary files /dev/null and b/data/gfx/gui/misc/cup.png differ diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 427ae706..40e17a37 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) myQtToolsInterface = CreateQtToolsWrapper(); // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 78; + configRev = 79; //standard defaults logOnOffDefault = "1"; @@ -210,6 +210,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) configList.push_back(ConfigInfo("AvatarServerAddress", CONFIG_TYPE_STRING, "")); configList.push_back(ConfigInfo("UseInternetGamePassword", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("InternetGamePassword", CONFIG_TYPE_STRING, "")); + configList.push_back(ConfigInfo("InternetGameRankingMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("UseLobbyChat", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("UseAdminIRC", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("AdminIRCServerAddress", CONFIG_TYPE_STRING, "chat.freenode.net")); diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui index 292f9733..72971737 100644 --- a/src/gui/qt/createinternetgamedialog.ui +++ b/src/gui/qt/createinternetgamedialog.ui @@ -6,8 +6,8 @@ 0 0 - 302 - 329 + 284 + 342 @@ -123,6 +123,10 @@ Password: + + + :/gfx/lock.png:/gfx/lock.png + @@ -139,6 +143,12 @@ + + + 0 + 0 + + Timeout for player action: @@ -175,6 +185,12 @@ + + + 0 + 0 + + s @@ -189,6 +205,23 @@ + + + + This game will affect players ranking level + + + This game will affect players ranking level + + + Ranking game mode + + + + :/gfx/cup.png:/gfx/cup.png + + + @@ -241,7 +274,9 @@ pushButton_createGame pushButton_cancel - + + + pushButton_createGame diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index 6c32c1cd..396f7385 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -98,6 +98,8 @@ void createInternetGameDialogImpl::fillFormular() { myChangeCompleteBlindsDialog->radioButton_afterThisAlwaysRaiseAbout->setChecked(myConfig->readConfigInt("NetAfterMBAlwaysRaiseAbout")); myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("NetAfterMBAlwaysRaiseValue")); myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("NetAfterMBStayAtLastBlind")); + + checkBox_rankingMode->setChecked(myConfig->readConfigInt("InternetGameRankingMode")); } void createInternetGameDialogImpl::showDialog() { diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 8ad115b8..ecc8f530 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -375,6 +375,16 @@ void gameLobbyDialogImpl::updateGameItem(QList itemList, unsign itemList.at(2)->setData("open", 16); } +// if (info.isRankingGame) { +// itemList.at(3)->setIcon(QIcon(myAppDataPath+"gfx/gui/misc/cup.png")); +// itemList.at(3)->setData(" ", Qt::DisplayRole); +// itemList.at(3)->setData("ranking", 16); +// } +// else { +// itemList.at(3)->setData("", Qt::DisplayRole); +// itemList.at(3)->setData("nonranking", 16); +// } + if (info.isPasswordProtected) { itemList.at(4)->setIcon(QIcon(myAppDataPath+"gfx/gui/misc/lock.png")); itemList.at(4)->setData(" ", Qt::DisplayRole); diff --git a/src/gui/qt/resources/cup.png b/src/gui/qt/resources/cup.png new file mode 100644 index 00000000..4521fe1f Binary files /dev/null and b/src/gui/qt/resources/cup.png differ diff --git a/src/gui/qt/resources/lock.png b/src/gui/qt/resources/lock.png new file mode 100644 index 00000000..3d121290 Binary files /dev/null and b/src/gui/qt/resources/lock.png differ diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc index 2d742cc1..8a4a02fe 100644 --- a/src/gui/qt/resources/pokerth.qrc +++ b/src/gui/qt/resources/pokerth.qrc @@ -1,5 +1,5 @@ - + view-fullscreen.png pokerth.qrc swbuttoninternetgame.png @@ -33,5 +33,7 @@ dialog_ok_apply.png filesave.png fill-color.png + lock.png + cup.png diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 691f3588..7cb63f7b 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -125,7 +125,7 @@ - 0 + 5 @@ -303,7 +303,7 @@ - 2 + 0 @@ -1648,6 +1648,10 @@ p, li { white-space: pre-wrap; } Use password for private game: + + + :/gfx/lock.png:/gfx/lock.png + @@ -1662,7 +1666,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -1678,7 +1682,18 @@ p, li { white-space: pre-wrap; } - Enable/Disable Lobby Chat + Show lobby chat + + + + + + + Use ranking mode (this game will affect players online ranking level) + + + + :/gfx/cup.png:/gfx/cup.png diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index dc85cd3c..98d7a7da 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -208,6 +208,7 @@ void settingsDialogImpl::exec() { lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str())); } checkBox_UseLobbyChat->setChecked(myConfig->readConfigInt("UseLobbyChat")); + checkBox_InternetGameRankingMode->setChecked(myConfig->readConfigInt("InternetGameRankingMode")); //Interface comboBox_switchLanguage->setCurrentIndex(comboBox_switchLanguage->findData(QString::fromUtf8(myConfig->readConfigString("Language").c_str()).section('_', 0, 0))); @@ -527,6 +528,7 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("UseInternetGamePassword", checkBox_UseInternetGamePassword->isChecked()); myConfig->writeConfigString("InternetGamePassword", lineEdit_InternetGamePassword->text().toUtf8().constData()); myConfig->writeConfigInt("UseLobbyChat", checkBox_UseLobbyChat->isChecked()); + myConfig->writeConfigInt("InternetGameRankingMode", checkBox_InternetGameRankingMode->isChecked()); // Interface myConfig->writeConfigString("Language", comboBox_switchLanguage->itemData(comboBox_switchLanguage->currentIndex()).toString().toUtf8().constData()); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index c84908d8..85317746 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -801,6 +801,6 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt) void GameTableStyleReader::setSliderStyle(QSlider *s) { - s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+"; height: 3px; background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 4px; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 9px; margin: -6px 0; border-radius: 4px;}"); + s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+"; height: 3px; background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 9px; margin: -5px 0; border-radius: 4px;}"); }