From ca2e05952e41942426adeeb9ee7dcee62d887ee4 Mon Sep 17 00:00:00 2001 From: Zach H Date: Tue, 3 Apr 2018 18:41:10 -0400 Subject: [PATCH] add rooster ranges, remove woogerworks (#3163) --- cockatrice/src/dlg_connect.cpp | 6 +++++- .../src/dlg_forgotpasswordchallenge.cpp | 2 +- cockatrice/src/dlg_forgotpasswordrequest.cpp | 2 +- cockatrice/src/dlg_forgotpasswordreset.cpp | 2 +- cockatrice/src/dlg_register.cpp | 2 +- cockatrice/src/settings/serverssettings.cpp | 17 +++++++++++++++ cockatrice/src/settings/serverssettings.h | 1 + cockatrice/src/settings/settingsmanager.cpp | 21 +++++++++++++++++++ cockatrice/src/settings/settingsmanager.h | 3 ++- webclient/index.html | 2 +- 10 files changed, 51 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp index 27063ada..dcfb0442 100644 --- a/cockatrice/src/dlg_connect.cpp +++ b/cockatrice/src/dlg_connect.cpp @@ -167,11 +167,15 @@ void DlgConnect::rebuildComboBoxList() savedHostList = uci.getServerInfo(); if (savedHostList.size() == 1) { - settingsCache->servers().addNewServer("Woogerworks", "cockatrice.woogerworks.com", "4747", "", "", false); + settingsCache->servers().addNewServer("Rooster Ranges", "server.cockatrice.us", "4747", "", "", false); settingsCache->servers().addNewServer("Chickatrice", "chickatrice.net", "4747", "", "", false); settingsCache->servers().addNewServer("dr4ft", "cockatrice.dr4ft.com", "4747", "", "", false); settingsCache->servers().addNewServer("Tetrarch", "mtg.tetrarch.co", "4747", "", "", false); + } else if (!savedHostList.contains("Rooster Ranges")) { + settingsCache->servers().addNewServer("Rooster Ranges", "server.cockatrice.us", "4747", "", "", false); + settingsCache->servers().removeServer("Woogerworks"); } + savedHostList = uci.getServerInfo(); int i = 0; diff --git a/cockatrice/src/dlg_forgotpasswordchallenge.cpp b/cockatrice/src/dlg_forgotpasswordchallenge.cpp index 0f7c4ede..b9418f52 100644 --- a/cockatrice/src/dlg_forgotpasswordchallenge.cpp +++ b/cockatrice/src/dlg_forgotpasswordchallenge.cpp @@ -15,7 +15,7 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo QString lastfphost; QString lastfpport; QString lastfpplayername; - lastfphost = settingsCache->servers().getHostname("cockatrice.woogerworks.com"); + lastfphost = settingsCache->servers().getHostname("server.cockatrice.us"); lastfpport = settingsCache->servers().getPort("4747"); lastfpplayername = settingsCache->servers().getPlayerName("Player"); diff --git a/cockatrice/src/dlg_forgotpasswordrequest.cpp b/cockatrice/src/dlg_forgotpasswordrequest.cpp index ec1b74c7..ac87a9c8 100644 --- a/cockatrice/src/dlg_forgotpasswordrequest.cpp +++ b/cockatrice/src/dlg_forgotpasswordrequest.cpp @@ -15,7 +15,7 @@ DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(pa QString lastfphost; QString lastfpport; QString lastfpplayername; - lastfphost = settingsCache->servers().getHostname("cockatrice.woogerworks.com"); + lastfphost = settingsCache->servers().getHostname("server.cockatrice.us"); lastfpport = settingsCache->servers().getPort("4747"); lastfpplayername = settingsCache->servers().getPlayerName("Player"); diff --git a/cockatrice/src/dlg_forgotpasswordreset.cpp b/cockatrice/src/dlg_forgotpasswordreset.cpp index 7530bc2a..dbfb6d29 100644 --- a/cockatrice/src/dlg_forgotpasswordreset.cpp +++ b/cockatrice/src/dlg_forgotpasswordreset.cpp @@ -15,7 +15,7 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent QString lastfphost; QString lastfpport; QString lastfpplayername; - lastfphost = settingsCache->servers().getHostname("cockatrice.woogerworks.com"); + lastfphost = settingsCache->servers().getHostname("server.cockatrice.us"); lastfpport = settingsCache->servers().getPort("4747"); lastfpplayername = settingsCache->servers().getPlayerName("Player"); diff --git a/cockatrice/src/dlg_register.cpp b/cockatrice/src/dlg_register.cpp index 606adfd7..d9deb94c 100644 --- a/cockatrice/src/dlg_register.cpp +++ b/cockatrice/src/dlg_register.cpp @@ -13,7 +13,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) { hostLabel = new QLabel(tr("&Host:")); - hostEdit = new QLineEdit(settingsCache->servers().getHostname("cockatrice.woogerworks.com")); + hostEdit = new QLineEdit(settingsCache->servers().getHostname("server.cockatrice.us")); hostLabel->setBuddy(hostEdit); portLabel = new QLabel(tr("&Port:")); diff --git a/cockatrice/src/settings/serverssettings.cpp b/cockatrice/src/settings/serverssettings.cpp index 169a9781..999a941c 100644 --- a/cockatrice/src/settings/serverssettings.cpp +++ b/cockatrice/src/settings/serverssettings.cpp @@ -196,6 +196,23 @@ void ServersSettings::addNewServer(QString saveName, setValue(password, QString("password%1").arg(index), "server", "server_details"); } +void ServersSettings::removeServer(QString saveName) +{ + int size = getValue("totalServers", "server", "server_details").toInt() + 1; + + for (int i = 0; i < size; i++) { + if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) { + deleteValue(QString("server%1").arg(i), "server", "server_details"); + deleteValue(QString("port%1").arg(i), "server", "server_details"); + deleteValue(QString("username%1").arg(i), "server", "server_details"); + deleteValue(QString("savePassword%1").arg(i), "server", "server_details"); + deleteValue(QString("password%1").arg(i), "server", "server_details"); + deleteValue(QString("saveName%1").arg(i), "server", "server_details"); + return; + } + } +} + bool ServersSettings::updateExistingServer(QString saveName, QString serv, QString port, diff --git a/cockatrice/src/settings/serverssettings.h b/cockatrice/src/settings/serverssettings.h index 0f7e4278..4eacd0e2 100644 --- a/cockatrice/src/settings/serverssettings.h +++ b/cockatrice/src/settings/serverssettings.h @@ -39,6 +39,7 @@ public: void setFPPlayerName(QString playerName); void addNewServer(QString saveName, QString serv, QString port, QString username, QString password, bool savePassword); + void removeServer(QString saveName); bool updateExistingServer(QString saveName, QString serv, QString port, diff --git a/cockatrice/src/settings/settingsmanager.cpp b/cockatrice/src/settings/settingsmanager.cpp index bb83c490..acd7664c 100644 --- a/cockatrice/src/settings/settingsmanager.cpp +++ b/cockatrice/src/settings/settingsmanager.cpp @@ -26,6 +26,27 @@ void SettingsManager::setValue(QVariant value, QString name, QString group, QStr } } +void SettingsManager::deleteValue(QString name, QString group, QString subGroup) +{ + if (!group.isEmpty()) { + settings.beginGroup(group); + } + + if (!subGroup.isEmpty()) { + settings.beginGroup(subGroup); + } + + settings.remove(name); + + if (!subGroup.isEmpty()) { + settings.endGroup(); + } + + if (!group.isEmpty()) { + settings.endGroup(); + } +} + QVariant SettingsManager::getValue(QString name, QString group, QString subGroup) { if (!group.isEmpty()) { diff --git a/cockatrice/src/settings/settingsmanager.h b/cockatrice/src/settings/settingsmanager.h index 9a94b7fb..648e6a0d 100644 --- a/cockatrice/src/settings/settingsmanager.h +++ b/cockatrice/src/settings/settingsmanager.h @@ -10,7 +10,7 @@ class SettingsManager : public QObject { Q_OBJECT public: - SettingsManager(QString settingPath, QObject *parent = 0); + explicit SettingsManager(QString settingPath, QObject *parent = nullptr); QVariant getValue(QString name, QString group = "", QString subGroup = ""); signals: @@ -20,6 +20,7 @@ public slots: protected: QSettings settings; void setValue(QVariant value, QString name, QString group = "", QString subGroup = ""); + void deleteValue(QString name, QString group = "", QString subGroup = ""); }; #endif // SETTINGSMANAGER_H diff --git a/webclient/index.html b/webclient/index.html index 33d9e701..36d81d68 100755 --- a/webclient/index.html +++ b/webclient/index.html @@ -89,7 +89,7 @@ Loading cockatrice web client... $( "#host" ).autocomplete({ source: [ // add custom servers here - "cockatrice.woogerworks.com", + "server.cockatrice.us", "chickatrice.net", "127.0.0.1" ]