From 1a882758ca9ccc2b260d803ba74e5f2d1436c341 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 22 Dec 2015 13:15:13 +0100 Subject: [PATCH] Revert Replace button to PrettyRadioButton. --- src/modules/partition/gui/ChoicePage.cpp | 13 +------------ src/modules/partition/gui/ChoicePage.h | 3 +-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index e7e68662f..add85c649 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -189,7 +189,7 @@ ChoicePage::setupChoices() iconSize ) ); grp->addButton( m_eraseButton->buttonWidget() ); - m_replaceButton = createReplaceButton(); + m_replaceButton = new PrettyRadioButton; m_replaceButton->setIconSize( iconSize ); 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 * a list view) to get a pointer to the currently selected Device. diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 68f721b99..96211572e 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -74,7 +74,6 @@ private: void setupChoices(); QComboBox* createBootloaderComboBox( ExpandableRadioButton* parentButton ); ExpandableRadioButton* createEraseButton(); - ExpandableRadioButton* createReplaceButton(); Device* selectedDevice(); void applyDeviceChoice(); void updateDeviceStatePreview(); @@ -95,7 +94,7 @@ private: PrettyRadioButton* m_alongsideButton; ExpandableRadioButton* m_eraseButton; - ExpandableRadioButton* m_replaceButton; + PrettyRadioButton* m_replaceButton; PrettyRadioButton* m_somethingElseButton; DeviceInfoWidget* m_deviceInfoWidget;