@ -130,21 +130,21 @@ void
LicensePage : : setEntries ( const QList < LicenseEntry > & entriesList )
LicensePage : : setEntries ( const QList < LicenseEntry > & entriesList )
{
{
CalamaresUtils : : clearLayout ( ui - > licenseEntriesLayout ) ;
CalamaresUtils : : clearLayout ( ui - > licenseEntriesLayout ) ;
m_entries . clear ( ) ;
m_entries . reserve ( entriesList . count ( ) ) ;
auto isRequired = [ ] ( const LicenseEntry & e ) { return e . m_required ; } ;
m_allLicensesOptional = true ;
m_allLicensesOptional = std : : none_of ( entriesList . cbegin ( ) , entriesList . cend ( ) , isRequired ) ;
checkAcceptance ( false ) ;
m_entries . clear ( ) ;
m_entries . reserve ( entriesList . count ( ) ) ;
for ( const LicenseEntry & entry : entriesList )
for ( const LicenseEntry & entry : entriesList )
{
{
LicenseWidget * w = new LicenseWidget ( entry ) ;
LicenseWidget * w = new LicenseWidget ( entry ) ;
ui - > licenseEntriesLayout - > addWidget ( w ) ;
ui - > licenseEntriesLayout - > addWidget ( w ) ;
m_entries . append ( w ) ;
m_entries . append ( w ) ;
m_allLicensesOptional & = ! entry . isRequired ( ) ;
}
}
ui - > licenseEntriesLayout - > addStretch ( ) ;
ui - > acceptCheckBox - > setChecked ( false ) ;
checkAcceptance ( false ) ;
}
}
void
void