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

[finished] Apply newer clang-formatting

Browse Source
This commit is contained in:
Adriaan de Groot 2024-04-17 10:55:16 +02:00
parent df09d7ae89
commit 2100d273ce
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/finished/Config.cpp
View File

@ -139,7 +139,8 @@ Config::doNotify( bool hasFailed, bool sendAnyway )
QString message; QString message;
if ( hasFailed ) if ( hasFailed )
{ {
title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed", "@title" ) : tr( "Installation Failed", "@title" ); title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed", "@title" )
: tr( "Installation Failed", "@title" );
message = Calamares::Settings::instance()->isSetupMode() message = Calamares::Settings::instance()->isSetupMode()
? tr( "The setup of %1 did not complete successfully.", "@info" ) ? tr( "The setup of %1 did not complete successfully.", "@info" )
: tr( "The installation of %1 did not complete successfully.", "@info" ); : tr( "The installation of %1 did not complete successfully.", "@info" );
@ -148,8 +149,9 @@ Config::doNotify( bool hasFailed, bool sendAnyway )
{ {
title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete", "@title" ) title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete", "@title" )
: tr( "Installation Complete", "@title" ); : tr( "Installation Complete", "@title" );
message = Calamares::Settings::instance()->isSetupMode() ? tr( "The setup of %1 is complete.", "@info" ) message = Calamares::Settings::instance()->isSetupMode()
: tr( "The installation of %1 is complete.", "@info" ); ? tr( "The setup of %1 is complete.", "@info" )
: tr( "The installation of %1 is complete.", "@info" );
} }
const auto* branding = Calamares::Branding::instance(); const auto* branding = Calamares::Branding::instance();

18
src/modules/finished/FinishedPage.cpp
View File

@ -74,26 +74,30 @@ FinishedPage::retranslate()
{ {
ui->mainText->setText( tr( "<h1>All done.</h1><br/>" ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
"%1 has been set up on your computer.<br/>" "%1 has been set up on your computer.<br/>"
"You may now start using your new system.", "@info" ) "You may now start using your new system.",
"@info" )
.arg( branding->versionedName() ) ); .arg( branding->versionedName() ) );
ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"
"<p>When this box is checked, your system will " "<p>When this box is checked, your system will "
"restart immediately when you click on " "restart immediately when you click on "
"<span style=\"font-style:italic;\">Done</span> " "<span style=\"font-style:italic;\">Done</span> "
"or close the setup program.</p></body></html>", "@tooltip" ) ); "or close the setup program.</p></body></html>",
"@tooltip" ) );
} }
else else
{ {
ui->mainText->setText( tr( "<h1>All done.</h1><br/>" ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
"%1 has been installed on your computer.<br/>" "%1 has been installed on your computer.<br/>"
"You may now restart into your new system, or continue " "You may now restart into your new system, or continue "
"using the %2 Live environment.", "@info" ) "using the %2 Live environment.",
"@info" )
.arg( branding->versionedName(), branding->productName() ) ); .arg( branding->versionedName(), branding->productName() ) );
ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"
"<p>When this box is checked, your system will " "<p>When this box is checked, your system will "
"restart immediately when you click on " "restart immediately when you click on "
"<span style=\"font-style:italic;\">Done</span> " "<span style=\"font-style:italic;\">Done</span> "
"or close the installer.</p></body></html>", "@tooltip" ) ); "or close the installer.</p></body></html>",
"@tooltip" ) );
} }
} }
else else
@ -104,7 +108,8 @@ FinishedPage::retranslate()
{ {
ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>" ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>"
"%1 has not been set up on your computer.<br/>" "%1 has not been set up on your computer.<br/>"
"The error message was: %2.", "@info, %1 is product name with version" ) "The error message was: %2.",
"@info, %1 is product name with version" )
.arg( branding->versionedName() ) .arg( branding->versionedName() )
.arg( message ) ); .arg( message ) );
} }
@ -112,7 +117,8 @@ FinishedPage::retranslate()
{ {
ui->mainText->setText( tr( "<h1>Installation Failed</h1><br/>" ui->mainText->setText( tr( "<h1>Installation Failed</h1><br/>"
"%1 has not been installed on your computer.<br/>" "%1 has not been installed on your computer.<br/>"
"The error message was: %2.", "@info, %1 is product name with version" ) "The error message was: %2.",
"@info, %1 is product name with version" )
.arg( branding->versionedName() ) .arg( branding->versionedName() )
.arg( message ) ); .arg( message ) );
} }