devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make Rockbox Utility build again and make some strings translatable. Break some long lines.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24293 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2010-01-19 23:16:43 +00:00
parent fd3abfc6c7
commit 92042548a2
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rbutil/rbutilqt/base/bootloaderinstallams.cpp
View file

@ -94,7 +94,8 @@ void BootloaderInstallAms::installStage2(void)
} }
/* Load bootloader file */ /* Load bootloader file */
rb_packed = load_rockbox_file(bootfile.toLocal8Bit().data(), sum.model, &bootloader_size,&rb_packedsize, rb_packed = load_rockbox_file(bootfile.toLocal8Bit().data(), sum.model,
&bootloader_size,&rb_packedsize,
errstr,sizeof(errstr)); errstr,sizeof(errstr));
if (rb_packed == NULL) if (rb_packed == NULL)
{ {
@ -112,7 +113,8 @@ void BootloaderInstallAms::installStage2(void)
if (totalsize > firmware_size) if (totalsize > firmware_size)
{ {
qDebug() << "[BootloaderInstallAms] No room to insert bootloader"; qDebug() << "[BootloaderInstallAms] No room to insert bootloader";
emit logItem("No room to insert bootloader, try another firmware version",LOGERROR); emit logItem(tr("No room to insert bootloader, try another firmware version"),
LOGERROR);
free(buf); free(buf);
free(of_packed); free(of_packed);
free(rb_packed); free(rb_packed);
@ -123,14 +125,15 @@ void BootloaderInstallAms::installStage2(void)
/* patch the firmware */ /* patch the firmware */
emit logItem(tr("Patching Firmware..."), LOGINFO); emit logItem(tr("Patching Firmware..."), LOGINFO);
patch_firmware(sum.model,firmware_revision(sum.model),firmware_size,buf,len,of_packed,of_packedsize,rb_packed,rb_packedsize); patch_firmware(sum.model,firmware_revision(sum.model),firmware_size,buf,
len,of_packed,of_packedsize,rb_packed,rb_packedsize);
/* write out file */ /* write out file */
QFile out(m_blfile); QFile out(m_blfile);
if(!out.open(QIODevice::WriteOnly | QIODevice::Truncate)) if(!out.open(QIODevice::WriteOnly | QIODevice::Truncate))
{ {
qDebug() << "[BootloaderInstallAms] Could not open" << m_blfile "for writing"; qDebug() << "[BootloaderInstallAms] Could not open" << m_blfile << "for writing";
emit logItem(tr("Could not open %1 for writing").arg(m_blfile),LOGERROR); emit logItem(tr("Could not open %1 for writing").arg(m_blfile),LOGERROR);
free(buf); free(buf);
free(of_packed); free(of_packed);
@ -168,7 +171,8 @@ void BootloaderInstallAms::installStage2(void)
bool BootloaderInstallAms::uninstall(void) bool BootloaderInstallAms::uninstall(void)
{ {
emit logItem("To uninstall, perform a normal upgrade with an unmodified original firmware", LOGINFO); emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
"original firmware"), LOGINFO);
logInstall(LogRemove); logInstall(LogRemove);
return false; return false;
} }
@ -182,3 +186,4 @@ BootloaderInstallBase::Capabilities BootloaderInstallAms::capabilities(void)
{ {
return (Install | NeedsOf); return (Install | NeedsOf);
} }