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

[welcome] Improve variable naming

Browse Source 
- these two are about whether all the checkEntries are satisfied
   (in general, and the mandatory ones) so make the names reflect that.
This commit is contained in:
Adriaan de Groot 2020-01-28 13:02:39 +01:00
parent 5795801be5
commit f5c0e57f17
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/welcome/checker/ResultsListWidget.cpp
View File

@ -157,8 +157,8 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
spacerLayout->addSpacing( paddingSize );
CalamaresUtils::unmarginLayout( spacerLayout );
bool allChecked = true;
bool requirementsSatisfied = true;
bool requirementsSatisfied = true; // Give a warning
bool mandatorySatisfied = true; // Give an error
for ( const auto& entry : checkEntries )
{
@ -169,10 +169,10 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
entriesLayout->addWidget( ciw );
ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
allChecked = false;
requirementsSatisfied = false;
if ( entry.mandatory )
{
requirementsSatisfied = false;
mandatorySatisfied = false;
}
ciw->setAutoFillBackground( true );
@ -191,11 +191,11 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
entriesLayout->insertWidget( 0, textLabel );
textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
if ( !allChecked )
if ( !requirementsSatisfied )
{
entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
if ( !requirementsSatisfied )
if ( !mandatorySatisfied )
{
CALAMARES_RETRANSLATE( QString message = Calamares::Settings::instance()->isSetupMode()
? tr( "This computer does not satisfy the minimum "
@ -230,7 +230,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
}
}
if ( allChecked && requirementsSatisfied )
if ( requirementsSatisfied && mandatorySatisfied )
{
if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
{