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

[finished] Rename and document following coding style

Browse Source
This commit is contained in:
Adriaan de Groot 2021-02-23 12:50:52 +01:00
parent 84240683f5
commit 288fe5b274
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/finished/FinishedViewStep.cpp
View File

@ -29,7 +29,7 @@ FinishedViewStep::FinishedViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
, m_config( new Config( this ) ) , m_config( new Config( this ) )
, m_widget( new FinishedPage() ) , m_widget( new FinishedPage() )
, installFailed( false ) , m_installFailed( false )
{ {
auto jq = Calamares::JobQueue::instance(); auto jq = Calamares::JobQueue::instance();
connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed ); connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed );
@ -94,7 +94,7 @@ FinishedViewStep::sendNotification()
{ {
// If the installation failed, don't send notification popup; // If the installation failed, don't send notification popup;
// there's a (modal) dialog popped up with the failure notice. // there's a (modal) dialog popped up with the failure notice.
if ( installFailed ) if ( m_installFailed )
{ {
return; return;
} }
@ -151,7 +151,7 @@ FinishedViewStep::onInstallationFailed( const QString& message, const QString& d
{ {
Q_UNUSED( message ) Q_UNUSED( message )
Q_UNUSED( details ) Q_UNUSED( details )
installFailed = true; m_installFailed = true;
} }
void void

14
src/modules/finished/FinishedViewStep.h
View File

@ -50,16 +50,18 @@ public slots:
void onInstallationFailed( const QString& message, const QString& details ); void onInstallationFailed( const QString& message, const QString& details );
private: private:
Config* m_config;
FinishedPage* m_widget;
/** /**
* @brief At the end of installation (when this step is activated), * @brief Send notification at the end via DBus
* send a desktop notification via DBus that the install is done. *
* At the end of installation (when this step is activated),
* send a desktop notification via DBus that the install is done.
* If the installation failed, no notification is sent.
*/ */
void sendNotification(); void sendNotification();
bool installFailed; Config* m_config;
FinishedPage* m_widget;
bool m_installFailed; // Track if onInstallationFailed() was called
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory )