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

Initial work on having the Replace feature obey the encryption setting.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-05-27 16:29:03 +02:00
parent 20b5cfd776
commit 6cd1bf6b3d
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,6 +484,19 @@ ChoicePage::onEncryptWidgetStateChanged()
state == EncryptWidget::EncryptionDisabled )
applyActionChoice( m_choice );
}
else if ( m_choice == Replace )
{
if ( m_beforePartitionBarsView &&
m_beforePartitionBarsView->selectionModel()->currentIndex().isValid() &&
( state == EncryptWidget::EncryptionConfirmed ||
state == EncryptWidget::EncryptionDisabled ) )
{
doReplaceSelectedPartition( m_beforePartitionBarsView->
selectionModel()->
currentIndex(),
QModelIndex() );
}
}
updateNextEnabled();
}
@ -610,13 +623,28 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
}
}
Partition* newPartition = KPMHelpers::createNewPartition(
Partition* newPartition = nullptr;
if ( m_encryptWidget->state() == EncryptWidget::EncryptionConfirmed )
{
newPartition = KPMHelpers::createNewEncryptedPartition(
newParent,
*selectedDevice(),
newRoles,
FileSystem::Ext4,
selectedPartition->firstSector(),
selectedPartition->lastSector(),
m_encryptWidget->passphrase() );
}
else
{
newPartition = KPMHelpers::createNewPartition(
newParent,
*selectedDevice(),
newRoles,
FileSystem::Ext4,
selectedPartition->firstSector(),
selectedPartition->lastSector() );
}
PartitionInfo::setMountPoint( newPartition, "/" );
PartitionInfo::setFormat( newPartition, true );
@ -850,7 +878,6 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
m_selectLabel->hide();
else
{
m_encryptWidget->hide();
SelectionFilter filter = [ this ]( const QModelIndex& index )
{
return PartUtils::canBeReplaced( (Partition*)( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );