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

Update the bootloader picker when the chosen device changes.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-11-08 18:30:26 +01:00
parent a65be8bfda
commit e0b1290b8c
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,22 +210,56 @@ ChoicePage::setupChoices()
{ {
QWidget* eraseWidget = new QWidget; QWidget* eraseWidget = new QWidget;
{ {
eraseWidget->setLayout( new QHBoxLayout ); QHBoxLayout* eraseLayout = new QHBoxLayout;
eraseWidget->setLayout( eraseLayout );
eraseLayout->setContentsMargins( 0, 0, 0, 0 );
QLabel* eraseBootloaderLabel = new QLabel( eraseWidget ); QLabel* eraseBootloaderLabel = new QLabel( eraseWidget );
eraseWidget->layout()->addWidget( eraseBootloaderLabel ); eraseLayout->addWidget( eraseBootloaderLabel );
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) ); eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
QComboBox* eraseBootloaderCombo = new QComboBox; QComboBox* eraseBootloaderCombo = new QComboBox;
eraseWidget->layout()->addWidget( eraseBootloaderCombo ); eraseLayout->addWidget( eraseBootloaderCombo );
eraseBootloaderLabel->setBuddy( eraseBootloaderCombo ); eraseBootloaderLabel->setBuddy( eraseBootloaderCombo );
eraseBootloaderCombo->setModel( m_core->bootLoaderModel() ); eraseBootloaderCombo->setModel( m_core->bootLoaderModel() );
eraseLayout->addStretch();
// When the chosen bootloader device changes, we update the choice in the PCM
connect( eraseBootloaderCombo, static_cast< void (QComboBox::*)(int) >( &QComboBox::currentIndexChanged ), connect( eraseBootloaderCombo, static_cast< void (QComboBox::*)(int) >( &QComboBox::currentIndexChanged ),
[=]( int /* index */ ) [=]( int newIndex )
{ {
QVariant var = eraseBootloaderCombo->currentData( BootLoaderModel::BootLoaderPathRole ); QVariant var = eraseBootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() ) if ( !var.isValid() )
return; return;
m_core->setBootLoaderInstallPath( var.toString() ); m_core->setBootLoaderInstallPath( var.toString() );
} ); } );
// If the user picks a new device, we update the bootloader choice to that
// same device automatically.
auto updateBootloaderDevice = [eraseBootloaderCombo]( Device* currd )
{
if ( !currd )
return;
QString devPath = currd->deviceNode();
for ( int i = 0; i < eraseBootloaderCombo->count(); ++i )
{
QVariant var = eraseBootloaderCombo->itemData( i , BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
continue;
if ( var.toString() == devPath )
{
eraseBootloaderCombo->setCurrentIndex( i );
return;
}
}
};
connect( this, &ChoicePage::deviceChosen,
this, updateBootloaderDevice );
connect( m_eraseButton, &ExpandableRadioButton::expanded,
this, [=]( bool expanded )
{
if ( expanded )
updateBootloaderDevice( selectedDevice() );
}, Qt::QueuedConnection );
// ^ Must be Queued so it's sure to run when the widget is already visible.
} }
m_eraseButton->setExpandableWidget( eraseWidget ); m_eraseButton->setExpandableWidget( eraseWidget );
} }
@ -394,6 +428,7 @@ ChoicePage::applyDeviceChoice()
m_lastSelectedDeviceIndex = drivesList->selectionModel()->currentIndex().row(); m_lastSelectedDeviceIndex = drivesList->selectionModel()->currentIndex().row();
emit actionChosen(); emit actionChosen();
emit deviceChosen( currd );
} }

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

@ -63,6 +63,7 @@ public:
signals: signals:
void nextStatusChanged( bool ); void nextStatusChanged( bool );
void actionChosen(); void actionChosen();
void deviceChosen( Device* );
private: private:
bool compact(); bool compact();