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

[partition] Rename Choice -> InstallChoice

Browse Source 
- There are more choices to be made (or to come) when partitioning,
   so don't take the most generic term for one enum.
This commit is contained in:
Adriaan de Groot 2018-09-12 10:16:48 -04:00
parent 10f7bac2df
commit 7d0451fe69
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ ChoicePage::setupChoices()
{ {
if ( checked ) // An action was picked. if ( checked ) // An action was picked.
{ {
m_choice = static_cast< Choice >( id ); m_choice = static_cast< InstallChoice >( id );
updateNextEnabled(); updateNextEnabled();
emit actionChosen(); emit actionChosen();
@ -386,7 +386,7 @@ ChoicePage::continueApplyDeviceChoice()
void void
ChoicePage::applyActionChoice( ChoicePage::Choice choice ) ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
{ {
m_beforePartitionBarsView->selectionModel()-> m_beforePartitionBarsView->selectionModel()->
disconnect( SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ) ); disconnect( SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ) );
@ -901,7 +901,7 @@ ChoicePage::updateDeviceStatePreview()
* @param choice the chosen partitioning action. * @param choice the chosen partitioning action.
*/ */
void void
ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
{ {
Device* currentDevice = selectedDevice(); Device* currentDevice = selectedDevice();
Q_ASSERT( currentDevice ); Q_ASSERT( currentDevice );
@ -1356,7 +1356,7 @@ ChoicePage::isNextEnabled() const
} }
ChoicePage::Choice ChoicePage::InstallChoice
ChoicePage::currentChoice() const ChoicePage::currentChoice() const
{ {
return m_choice; return m_choice;

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

@ -53,7 +53,7 @@ class ChoicePage : public QWidget, private Ui::ChoicePage
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Choice enum InstallChoice
{ {
NoChoice, NoChoice,
Alongside, Alongside,
@ -84,7 +84,7 @@ public:
* currently selected partitioning mode (with a PrettyRadioButton). * currently selected partitioning mode (with a PrettyRadioButton).
* @return the enum Choice value. * @return the enum Choice value.
*/ */
Choice currentChoice() const; InstallChoice currentChoice() const;
/** /**
* @brief onLeave runs when control passes from this page to another one. * @brief onLeave runs when control passes from this page to another one.
@ -95,7 +95,7 @@ public:
* @brief applyActionChoice reacts to a choice of partitioning mode. * @brief applyActionChoice reacts to a choice of partitioning mode.
* @param choice the partitioning action choice. * @param choice the partitioning action choice.
*/ */
void applyActionChoice( ChoicePage::Choice choice ); void applyActionChoice( ChoicePage::InstallChoice choice );
signals: signals:
void nextStatusChanged( bool ); void nextStatusChanged( bool );
@ -121,7 +121,7 @@ private:
void continueApplyDeviceChoice(); // .. called after scan void continueApplyDeviceChoice(); // .. called after scan
void updateDeviceStatePreview(); void updateDeviceStatePreview();
void updateActionChoicePreview( ChoicePage::Choice choice ); void updateActionChoicePreview( ChoicePage::InstallChoice choice );
void setupActions(); void setupActions();
OsproberEntryList getOsproberEntriesForDevice( Device* device ) const; OsproberEntryList getOsproberEntriesForDevice( Device* device ) const;
void doAlongsideApply(); void doAlongsideApply();
@ -132,7 +132,7 @@ private:
QMutex m_previewsMutex; QMutex m_previewsMutex;
Choice m_choice; InstallChoice m_choice;
bool m_isEfi; bool m_isEfi;
QComboBox* m_drivesCombo; QComboBox* m_drivesCombo;

2
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -138,7 +138,7 @@ PartitionViewStep::createSummaryWidget() const
widget->setLayout( mainLayout ); widget->setLayout( mainLayout );
mainLayout->setMargin( 0 ); mainLayout->setMargin( 0 );
ChoicePage::Choice choice = m_choicePage->currentChoice(); ChoicePage::InstallChoice choice = m_choicePage->currentChoice();
QFormLayout* formLayout = new QFormLayout( widget ); QFormLayout* formLayout = new QFormLayout( widget );
const int MARGIN = CalamaresUtils::defaultFontHeight() / 2; const int MARGIN = CalamaresUtils::defaultFontHeight() / 2;