diff --git a/CHANGES-3.3 b/CHANGES-3.3 index 0c682c5bf..d66e89eae 100644 --- a/CHANGES-3.3 +++ b/CHANGES-3.3 @@ -14,13 +14,16 @@ it must be placed before the *fstab* module in settings.conf. If it comes after, then the keyfile will be missing from crypttab and the user will be asked for their password multiple times. -This release contains contributions from (alphabetically by first name): +This release contains contributions from (alphabetically by given name): + - Adriaan de Groot - Evan James ## Core ## ## Modules ## - - Placed *luksbootkeyfile* before *fstab* in the example settings.conf + - Placed *luksbootkeyfile* before *fstab* in the example `settings.conf` (#2356, Evan) + - *partition* module mentions creating a swap file in its summary (#2320, Adriaan) + # 3.3.8 (2024-07-02) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index db087b59d..a5de6d5ea 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -110,8 +110,8 @@ PartitionViewStep::prettyName() const /** @brief Gather the pretty descriptions of all the partitioning jobs * * Returns a QStringList of each job's pretty description, including - * empty strings and duplicates. The list is in-order of how the - * jobs will be run. + * duplicates (but no empty lines). The list is in-order of how the + * jobs will be run. If no job has a non-empty description, the list is empty. */ static QStringList jobDescriptions( const Calamares::JobList& jobs ) @@ -119,9 +119,10 @@ jobDescriptions( const Calamares::JobList& jobs ) QStringList jobsLines; for ( const Calamares::job_ptr& job : qAsConst( jobs ) ) { - if ( !job->prettyDescription().isEmpty() ) + const auto description = job->prettyDescription(); + if ( !description.isEmpty() ) { - jobsLines.append( job->prettyDescription() ); + jobsLines.append( description ); } } return jobsLines; @@ -232,8 +233,12 @@ PartitionViewStep::prettyStatus() const } return s.join( QString() ); }(); - const QString jobsLabel = jobDescriptions( jobs() ).join( QStringLiteral( "
" ) ); - return diskInfoLabel + "
" + jobsLabel; + QStringList jobsLabels = jobDescriptions( jobs() ); + if ( m_config->swapChoice() == Config::SwapChoice::SwapFile ) + { + jobsLabels.append( tr( "Create a swap file." ) ); + } + return diskInfoLabel + "
" + jobsLabels.join( QStringLiteral( "
" ) ); } QWidget*