diff --git a/ci/HACKING.md b/ci/HACKING.md index ca3901f07..f2e6308d1 100644 --- a/ci/HACKING.md +++ b/ci/HACKING.md @@ -60,6 +60,8 @@ some PEP8 guidelines. * Function and class definitions have their braces on separate lines. * A function implementation's return type is on its own line. * `CamelCase.{cpp,h}` style file names. +* Lambdas are preferrably indented to a 4-space tab, even when passed as an + argument to functions. Example: ``` diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index d9fb89b3f..3a2b0c4bc 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -960,19 +960,18 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice ) QLabel* sizeLabel = new QLabel( m_previewAfterFrame ); layout->addWidget( sizeLabel ); sizeLabel->setWordWrap( true ); - connect( m_afterPartitionSplitterWidget, &PartitionSplitterWidget::partitionResized, - this, [ this, sizeLabel ]( const QString& path, - qint64 size, - qint64 sizeNext ) - { - Q_UNUSED( path ) - sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new " - "%3MiB partition will be created for %4." ) - .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) - .arg( CalamaresUtils::BytesToMiB( size ) ) - .arg( CalamaresUtils::BytesToMiB( sizeNext ) ) - .arg( *Calamares::Branding::ShortProductName ) ); - } ); + connect( m_afterPartitionSplitterWidget, &PartitionSplitterWidget::partitionResized, this, + [ this, sizeLabel ]( const QString& path, qint64 size, qint64 sizeNext ) + { + Q_UNUSED( path ) + sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new " + "%3MiB partition will be created for %4." ) + .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) + .arg( CalamaresUtils::BytesToMiB( size ) ) + .arg( CalamaresUtils::BytesToMiB( sizeNext ) ) + .arg( *Calamares::Branding::ShortProductName ) ); + } + ); m_previewAfterFrame->show(); m_previewAfterLabel->show(); @@ -1026,23 +1025,23 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice ) m_bootloaderComboBox = createBootloaderComboBox( eraseWidget ); connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset, - [ this ]() - { - Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); - } - ); - connect( m_core, &PartitionCoreModule::deviceReverted, - this, [ this ]( Device* dev ) - { - Q_UNUSED( dev ) - if ( !m_bootloaderComboBox.isNull() ) + [ this ]() { - if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) - m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); - - m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); } - }, Qt::QueuedConnection ); + ); + connect( m_core, &PartitionCoreModule::deviceReverted, this, + [ this ]( Device* dev ) + { + Q_UNUSED( dev ) + if ( !m_bootloaderComboBox.isNull() ) + { + if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) + m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); + + m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + } + }, Qt::QueuedConnection ); // ^ Must be Queued so it's sure to run when the widget is already visible. eraseLayout->addWidget( m_bootloaderComboBox );