@ -906,7 +906,9 @@ ChoicePage::updateDeviceStatePreview()
m_beforePartitionBarsView - > setSelectionMode ( QAbstractItemView : : SingleSelection ) ;
m_beforePartitionLabelsView - > setSelectionMode ( QAbstractItemView : : SingleSelection ) ;
break ;
default :
case InstallChoice : : NoChoice :
case InstallChoice : : Erase :
case InstallChoice : : Manual :
m_beforePartitionBarsView - > setSelectionMode ( QAbstractItemView : : NoSelection ) ;
m_beforePartitionLabelsView - > setSelectionMode ( QAbstractItemView : : NoSelection ) ;
}
@ -990,7 +992,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
m_previewAfterFrame - > show ( ) ;
m_previewAfterLabel - > show ( ) ;
SelectionFilter filter = [ this ] ( const QModelIndex & index ) {
SelectionFilter filter = [ ] ( const QModelIndex & index ) {
return PartUtils : : canBeResized (
static_cast < Partition * > ( index . data ( PartitionModel : : PartitionPtrRole ) . value < void * > ( ) ) ) ;
} ;
@ -1079,7 +1081,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
}
else
{
SelectionFilter filter = [ this ] ( const QModelIndex & index ) {
SelectionFilter filter = [ ] ( const QModelIndex & index ) {
return PartUtils : : canBeReplaced (
static_cast < Partition * > ( index . data ( PartitionModel : : PartitionPtrRole ) . value < void * > ( ) ) ) ;
} ;
@ -1125,7 +1127,9 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
case InstallChoice : : Alongside :
previewSelectionMode = QAbstractItemView : : SingleSelection ;
break ;
default :
case InstallChoice : : NoChoice :
case InstallChoice : : Erase :
case InstallChoice : : Manual :
previewSelectionMode = QAbstractItemView : : NoSelection ;
}
@ -1179,15 +1183,15 @@ ChoicePage::setupEfiSystemPartitionSelector()
QComboBox *
ChoicePage : : createBootloaderComboBox ( QWidget * parent )
{
QComboBox * b cb = new QComboBox ( parent ) ;
b cb- > setModel ( m_core - > bootLoaderModel ( ) ) ;
QComboBox * com boForBootloader = new QComboBox ( parent ) ;
com boForBootloader - > setModel ( m_core - > bootLoaderModel ( ) ) ;
// When the chosen bootloader device changes, we update the choice in the PCM
connect ( b cb, QOverload < int > : : of ( & QComboBox : : currentIndexChanged ) , this , [ this ] ( int newIndex ) {
QComboBox * b cb = qobject_cast < QComboBox * > ( sender ( ) ) ;
if ( b cb )
connect ( com boForBootloader , QOverload < int > : : of ( & QComboBox : : currentIndexChanged ) , this , [ this ] ( int newIndex ) {
QComboBox * b ootloaderCombo = qobject_cast < QComboBox * > ( sender ( ) ) ;
if ( b ootloaderCombo )
{
QVariant var = b cb - > itemData ( newIndex , BootLoaderModel : : BootLoaderPathRole ) ;
QVariant var = b ootloaderCombo - > itemData ( newIndex , BootLoaderModel : : BootLoaderPathRole ) ;
if ( ! var . isValid ( ) )
{
return ;
@ -1196,7 +1200,7 @@ ChoicePage::createBootloaderComboBox( QWidget* parent )
}
} ) ;
return b cb;
return com boForBootloader ;
}
@ -1220,7 +1224,6 @@ operator<<( QDebug& s, PartitionIterator& it )
* @ brief ChoicePage : : setupActions happens every time a new Device * is selected in the
* device picker . Sets up the text and visibility of the partitioning actions based
* on the currently selected Device * , bootloader and os - prober output .
* @ param currentDevice
*/
void
ChoicePage : : setupActions ( )