devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: add abort signal for bootloader install/uninstall

Browse source 
During the bootloader install/uninstall process, a signal
is emitted when "Abort" button is pressed, the installers
can attach this signal and cancel the process.

Change-Id: I7f297b8031d7a2d93da0022081aaef03ef041baf
This commit is contained in:
Cástor Muñoz 2016-01-08 23:56:27 +01:00 • committed by Dominik Riebeling
parent e4af97300d
commit 40ce2b4133
4 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rbutil/rbutilqt/base/bootloaderinstallbase.cpp
View file

@ -103,6 +103,13 @@ void BootloaderInstallBase::installBlfile(void)
}
void BootloaderInstallBase::progressAborted(void)
{
LOG_INFO() << "progressAborted(void)";
emit installAborted();
}
//! @brief backup OF file.
//! @param to folder to write backup file to. Folder will get created.
//! @return true on success, false on error.

2
rbutil/rbutilqt/base/bootloaderinstallbase.h
View file

@ -73,6 +73,7 @@ class BootloaderInstallBase : public QObject
void downloadReqFinished(int id, bool error);
void downloadBlFinish(bool error);
void installBlfile(void);
void progressAborted(void);
// NOTE: we need to keep this slot even on targets that don't need it
// -- using the preprocessor here confused moc.
@ -101,6 +102,7 @@ class BootloaderInstallBase : public QObject
signals:
void downloadDone(void); //! internal signal sent when download finished.
void installAborted(void); //! internal signal sent on abort button click.
void done(bool);
void logItem(QString, int); //! set logger item
void logProgress(int, int); //! set progress bar.

2
rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
View file

@ -247,6 +247,8 @@ void SelectiveInstallWidget::installBootloader(void)
connect(bl, SIGNAL(done(bool)), this, SLOT(continueInstall(bool)));
connect(bl, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(bl, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int)));
// pass Abort button click signal to current installer
connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted()));
// set bootloader filename. Do this now as installed() needs it.
QStringList blfile = SystemInfo::value(SystemInfo::CurBootloaderFile).toStringList();

2
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -569,6 +569,8 @@ void RbUtilQt::uninstallBootloader(void)
connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished()));
// pass Abort button click signal to current installer
connect(logger, SIGNAL(aborted()), bl, SLOT(progressAborted()));
bl->uninstall();