diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 20 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.h | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 20 |
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 { | |||
48 | { RbSettings::InstallThemes, "install_themes", "false" }, | 48 | { RbSettings::InstallThemes, "install_themes", "false" }, |
49 | { RbSettings::InstallGamefiles, "install_gamefiles", "true" }, | 49 | { RbSettings::InstallGamefiles, "install_gamefiles", "true" }, |
50 | { RbSettings::InstallVoice, "install_voice", "false" }, | 50 | { RbSettings::InstallVoice, "install_voice", "false" }, |
51 | { RbSettings::InstallManual, "install_manual", "false" }, | ||
51 | #if defined(Q_OS_WIN32) | 52 | #if defined(Q_OS_WIN32) |
52 | { RbSettings::Tts, "tts", "sapi" }, | 53 | { RbSettings::Tts, "tts", "sapi" }, |
53 | #elif defined(Q_OS_MACX) | 54 | #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 | |||
47 | InstallThemes, | 47 | InstallThemes, |
48 | InstallGamefiles, | 48 | InstallGamefiles, |
49 | InstallVoice, | 49 | InstallVoice, |
50 | InstallManual, | ||
50 | Tts, | 51 | Tts, |
51 | UseTtsCorrections, | 52 | UseTtsCorrections, |
52 | TalkFolders, | 53 | 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 { | |||
42 | { ServerInfo::RelCandidateVersion, "release-candidate/:platform:", "" }, | 42 | { ServerInfo::RelCandidateVersion, "release-candidate/:platform:", "" }, |
43 | { ServerInfo::RelCandidateUrl, "release-candidate/:platform:", "" }, | 43 | { ServerInfo::RelCandidateUrl, "release-candidate/:platform:", "" }, |
44 | { ServerInfo::CurStatus, "status/:platform:", "-1" }, | 44 | { ServerInfo::CurStatus, "status/:platform:", "-1" }, |
45 | { ServerInfo::ManualPdfUrl, "", "" }, | ||
46 | { ServerInfo::ManualHtmlUrl, "", "" }, | ||
47 | { ServerInfo::ManualZipUrl, "", "" }, | ||
48 | { ServerInfo::BleedingRevision, "bleeding/rev", "" }, | 45 | { ServerInfo::BleedingRevision, "bleeding/rev", "" }, |
49 | { ServerInfo::BleedingDate, "bleeding/timestamp", "" }, | 46 | { ServerInfo::BleedingDate, "bleeding/timestamp", "" }, |
50 | { ServerInfo::CurDevelUrl, "", "" }, | 47 | { ServerInfo::CurDevelUrl, "", "" }, |
@@ -111,23 +108,6 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform) | |||
111 | SystemInfo::BuildCurrent).toString() | 108 | SystemInfo::BuildCurrent).toString() |
112 | .replace("%MODEL%", platform); | 109 | .replace("%MODEL%", platform); |
113 | break; | 110 | break; |
114 | case ManualPdfUrl: | ||
115 | case ManualZipUrl: | ||
116 | case ManualHtmlUrl: | ||
117 | { | ||
118 | QString url = SystemInfo::value(SystemInfo::ManualUrl).toString(); | ||
119 | QString modelman = SystemInfo::platformValue( | ||
120 | SystemInfo::Manual, platform).toString(); | ||
121 | url.replace("%MODEL%", modelman.isEmpty() ? platform : modelman); | ||
122 | if(info == ManualPdfUrl) | ||
123 | url.replace("%FORMAT%", ".pdf"); | ||
124 | else if(info == ManualZipUrl) | ||
125 | url.replace("%FORMAT%", "-html.zip"); | ||
126 | else if(info == ManualHtmlUrl) | ||
127 | url.replace("%FORMAT%", "/rockbox-build.html"); | ||
128 | value = url; | ||
129 | } | ||
130 | break; | ||
131 | case BleedingDate: | 111 | case BleedingDate: |
132 | // TODO: get rid of this, it's location specific. | 112 | // TODO: get rid of this, it's location specific. |
133 | value = QDateTime::fromString(value.toString(), | 113 | 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 | |||
41 | CurStatus, | 41 | CurStatus, |
42 | CurReleaseUrl, | 42 | CurReleaseUrl, |
43 | CurDevelUrl, | 43 | CurDevelUrl, |
44 | ManualPdfUrl, | ||
45 | ManualHtmlUrl, | ||
46 | ManualZipUrl, | ||
47 | BleedingRevision, | 44 | BleedingRevision, |
48 | BleedingDate, | 45 | BleedingDate, |
49 | RelCandidateVersion, | 46 | 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 { | |||
51 | const char* name; | 51 | const char* name; |
52 | const char* def; | 52 | const char* def; |
53 | } PlatformInfosList[] = { | 53 | } PlatformInfosList[] = { |
54 | { SystemInfo::PlatformName, ":platform:/name", "" }, | 54 | { SystemInfo::PlatformName, ":platform:/name", "" }, |
55 | { SystemInfo::Manual, ":platform:/manualname","rockbox-:platform:" }, | 55 | { SystemInfo::Manual, ":platform:/manualname", ":platform:" }, |
56 | { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" }, | 56 | { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" }, |
57 | { SystemInfo::BootloaderName, ":platform:/bootloadername", "" }, | 57 | { SystemInfo::BootloaderName, ":platform:/bootloadername", "" }, |
58 | { SystemInfo::BootloaderFile, ":platform:/bootloaderfile", "" }, | 58 | { SystemInfo::BootloaderFile, ":platform:/bootloaderfile", "" }, |
59 | { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" }, | 59 | { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" }, |
60 | { SystemInfo::Encoder, ":platform:/encoder", "" }, | 60 | { SystemInfo::Encoder, ":platform:/encoder", "" }, |
61 | { SystemInfo::Brand, ":platform:/brand", "" }, | 61 | { SystemInfo::Brand, ":platform:/brand", "" }, |
62 | { SystemInfo::Name, ":platform:/name", "" }, | 62 | { SystemInfo::Name, ":platform:/name", "" }, |
63 | { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" }, | 63 | { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" }, |
64 | { SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" }, | 64 | { SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" }, |
65 | { SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, | 65 | { SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, |
66 | }; | 66 | }; |
67 | 67 | ||
68 | //! pointer to setting object to nullptr | 68 | //! pointer to setting object to nullptr |