summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-14 18:45:06 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-14 18:45:06 +0300
commit2bc5d7a1bfaf32f5df3121bbc4d07b886cf9ffc3 (patch)
tree3f673405aaa8ac090636e61a4f64c19fa759b2af
parent835af9b140c069f7b8fa581718081a68687d02d2 (diff)
downloadplus-2bc5d7a1bfaf32f5df3121bbc4d07b886cf9ffc3.tar.gz
plus-2bc5d7a1bfaf32f5df3121bbc4d07b886cf9ffc3.tar.bz2
plus-2bc5d7a1bfaf32f5df3121bbc4d07b886cf9ffc3.tar.xz
plus-2bc5d7a1bfaf32f5df3121bbc4d07b886cf9ffc3.zip
Add docs section for server in serverslist.xml
-rw-r--r--src/gui/windows/serverdialog.cpp6
-rw-r--r--src/gui/windows/serverinfowindow.cpp3
-rw-r--r--src/net/serverinfo.h5
3 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 95b40f03d..501557c8c 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -245,6 +245,7 @@ void ServerDialog::connectToSelectedServer()
mServerInfo->updateHosts = server.updateHosts;
mServerInfo->freeSources = server.freeSources;
mServerInfo->nonFreeSources = server.nonFreeSources;
+ mServerInfo->docs = server.docs;
settings.persistentIp = mServerInfo->persistentIp;
settings.supportUrl = mServerInfo->supportUrl;
@@ -668,6 +669,10 @@ void ServerDialog::loadServers(const bool addNew)
{
loadServerSources(subNode, server);
}
+ else if (xmlNameEqual(subNode, "docs"))
+ {
+ loadServerSourcesList(subNode, server.docs);
+ }
}
server.version.first = font->getWidth(version);
@@ -699,6 +704,7 @@ void ServerDialog::loadServers(const bool addNew)
mServers[i].packetVersion = server.packetVersion;
mServers[i].freeSources = server.freeSources;
mServers[i].nonFreeSources = server.nonFreeSources;
+ mServers[i].docs = server.docs;
mServersListModel->setVersionString(i, version);
found = true;
break;
diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp
index d6f0c3cad..660dd0241 100644
--- a/src/gui/windows/serverinfowindow.cpp
+++ b/src/gui/windows/serverinfowindow.cpp
@@ -127,6 +127,9 @@ void ServerInfoWindow::showServerInfo()
addSourcesList(mServerInfo.freeSources,
// TRANSLATORS: server info non free comment
_("##BFree sources"));
+ addSourcesList(mServerInfo.docs,
+ // TRANSLATORS: server info documentation comment
+ _("##BDocumentation"));
}
void ServerInfoWindow::addSourcesList(const std::vector<ServerUrlInfo> &list,
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 70ac3b716..2deccb04f 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -53,6 +53,7 @@ class ServerInfo final
std::vector<HostsGroup> updateHosts;
std::vector<ServerUrlInfo> freeSources;
std::vector<ServerUrlInfo> nonFreeSources;
+ std::vector<ServerUrlInfo> docs;
uint16_t port;
VersionString version;
int packetVersion;
@@ -75,6 +76,7 @@ class ServerInfo final
updateHosts(),
freeSources(),
nonFreeSources(),
+ docs(),
#ifdef TMWA_SUPPORT
port(6901),
#else // TMWA_SUPPORT
@@ -104,6 +106,7 @@ class ServerInfo final
updateHosts(info.updateHosts),
freeSources(info.freeSources),
nonFreeSources(info.nonFreeSources),
+ docs(info.docs),
port(info.port),
version(),
packetVersion(info.packetVersion),
@@ -133,6 +136,7 @@ class ServerInfo final
updateHosts = info.updateHosts;
freeSources = info.freeSources;
nonFreeSources = info.nonFreeSources;
+ docs = info.docs;
port = info.port;
save = info.save;
persistentIp = info.persistentIp;
@@ -166,6 +170,7 @@ class ServerInfo final
updateHosts.clear();
freeSources.clear();
nonFreeSources.clear();
+ docs.clear();
version.first = 0;
version.second.clear();
packetVersion = 0;