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

[partition] Introduce retranslate slot for ChoicePage, code style

Browse Source
This commit is contained in:
Adriaan de Groot 2021-07-26 16:12:41 +02:00
parent 954e8ee3f8
commit e0b8942242
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
CalamaresUtils::unmarginLayout( m_itemsLayout ); CalamaresUtils::unmarginLayout( m_itemsLayout );
// Drive selector + preview // Drive selector + preview
CALAMARES_RETRANSLATE( retranslateUi( this ); m_drivesLabel->setText( tr( "Select storage de&vice:" ) ); CALAMARES_RETRANSLATE_SLOT( retranslate );
m_previewBeforeLabel->setText( tr( "Current:" ) );
m_previewAfterLabel->setText( tr( "After:" ) ); );
m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
@ -134,6 +132,15 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
ChoicePage::~ChoicePage() {} ChoicePage::~ChoicePage() {}
void
ChoicePage::retranslate()
{
retranslateUi( this );
m_drivesLabel->setText( tr( "Select storage de&vice:" ) );
m_previewBeforeLabel->setText( tr( "Current:" ) );
m_previewAfterLabel->setText( tr( "After:" ) );
}
/** @brief Sets the @p model for the given @p box and adjusts UI sizes to match. /** @brief Sets the @p model for the given @p box and adjusts UI sizes to match.
* *
@ -174,10 +181,7 @@ ChoicePage::init( PartitionCoreModule* core )
} ); } );
setModelToComboBox( m_drivesCombo, core->deviceModel() ); setModelToComboBox( m_drivesCombo, core->deviceModel() );
connect( m_drivesCombo, connect( m_drivesCombo, qOverload< int >( &QComboBox::currentIndexChanged ), this, &ChoicePage::applyDeviceChoice );
qOverload<int>( &QComboBox::currentIndexChanged ),
this,
&ChoicePage::applyDeviceChoice );
connect( m_encryptWidget, &EncryptWidget::stateChanged, this, &ChoicePage::onEncryptWidgetStateChanged ); connect( m_encryptWidget, &EncryptWidget::stateChanged, this, &ChoicePage::onEncryptWidgetStateChanged );
connect( m_reuseHomeCheckBox, &QCheckBox::stateChanged, this, &ChoicePage::onHomeCheckBoxStateChanged ); connect( m_reuseHomeCheckBox, &QCheckBox::stateChanged, this, &ChoicePage::onHomeCheckBoxStateChanged );
@ -270,11 +274,12 @@ ChoicePage::setupChoices()
m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox ); m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox );
} }
if ( m_config->eraseFsTypes().count() > 1) if ( m_config->eraseFsTypes().count() > 1 )
{ {
m_eraseFsTypesChoiceComboBox = new QComboBox; m_eraseFsTypesChoiceComboBox = new QComboBox;
m_eraseFsTypesChoiceComboBox->addItems(m_config->eraseFsTypes()); m_eraseFsTypesChoiceComboBox->addItems( m_config->eraseFsTypes() );
connect( m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice ); connect(
m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
connect( m_config, &Config::eraseModeFilesystemChanged, this, &ChoicePage::onActionChanged ); connect( m_config, &Config::eraseModeFilesystemChanged, this, &ChoicePage::onActionChanged );
m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox ); m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox );
} }

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

@ -101,6 +101,8 @@ private slots:
/// @brief Calls onActionChanged() as needed. /// @brief Calls onActionChanged() as needed.
void onEraseSwapChoiceChanged(); void onEraseSwapChoiceChanged();
void retranslate();
private: private:
bool calculateNextEnabled() const; bool calculateNextEnabled() const;
void updateNextEnabled(); void updateNextEnabled();