len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep logger open after user aborted bootloader reinstall during automated install. Do some code police.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19475 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2008-12-18 22:42:24 +00:00
parent cd5f753f5e
commit 3e1168fa8a
1 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -520,7 +520,8 @@ bool RbUtilQt::installAuto()
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
{ {
logger->addItem(tr("Starting backup..."),LOGINFO); logger->addItem(tr("Starting backup..."),LOGINFO);
QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip"; QString backupName = settings->mountpoint()
+ "/.backup/rockbox-backup-" + rbVersion + ".zip";
//! create dir, if it doesnt exist //! create dir, if it doesnt exist
QFileInfo backupFile(backupName); QFileInfo backupFile(backupName);
@ -652,8 +653,15 @@ void RbUtilQt::installBootloader()
if(QMessageBox::question(this, tr("Bootloader detected"), if(QMessageBox::question(this, tr("Bootloader detected"),
tr("Bootloader already installed. Do you want to reinstall the bootloader?"), tr("Bootloader already installed. Do you want to reinstall the bootloader?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
if(m_auto) {
// keep logger open for auto installs.
// don't consider abort as error in auto-mode.
installBootloaderPost(false);
}
else {
logger->close(); logger->close();
m_error = true; installBootloaderPost(true);
}
return; return;
} }
} }
@ -802,7 +810,8 @@ void RbUtilQt::installVoice()
if(m_gotInfo == false) if(m_gotInfo == false)
{ {
QMessageBox::warning(this, tr("Warning"), QMessageBox::warning(this, tr("Warning"),
tr("The Application is still downloading Information about new Builds. Please try again shortly.")); tr("The Application is still downloading Information about new Builds."
" Please try again shortly."));
return; return;
} }
@ -836,7 +845,8 @@ void RbUtilQt::installDoomBtn()
{ {
if(chkConfig(true)) return; if(chkConfig(true)) return;
if(!hasDoom()){ if(!hasDoom()){
QMessageBox::critical(this, tr("Error"), tr("Your device doesn't have a doom plugin. Aborting.")); QMessageBox::critical(this, tr("Error"),
tr("Your device doesn't have a doom plugin. Aborting."));
return; return;
} }
@ -1047,13 +1057,15 @@ void RbUtilQt::installPortable(void)
QFile::remove(settings->mountpoint() + "/RockboxUtility.exe"); QFile::remove(settings->mountpoint() + "/RockboxUtility.exe");
QFile::remove(settings->mountpoint() + "/RockboxUtility.ini"); QFile::remove(settings->mountpoint() + "/RockboxUtility.ini");
// copy currently running binary and currently used settings file // copy currently running binary and currently used settings file
if(!QFile::copy(qApp->applicationFilePath(), settings->mountpoint() + "/RockboxUtility.exe")) { if(!QFile::copy(qApp->applicationFilePath(), settings->mountpoint()
+ "/RockboxUtility.exe")) {
logger->addItem(tr("Error installing Rockbox Utility"), LOGERROR); logger->addItem(tr("Error installing Rockbox Utility"), LOGERROR);
logger->abort(); logger->abort();
return; return;
} }
logger->addItem(tr("Installing user configuration"), LOGINFO); logger->addItem(tr("Installing user configuration"), LOGINFO);
if(!QFile::copy(settings->userSettingFilename(), settings->mountpoint() + "/RockboxUtility.ini")) { if(!QFile::copy(settings->userSettingFilename(), settings->mountpoint()
+ "/RockboxUtility.ini")) {
logger->addItem(tr("Error installing user configuration"), LOGERROR); logger->addItem(tr("Error installing user configuration"), LOGERROR);
logger->abort(); logger->abort();
return; return;
@ -1070,7 +1082,8 @@ void RbUtilQt::updateInfo()
{ {
qDebug() << "RbUtilQt::updateInfo()"; qDebug() << "RbUtilQt::updateInfo()";
QSettings log(settings->mountpoint() + "/.rockbox/rbutil.log", QSettings::IniFormat, this); QSettings log(settings->mountpoint() + "/.rockbox/rbutil.log",
QSettings::IniFormat, this);
QStringList groups = log.childGroups(); QStringList groups = log.childGroups();
QList<QTreeWidgetItem *> items; QList<QTreeWidgetItem *> items;
QTreeWidgetItem *w, *w2; QTreeWidgetItem *w, *w2;
@ -1134,9 +1147,7 @@ QUrl RbUtilQt::proxy()
if(settings->proxyType() == "manual") if(settings->proxyType() == "manual")
return QUrl(settings->proxy()); return QUrl(settings->proxy());
else if(settings->proxy() == "system") else if(settings->proxy() == "system")
{
return Detect::systemProxy(); return Detect::systemProxy();
}
return QUrl(""); return QUrl("");
} }