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

Clang: reduce warnings; make enum-switch explicit

Browse Source
This commit is contained in:
Adriaan de Groot 2017-06-28 05:49:53 -04:00
parent 2905a9969d
commit c0b3f3fe9d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,8 @@ PartitionViewStep::createSummaryWidget() const
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ); string( Calamares::Branding::ShortVersionedName ) );
break; break;
default: case ChoicePage::NoChoice:
case ChoicePage::Manual:
modeText = tr( "<strong>Manual</strong> partitioning." ); modeText = tr( "<strong>Manual</strong> partitioning." );
} }
modeLabel->setText( modeText ); modeLabel->setText( modeText );
@ -203,7 +204,8 @@ PartitionViewStep::createSummaryWidget() const
.arg( info.deviceNode ) .arg( info.deviceNode )
.arg( info.deviceName ); .arg( info.deviceName );
break; break;
default: case ChoicePage::NoChoice:
case ChoicePage::Manual:
modeText = tr( "<strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2)." ) modeText = tr( "<strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2)." )
.arg( info.deviceNode ) .arg( info.deviceNode )
.arg( info.deviceName ); .arg( info.deviceName );
@ -271,7 +273,6 @@ PartitionViewStep::createSummaryWidget() const
QLabel* jobsLabel = new QLabel( widget ); QLabel* jobsLabel = new QLabel( widget );
mainLayout->addWidget( jobsLabel ); mainLayout->addWidget( jobsLabel );
jobsLabel->setText( jobsLines.join( "<br/>" ) ); jobsLabel->setText( jobsLines.join( "<br/>" ) );
int m = CalamaresUtils::defaultFontHeight() / 2;
jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
QPalette pal; QPalette pal;
pal.setColor( QPalette::Background, pal.background().color().lighter( 108 ) ); pal.setColor( QPalette::Background, pal.background().color().lighter( 108 ) );