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] Support translations of swap choices

Browse source 
- Introduce enum to indicate what is selected
 - Support translations
 - Fill selections for erase
This commit is contained in:
Adriaan de Groot 2018-09-12 11:18:17 -04:00
parent 7d0451fe69
commit cfa940b35c
2 changed files with 70 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,9 @@ ChoicePage::ChoicePage( QWidget* parent )
, m_eraseButton( nullptr )
, m_replaceButton( nullptr )
, m_somethingElseButton( nullptr )
, m_eraseSwapChoices( nullptr )
, m_replaceSwapChoices( nullptr )
, m_alongsideSwapChoices( nullptr )
, m_deviceInfoWidget( nullptr )
, m_beforePartitionBarsView( nullptr )
, m_beforePartitionLabelsView( nullptr )
@ -172,19 +175,6 @@ ChoicePage::init( PartitionCoreModule* core )
ChoicePage::applyDeviceChoice();
}
static QComboBox*
swapSelectionCombo()
{
QComboBox* box = new QComboBox;
box->addItem( box->tr( "No swap" ), 0 );
box->addItem( box->tr( "Re-use swap" ), 1 );
box->addItem( box->tr( "Limited swap" ), 2 );
box->addItem( box->tr( "Full swap" ), 3 );
box->addItem( box->tr( "Swap file" ), 4 );
return box;
}
/**
* @brief ChoicePage::setupChoices creates PrettyRadioButton objects for the action
* choices.
@ -228,7 +218,6 @@ ChoicePage::setupChoices()
m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
CalamaresUtils::Original,
iconSize ) );
m_eraseButton->addOptionsComboBox( swapSelectionCombo() );
m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
m_replaceButton = new PrettyRadioButton;
@ -239,6 +228,13 @@ ChoicePage::setupChoices()
iconSize ) );
m_grp->addButton( m_replaceButton->buttonWidget(), Replace );
// Fill up swap options
// .. TODO: only if enabled in the config
m_eraseSwapChoices = new QComboBox;
for ( SwapChoice c : { NoSwap, SmallSwap, FullSwap } )
m_eraseSwapChoices->addItem( QString(), c );
m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
m_itemsLayout->addWidget( m_alongsideButton );
m_itemsLayout->addWidget( m_replaceButton );
m_itemsLayout->addWidget( m_eraseButton );
@ -292,6 +288,12 @@ ChoicePage::setupChoices()
applyActionChoice( currentChoice() );
}
} );
CALAMARES_RETRANSLATE(
updateSwapChoicesTr( m_eraseSwapChoices );
updateSwapChoicesTr( m_alongsideSwapChoices );
updateSwapChoicesTr( m_replaceSwapChoices );
)
}
@ -1404,3 +1406,42 @@ ChoicePage::updateNextEnabled()
emit nextStatusChanged( enabled );
}
void
ChoicePage::updateSwapChoicesTr(QComboBox* box)
{
if ( !box )
return;
static_assert(NoSwap == 0, "Enum values out-of-sync");
for ( int index = 0; index < box->count(); ++index )
{
bool ok = false;
int value = 0;
switch ( value = box->itemData( index ).toInt( &ok ) )
{
// case 0:
case NoSwap:
// toInt() returns 0 on failure, so check for ok
if ( ok ) // It was explicitly set to 0
box->setItemText( index, tr( "No Swap" ) );
else
cWarning() << "Box item" << index << box->itemText( index ) << "has non-integer role.";
break;
case ReuseSwap:
box->setItemText( index, tr( "Reuse Swap" ) );
break;
case SmallSwap:
box->setItemText( index, tr( "Swap (no Hibernate)" ) );
break;
case FullSwap:
box->setItemText( index, tr( "Swap (with Hibernate)" ) );
break;
case SwapFile:
box->setItemText( index, tr( "Swap to file" ) );
break;
default:
cWarning() << "Box item" << index << box->itemText( index ) << "has role" << value;
}
}
}