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

Clean up ProgressLogger state handling:

Browse source 
- use better names for member functions
- don't emit aborted() when exiting a successful log


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20844 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-05-02 18:40:04 +00:00
parent b10ba5e8b3
commit 7cfdd47587
11 changed files with 83 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rbutil/rbutilqt/zipinstaller.cpp
View file

@ -59,7 +59,7 @@ void ZipInstaller::installContinue()
}
else {
m_dp->addItem(tr("Installation finished successfully."),LOGOK);
m_dp->abort();
m_dp->setFinished();
emit done(false);
return;
@ -112,14 +112,14 @@ void ZipInstaller::downloadDone(bool error)
m_dp->setProgressValue(max);
if(getter->httpResponse() != 200 && !getter->isCached()) {
m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR);
m_dp->abort();
m_dp->setFinished();
emit done(true);
return;
}
if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO);
if(error) {
m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
m_dp->abort();
m_dp->setFinished();
emit done(true);
return;
}
@ -143,7 +143,7 @@ void ZipInstaller::downloadDone(bool error)
.arg(uz.formatError(ec)),LOGERROR);
m_dp->setProgressMax(1);
m_dp->setProgressValue(1);
m_dp->abort();
m_dp->setFinished();
emit done(true);
return;
}
@ -153,7 +153,7 @@ void ZipInstaller::downloadDone(bool error)
// cluster sizes on the player).
if(filesystemFree(m_mountpoint) < (uz.totalSize() + 1000000)) {
m_dp->addItem(tr("Not enough disk space! Aborting."), LOGERROR);
m_dp->abort();
m_dp->setFinished();
m_dp->setProgressMax(1);
m_dp->setProgressValue(1);
emit done(true);
@ -164,7 +164,7 @@ void ZipInstaller::downloadDone(bool error)
if(ec != UnZip::Ok) {
m_dp->addItem(tr("Extracting failed: %1.")
.arg(uz.formatError(ec)),LOGERROR);
m_dp->abort();
m_dp->setFinished();
m_dp->setProgressMax(1);
m_dp->setProgressValue(1);
@ -188,7 +188,7 @@ void ZipInstaller::downloadDone(bool error)
QFile(m_mountpoint + m_target).remove();
if(!downloadFile->copy(m_mountpoint + m_target)) {
m_dp->addItem(tr("Installing file failed."), LOGERROR);
m_dp->abort();
m_dp->setFinished();
emit done(true);
return;
}