diff options
author | Cástor Muñoz <cmvidal@gmail.com> | 2016-01-09 04:40:53 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2016-08-15 20:12:32 +0200 |
commit | e4af97300d5b08e48d9d282d5a7500cdfae4c251 (patch) | |
tree | 45800601c8ac0d6df2045e19767b569e59dc24d6 | |
parent | 5a673d6df2125c5b17534e8ee9c143de9e3cd512 (diff) | |
download | rockbox-e4af97300d5b08e48d9d282d5a7500cdfae4c251.tar.gz rockbox-e4af97300d5b08e48d9d282d5a7500cdfae4c251.zip |
rbutil: show progress bar during bootloader uninstall
Useful for targets that needs multi-stage uninstall. On current
targets (with Uninstall capability) the progress is updated to
100% when bootloader uninstall is successfully finished.
Change-Id: I61be1c4f5cfc2d2f35fa5005962be9703888447d
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallfile.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp index 70867b8868..209e56b4f3 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp | |||
@@ -129,6 +129,7 @@ bool BootloaderInstallFile::uninstall(void) | |||
129 | } | 129 | } |
130 | emit logItem(tr("Original bootloader restored successfully."), LOGOK); | 130 | emit logItem(tr("Original bootloader restored successfully."), LOGOK); |
131 | logInstall(LogRemove); | 131 | logInstall(LogRemove); |
132 | emit logProgress(1, 1); | ||
132 | emit done(false); | 133 | emit done(false); |
133 | 134 | ||
134 | return true; | 135 | return true; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index 6c23bc200f..fdee6f5778 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp | |||
@@ -174,6 +174,7 @@ bool BootloaderInstallIpod::uninstall(void) | |||
174 | if (delete_bootloader(&ipod)==0) { | 174 | if (delete_bootloader(&ipod)==0) { |
175 | emit logItem(tr("Successfully removed bootloader"), LOGOK); | 175 | emit logItem(tr("Successfully removed bootloader"), LOGOK); |
176 | logInstall(LogRemove); | 176 | logInstall(LogRemove); |
177 | emit logProgress(1, 1); | ||
177 | emit done(false); | 178 | emit done(false); |
178 | ipod_close(&ipod); | 179 | ipod_close(&ipod); |
179 | return true; | 180 | return true; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp index 98146b0723..b0e83a8585 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | |||
@@ -114,6 +114,7 @@ bool BootloaderInstallMi4::uninstall(void) | |||
114 | QFile::rename(Utils::resolvePathCase(original), resolved); | 114 | QFile::rename(Utils::resolvePathCase(original), resolved); |
115 | emit logItem(tr("Rockbox bootloader successful removed"), LOGINFO); | 115 | emit logItem(tr("Rockbox bootloader successful removed"), LOGINFO); |
116 | logInstall(LogRemove); | 116 | logInstall(LogRemove); |
117 | emit logProgress(1, 1); | ||
117 | emit done(false); | 118 | emit done(false); |
118 | 119 | ||
119 | return true; | 120 | return true; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp index 245e5525bb..5d56fe593a 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | |||
@@ -194,6 +194,7 @@ bool BootloaderInstallSansa::uninstall(void) | |||
194 | if (sansa_delete_bootloader(&sansa)==0) { | 194 | if (sansa_delete_bootloader(&sansa)==0) { |
195 | emit logItem(tr("Successfully removed bootloader"), LOGOK); | 195 | emit logItem(tr("Successfully removed bootloader"), LOGOK); |
196 | logInstall(LogRemove); | 196 | logInstall(LogRemove); |
197 | emit logProgress(1, 1); | ||
197 | emit done(false); | 198 | emit done(false); |
198 | sansa_close(&sansa); | 199 | sansa_close(&sansa); |
199 | return true; | 200 | return true; |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index b44c30c49c..1444f4509d 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -523,7 +523,6 @@ void RbUtilQt::uninstallBootloader(void) | |||
523 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; | 523 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; |
524 | // create logger | 524 | // create logger |
525 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); | 525 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); |
526 | logger->setProgressVisible(false); | ||
527 | logger->show(); | 526 | logger->show(); |
528 | 527 | ||
529 | QString platform = RbSettings::value(RbSettings::Platform).toString(); | 528 | QString platform = RbSettings::value(RbSettings::Platform).toString(); |