From e4af97300d5b08e48d9d282d5a7500cdfae4c251 Mon Sep 17 00:00:00 2001 From: Cástor Muñoz Date: Sat, 9 Jan 2016 04:40:53 +0100 Subject: 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 --- rbutil/rbutilqt/base/bootloaderinstallfile.cpp | 1 + rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 1 + rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 1 + rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 1 + rbutil/rbutilqt/rbutilqt.cpp | 1 - 5 files changed, 4 insertions(+), 1 deletion(-) 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) } emit logItem(tr("Original bootloader restored successfully."), LOGOK); logInstall(LogRemove); + emit logProgress(1, 1); emit done(false); 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) if (delete_bootloader(&ipod)==0) { emit logItem(tr("Successfully removed bootloader"), LOGOK); logInstall(LogRemove); + emit logProgress(1, 1); emit done(false); ipod_close(&ipod); 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) QFile::rename(Utils::resolvePathCase(original), resolved); emit logItem(tr("Rockbox bootloader successful removed"), LOGINFO); logInstall(LogRemove); + emit logProgress(1, 1); emit done(false); 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) if (sansa_delete_bootloader(&sansa)==0) { emit logItem(tr("Successfully removed bootloader"), LOGOK); logInstall(LogRemove); + emit logProgress(1, 1); emit done(false); sansa_close(&sansa); 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) QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; // create logger ProgressLoggerGui* logger = new ProgressLoggerGui(this); - logger->setProgressVisible(false); logger->show(); QString platform = RbSettings::value(RbSettings::Platform).toString(); -- cgit