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

[partition] Apply newer clang-formatting

Browse Source
This commit is contained in:
Adriaan de Groot 2024-04-17 10:55:21 +02:00
parent 5bf787c1a5
commit 92a5d07ed7
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/partition/gui/ChoicePage.cpp
View File

@ -1057,7 +1057,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
Q_UNUSED( path ) Q_UNUSED( path )
sizeLabel->setText( sizeLabel->setText(
tr( "%1 will be shrunk to %2MiB and a new " tr( "%1 will be shrunk to %2MiB and a new "
"%3MiB partition will be created for %4.", "@info, %1 is partition name, %4 is product name" ) "%3MiB partition will be created for %4.",
"@info, %1 is partition name, %4 is product name" )
.arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() )
.arg( Calamares::BytesToMiB( size ) ) .arg( Calamares::BytesToMiB( size ) )
.arg( Calamares::BytesToMiB( sizeNext ) ) .arg( Calamares::BytesToMiB( sizeNext ) )
@ -1188,14 +1189,16 @@ ChoicePage::setupEfiSystemPartitionSelector()
{ {
m_efiLabel->setText( tr( "An EFI system partition cannot be found anywhere " m_efiLabel->setText( tr( "An EFI system partition cannot be found anywhere "
"on this system. Please go back and use manual " "on this system. Please go back and use manual "
"partitioning to set up %1.", "@info, %1 is product name" ) "partitioning to set up %1.",
"@info, %1 is product name" )
.arg( Calamares::Branding::instance()->shortProductName() ) ); .arg( Calamares::Branding::instance()->shortProductName() ) );
updateNextEnabled(); updateNextEnabled();
} }
else if ( efiSystemPartitions.count() == 1 ) //probably most usual situation else if ( efiSystemPartitions.count() == 1 ) //probably most usual situation
{ {
m_efiLabel->setText( tr( "The EFI system partition at %1 will be used for " m_efiLabel->setText( tr( "The EFI system partition at %1 will be used for "
"starting %2.", "@info, %1 is partition path, %2 is product name" ) "starting %2.",
"@info, %1 is partition path, %2 is product name" )
.arg( efiSystemPartitions.first()->partitionPath() ) .arg( efiSystemPartitions.first()->partitionPath() )
.arg( Calamares::Branding::instance()->shortProductName() ) ); .arg( Calamares::Branding::instance()->shortProductName() ) );
} }
@ -1505,7 +1508,8 @@ ChoicePage::setupActions()
{ {
if ( atLeastOneIsMounted ) if ( atLeastOneIsMounted )
{ {
m_messageLabel->setText( tr( "This storage device has one of its partitions <strong>mounted</strong>.", "@info" ) ); m_messageLabel->setText(
tr( "This storage device has one of its partitions <strong>mounted</strong>.", "@info" ) );
} }
else else
{ {

3
src/modules/partition/gui/EncryptWidget.cpp
View File

@ -155,7 +155,8 @@ EncryptWidget::updateState( const bool notify )
else if ( m_filesystem == FileSystem::Zfs && p1.length() < ZFS_MIN_LENGTH ) else if ( m_filesystem == FileSystem::Zfs && p1.length() < ZFS_MIN_LENGTH )
{ {
applyPixmap( m_ui->m_iconLabel, Calamares::StatusError ); applyPixmap( m_ui->m_iconLabel, Calamares::StatusError );
m_ui->m_iconLabel->setToolTip( tr( "Password must be a minimum of %1 characters.", "@tooltip" ).arg( ZFS_MIN_LENGTH ) ); m_ui->m_iconLabel->setToolTip(
tr( "Password must be a minimum of %1 characters.", "@tooltip" ).arg( ZFS_MIN_LENGTH ) );
} }
else if ( p1 == p2 ) else if ( p1 == p2 )
{ {

3
src/modules/partition/gui/ScanningDialog.cpp
View File

@ -65,7 +65,8 @@ ScanningDialog::run( const QFuture< void >& future,
void void
ScanningDialog::run( const QFuture< void >& future, const std::function< void() >& callback, QWidget* parent ) ScanningDialog::run( const QFuture< void >& future, const std::function< void() >& callback, QWidget* parent )
{ {
ScanningDialog::run( future, tr( "Scanning storage devices…", "@status" ), tr( "Partitioning…", "@status" ), callback, parent ); ScanningDialog::run(
future, tr( "Scanning storage devices…", "@status" ), tr( "Partitioning…", "@status" ), callback, parent );
} }
void void