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

Merge pull request #2358 from calamares/issue-2320

Browse Source 
Mention swapfile in summary
This commit is contained in:
Adriaan de Groot 2024-08-05 22:38:37 +02:00 committed by GitHub
commit a9044661ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES-3.3
View File

@ -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)

17
src/modules/partition/PartitionViewStep.cpp
View File

@ -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( "<br/>" ) );
return diskInfoLabel + "<br/>" + jobsLabel;
QStringList jobsLabels = jobDescriptions( jobs() );
if ( m_config->swapChoice() == Config::SwapChoice::SwapFile )
{
jobsLabels.append( tr( "Create a swap file." ) );
}
return diskInfoLabel + "<br/>" + jobsLabels.join( QStringLiteral( "<br/>" ) );
}
QWidget*