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

[partition] Rename combo box

Browse source 
- Too much confusion possible between the different members all
   named variations of *SwapChoice*
 - Update copyright years, too
This commit is contained in:
Adriaan de Groot 2019-02-12 05:38:53 -05:00
parent ae714278a5
commit a4e6d4cd35
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org> * Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd * Copyright 2019, Collabora Ltd
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
@ -100,7 +100,7 @@ ChoicePage::ChoicePage( const SwapChoiceSet& swapChoices, QWidget* parent )
, m_eraseButton( nullptr ) , m_eraseButton( nullptr )
, m_replaceButton( nullptr ) , m_replaceButton( nullptr )
, m_somethingElseButton( nullptr ) , m_somethingElseButton( nullptr )
, m_eraseSwapChoices( nullptr ) , m_eraseSwapChoiceComboBox( nullptr )
, m_deviceInfoWidget( nullptr ) , m_deviceInfoWidget( nullptr )
, m_beforePartitionBarsView( nullptr ) , m_beforePartitionBarsView( nullptr )
, m_beforePartitionLabelsView( nullptr ) , m_beforePartitionLabelsView( nullptr )
@ -270,8 +270,8 @@ ChoicePage::setupChoices()
// .. TODO: only if enabled in the config // .. TODO: only if enabled in the config
if ( m_availableSwapChoices.count() > 1 ) if ( m_availableSwapChoices.count() > 1 )
{ {
m_eraseSwapChoices = createCombo( m_availableSwapChoices ); m_eraseSwapChoiceComboBox = createCombo( m_availableSwapChoices );
m_eraseButton->addOptionsComboBox( m_eraseSwapChoices ); m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox );
} }
m_itemsLayout->addWidget( m_alongsideButton ); m_itemsLayout->addWidget( m_alongsideButton );
@ -316,14 +316,14 @@ ChoicePage::setupChoices()
connect( this, &ChoicePage::actionChosen, connect( this, &ChoicePage::actionChosen,
this, &ChoicePage::onActionChanged ); this, &ChoicePage::onActionChanged );
if ( m_eraseSwapChoices ) if ( m_eraseSwapChoiceComboBox )
connect( m_eraseSwapChoices, QOverload<int>::of(&QComboBox::currentIndexChanged), connect( m_eraseSwapChoiceComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &ChoicePage::onActionChanged ); this, &ChoicePage::onActionChanged );
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>" m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
"You can create or resize partitions yourself." ) ); "You can create or resize partitions yourself." ) );
updateSwapChoicesTr( m_eraseSwapChoices ); updateSwapChoicesTr( m_eraseSwapChoiceComboBox );
) )
} }
@ -448,7 +448,7 @@ ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
m_encryptWidget->passphrase(), m_encryptWidget->passphrase(),
gs->value( "efiSystemPartition" ).toString(), gs->value( "efiSystemPartition" ).toString(),
CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ), CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ),
static_cast<PartitionActions::Choices::SwapChoice>( m_eraseSwapChoices->currentData().toInt() ) static_cast<PartitionActions::Choices::SwapChoice>( m_eraseSwapChoiceComboBox->currentData().toInt() )
}; };
if ( m_core->isDirty() ) if ( m_core->isDirty() )

4
src/modules/partition/gui/ChoicePage.h
View file

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2014-2016, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Adriaan de Groot <groot@kde.org> * Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd * Copyright 2019, Collabora Ltd
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
@ -155,7 +155,7 @@ private:
PrettyRadioButton* m_eraseButton; PrettyRadioButton* m_eraseButton;
PrettyRadioButton* m_replaceButton; PrettyRadioButton* m_replaceButton;
PrettyRadioButton* m_somethingElseButton; PrettyRadioButton* m_somethingElseButton;
QComboBox* m_eraseSwapChoices; // UI, see also m_swapChoices QComboBox* m_eraseSwapChoiceComboBox; // UI, see also m_eraseSwapChoice
DeviceInfoWidget* m_deviceInfoWidget; DeviceInfoWidget* m_deviceInfoWidget;