summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-06-06 18:41:02 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-06-06 18:41:02 +0000
commit2a90375c1201ea4f7a53fb973d59ab3a8dc88faa (patch)
tree83668fb3362eefdddd58468164846cf3554fe934 /rbutil
parent56fea4f74d815dea21486848227d59b08719afdb (diff)
downloadrockbox-2a90375c1201ea4f7a53fb973d59ab3a8dc88faa.tar.gz
rockbox-2a90375c1201ea4f7a53fb973d59ab3a8dc88faa.tar.bz2
rockbox-2a90375c1201ea4f7a53fb973d59ab3a8dc88faa.zip
Sort rbutil.ini general section and rename voice_url for clarity.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26638 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/systeminfo.cpp2
-rw-r--r--rbutil/rbutilqt/base/systeminfo.h2
-rw-r--r--rbutil/rbutilqt/rbutil.ini25
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
4 files changed, 20 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index 98d865f814..c1bb35ab4d 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -38,7 +38,7 @@ const static struct {
{ SystemInfo::BootloaderUrl, "bootloader_url", "" },
{ SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" },
{ SystemInfo::FontUrl, "font_url", "" },
- { SystemInfo::VoiceUrl, "voice_url", "" },
+ { SystemInfo::DailyVoiceUrl, "daily_voice_url", "" },
{ SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" },
{ SystemInfo::DoomUrl, "doom_url", "" },
{ SystemInfo::ReleaseUrl, "release_url", "" },
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 78fd881d22..5e5b60770a 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -42,7 +42,7 @@ class SystemInfo : public QObject
BootloaderUrl,
BootloaderInfoUrl,
FontUrl,
- VoiceUrl,
+ DailyVoiceUrl,
DoomUrl,
ReleaseUrl,
ReleaseVoiceUrl,
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 1f0d97db5c..273486fc2a 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -1,21 +1,30 @@
[general]
-; release downloads
+; builds
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
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
-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
+
+; themes
themes_url=http://themes.rockbox.org/
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
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/
[platforms]
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 0cf1cbab93..d503da00e4 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -863,7 +863,7 @@ void RbUtilQt::installVoice()
}
if(relversion.isEmpty()) {
// 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();
}
else {