rbutil: Move Manual installation to main tab.

The manual tab didn't show the manual, so it's clearer to have that as
part of the main tab.

Also fixes the wrong manual getting downloaded for releases.

Change-Id: I5d4a287102af037f94f0de8464e025d9ff5f76ed

1 files changed, 0 insertions, 20 deletions

diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index 2f73d96beb..8b6707540e 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -42,9 +42,6 @@ const static struct {
     { ServerInfo::RelCandidateVersion,  "release-candidate/:platform:", "" },
     { ServerInfo::RelCandidateUrl,      "release-candidate/:platform:", "" },
     { ServerInfo::CurStatus,            "status/:platform:",            "-1" },
-    { ServerInfo::ManualPdfUrl,         "",                             "" },
-    { ServerInfo::ManualHtmlUrl,        "",                             "" },
-    { ServerInfo::ManualZipUrl,         "",                             "" },
     { ServerInfo::BleedingRevision,     "bleeding/rev",                 "" },
     { ServerInfo::BleedingDate,         "bleeding/timestamp",           "" },
     { ServerInfo::CurDevelUrl,          "",                             "" },
@@ -111,23 +108,6 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform)
                                   SystemInfo::BuildCurrent).toString()
                 .replace("%MODEL%", platform);
         break;
-    case ManualPdfUrl:
-    case ManualZipUrl:
-    case ManualHtmlUrl:
-        {
-            QString url = SystemInfo::value(SystemInfo::ManualUrl).toString();
-            QString modelman = SystemInfo::platformValue(
-                    SystemInfo::Manual, platform).toString();
-            url.replace("%MODEL%", modelman.isEmpty() ? platform : modelman);
-            if(info == ManualPdfUrl)
-                url.replace("%FORMAT%", ".pdf");
-            else if(info == ManualZipUrl)
-                url.replace("%FORMAT%", "-html.zip");
-            else if(info == ManualHtmlUrl)
-                url.replace("%FORMAT%", "/rockbox-build.html");
-            value = url;
-        }
-        break;
     case BleedingDate:
         // TODO: get rid of this, it's location specific.
         value = QDateTime::fromString(value.toString(),