jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

server site added to connect window (#3190)

Browse source
This commit is contained in:
David Szabo 2018-04-11 01:05:13 +02:00 • committed by Zach H
parent 034e79dd36
commit cc2a0fa0d0
7 changed files with 80 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/userconnection_information.cpp
View file

@ -10,9 +10,10 @@ UserConnection_Information::UserConnection_Information(QString _saveName,
QString _portNum,
QString _userName,
QString _pass,
bool _savePass)
bool _savePass,
QString _site)
: saveName(std::move(_saveName)), server(std::move(_serverName)), port(std::move(_portNum)),
username(std::move(_userName)), password(std::move(_pass)), savePassword(_savePass)
username(std::move(_userName)), password(std::move(_pass)), savePassword(_savePass), site(std::move(_site))
{
}
@ -35,8 +36,10 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
settingsCache->servers().getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass =
settingsCache->servers().getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site =
settingsCache->servers().getValue(QString("site%1").arg(i), "server", "server_details").toString();
UserConnection_Information userInfo(saveName, serverName, portNum, userName, pass, savePass);
UserConnection_Information userInfo(saveName, serverName, portNum, userName, pass, savePass, site);
serverList.insert(saveName, std::make_pair(serverName, userInfo));
}
@ -65,6 +68,8 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
settingsCache->servers().getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass =
settingsCache->servers().getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site =
settingsCache->servers().getValue(QString("site%1").arg(i), "server", "server_details").toString();
server.append(saveName);
server.append(serverName);
@ -72,6 +77,7 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
server.append(userName);
server.append(pass);
server.append(savePass ? "1" : "0");
server.append(site);
break;
}