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

5 files changed, 12 insertions, 33 deletions

diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index 5baa53bee0..adb222f80e 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -48,6 +48,7 @@ const static struct {
     { RbSettings::InstallThemes,        "install_themes",       "false" },
     { RbSettings::InstallGamefiles,     "install_gamefiles",    "true" },
     { RbSettings::InstallVoice,         "install_voice",        "false" },
+    { RbSettings::InstallManual,        "install_manual",       "false" },
 #if defined(Q_OS_WIN32)
     { RbSettings::Tts,                  "tts",                  "sapi" },
 #elif defined(Q_OS_MACX)
diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h
index a25eabbcee..0060879fee 100644
--- a/rbutil/rbutilqt/base/rbsettings.h
+++ b/rbutil/rbutilqt/base/rbsettings.h
@@ -47,6 +47,7 @@ class RbSettings : public QObject
             InstallThemes,
             InstallGamefiles,
             InstallVoice,
+            InstallManual,
             Tts,
             UseTtsCorrections,
             TalkFolders,
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(),
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h
index 9affcb6032..7b7e52beb7 100644
--- a/rbutil/rbutilqt/base/serverinfo.h
+++ b/rbutil/rbutilqt/base/serverinfo.h
@@ -41,9 +41,6 @@ class ServerInfo : public QObject
             CurStatus,
             CurReleaseUrl,
             CurDevelUrl,
-            ManualPdfUrl,
-            ManualHtmlUrl,
-            ManualZipUrl,
             BleedingRevision,
             BleedingDate,
             RelCandidateVersion,
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index 2ad3c7a7d4..b0837438cb 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -51,18 +51,18 @@ const static struct {
     const char* name;
     const char* def;
 } PlatformInfosList[] = {
-    { SystemInfo::PlatformName,     ":platform:/name",      "" },
-    { SystemInfo::Manual,           ":platform:/manualname","rockbox-:platform:" },
-    { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" },
-    { SystemInfo::BootloaderName,   ":platform:/bootloadername", "" },
-    { SystemInfo::BootloaderFile,   ":platform:/bootloaderfile", "" },
-    { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" },
-    { SystemInfo::Encoder,          ":platform:/encoder",   "" },
-    { SystemInfo::Brand,            ":platform:/brand",     "" },
-    { SystemInfo::Name,             ":platform:/name",      "" },
+    { SystemInfo::PlatformName,     ":platform:/name",              "" },
+    { SystemInfo::Manual,           ":platform:/manualname",        ":platform:" },
+    { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod",  "none" },
+    { SystemInfo::BootloaderName,   ":platform:/bootloadername",    "" },
+    { SystemInfo::BootloaderFile,   ":platform:/bootloaderfile",    "" },
+    { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter",  "" },
+    { SystemInfo::Encoder,          ":platform:/encoder",           "" },
+    { SystemInfo::Brand,            ":platform:/brand",             "" },
+    { SystemInfo::Name,             ":platform:/name",              "" },
     { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" },
     { SystemInfo::ConfigureModel,   ":platform:/configure_modelname", "" },
-    { SystemInfo::PlayerPicture,    ":platform:/playerpic", "" },
+    { SystemInfo::PlayerPicture,    ":platform:/playerpic",         "" },
 };
 
 //! pointer to setting object to nullptr