summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-01-08 17:16:53 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-01-08 17:16:53 +0000
commitc1b4745d7c2f46bdeda432a8279aac01d47821fd (patch)
tree955395ea84d8418f9d91634f2dcc09bc2bdbaf19
parentf5ab7c028e5932049b1778a53ed59757d21bc31d (diff)
downloadrockbox-c1b4745d7c2f46bdeda432a8279aac01d47821fd.tar.gz
rockbox-c1b4745d7c2f46bdeda432a8279aac01d47821fd.zip
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.cpp3
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallfile.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallhex.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallipod.cpp4
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallmi4.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallsansa.cpp6
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)
81 else 81 else
82 emit logItem(tr("Download finished."), LOGOK); 82 emit logItem(tr("Download finished."), LOGOK);
83 83
84 QCoreApplication::processEvents();
84 m_blversion = m_http.timestamp(); 85 m_blversion = m_http.timestamp();
85 emit downloadDone(); 86 emit downloadDone();
86} 87}
@@ -134,6 +135,8 @@ int BootloaderInstallBase::logInstall(LogMode mode)
134 } 135 }
135 s.sync(); 136 s.sync();
136 137
138 emit logItem(tr("Installation log created"), LOGOK);
139
137 return result; 140 return result;
138} 141}
139 142
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)
42void BootloaderInstallFile::installStage2(void) 42void BootloaderInstallFile::installStage2(void)
43{ 43{
44 emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); 44 emit logItem(tr("Installing Rockbox bootloader"), LOGINFO);
45 QCoreApplication::processEvents();
45 46
46 // if an old bootloader is present (Gigabeat) move it out of the way. 47 // if an old bootloader is present (Gigabeat) move it out of the way.
47 QString fwfile(resolvePathCase(m_blfile)); 48 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)
118void BootloaderInstallHex::installStage2(void) 118void BootloaderInstallHex::installStage2(void)
119{ 119{
120 emit logItem(tr("Adding bootloader to firmware file"), LOGINFO); 120 emit logItem(tr("Adding bootloader to firmware file"), LOGINFO);
121 QCoreApplication::processEvents();
121 122
122 // local temp file 123 // local temp file
123 QTemporaryFile tempbin; 124 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)
82{ 82{
83 struct ipod_t ipod; 83 struct ipod_t ipod;
84 84
85 emit logItem(tr("Installing Rockbox bootloader"), LOGINFO);
86 QCoreApplication::processEvents();
85 if(!ipodInitialize(&ipod)) { 87 if(!ipodInitialize(&ipod)) {
86 emit done(true); 88 emit done(true);
87 return; 89 return;
@@ -137,6 +139,8 @@ void BootloaderInstallIpod::installStage2(void)
137bool BootloaderInstallIpod::uninstall(void) 139bool BootloaderInstallIpod::uninstall(void)
138{ 140{
139 struct ipod_t ipod; 141 struct ipod_t ipod;
142 emit logItem(tr("Uninstalling bootloader"), LOGINFO);
143 QCoreApplication::processEvents();
140 144
141 if(!ipodInitialize(&ipod)) { 145 if(!ipodInitialize(&ipod)) {
142 emit done(true); 146 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)
41void BootloaderInstallMi4::installStage2(void) 41void BootloaderInstallMi4::installStage2(void)
42{ 42{
43 emit logItem(tr("Installing Rockbox bootloader"), LOGINFO); 43 emit logItem(tr("Installing Rockbox bootloader"), LOGINFO);
44 QCoreApplication::processEvents();
44 45
45 // move old bootloader out of the way 46 // move old bootloader out of the way
46 QString fwfile(resolvePathCase(m_blfile)); 47 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)
82 struct sansa_t sansa; 82 struct sansa_t sansa;
83 sansa_scan(&sansa); 83 sansa_scan(&sansa);
84 84
85 emit logItem(tr("Installing Rockbox bootloader"), LOGINFO);
86 QCoreApplication::processEvents();
87
85 if(sansa_open(&sansa, 0) < 0) { 88 if(sansa_open(&sansa, 0) < 0) {
86 emit logItem(tr("could not open Sansa"), LOGERROR); 89 emit logItem(tr("could not open Sansa"), LOGERROR);
87 emit done(true); 90 emit done(true);
@@ -146,6 +149,9 @@ bool BootloaderInstallSansa::uninstall(void)
146{ 149{
147 struct sansa_t sansa; 150 struct sansa_t sansa;
148 151
152 emit logItem(tr("Uninstalling bootloader"), LOGINFO);
153 QCoreApplication::processEvents();
154
149 if(sansa_scan(&sansa) != 1) { 155 if(sansa_scan(&sansa) != 1) {
150 emit logItem(tr("Can't find Sansa"), LOGERROR); 156 emit logItem(tr("Can't find Sansa"), LOGERROR);
151 emit done(true); 157 emit done(true);