diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 2 |
4 files changed, 16 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index 8b6707540e..9fa3402828 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp | |||
@@ -41,6 +41,8 @@ const static struct { | |||
41 | { ServerInfo::CurReleaseUrl, "release/:platform:", "" }, | 41 | { ServerInfo::CurReleaseUrl, "release/:platform:", "" }, |
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::DailyVersion, "daily/:platform:", "" }, | ||
45 | { ServerInfo::DailyUrl, "daily/:platform:", "" }, | ||
44 | { ServerInfo::CurStatus, "status/:platform:", "-1" }, | 46 | { ServerInfo::CurStatus, "status/:platform:", "-1" }, |
45 | { ServerInfo::BleedingRevision, "bleeding/rev", "" }, | 47 | { ServerInfo::BleedingRevision, "bleeding/rev", "" }, |
46 | { ServerInfo::BleedingDate, "bleeding/timestamp", "" }, | 48 | { ServerInfo::BleedingDate, "bleeding/timestamp", "" }, |
@@ -83,10 +85,12 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform) | |||
83 | switch(info) { | 85 | switch(info) { |
84 | case CurReleaseVersion: | 86 | case CurReleaseVersion: |
85 | case RelCandidateVersion: | 87 | case RelCandidateVersion: |
88 | case DailyVersion: | ||
86 | value = value.toStringList().at(0); | 89 | value = value.toStringList().at(0); |
87 | break; | 90 | break; |
88 | case CurReleaseUrl: | 91 | case CurReleaseUrl: |
89 | case RelCandidateUrl: | 92 | case RelCandidateUrl: |
93 | case DailyUrl: | ||
90 | { | 94 | { |
91 | QString version = value.toStringList().at(0); | 95 | QString version = value.toStringList().at(0); |
92 | if(value.toStringList().size() > 1) | 96 | if(value.toStringList().size() > 1) |
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index 7b7e52beb7..0746ec2c4f 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h | |||
@@ -45,6 +45,8 @@ class ServerInfo : public QObject | |||
45 | BleedingDate, | 45 | BleedingDate, |
46 | RelCandidateVersion, | 46 | RelCandidateVersion, |
47 | RelCandidateUrl, | 47 | RelCandidateUrl, |
48 | DailyVersion, | ||
49 | DailyUrl | ||
48 | }; | 50 | }; |
49 | 51 | ||
50 | static ServerInfo* instance(); | 52 | static ServerInfo* instance(); |
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index f64cfecd7c..cc5abb40ad 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -124,6 +124,8 @@ void SelectiveInstallWidget::updateVersion(void) | |||
124 | ServerInfo::BleedingRevision).toString()); | 124 | ServerInfo::BleedingRevision).toString()); |
125 | m_versions.insert(SystemInfo::BuildCandidate, ServerInfo::instance()->platformValue( | 125 | m_versions.insert(SystemInfo::BuildCandidate, ServerInfo::instance()->platformValue( |
126 | ServerInfo::RelCandidateVersion).toString()); | 126 | ServerInfo::RelCandidateVersion).toString()); |
127 | m_versions.insert(SystemInfo::BuildDaily, ServerInfo::instance()->platformValue( | ||
128 | ServerInfo::DailyVersion).toString()); | ||
127 | } | 129 | } |
128 | 130 | ||
129 | ui.selectedVersion->clear(); | 131 | ui.selectedVersion->clear(); |
@@ -139,6 +141,10 @@ void SelectiveInstallWidget::updateVersion(void) | |||
139 | ui.selectedVersion->addItem(tr("Release Candidate (Revison %1)").arg( | 141 | ui.selectedVersion->addItem(tr("Release Candidate (Revison %1)").arg( |
140 | m_versions[SystemInfo::BuildCandidate]), SystemInfo::BuildCandidate); | 142 | m_versions[SystemInfo::BuildCandidate]), SystemInfo::BuildCandidate); |
141 | } | 143 | } |
144 | if(!m_versions[SystemInfo::BuildDaily].isEmpty()) { | ||
145 | ui.selectedVersion->addItem(tr("Daily Build (%1)").arg( | ||
146 | m_versions[SystemInfo::BuildDaily]), SystemInfo::BuildDaily); | ||
147 | } | ||
142 | 148 | ||
143 | // select previously selected version | 149 | // select previously selected version |
144 | int index = ui.selectedVersion->findData(RbSettings::value(RbSettings::Build).toString()); | 150 | int index = ui.selectedVersion->findData(RbSettings::value(RbSettings::Build).toString()); |
@@ -450,6 +456,9 @@ void SelectiveInstallWidget::installRockbox(void) | |||
450 | url = ServerInfo::instance()->platformValue( | 456 | url = ServerInfo::instance()->platformValue( |
451 | ServerInfo::RelCandidateUrl, m_target).toString(); | 457 | ServerInfo::RelCandidateUrl, m_target).toString(); |
452 | break; | 458 | break; |
459 | case SystemInfo::BuildDaily: | ||
460 | url = ServerInfo::instance()->platformValue( | ||
461 | ServerInfo::DailyUrl, m_target).toString(); | ||
453 | } | 462 | } |
454 | //! install build | 463 | //! install build |
455 | if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater(); | 464 | if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater(); |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index cec17d2fa4..da7a2a78af 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -42,7 +42,7 @@ manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT% | |||
42 | 42 | ||
43 | [daily] | 43 | [daily] |
44 | build_url=https://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip | 44 | build_url=https://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip |
45 | voice_url=https://download.rockbox.org/daily/voices/%MODEL%-%LANGUAGE%.zip | 45 | voice_url=https://download.rockbox.org/daily/%MODEL%/voice-%MODEL%-%LANGUAGE%.zip |
46 | font_url=https://download.rockbox.org/daily/fonts/rockbox-fonts.zip | 46 | font_url=https://download.rockbox.org/daily/fonts/rockbox-fonts.zip |
47 | manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT% | 47 | manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT% |
48 | 48 | ||