aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add rooster ranges, remove woogerworks (#3163)

Browse source
This commit is contained in:
Zach H 2018-04-03 18:41:10 -04:00 committed by GitHub
parent 2fcb02cadd
commit ca2e05952e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/dlg_connect.cpp
View file

@ -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;

2
cockatrice/src/dlg_forgotpasswordchallenge.cpp
View file

@ -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");

2
cockatrice/src/dlg_forgotpasswordrequest.cpp
View file

@ -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");

2
cockatrice/src/dlg_forgotpasswordreset.cpp
View file

@ -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");

2
cockatrice/src/dlg_register.cpp
View file

@ -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:"));

17
cockatrice/src/settings/serverssettings.cpp
View file

@ -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,

1
cockatrice/src/settings/serverssettings.h
View file

@ -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,

21
cockatrice/src/settings/settingsmanager.cpp
View file

@ -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()) {

3
cockatrice/src/settings/settingsmanager.h
View file

@ -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

2
webclient/index.html
View file

@ -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"
]