diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp index 10da425ab..53e65fa04 100644 --- a/src/modules/welcome/checker/CheckerContainer.cpp +++ b/src/modules/welcome/checker/CheckerContainer.cpp @@ -31,7 +31,7 @@ #include -CheckerContainer::CheckerContainer( const Calamares::RequirementsModel &model, QWidget* parent ) +CheckerContainer::CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent ) : QWidget( parent ) , m_waitingWidget( new WaitingWidget( QString(), this ) ) , m_checkerWidget( nullptr ) @@ -60,7 +60,7 @@ CheckerContainer::requirementsComplete( bool ok ) m_waitingWidget->deleteLater(); m_waitingWidget = nullptr; // Don't delete in destructor - m_checkerWidget = new ResultsListWidget( m_model, this); + m_checkerWidget = new ResultsListWidget( m_model, this ); layout()->addWidget( m_checkerWidget ); m_verdict = ok; diff --git a/src/modules/welcome/checker/CheckerContainer.h b/src/modules/welcome/checker/CheckerContainer.h index 5ebefa36e..9744ecc77 100644 --- a/src/modules/welcome/checker/CheckerContainer.h +++ b/src/modules/welcome/checker/CheckerContainer.h @@ -23,8 +23,8 @@ #ifndef CHECKERCONTAINER_H #define CHECKERCONTAINER_H -#include #include "Config.h" +#include class ResultsListWidget; class WaitingWidget; @@ -40,7 +40,7 @@ class CheckerContainer : public QWidget { Q_OBJECT public: - explicit CheckerContainer(const Calamares::RequirementsModel &model, QWidget* parent = nullptr ); + explicit CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent = nullptr ); virtual ~CheckerContainer(); bool verdict() const; @@ -52,13 +52,13 @@ public slots: void requirementsProgress( const QString& message ); protected: - WaitingWidget *m_waitingWidget; - ResultsListWidget *m_checkerWidget; + WaitingWidget* m_waitingWidget; + ResultsListWidget* m_checkerWidget; bool m_verdict; private: - const Calamares::RequirementsModel &m_model; -} ; + const Calamares::RequirementsModel& m_model; +}; #endif diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp index 00579aef6..fc9fe5ce6 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp @@ -38,12 +38,12 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include #include #include #include #include #include +#include #include #include //geteuid @@ -123,8 +123,10 @@ GeneralRequirements::checkRequirements() { checkEntries.append( { entry, - [req = m_requiredStorageGiB] { return tr( "has at least %1 GiB available drive space" ).arg( req ); }, - [req = m_requiredStorageGiB] { + [ req = m_requiredStorageGiB ] { + return tr( "has at least %1 GiB available drive space" ).arg( req ); + }, + [ req = m_requiredStorageGiB ] { return tr( "There is not enough drive space. At least %1 GiB is required." ).arg( req ); }, enoughStorage, @@ -134,8 +136,8 @@ GeneralRequirements::checkRequirements() { checkEntries.append( { entry, - [req = m_requiredRamGiB] { return tr( "has at least %1 GiB working memory" ).arg( req ); }, - [req = m_requiredRamGiB] { + [ req = m_requiredRamGiB ] { return tr( "has at least %1 GiB working memory" ).arg( req ); }, + [ req = m_requiredRamGiB ] { return tr( "The system does not have enough working memory. At least %1 GiB is required." ) .arg( req ); }, diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h index 8e5a6cd54..ce3abec83 100644 --- a/src/modules/welcome/checker/GeneralRequirements.h +++ b/src/modules/welcome/checker/GeneralRequirements.h @@ -50,4 +50,4 @@ private: qreal m_requiredRamGiB; }; -#endif // REQUIREMENTSCHECKER_H +#endif // REQUIREMENTSCHECKER_H diff --git a/src/modules/welcome/checker/ResultWidget.cpp b/src/modules/welcome/checker/ResultWidget.cpp index 3c3af62d4..5da120a2a 100644 --- a/src/modules/welcome/checker/ResultWidget.cpp +++ b/src/modules/welcome/checker/ResultWidget.cpp @@ -24,17 +24,14 @@ #include -static inline void setCondition( QLabel* label, CalamaresUtils::ImageType t ) +static inline void +setCondition( QLabel* label, CalamaresUtils::ImageType t ) { label->setPixmap( - CalamaresUtils::defaultPixmap( t, - CalamaresUtils::Original, - QSize( label->height(), label->height() ) ) ); + CalamaresUtils::defaultPixmap( t, CalamaresUtils::Original, QSize( label->height(), label->height() ) ) ); } -ResultWidget::ResultWidget( bool satisfied, - bool required, - QWidget* parent ) +ResultWidget::ResultWidget( bool satisfied, bool required, QWidget* parent ) : QWidget( parent ) { QBoxLayout* mainLayout = new QHBoxLayout; @@ -48,11 +45,17 @@ ResultWidget::ResultWidget( bool satisfied, m_textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); if ( satisfied ) + { setCondition( m_iconLabel, CalamaresUtils::StatusOk ); + } else if ( required ) + { setCondition( m_iconLabel, CalamaresUtils::StatusError ); + } else + { setCondition( m_iconLabel, CalamaresUtils::StatusWarning ); + } } diff --git a/src/modules/welcome/checker/ResultWidget.h b/src/modules/welcome/checker/ResultWidget.h index d842339ef..f84310bb6 100644 --- a/src/modules/welcome/checker/ResultWidget.h +++ b/src/modules/welcome/checker/ResultWidget.h @@ -38,14 +38,14 @@ public: * * Use setText() to set up the text of the widget. */ - explicit ResultWidget( bool satisfied, bool required, - QWidget* parent = nullptr ); + explicit ResultWidget( bool satisfied, bool required, QWidget* parent = nullptr ); /// @brief Set the displayed description of the check. void setText( const QString& text ); + private: QLabel* m_textLabel; QLabel* m_iconLabel; }; -#endif // CHECKER_RESULTWIDGET_H +#endif // CHECKER_RESULTWIDGET_H diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index 3fa49298f..2554f907b 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -47,16 +47,15 @@ static void createResultWidgets( QLayout* layout, QList< ResultWidget* >& resultWidgets, - const Calamares::RequirementsModel &model, - std::function< bool( const Calamares::RequirementEntry& ) > predicate - ) + const Calamares::RequirementsModel& model, + std::function< bool( const Calamares::RequirementEntry& ) > predicate ) { resultWidgets.clear(); resultWidgets.reserve( model.count() ); for ( auto i = 0; i < model.count(); i++ ) { - const auto &entry = model.getEntry(i); - if ( !predicate(entry)) + const auto& entry = model.getEntry( i ); + if ( !predicate( entry ) ) { resultWidgets.append( nullptr ); continue; @@ -105,7 +104,7 @@ private: void retranslate(); }; -ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent) +ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent ) : QDialog( parent ) , m_model( model ) { @@ -114,9 +113,8 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, m_title = new QLabel( this ); - createResultWidgets( entriesLayout, m_resultWidgets, model, []( const Calamares::RequirementEntry& e ) { - return e.hasDetails(); - } ); + createResultWidgets( + entriesLayout, m_resultWidgets, model, []( const Calamares::RequirementEntry& e ) { return e.hasDetails(); } ); QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this ); @@ -132,7 +130,7 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, retranslate(); // Do it now to fill in the texts } -ResultsListDialog::~ResultsListDialog() {} +ResultsListDialog::~ResultsListDialog() { } void ResultsListDialog::retranslate() @@ -142,7 +140,7 @@ ResultsListDialog::retranslate() for ( auto i = 0; i < m_model.count(); i++ ) { - const auto &entry = m_model.getEntry(i); + const auto& entry = m_model.getEntry( i ); if ( m_resultWidgets[ i ] ) { m_resultWidgets[ i ]->setText( entry.enumerationText() ); @@ -151,7 +149,7 @@ ResultsListDialog::retranslate() } -ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel &model, QWidget* parent ) +ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model, QWidget* parent ) : QWidget( parent ) , m_model( model ) { @@ -242,7 +240,7 @@ ResultsListWidget::retranslate() { for ( auto i = 0; i < m_model.count(); i++ ) { - const auto &entry = m_model.getEntry(i); + const auto& entry = m_model.getEntry( i ); if ( m_resultWidgets[ i ] ) { m_resultWidgets[ i ]->setText( entry.negatedText() ); diff --git a/src/modules/welcome/checker/ResultsListWidget.h b/src/modules/welcome/checker/ResultsListWidget.h index 05a8adfa4..3f21955ba 100644 --- a/src/modules/welcome/checker/ResultsListWidget.h +++ b/src/modules/welcome/checker/ResultsListWidget.h @@ -30,7 +30,7 @@ class ResultsListWidget : public QWidget { Q_OBJECT public: - explicit ResultsListWidget(const Calamares::RequirementsModel &model, QWidget* parent); + explicit ResultsListWidget( const Calamares::RequirementsModel& model, QWidget* parent ); private: /// @brief A link in the explanatory text has been clicked @@ -38,7 +38,7 @@ private: void retranslate(); QLabel* m_explanation = nullptr; ///< Explanatory text above the list, with link - const Calamares::RequirementsModel &m_model; + const Calamares::RequirementsModel& m_model; QList< ResultWidget* > m_resultWidgets; ///< One widget for each unsatisfied entry };