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

Never show an empty jobs label.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-04-10 12:55:08 +02:00
parent a8b8a3a455
commit 22411d2399
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -201,21 +201,24 @@ PartitionViewStep::createSummaryWidget() const
info.partitionModelAfter->setParent( widget ); info.partitionModelAfter->setParent( widget );
formLayout->addRow( tr( "After:" ), preview ); formLayout->addRow( tr( "After:" ), preview );
} }
QLabel* jobsLabel = new QLabel( widget );
mainLayout->addWidget( jobsLabel );
QStringList jobsLines; QStringList jobsLines;
foreach ( const Calamares::job_ptr& job, jobs() ) foreach ( const Calamares::job_ptr& job, jobs() )
{ {
if ( !job->prettyDescription().isEmpty() ) if ( !job->prettyDescription().isEmpty() )
jobsLines.append( job->prettyDescription() ); jobsLines.append( job->prettyDescription() );
} }
jobsLabel->setText( jobsLines.join( "<br/>" ) ); if ( !jobsLines.isEmpty() )
int m = CalamaresUtils::defaultFontHeight() / 2; {
jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); QLabel* jobsLabel = new QLabel( widget );
QPalette pal; mainLayout->addWidget( jobsLabel );
pal.setColor( QPalette::Background, pal.background().color().lighter( 108 ) ); jobsLabel->setText( jobsLines.join( "<br/>" ) );
jobsLabel->setAutoFillBackground( true ); int m = CalamaresUtils::defaultFontHeight() / 2;
jobsLabel->setPalette( pal ); jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
QPalette pal;
pal.setColor( QPalette::Background, pal.background().color().lighter( 108 ) );
jobsLabel->setAutoFillBackground( true );
jobsLabel->setPalette( pal );
}
return widget; return widget;
} }