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

Rebuild autopartition proposal when encryption choice changes.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-05-05 12:26:28 +02:00
parent b6c2e0f4d7
commit b792ea0216
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ ChoicePage::init( PartitionCoreModule* core )
this, &ChoicePage::applyDeviceChoice ); this, &ChoicePage::applyDeviceChoice );
connect( m_encryptWidget, &EncryptWidget::stateChanged, connect( m_encryptWidget, &EncryptWidget::stateChanged,
this, &ChoicePage::updateNextEnabled ); this, &ChoicePage::onEncryptWidgetStateChanged );
ChoicePage::applyDeviceChoice(); ChoicePage::applyDeviceChoice();
} }
@ -368,14 +368,14 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
} ), } ),
[ = ] [ = ]
{ {
PartitionActions::doAutopartition( m_core, selectedDevice() ); PartitionActions::doAutopartition( m_core, selectedDevice(), m_encryptWidget->passphrase() );
emit deviceChosen(); emit deviceChosen();
}, },
this ); this );
} }
else else
{ {
PartitionActions::doAutopartition( m_core, selectedDevice() ); PartitionActions::doAutopartition( m_core, selectedDevice(), m_encryptWidget->passphrase() );
emit deviceChosen(); emit deviceChosen();
} }
@ -474,6 +474,20 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
} }
void
ChoicePage::onEncryptWidgetStateChanged()
{
EncryptWidget::State state = m_encryptWidget->state();
if ( m_choice == Erase )
{
if ( state == EncryptWidget::EncryptionConfirmed ||
state == EncryptWidget::EncryptionDisabled )
applyActionChoice( m_choice );
}
updateNextEnabled();
}
void void
ChoicePage::onLeave() ChoicePage::onLeave()
{ {

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

@ -74,6 +74,7 @@ signals:
private slots: private slots:
void doReplaceSelectedPartition( const QModelIndex& current, const QModelIndex& previous ); void doReplaceSelectedPartition( const QModelIndex& current, const QModelIndex& previous );
void doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous ); void doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous );
void onEncryptWidgetStateChanged();
private: private:
void updateNextEnabled(); void updateNextEnabled();