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

[partition] Drop label on swap-options box

Browse Source
This commit is contained in:
Adriaan de Groot 2018-09-12 08:42:21 -04:00
parent a791818a65
commit dc492b301c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,7 @@ ChoicePage::setupChoices()
m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto, m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
CalamaresUtils::Original, CalamaresUtils::Original,
iconSize ) ); iconSize ) );
m_eraseButton->addOptionsComboBox( tr( "Swap" ), swapSelectionCombo() ); m_eraseButton->addOptionsComboBox( swapSelectionCombo() );
m_grp->addButton( m_eraseButton->buttonWidget(), Erase ); m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
m_replaceButton = new PrettyRadioButton; m_replaceButton = new PrettyRadioButton;

5
src/modules/partition/gui/PrettyRadioButton.cpp
View File

@ -83,9 +83,8 @@ PrettyRadioButton::buttonWidget() const
} }
void void
PrettyRadioButton::addOptionsComboBox( const QString& label, QComboBox* box ) PrettyRadioButton::addOptionsComboBox( QComboBox* box )
{ {
int row = m_mainLayout->rowCount(); // Rows index from 0, count from 1 int row = m_mainLayout->rowCount(); // Rows index from 0, count from 1
m_mainLayout->addWidget( new QLabel( label ), row, 1 ); m_mainLayout->addWidget( box, row, 1 );
m_mainLayout->addWidget( box, row, 2 );
} }

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

@ -50,7 +50,7 @@ public:
virtual QRadioButton* buttonWidget() const; virtual QRadioButton* buttonWidget() const;
/** @brief Add an options drop-down to this button. */ /** @brief Add an options drop-down to this button. */
void addOptionsComboBox( const QString& label, QComboBox* ); void addOptionsComboBox( QComboBox* );
protected: protected:
ClickableLabel* m_label; ClickableLabel* m_label;