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

Revert Replace button to PrettyRadioButton.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-22 13:15:13 +01:00
parent 43c67310db
commit 1a882758ca
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,7 @@ ChoicePage::setupChoices()
iconSize ) ); iconSize ) );
grp->addButton( m_eraseButton->buttonWidget() ); grp->addButton( m_eraseButton->buttonWidget() );
m_replaceButton = createReplaceButton(); m_replaceButton = new PrettyRadioButton;
m_replaceButton->setIconSize( iconSize ); m_replaceButton->setIconSize( iconSize );
m_replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs, m_replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs,
@ -355,17 +355,6 @@ ChoicePage::createEraseButton()
} }
ExpandableRadioButton*
ChoicePage::createReplaceButton()
{
ExpandableRadioButton* replaceButton = new ExpandableRadioButton;
replaceButton->setExpandableWidget(
new QLabel( tr( "Select which OS to replace below." ) ) );
return replaceButton;
}
/** /**
* @brief ChoicePage::selectedDevice queries the device picker (which may be a combo or * @brief ChoicePage::selectedDevice queries the device picker (which may be a combo or
* a list view) to get a pointer to the currently selected Device. * a list view) to get a pointer to the currently selected Device.

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

@ -74,7 +74,6 @@ private:
void setupChoices(); void setupChoices();
QComboBox* createBootloaderComboBox( ExpandableRadioButton* parentButton ); QComboBox* createBootloaderComboBox( ExpandableRadioButton* parentButton );
ExpandableRadioButton* createEraseButton(); ExpandableRadioButton* createEraseButton();
ExpandableRadioButton* createReplaceButton();
Device* selectedDevice(); Device* selectedDevice();
void applyDeviceChoice(); void applyDeviceChoice();
void updateDeviceStatePreview(); void updateDeviceStatePreview();
@ -95,7 +94,7 @@ private:
PrettyRadioButton* m_alongsideButton; PrettyRadioButton* m_alongsideButton;
ExpandableRadioButton* m_eraseButton; ExpandableRadioButton* m_eraseButton;
ExpandableRadioButton* m_replaceButton; PrettyRadioButton* m_replaceButton;
PrettyRadioButton* m_somethingElseButton; PrettyRadioButton* m_somethingElseButton;
DeviceInfoWidget* m_deviceInfoWidget; DeviceInfoWidget* m_deviceInfoWidget;