len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sort rbutil.ini general section and rename voice_url for clarity.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26638 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2010-06-06 18:41:02 +00:00
parent 56fea4f74d
commit 2a90375c12
4 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/base/systeminfo.cpp
View file

@ -38,7 +38,7 @@ const static struct {
{ SystemInfo::BootloaderUrl, "bootloader_url", "" }, { SystemInfo::BootloaderUrl, "bootloader_url", "" },
{ SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" }, { SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" },
{ SystemInfo::FontUrl, "font_url", "" }, { SystemInfo::FontUrl, "font_url", "" },
{ SystemInfo::VoiceUrl, "voice_url", "" }, { SystemInfo::DailyVoiceUrl, "daily_voice_url", "" },
{ SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" }, { SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" },
{ SystemInfo::DoomUrl, "doom_url", "" }, { SystemInfo::DoomUrl, "doom_url", "" },
{ SystemInfo::ReleaseUrl, "release_url", "" }, { SystemInfo::ReleaseUrl, "release_url", "" },

2
rbutil/rbutilqt/base/systeminfo.h
View file

@ -42,7 +42,7 @@ class SystemInfo : public QObject
BootloaderUrl, BootloaderUrl,
BootloaderInfoUrl, BootloaderInfoUrl,
FontUrl, FontUrl,
VoiceUrl, DailyVoiceUrl,
DoomUrl, DoomUrl,
ReleaseUrl, ReleaseUrl,
ReleaseVoiceUrl, ReleaseVoiceUrl,

25
rbutil/rbutilqt/rbutil.ini
View file

@ -1,21 +1,30 @@
[general] [general]
; release downloads ; builds
release_url=http://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip release_url=http://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
release_voice_url=http://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
daily_url=http://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip daily_url=http://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip
bleeding_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip bleeding_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip
server_conf_url=http://download.rockbox.org/daily/build-info
; voice files
release_voice_url=http://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
daily_voice_url=http://download.rockbox.org/daily/voices/%MODEL%-%DATE%-english.zip
genlang_url=http://www.rockbox.org/genlang/
; bootloader
bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info
bleeding_info=http://build.rockbox.org/cvsmod/build-info
font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip
bootloader_url=http://download.rockbox.org/bootloader bootloader_url=http://download.rockbox.org/bootloader
; themes
themes_url=http://themes.rockbox.org/ themes_url=http://themes.rockbox.org/
themes_info_url=http://themes.rockbox.org/rbutilqt.php?target=%TARGET%&release=%RELEASE%&revision=%REVISION%&rbutilver=%RBUTILVER% themes_info_url=http://themes.rockbox.org/rbutilqt.php?target=%TARGET%&release=%RELEASE%&revision=%REVISION%&rbutilver=%RBUTILVER%
; server information
server_conf_url=http://download.rockbox.org/daily/build-info
bleeding_info=http://build.rockbox.org/cvsmod/build-info
font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip
; other
manual_url=http://download.rockbox.org/daily/manual manual_url=http://download.rockbox.org/daily/manual
doom_url=http://download.rockbox.org/useful/rockdoom.zip doom_url=http://download.rockbox.org/useful/rockdoom.zip
voice_url=http://download.rockbox.org/daily/voices/%MODEL%-%DATE%-english.zip
genlang_url=http://www.rockbox.org/genlang/
rbutil_url=http://download.rockbox.org/rbutil/ rbutil_url=http://download.rockbox.org/rbutil/
[platforms] [platforms]

2
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -863,7 +863,7 @@ void RbUtilQt::installVoice()
} }
if(relversion.isEmpty()) { if(relversion.isEmpty()) {
// release is empty for non-release versions (i.e. daily / current) // release is empty for non-release versions (i.e. daily / current)
voiceurl = SystemInfo::value(SystemInfo::VoiceUrl).toString(); voiceurl = SystemInfo::value(SystemInfo::DailyVoiceUrl).toString();
logversion = installInfo.revision(); logversion = installInfo.revision();
} }
else { else {