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

[partition] Tighten up determining job labels for description

Browse Source
This commit is contained in:
Adriaan de Groot 2022-02-21 12:12:20 +01:00
parent 62888f7984
commit 99d11f754f
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,7 @@ diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, C
QString QString
PartitionViewStep::prettyStatus() const PartitionViewStep::prettyStatus() const
{ {
QString jobsLabel, modeText, diskInfoLabel; QString modeText, diskInfoLabel;
const Config::InstallChoice choice = m_config->installChoice(); const Config::InstallChoice choice = m_config->installChoice();
const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
@ -233,12 +233,7 @@ PartitionViewStep::prettyStatus() const
diskInfoLabel = diskDescription( list.length(), info, choice ); diskInfoLabel = diskDescription( list.length(), info, choice );
} }
const QStringList jobsLines = jobDescriptions( jobs() ); const QString jobsLabel = jobDescriptions( jobs() ).join( QStringLiteral( "<br/>" ) );
if ( !jobsLines.isEmpty() )
{
jobsLabel = jobsLines.join( "<br/>" );
}
return diskInfoLabel + "<br/>" + jobsLabel; return diskInfoLabel + "<br/>" + jobsLabel;
} }