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

[partition] Simplify creation of comboboxes for swap choices

Browse Source
This commit is contained in:
Adriaan de Groot 2018-09-13 04:44:36 -04:00
parent cfa940b35c
commit 959cd7b224
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,20 @@ ChoicePage::init( PartitionCoreModule* core )
ChoicePage::applyDeviceChoice(); ChoicePage::applyDeviceChoice();
} }
/** @brief Creates a combobox with the given choices in it.
*
* No texts are set -- that happens later by the translator functions.
*/
static inline QComboBox*
createCombo( std::initializer_list< ChoicePage::SwapChoice > l )
{
QComboBox* box = new QComboBox;
for ( ChoicePage::SwapChoice c : l )
box->addItem( QString(), c );
return box;
}
/** /**
* @brief ChoicePage::setupChoices creates PrettyRadioButton objects for the action * @brief ChoicePage::setupChoices creates PrettyRadioButton objects for the action
* choices. * choices.
@ -230,11 +244,15 @@ ChoicePage::setupChoices()
// Fill up swap options // Fill up swap options
// .. TODO: only if enabled in the config // .. TODO: only if enabled in the config
m_eraseSwapChoices = new QComboBox; m_eraseSwapChoices = createCombo( { NoSwap, SmallSwap, FullSwap } );
for ( SwapChoice c : { NoSwap, SmallSwap, FullSwap } )
m_eraseSwapChoices->addItem( QString(), c );
m_eraseButton->addOptionsComboBox( m_eraseSwapChoices ); m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
m_replaceSwapChoices = createCombo( { NoSwap, ReuseSwap, SmallSwap, FullSwap } );
m_replaceButton->addOptionsComboBox( m_replaceSwapChoices );
m_alongsideSwapChoices = createCombo( { NoSwap, ReuseSwap, SmallSwap, FullSwap } );
m_alongsideButton->addOptionsComboBox( m_alongsideSwapChoices );
m_itemsLayout->addWidget( m_alongsideButton ); m_itemsLayout->addWidget( m_alongsideButton );
m_itemsLayout->addWidget( m_replaceButton ); m_itemsLayout->addWidget( m_replaceButton );
m_itemsLayout->addWidget( m_eraseButton ); m_itemsLayout->addWidget( m_eraseButton );