jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add more info to dialogs (#4293)

Browse source 
* add more info to dialogs

adds descriptive strings to the register, password reset request,
password reset challenge request, password reset token dialogs
adds tip to set manager to use ctrl a to select all sets
change sizes in set manager
moves default server info to settings instead of having it hardcoded in
each dialog

* make sets manager smaller

* clangify

* cleanup
This commit is contained in:
ebbit1q 2021-04-02 05:34:25 +02:00 • committed by GitHub
parent 1b4543aa11
commit 8e954b10e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 170 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,20 +56,15 @@ QString ServersSettings::getPrevioushostName()
int ServersSettings::getPrevioushostindex(const QString &saveName)
{
int size = getValue("totalServers", "server", "server_details").toInt() + 1;
int size = getValue("totalServers", "server", "server_details").toInt();
for (int i = 0; i < size; i++)
for (int i = 0; i <= size; ++i)
if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString())
return i;
return -1;
}
void ServersSettings::setHostName(QString hostname)
{
setValue(hostname, "hostname", "server");
}
QString ServersSettings::getHostname(QString defaultHost)
{
int index = getPrevioushostindex(getPrevioushostName());
@ -77,11 +72,6 @@ QString ServersSettings::getHostname(QString defaultHost)
return hostname == QVariant() ? std::move(defaultHost) : hostname.toString();
}
void ServersSettings::setPort(QString port)
{
setValue(port, "port", "server");
}
QString ServersSettings::getPort(QString defaultPort)
{
int index = getPrevioushostindex(getPrevioushostName());
@ -90,11 +80,6 @@ QString ServersSettings::getPort(QString defaultPort)
return port == QVariant() ? std::move(defaultPort) : port.toString();
}
void ServersSettings::setPlayerName(QString playerName)
{
setValue(playerName, "playername", "server");
}
QString ServersSettings::getPlayerName(QString defaultName)
{
int index = getPrevioushostindex(getPrevioushostName());
@ -120,16 +105,6 @@ bool ServersSettings::getSavePassword()
return save;
}
void ServersSettings::setPassword(QString password)
{
setValue(password, "password", "server");
}
void ServersSettings::setSavePassword(int save)
{
setValue(save, "save_password", "server");
}
void ServersSettings::setAutoConnect(int autoconnect)
{
setValue(autoconnect, "auto_connect", "server");
@ -210,20 +185,48 @@ void ServersSettings::addNewServer(const QString &saveName,
void ServersSettings::removeServer(QString servAddr)
{
int size = getValue("totalServers", "server", "server_details").toInt() + 1;
int size = getValue("totalServers", "server", "server_details").toInt();
for (int i = 0; i < size; i++) {
if (servAddr == getValue(QString("server%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");
deleteValue(QString("site%1").arg(i), "server", "server_details");
return;
bool found = false;
for (int i = 0; i <= size; ++i) {
if (!found) {
// find entry and overwrite it
if (servAddr == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
found = true;
}
} else {
// move all other entries after it one back, overwriting the previous one
int previous = i - 1; // we delete only one entry
setValue(getValue(QString("server%1").arg(i), "server", "server_details"),
QString("server%1").arg(previous), "server", "server_details");
setValue(getValue(QString("port%1").arg(i), "server", "server_details"), QString("port%1").arg(previous),
"server", "server_details");
setValue(getValue(QString("username%1").arg(i), "server", "server_details"),
QString("username%1").arg(previous), "server", "server_details");
setValue(getValue(QString("savePassword%1").arg(i), "server", "server_details"),
QString("savePassword%1").arg(previous), "server", "server_details");
setValue(getValue(QString("password%1").arg(i), "server", "server_details"),
QString("password%1").arg(previous), "server", "server_details");
setValue(getValue(QString("saveName%1").arg(i), "server", "server_details"),
QString("saveName%1").arg(previous), "server", "server_details");
setValue(getValue(QString("site%1").arg(i), "server", "server_details"), QString("site%1").arg(previous),
"server", "server_details");
}
}
// if we have deleted an entry, adjust the total
if (found) {
setValue(size - 1, "totalServers", "server", "server_details");
// delete last value
deleteValue(QString("server%1").arg(size), "server", "server_details");
deleteValue(QString("port%1").arg(size), "server", "server_details");
deleteValue(QString("username%1").arg(size), "server", "server_details");
deleteValue(QString("savePassword%1").arg(size), "server", "server_details");
deleteValue(QString("password%1").arg(size), "server", "server_details");
deleteValue(QString("saveName%1").arg(size), "server", "server_details");
deleteValue(QString("site%1").arg(size), "server", "server_details");
}
}
/**
@ -231,9 +234,9 @@ void ServersSettings::removeServer(QString servAddr)
*/
bool ServersSettings::updateExistingServerWithoutLoss(QString saveName, QString serv, QString port, QString site)
{
int size = getValue("totalServers", "server", "server_details").toInt() + 1;
int size = getValue("totalServers", "server", "server_details").toInt();
for (int i = 0; i < size; i++) {
for (int i = 0; i <= size; ++i) {
if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
if (!port.isEmpty()) {
setValue(port, QString("port%1").arg(i), "server", "server_details");
@ -259,9 +262,9 @@ bool ServersSettings::updateExistingServer(QString saveName,
bool savePassword,
QString site)
{
int size = getValue("totalServers", "server", "server_details").toInt() + 1;
int size = getValue("totalServers", "server", "server_details").toInt();
for (int i = 0; i < size; i++) {
for (int i = 0; i <= size; ++i) {
if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
setValue(port, QString("port%1").arg(i), "server", "server_details");
if (!username.isEmpty()) {