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

rbutil: Fix some messages

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24174 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2010-01-03 20:17:36 +00:00
parent a398e44680
commit 86c1360169
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rbutil/rbutilqt/base/bootloaderinstallbase.cpp
View file

@ -84,9 +84,9 @@ void BootloaderInstallBase::downloadBlFinish(bool error)
return; return;
} }
else if(m_http.isCached()) else if(m_http.isCached())
emit logItem(tr("Download finished (cache used)."), LOGOK); emit logItem(tr("Download finished (cache used)"), LOGOK);
else else
emit logItem(tr("Download finished."), LOGOK); emit logItem(tr("Download finished"), LOGOK);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
m_blversion = m_http.timestamp(); m_blversion = m_http.timestamp();

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

@ -126,7 +126,7 @@ void BootloaderInstallIpod::installStage3(bool mounted)
{ {
if(mounted) { if(mounted) {
logInstall(LogAdd); logInstall(LogAdd);
emit logItem(tr("Bootloader Installation complete."), LOGINFO); emit logItem(tr("Bootloader Installation complete"), LOGINFO);
emit done(false); emit done(false);
return; return;
} }

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

@ -157,7 +157,7 @@ void BootloaderInstallSansa::installStage3(bool mounted)
{ {
if(mounted) { if(mounted) {
logInstall(LogAdd); logInstall(LogAdd);
emit logItem(tr("Bootloader Installation complete."), LOGINFO); emit logItem(tr("Bootloader Installation complete"), LOGINFO);
emit done(false); emit done(false);
return; return;
} }

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

@ -49,7 +49,7 @@ void Uninstaller::uninstall(ProgressloggerInterface* dp)
for(int i=0; i< uninstallSections.size() ; i++) for(int i=0; i< uninstallSections.size() ; i++)
{ {
m_dp->addItem(tr("Uninstalling ") + uninstallSections.at(i) + " ...",LOGINFO); m_dp->addItem(tr("Uninstalling ") + uninstallSections.at(i) + "...",LOGINFO);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
// create list of all other install sections // create list of all other install sections
QStringList sections = installlog.childGroups(); QStringList sections = installlog.childGroups();

4
rbutil/rbutilqt/base/voicefile.cpp
View file

@ -97,7 +97,7 @@ void VoiceFileCreator::downloadDone(bool error)
} }
if(getter->isCached()) if(getter->isCached())
emit logItem(tr("Cached file used."), LOGINFO); emit logItem(tr("Cached file used"), LOGINFO);
if(error) if(error)
{ {
emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
@ -105,7 +105,7 @@ void VoiceFileCreator::downloadDone(bool error)
return; return;
} }
else else
emit logItem(tr("Download finished."),LOGINFO); emit logItem(tr("Download finished"),LOGINFO);
QCoreApplication::processEvents(); QCoreApplication::processEvents();

10
rbutil/rbutilqt/base/zipinstaller.cpp
View file

@ -56,7 +56,7 @@ void ZipInstaller::installContinue()
runner++; // this gets called when a install finished, so increase first. runner++; // this gets called when a install finished, so increase first.
qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size(); qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size();
if(runner < m_urllist.size()) { if(runner < m_urllist.size()) {
emit logItem(tr("done."), LOGOK); emit logItem(tr("Done"), LOGOK);
m_url = m_urllist.at(runner); m_url = m_urllist.at(runner);
m_logsection = m_loglist.at(runner); m_logsection = m_loglist.at(runner);
if(runner < m_verlist.size()) m_logver = m_verlist.at(runner); if(runner < m_verlist.size()) m_logver = m_verlist.at(runner);
@ -64,7 +64,7 @@ void ZipInstaller::installContinue()
installStart(); installStart();
} }
else { else {
emit logItem(tr("Installation finished successfully."), LOGOK); emit logItem(tr("Installation finished successfully"), LOGOK);
emit done(false); emit done(false);
return; return;
@ -117,19 +117,19 @@ void ZipInstaller::downloadDone(bool error)
return; return;
} }
if(getter->isCached()) if(getter->isCached())
emit logItem(tr("Cached file used."), LOGINFO); emit logItem(tr("Cached file used"), LOGINFO);
if(error) { if(error) {
emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR); emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR);
emit done(true); emit done(true);
return; return;
} }
else emit logItem(tr("Download finished."),LOGOK); else emit logItem(tr("Download finished"),LOGOK);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
if(m_unzip) { if(m_unzip) {
// unzip downloaded file // unzip downloaded file
qDebug() << "[ZipInstall] about to unzip " << m_file << "to" << m_mountpoint; qDebug() << "[ZipInstall] about to unzip " << m_file << "to" << m_mountpoint;
emit logItem(tr("Extracting file."), LOGINFO); emit logItem(tr("Extracting file"), LOGINFO);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
UnZip::ErrorCode ec; UnZip::ErrorCode ec;

2
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -1019,7 +1019,7 @@ void RbUtilQt::uninstallBootloader(void)
bl = new BootloaderInstallFile(this); bl = new BootloaderInstallFile(this);
} }
else { else {
logger->addItem(tr("No uninstall method known."), LOGERROR); logger->addItem(tr("No uninstall method known"), LOGERROR);
logger->setFinished(); logger->setFinished();
return; return;
} }

6
rbutil/rbutilqt/themesinstallwindow.cpp
View file

@ -119,7 +119,7 @@ void ThemesInstallWindow::downloadDone(bool error)
connect(logger, SIGNAL(closed()), this, SLOT(close())); connect(logger, SIGNAL(closed()), this, SLOT(close()));
return; return;
} }
logger->addItem(tr("done."), LOGOK); logger->addItem(tr("Done"), LOGOK);
logger->setFinished(); logger->setFinished();
logger->close(); logger->close();
@ -189,7 +189,7 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p
ui.themeDescription->setText(tr("fetching details for %1") ui.themeDescription->setText(tr("fetching details for %1")
.arg(cur->data(Qt::DisplayRole).toString())); .arg(cur->data(Qt::DisplayRole).toString()));
ui.themePreview->clear(); ui.themePreview->clear();
ui.themePreview->setText(tr("fetching preview ...")); ui.themePreview->setText(tr("Fetching preview..."));
imgData.clear(); imgData.clear();
iniDetails.beginGroup(cur->data(Qt::UserRole).toString()); iniDetails.beginGroup(cur->data(Qt::UserRole).toString());
@ -281,7 +281,7 @@ void ThemesInstallWindow::show()
QDialog::show(); QDialog::show();
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
logger->addItem(tr("getting themes information ..."), LOGINFO); logger->addItem(tr("Getting themes information..."), LOGINFO);
connect(logger, SIGNAL(aborted()), this, SLOT(close())); connect(logger, SIGNAL(aborted()), this, SLOT(close()));