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

[partition] Tidy up code

Browse Source 
- avoid possible nullptr dereference on connect() if no swap choices
 - group retranslations together
This commit is contained in:
Adriaan de Groot 2019-01-21 08:22:17 -05:00
parent 24422b19bd
commit aef61a42bc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,10 +276,6 @@ ChoicePage::setupChoices()
m_itemsLayout->addWidget( m_eraseButton );
m_somethingElseButton = new PrettyRadioButton;
CALAMARES_RETRANSLATE(
m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
"You can create or resize partitions yourself." ) );
)
m_somethingElseButton->setIconSize( iconSize );
m_somethingElseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual,
CalamaresUtils::Original,
@ -317,10 +313,13 @@ ChoicePage::setupChoices()
connect( this, &ChoicePage::actionChosen,
this, &ChoicePage::onActionChanged );
connect( m_eraseSwapChoices, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &ChoicePage::onActionChanged );
if ( m_eraseSwapChoices )
connect( m_eraseSwapChoices, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &ChoicePage::onActionChanged );
CALAMARES_RETRANSLATE(
m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
"You can create or resize partitions yourself." ) );
updateSwapChoicesTr( m_eraseSwapChoices );
)
}