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

Remove ReplaceWidget.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-17 13:54:54 +01:00
parent d0ee43172c
commit d164ec4d91
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,30 +360,8 @@ ExpandableRadioButton*
ChoicePage::createReplaceButton() ChoicePage::createReplaceButton()
{ {
ExpandableRadioButton* replaceButton = new ExpandableRadioButton; ExpandableRadioButton* replaceButton = new ExpandableRadioButton;
QWidget* replaceContainer = new QWidget; replaceButton->setExpandableWidget(
QVBoxLayout* mainReplaceLayout = new QVBoxLayout; new QLabel( tr( "Select which OS to replace below." ) ) );
replaceContainer->setLayout( mainReplaceLayout );
CalamaresUtils::unmarginLayout( mainReplaceLayout );
ReplaceWidget* replaceWidget = new ReplaceWidget( m_core, m_drivesCombo );
mainReplaceLayout->addWidget( replaceWidget );
if ( !m_isEfi )
{
QHBoxLayout* bootloaderLayout = new QHBoxLayout;
bootloaderLayout->setContentsMargins( 0, 0, 0, 0 );
QLabel* eraseBootloaderLabel = new QLabel( replaceButton );
bootloaderLayout->addWidget( eraseBootloaderLabel );
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
QComboBox* eraseBootloaderCombo = createBootloaderComboBox( replaceButton );
bootloaderLayout->addWidget( eraseBootloaderCombo );
eraseBootloaderLabel->setBuddy( eraseBootloaderCombo );
bootloaderLayout->addStretch();
mainReplaceLayout->addLayout( bootloaderLayout );
}
replaceButton->setExpandableWidget( replaceContainer );
return replaceButton; return replaceButton;
} }
@ -452,6 +430,7 @@ ChoicePage::applyActionChoice( Device* currentDevice, ChoicePage::Choice choice
PartitionActions::doAutopartition( m_core, selectedDevice() ); PartitionActions::doAutopartition( m_core, selectedDevice() );
break; break;
case Replace: case Replace:
case NoChoice: case NoChoice:
case Manual: case Manual:
break; break;