applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 01:15:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Use configured swap choices in choice page

Browse source
This commit is contained in:
Adriaan de Groot 2018-12-04 11:35:35 +01:00
parent 5945e9584d
commit 2998c27545
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/partition/gui/ChoicePage.cpp
View file

@ -72,7 +72,7 @@ using PartitionActions::Choices::SwapChoice;
* will show up as a list view.
* @param parent the QWidget parent.
*/
ChoicePage::ChoicePage( QWidget* parent )
ChoicePage::ChoicePage( const SwapChoiceSet& swapChoices, QWidget* parent )
: QWidget( parent )
, m_nextEnabled( false )
, m_core( nullptr )
@ -92,6 +92,7 @@ ChoicePage::ChoicePage( QWidget* parent )
, m_bootloaderComboBox( nullptr )
, m_lastSelectedDeviceIndex( -1 )
, m_enableEncryptionWidget( true )
, m_swapChoices( swapChoices )
{
setupUi( this );
@ -259,7 +260,7 @@ ChoicePage::setupChoices()
// Fill up swap options
// .. TODO: only if enabled in the config
m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } );
m_eraseSwapChoices = createCombo( m_swapChoices );
m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
#if 0