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

Create erase button in a separate method.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-11-12 18:17:21 +01:00
parent b0ad19bca3
commit a79575afe8
2 changed files with 67 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,64 +205,8 @@ ChoicePage::setupChoices()
iconSize ) );
grp->addButton( m_alongsideButton->buttonWidget() );
m_eraseButton = new ExpandableRadioButton;
if ( !m_isEfi )
{
QWidget* eraseWidget = new QWidget;
{
QHBoxLayout* eraseLayout = new QHBoxLayout;
eraseWidget->setLayout( eraseLayout );
eraseLayout->setContentsMargins( 0, 0, 0, 0 );
QLabel* eraseBootloaderLabel = new QLabel( eraseWidget );
eraseLayout->addWidget( eraseBootloaderLabel );
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
QComboBox* eraseBootloaderCombo = new QComboBox;
eraseLayout->addWidget( eraseBootloaderCombo );
eraseBootloaderLabel->setBuddy( eraseBootloaderCombo );
eraseBootloaderCombo->setModel( m_core->bootLoaderModel() );
eraseLayout->addStretch();
m_eraseButton = createEraseButton();
// When the chosen bootloader device changes, we update the choice in the PCM
connect( eraseBootloaderCombo, static_cast< void (QComboBox::*)(int) >( &QComboBox::currentIndexChanged ),
[=]( int newIndex )
{
QVariant var = eraseBootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
return;
m_core->setBootLoaderInstallPath( var.toString() );
} );
// If the user picks a new device, we update the bootloader choice to that
// same device automatically.
auto updateBootloaderDevice = [eraseBootloaderCombo]( Device* currd )
{
if ( !currd )
return;
QString devPath = currd->deviceNode();
for ( int i = 0; i < eraseBootloaderCombo->count(); ++i )
{
QVariant var = eraseBootloaderCombo->itemData( i , BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
continue;
if ( var.toString() == devPath )
{
eraseBootloaderCombo->setCurrentIndex( i );
return;
}
}
};
connect( this, &ChoicePage::deviceChosen,
this, updateBootloaderDevice );
connect( m_eraseButton, &ExpandableRadioButton::expanded,
this, [=]( bool expanded )
{
if ( expanded )
updateBootloaderDevice( selectedDevice() );
}, Qt::QueuedConnection );
// ^ Must be Queued so it's sure to run when the widget is already visible.
}
m_eraseButton->setExpandableWidget( eraseWidget );
}
m_eraseButton->setIconSize( iconSize );
m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
CalamaresUtils::Original,
@ -363,6 +307,71 @@ ChoicePage::setupChoices()
}
ExpandableRadioButton*
ChoicePage::createEraseButton()
{
ExpandableRadioButton* eraseButton = new ExpandableRadioButton;
if ( !m_isEfi )
{
QWidget* eraseWidget = new QWidget;
QHBoxLayout* eraseLayout = new QHBoxLayout;
eraseWidget->setLayout( eraseLayout );
eraseLayout->setContentsMargins( 0, 0, 0, 0 );
QLabel* eraseBootloaderLabel = new QLabel( eraseWidget );
eraseLayout->addWidget( eraseBootloaderLabel );
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
QComboBox* eraseBootloaderCombo = new QComboBox;
eraseLayout->addWidget( eraseBootloaderCombo );
eraseBootloaderLabel->setBuddy( eraseBootloaderCombo );
eraseBootloaderCombo->setModel( m_core->bootLoaderModel() );
eraseLayout->addStretch();
// When the chosen bootloader device changes, we update the choice in the PCM
connect( eraseBootloaderCombo, static_cast< void (QComboBox::*)(int) >( &QComboBox::currentIndexChanged ),
[=]( int newIndex )
{
QVariant var = eraseBootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
return;
m_core->setBootLoaderInstallPath( var.toString() );
} );
// If the user picks a new device, we update the bootloader choice to that
// same device automatically.
auto updateBootloaderDevice = [eraseBootloaderCombo]( Device* currd )
{
if ( !currd )
return;
QString devPath = currd->deviceNode();
for ( int i = 0; i < eraseBootloaderCombo->count(); ++i )
{
QVariant var = eraseBootloaderCombo->itemData( i , BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
continue;
if ( var.toString() == devPath )
{
eraseBootloaderCombo->setCurrentIndex( i );
return;
}
}
};
connect( this, &ChoicePage::deviceChosen,
this, updateBootloaderDevice );
connect( eraseButton, &ExpandableRadioButton::expanded,
this, [=]( bool expanded )
{
if ( expanded )
updateBootloaderDevice( selectedDevice() );
}, Qt::QueuedConnection );
// ^ Must be Queued so it's sure to run when the widget is already visible.
eraseButton->setExpandableWidget( eraseWidget );
}
return eraseButton;
}
/**
* @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.

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

@ -69,6 +69,7 @@ private:
bool compact();
void setNextEnabled( bool enabled );
void setupChoices();
ExpandableRadioButton* createEraseButton();
Device* selectedDevice();
void applyDeviceChoice();
void updateDeviceStatePreview( Device* currentDevice );