From 2100d273ce15246c6abf9daddd529fcbf096bcb4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Apr 2024 10:55:16 +0200 Subject: [PATCH] [finished] Apply newer clang-formatting --- src/modules/finished/Config.cpp | 8 +++++--- src/modules/finished/FinishedPage.cpp | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index 136717f31..f54b20091 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -139,7 +139,8 @@ Config::doNotify( bool hasFailed, bool sendAnyway ) QString message; 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() ? tr( "The setup 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" ) : tr( "Installation Complete", "@title" ); - message = Calamares::Settings::instance()->isSetupMode() ? tr( "The setup of %1 is complete.", "@info" ) - : tr( "The installation of %1 is complete.", "@info" ); + message = Calamares::Settings::instance()->isSetupMode() + ? tr( "The setup of %1 is complete.", "@info" ) + : tr( "The installation of %1 is complete.", "@info" ); } const auto* branding = Calamares::Branding::instance(); diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index 23cb194c4..51be52678 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -74,26 +74,30 @@ FinishedPage::retranslate() { ui->mainText->setText( tr( "

All done.


" "%1 has been set up on your computer.
" - "You may now start using your new system.", "@info" ) + "You may now start using your new system.", + "@info" ) .arg( branding->versionedName() ) ); ui->restartCheckBox->setToolTip( tr( "" "

When this box is checked, your system will " "restart immediately when you click on " "Done " - "or close the setup program.

", "@tooltip" ) ); + "or close the setup program.

", + "@tooltip" ) ); } else { ui->mainText->setText( tr( "

All done.


" "%1 has been installed on your computer.
" "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() ) ); ui->restartCheckBox->setToolTip( tr( "" "

When this box is checked, your system will " "restart immediately when you click on " "Done " - "or close the installer.

", "@tooltip" ) ); + "or close the installer.

", + "@tooltip" ) ); } } else @@ -104,7 +108,8 @@ FinishedPage::retranslate() { ui->mainText->setText( tr( "

Setup Failed


" "%1 has not been set up on your computer.
" - "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( message ) ); } @@ -112,7 +117,8 @@ FinishedPage::retranslate() { ui->mainText->setText( tr( "

Installation Failed


" "%1 has not been installed on your computer.
" - "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( message ) ); }