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

[partition] Factor out creating-bootloader-panel

Browse Source 
- this makes createBootloaderComboBox obsolete, since that was
  an implementation detail for creating the panel.
- add the panel also when doing an alongside install.
- credits to Anubhav, whose PR started this code.
This commit is contained in:
Adriaan de Groot 2022-04-25 12:14:00 +02:00
parent d70d1ebfcd
commit d02afa20b8
2 changed files with 83 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
* SPDX-FileCopyrightText: 2014-2017 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2019 Collabora Ltd
* SPDX-FileCopyrightText: 2021 Anubhav Choudhary <ac.10edu@gmail.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
@ -1023,6 +1024,12 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
QLabel* sizeLabel = new QLabel( m_previewAfterFrame );
layout->addWidget( sizeLabel );
sizeLabel->setWordWrap( true );
if ( !m_isEfi )
{
layout->addWidget( createBootloaderPanel() );
}
connect( m_afterPartitionSplitterWidget,
&PartitionSplitterWidget::partitionResized,
this,
@ -1081,51 +1088,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
if ( !m_isEfi )
{
QWidget* eraseWidget = new QWidget;
QHBoxLayout* eraseLayout = new QHBoxLayout;
eraseWidget->setLayout( eraseLayout );
eraseLayout->setContentsMargins( 0, 0, 0, 0 );
QLabel* eraseBootloaderLabel = new QLabel( eraseWidget );
eraseLayout->addWidget( eraseBootloaderLabel );
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
m_bootloaderComboBox = createBootloaderComboBox( eraseWidget );
connect( m_core->bootLoaderModel(),
&QAbstractItemModel::modelReset,
[ this ]()
{
if ( !m_bootloaderComboBox.isNull() )
{
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox,
m_core->bootLoaderInstallPath() );
}
} );
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 );
eraseBootloaderLabel->setBuddy( m_bootloaderComboBox );
eraseLayout->addStretch();
layout->addWidget( eraseWidget );
layout->addWidget( createBootloaderPanel() );
}
m_previewAfterFrame->show();
@ -1237,35 +1200,6 @@ ChoicePage::setupEfiSystemPartitionSelector()
}
}
QComboBox*
ChoicePage::createBootloaderComboBox( QWidget* parent )
{
QComboBox* comboForBootloader = new QComboBox( parent );
comboForBootloader->setModel( m_core->bootLoaderModel() );
// When the chosen bootloader device changes, we update the choice in the PCM
connect( comboForBootloader,
QOverload< int >::of( &QComboBox::currentIndexChanged ),
this,
[ this ]( int newIndex )
{
QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
if ( bootloaderCombo )
{
QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
{
return;
}
m_core->setBootLoaderInstallPath( var.toString() );
}
} );
return comboForBootloader;
}
static inline void
force_uncheck( QButtonGroup* grp, PrettyRadioButton* button )
{
@ -1737,3 +1671,72 @@ ChoicePage::setLastSelectedDeviceIndex( int index )
m_lastSelectedDeviceIndex = index;
m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
}
QWidget*
ChoicePage::createBootloaderPanel()
{
QWidget* panelWidget = new QWidget;
QHBoxLayout* mainLayout = new QHBoxLayout;
panelWidget->setLayout( mainLayout );
mainLayout->setContentsMargins( 0, 0, 0, 0 );
QLabel* widgetLabel = new QLabel( panelWidget );
mainLayout->addWidget( widgetLabel );
widgetLabel->setText( tr( "Boot loader location:" ) );
QComboBox* comboForBootloader = new QComboBox( panelWidget );
comboForBootloader->setModel( m_core->bootLoaderModel() );
// When the chosen bootloader device changes, we update the choice in the PCM
connect( comboForBootloader,
QOverload< int >::of( &QComboBox::currentIndexChanged ),
this,
[ this ]( int newIndex )
{
QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
if ( bootloaderCombo )
{
QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
{
return;
}
m_core->setBootLoaderInstallPath( var.toString() );
}
} );
m_bootloaderComboBox = comboForBootloader;
connect( m_core->bootLoaderModel(),
&QAbstractItemModel::modelReset,
[ this ]()
{
if ( !m_bootloaderComboBox.isNull() )
{
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
}
} );
connect(
m_core,
&PartitionCoreModule::deviceReverted,
this,
[ this ]( Device* )
{
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.
mainLayout->addWidget( m_bootloaderComboBox );
widgetLabel->setBuddy( m_bootloaderComboBox );
mainLayout->addStretch();
return panelWidget;
}

7
src/modules/partition/gui/ChoicePage.h
View File

@ -108,7 +108,12 @@ private:
void updateNextEnabled();
void setupChoices();
void checkInstallChoiceRadioButton( Config::InstallChoice choice ); ///< Sets the chosen button to "on"
QComboBox* createBootloaderComboBox( QWidget* parentButton );
/** @brief Create a panel with "boot loader location:"
*
* Panel + dropdown and handling for model updates. Returns a pointer
* to the panel's widget.
*/
QWidget* createBootloaderPanel();
Device* selectedDevice();
/* Change the UI depending on the device selected. */