applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disk selections in partitioner are not sticky

Browse source
This commit is contained in:
Chantara Tith 2016-05-05 20:28:35 +07:00
parent e122600689
commit 625bbb6a4b
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/modules/partition/gui/PartitionPage.cpp
View file

@ -54,6 +54,7 @@
PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
: QWidget( parent )
, m_ui( new Ui_PartitionPage )
, m_lastSelectedBootLoaderIndex(-1)
, m_core( core )
{
m_ui->setupUi( this );
@ -74,6 +75,11 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
{
updateFromCurrentDevice();
} );
connect( m_ui->bootLoaderComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::activated),
[ this ]( const QString& /* text */ )
{
m_lastSelectedBootLoaderIndex = m_ui->bootLoaderComboBox->currentIndex();
} );
connect( m_ui->bootLoaderComboBox, &QComboBox::currentTextChanged,
[ this ]( const QString& /* text */ )
@ -94,7 +100,7 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
m_ui->bootLoaderComboBox->hide();
m_ui->label_3->hide();
}
CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); )
}
@ -152,6 +158,9 @@ PartitionPage::onNewPartitionTableClicked()
m_core->createPartitionTable( device, type );
}
delete dlg;
// PartionModelReset isn't emmited after createPartitionTable, so we have to manually update
// the bootLoader index after the reset.
updateBootLoaderIndex();
}
void
@ -188,6 +197,7 @@ PartitionPage::onEditClicked()
updatePartitionToCreate( model->device(), partition );
else
editExistingPartition( model->device(), partition );
}
void
@ -217,7 +227,12 @@ PartitionPage::onRevertClicked()
m_ui->deviceComboBox->setCurrentIndex( oldIndex );
updateFromCurrentDevice();
} ),
[]{},
[ this ]{
m_lastSelectedBootLoaderIndex = -1;
if( !m_ui->bootLoaderComboBox->currentIndex() >= 0 ) {
m_ui->bootLoaderComboBox->setCurrentIndex( 0 );
}
},
this );
}
@ -336,4 +351,14 @@ PartitionPage::onPartitionModelReset()
{
m_ui->partitionTreeView->expandAll();
updateButtons();
updateBootLoaderIndex();
}
void
PartitionPage::updateBootLoaderIndex()
{
// set bootloader back to user selected index
if ( m_lastSelectedBootLoaderIndex >= 0 && m_ui->bootLoaderComboBox->count() ) {
m_ui->bootLoaderComboBox->setCurrentIndex( m_lastSelectedBootLoaderIndex );
}
}

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

@ -60,8 +60,10 @@ private:
void editExistingPartition( Device*, Partition* );
void updateBootLoaderInstallPath();
void updateFromCurrentDevice();
void updateBootLoaderIndex();
QMutex m_revertMutex;
int m_lastSelectedBootLoaderIndex;
};
#endif // PARTITIONPAGE_H