napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[finished] Expand Config object's repertoire of notification-API

Browse Source
This commit is contained in:
Adriaan de Groot 2021-03-06 13:38:02 +01:00
parent f8258f671b
commit aa004503c5
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/finished/Config.cpp
View File

@ -121,10 +121,11 @@ Config::doRestart()
void
Config::doNotify( bool hasFailed )
Config::doNotify( bool hasFailed, bool sendAnyway )
{
if ( !notifyOnFinished() )
if ( !sendAnyway )
{
cDebug() << "Notification failed?" << hasFailed << "not sent.";
return;
}

15
src/modules/finished/Config.h
View File

@ -76,14 +76,21 @@ public Q_SLOTS:
*/
void doRestart();
/** @brief Send DBus notification, if desired.
*
* This takes notifyOnFinished() into account.
/** @brief Send DBus notification
*
* At the end of installation (when the FinishedViewStep is activated),
* send a desktop notification via DBus that the install is done.
*
* - The two-argument form sends success or failure, and can be
* forced to send by setting @p sendAnyway to @c true.
* - The one-argument form sends success or failure and takes
* the notifyOnFinished() configuration into account.
* - The no-argument form checks if a failure was signalled previously
* and uses that to decide if it was a failure.
*
*/
void doNotify( bool hasFailed );
void doNotify( bool hasFailed, bool sendAnyway );
void doNotify( bool hasFailed ) { doNotify( hasFailed, notifyOnFinished() ); }
void doNotify() { doNotify( hasFailed() ); }
/** @brief Tell the config the install failed