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

[partition] Introduce post-reset slot for boot loader selection

Browse Source
This commit is contained in:
Adriaan de Groot 2019-03-29 11:33:40 -04:00
parent 17aeaa134a
commit dc04aa999d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/partition/gui/PartitionPage.cpp
View File

@ -79,6 +79,7 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
value( "alwaysShowPartitionLabels" ).toBool() ); value( "alwaysShowPartitionLabels" ).toBool() );
m_ui->deviceComboBox->setModel( m_core->deviceModel() ); m_ui->deviceComboBox->setModel( m_core->deviceModel() );
m_ui->bootLoaderComboBox->setModel( m_core->bootLoaderModel() ); m_ui->bootLoaderComboBox->setModel( m_core->bootLoaderModel() );
connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset, this, &PartitionPage::restoreSelectedBootLoader );
PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()-> PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()->
value( "drawNestedPartitions" ).toBool() ? value( "drawNestedPartitions" ).toBool() ?
PartitionBarsView::DrawNestedPartitions : PartitionBarsView::DrawNestedPartitions :
@ -505,6 +506,12 @@ PartitionPage::updateSelectedBootLoaderIndex()
cDebug() << "Selected bootloader index" << m_lastSelectedBootLoaderIndex; cDebug() << "Selected bootloader index" << m_lastSelectedBootLoaderIndex;
} }
void
PartitionPage::restoreSelectedBootLoader()
{
}
void void
PartitionPage::updateFromCurrentDevice() PartitionPage::updateFromCurrentDevice()
{ {

2
src/modules/partition/gui/PartitionPage.h
View File

@ -57,6 +57,8 @@ private slots:
void updateBootLoaderInstallPath(); void updateBootLoaderInstallPath();
/// @brief Explicitly selected boot loader path /// @brief Explicitly selected boot loader path
void updateSelectedBootLoaderIndex(); void updateSelectedBootLoaderIndex();
/// @brief After boot loader model changes, try to preserve previously set value
void restoreSelectedBootLoader();
private: private:
QScopedPointer< Ui_PartitionPage > m_ui; QScopedPointer< Ui_PartitionPage > m_ui;