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

rbutil:

Browse source 
1. Make Themesite integration work again
2. Fix FS#10055 (Theme sizes are 0) and FS#10061 (Incorrect Target missmatch detected)
3. Rename platform and voicename in rbutil.ini to reflect better what they are. (modelnames from either configure or the buildserver)
4. Fix a few places where they were used incorrectly

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20558 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2009-03-27 18:09:01 +00:00
parent 463c96eb77
commit 75a5b9321b
7 changed files with 83 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -511,7 +511,7 @@ bool RbUtilQt::installAuto()
{
QString file = QString("%1/%2/rockbox-%3-%4.zip")
.arg(settings->releaseUrl(), versmap.value("rel_rev"),
settings->curPlatform(), versmap.value("rel_rev"));
settings->curBuildserver_Modelname(), versmap.value("rel_rev"));
buildInfo.open();
QSettings info(buildInfo.fileName(), QSettings::IniFormat, this);
buildInfo.close();
@ -649,8 +649,8 @@ void RbUtilQt::installBootloader()
// special case for H10 pure: this player can have a different
// bootloader file filename. This is handled here to keep the install
// class clean, though having it here is also not the nicest solution.
if(settings->curPlatformName() == "h10_ums"
|| settings->curPlatformName() == "h10_mtp") {
if(platform == "h10_ums"
|| platform == "h10_mtp") {
if(resolvePathCase(blfile).isEmpty())
blfile = settings->mountpoint()
+ settings->curBootloaderName().replace("H10",
@ -681,7 +681,7 @@ void RbUtilQt::installBootloader()
else if(bl->installed() == BootloaderInstallBase::BootloaderOther
&& bl->capabilities() & BootloaderInstallBase::Backup)
{
QString targetFolder = settings->curPlatformName() + " Firmware Backup";
QString targetFolder = settings->curPlatform() + " Firmware Backup";
// remove invalid character(s)
targetFolder.remove(QRegExp("[:/]"));
if(QMessageBox::question(this, tr("Create Bootloader backup"),
@ -842,7 +842,7 @@ void RbUtilQt::installVoice()
QString voiceurl = settings->voiceUrl();
voiceurl += settings->curVoiceName() + "-" +
voiceurl += settings->curConfigure_Modelname() + "-" +
versmap.value("arch_date") + "-english.zip";
qDebug() << voiceurl;
@ -981,8 +981,8 @@ void RbUtilQt::uninstallBootloader(void)
}
QString blfile = settings->mountpoint() + settings->curBootloaderFile();
if(settings->curPlatformName() == "h10_ums"
|| settings->curPlatformName() == "h10_mtp") {
if(settings->curPlatform() == "h10_ums"
|| settings->curPlatform() == "h10_mtp") {
if(resolvePathCase(blfile).isEmpty())
blfile = settings->mountpoint()
+ settings->curBootloaderName().replace("H10",