mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-02 11:33:55 -07:00
add more info to dialogs (#4293)
* 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
GitHub
parent
1b4543aa11
commit
8e954b10e6
16 changed files with 170 additions and 158 deletions
|
|
@ -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()) {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
#include "settingsmanager.h"
|
||||
|
||||
#include <QObject>
|
||||
#define SERVERSETTINGS_DEFAULT_HOST "server.cockatrice.us"
|
||||
#define SERVERSETTINGS_DEFAULT_PORT "4748"
|
||||
|
||||
class ServersSettings : public SettingsManager
|
||||
{
|
||||
|
|
@ -15,11 +17,11 @@ public:
|
|||
int getPrevioushostindex(const QString &);
|
||||
QStringList getPreviousHostList();
|
||||
QString getPrevioushostName();
|
||||
QString getHostname(QString defaultHost = "");
|
||||
QString getPort(QString defaultPort = "");
|
||||
QString getHostname(QString defaultHost = SERVERSETTINGS_DEFAULT_HOST);
|
||||
QString getPort(QString defaultPort = SERVERSETTINGS_DEFAULT_PORT);
|
||||
QString getPlayerName(QString defaultName = "");
|
||||
QString getFPHostname(QString defaultHost = "");
|
||||
QString getFPPort(QString defaultPort = "");
|
||||
QString getFPHostname(QString defaultHost = SERVERSETTINGS_DEFAULT_HOST);
|
||||
QString getFPPort(QString defaultPort = SERVERSETTINGS_DEFAULT_PORT);
|
||||
QString getFPPlayerName(QString defaultName = "");
|
||||
QString getPassword();
|
||||
QString getSaveName(QString defaultname = "");
|
||||
|
|
@ -30,15 +32,10 @@ public:
|
|||
void setPreviousHostLogin(int previous);
|
||||
void setPrevioushostName(const QString &);
|
||||
void setPreviousHostList(QStringList list);
|
||||
void setHostName(QString hostname);
|
||||
void setPort(QString port);
|
||||
void setPlayerName(QString playerName);
|
||||
void setAutoConnect(int autoconnect);
|
||||
void setSite(QString site);
|
||||
void setFPHostName(QString hostname);
|
||||
void setPassword(QString password);
|
||||
void setFPPort(QString port);
|
||||
void setSavePassword(int save);
|
||||
void setFPPlayerName(QString playerName);
|
||||
void addNewServer(const QString &saveName,
|
||||
const QString &serv,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue