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

[welcome] Fix code formatting

Browse Source 
- the RETRANSLATE macro is a real challenge for astyle and clang-format
This commit is contained in:
Adriaan de Groot 2019-08-29 11:01:02 +02:00
parent 07bd22ba95
commit fc5aa54cb2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/welcome/WelcomePage.cpp
View File

@ -76,13 +76,18 @@ WelcomePage::WelcomePage( QWidget* parent )
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
QString message; QString message;
if ( Calamares::Settings::instance()->isSetupMode() ) message if ( Calamares::Settings::instance()->isSetupMode() )
= Calamares::Branding::instance()->welcomeStyleCalamares() {
message = Calamares::Branding::instance()->welcomeStyleCalamares()
? tr( "<h1>Welcome to the Calamares setup program for %1.</h1>" ) ? tr( "<h1>Welcome to the Calamares setup program for %1.</h1>" )
: tr( "<h1>Welcome to %1 setup.</h1>" ); : tr( "<h1>Welcome to %1 setup.</h1>" );
else message = Calamares::Branding::instance()->welcomeStyleCalamares() }
else
{
message = Calamares::Branding::instance()->welcomeStyleCalamares()
? tr( "<h1>Welcome to the Calamares installer for %1.</h1>" ) ? tr( "<h1>Welcome to the Calamares installer for %1.</h1>" )
: tr( "<h1>Welcome to the %1 installer.</h1>" ); : tr( "<h1>Welcome to the %1 installer.</h1>" );
}
ui->mainText->setText( message.arg( *Calamares::Branding::VersionedName ) ); ui->mainText->setText( message.arg( *Calamares::Branding::VersionedName ) );
ui->retranslateUi( this ); ui->retranslateUi( this );