From 9e400ed9be599e9d74bae6422f8c7e458a016de0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 13 Jun 2017 03:27:36 +0300
Subject: Show site url in server info window.

---
 src/gui/windows/serverdialog.cpp     | 5 +++++
 src/gui/windows/serverinfowindow.cpp | 8 +++++---
 src/net/serverinfo.h                 | 5 +++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 6192f040d..2cd006e4e 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -650,6 +650,10 @@ void ServerDialog::loadServers(const bool addNew)
                 {
                     server.updateMirrors.push_back(XmlChildContent(subNode));
                 }
+                else if (xmlNameEqual(subNode, "site"))
+                {
+                    server.serverUrl = XmlChildContent(subNode);
+                }
             }
             if (xmlNameEqual(subNode, "updates"))
             {
@@ -687,6 +691,7 @@ void ServerDialog::loadServers(const bool addNew)
                 mServers[i].registerUrl = server.registerUrl;
                 mServers[i].onlineListUrl = server.onlineListUrl;
                 mServers[i].supportUrl = server.supportUrl;
+                mServers[i].serverUrl = server.serverUrl;
                 mServers[i].althostname = server.althostname;
                 mServers[i].persistentIp = server.persistentIp;
                 mServers[i].updateMirrors = server.updateMirrors;
diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp
index 23e7a7e50..99c0a902a 100644
--- a/src/gui/windows/serverinfowindow.cpp
+++ b/src/gui/windows/serverinfowindow.cpp
@@ -121,12 +121,15 @@ void ServerInfoWindow::showServerInfo()
         mBrowserBox->addRow(_("##BServer unknown licesne."));
     }
     mBrowserBox->addRow("");
+    addServerComment(mServerInfo.serverUrl,
+        // TRANSLATORS: server info comment
+        _("Server"));
     addServerComment(mServerInfo.supportUrl,
         // TRANSLATORS: server info comment
-        _("Support url"));
+        _("Support"));
     addServerComment(mServerInfo.registerUrl,
         // TRANSLATORS: server info comment
-        _("Register url"));
+        _("Register"));
 
     addSourcesList(mServerInfo.nonFreeSources,
         // TRANSLATORS: server info non free comment
@@ -149,7 +152,6 @@ void ServerInfoWindow::addSourcesList(const std::vector<ServerUrlInfo> &list,
             addServerComment(info.url,
                 info.name);
         }
-        mBrowserBox->addRow("");
     }
 }
 
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index ab4a99081..70ac3b716 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -47,6 +47,7 @@ class ServerInfo final
         std::string registerUrl;
         std::string onlineListUrl;
         std::string supportUrl;
+        std::string serverUrl;
         std::string defaultHostName;
         std::vector<std::string> updateMirrors;
         std::vector<HostsGroup> updateHosts;
@@ -68,6 +69,7 @@ class ServerInfo final
             registerUrl(),
             onlineListUrl(),
             supportUrl(),
+            serverUrl(),
             defaultHostName(),
             updateMirrors(),
             updateHosts(),
@@ -96,6 +98,7 @@ class ServerInfo final
             registerUrl(info.registerUrl),
             onlineListUrl(info.onlineListUrl),
             supportUrl(info.supportUrl),
+            serverUrl(info.serverUrl),
             defaultHostName(info.defaultHostName),
             updateMirrors(info.updateMirrors),
             updateHosts(info.updateHosts),
@@ -124,6 +127,7 @@ class ServerInfo final
             registerUrl = info.registerUrl;
             onlineListUrl = info.onlineListUrl;
             supportUrl = info.supportUrl;
+            serverUrl = info.serverUrl;
             defaultHostName = info.defaultHostName;
             updateMirrors = info.updateMirrors;
             updateHosts = info.updateHosts;
@@ -156,6 +160,7 @@ class ServerInfo final
             registerUrl.clear();
             onlineListUrl.clear();
             supportUrl.clear();
+            serverUrl.clear();
             defaultHostName.clear();
             updateMirrors.clear();
             updateHosts.clear();
-- 
cgit v1.2.3-60-g2f50