diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-08 17:16:53 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-08 17:16:53 +0000 |
commit | c1b4745d7c2f46bdeda432a8279aac01d47821fd (patch) | |
tree | 955395ea84d8418f9d91634f2dcc09bc2bdbaf19 | |
parent | f5ab7c028e5932049b1778a53ed59757d21bc31d (diff) |
Add some more bootloader install progress messages and call processEvents() more often before performing player disk accesses.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19724 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallbase.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallfile.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallhex.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 6 |
6 files changed, 16 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp index 831bc46db0..428283749d 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp @@ -81,6 +81,7 @@ void BootloaderInstallBase::downloadBlFinish(bool error) else emit logItem(tr("Download finished."), LOGOK); + QCoreApplication::processEvents(); m_blversion = m_http.timestamp(); emit downloadDone(); } @@ -134,6 +135,8 @@ int BootloaderInstallBase::logInstall(LogMode mode) } s.sync(); + emit logItem(tr("Installation log created"), LOGOK); + return result; } diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp index daa1ad8af7..0c12b05253 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp @@ -42,6 +42,7 @@ bool BootloaderInstallFile::install(void) void BootloaderInstallFile::installStage2(void) { emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); + QCoreApplication::processEvents(); // if an old bootloader is present (Gigabeat) move it out of the way. QString fwfile(resolvePathCase(m_blfile)); diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp index aa42beb994..a52f8d0584 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp @@ -118,6 +118,7 @@ bool BootloaderInstallHex::install(void) void BootloaderInstallHex::installStage2(void) { emit logItem(tr("Adding bootloader to firmware file"), LOGINFO); + QCoreApplication::processEvents(); // local temp file QTemporaryFile tempbin; diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index 037b695e88..c1f04281da 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp @@ -82,6 +82,8 @@ void BootloaderInstallIpod::installStage2(void) { struct ipod_t ipod; + emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); + QCoreApplication::processEvents(); if(!ipodInitialize(&ipod)) { emit done(true); return; @@ -137,6 +139,8 @@ void BootloaderInstallIpod::installStage2(void) bool BootloaderInstallIpod::uninstall(void) { struct ipod_t ipod; + emit logItem(tr("Uninstalling bootloader"), LOGINFO); + QCoreApplication::processEvents(); if(!ipodInitialize(&ipod)) { emit done(true); diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp index f7b8b9baf7..0b42425903 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp @@ -41,6 +41,7 @@ bool BootloaderInstallMi4::install(void) void BootloaderInstallMi4::installStage2(void) { emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); + QCoreApplication::processEvents(); // move old bootloader out of the way QString fwfile(resolvePathCase(m_blfile)); diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp index eba607bd2b..a78f336144 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp @@ -82,6 +82,9 @@ void BootloaderInstallSansa::installStage2(void) struct sansa_t sansa; sansa_scan(&sansa); + emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); + QCoreApplication::processEvents(); + if(sansa_open(&sansa, 0) < 0) { emit logItem(tr("could not open Sansa"), LOGERROR); emit done(true); @@ -146,6 +149,9 @@ bool BootloaderInstallSansa::uninstall(void) { struct sansa_t sansa; + emit logItem(tr("Uninstalling bootloader"), LOGINFO); + QCoreApplication::processEvents(); + if(sansa_scan(&sansa) != 1) { emit logItem(tr("Can't find Sansa"), LOGERROR); emit done(true); |