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

We don't need this any more...

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-01-29 16:49:21 +01:00
parent 61b016eb9e
commit 1bc6556b65
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,34 +771,17 @@ ChoicePage::createBootloaderComboBox( QWidget* parent )
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 = [bcb, this]()
{
Device* currd = selectedDevice();
if ( !currd )
return;
QString devPath = currd->deviceNode();
for ( int i = 0; i < bcb->count(); ++i )
{
QVariant var = bcb->itemData( i, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
continue;
if ( var.toString() == devPath )
{
bcb->setCurrentIndex( i );
return;
}
}
};
connect( this, &ChoicePage::deviceChosen,
this, updateBootloaderDevice );
connect( m_core, &PartitionCoreModule::deviceReverted, connect( m_core, &PartitionCoreModule::deviceReverted,
this, [ this, bcb ]( Device* dev ) this, [ this, bcb ]( Device* dev )
{ {
if ( bcb->model() != m_core->bootLoaderModel() ) if ( dev &&
bcb->setModel( m_core->bootLoaderModel() ); dev == selectedDevice() )
bcb->setCurrentIndex( m_lastSelectedDeviceIndex ); {
if ( bcb->model() != m_core->bootLoaderModel() )
bcb->setModel( m_core->bootLoaderModel() );
bcb->setCurrentIndex( m_lastSelectedDeviceIndex );
}
}, Qt::QueuedConnection ); }, Qt::QueuedConnection );
// ^ Must be Queued so it's sure to run when the widget is already visible. // ^ Must be Queued so it's sure to run when the widget is already visible.