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

Make the QButtonGroup a member in ChoicePage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-01-08 16:35:50 +01:00
parent 85a6f2068a
commit 3869338c39
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,14 +176,14 @@ ChoicePage::setupChoices()
QSize iconSize( CalamaresUtils::defaultIconSize().width() * 2.5, QSize iconSize( CalamaresUtils::defaultIconSize().width() * 2.5,
CalamaresUtils::defaultIconSize().height() * 2.5 ); CalamaresUtils::defaultIconSize().height() * 2.5 );
QButtonGroup* grp = new QButtonGroup( this ); m_grp = new QButtonGroup( this );
m_alongsideButton = new PrettyRadioButton; m_alongsideButton = new PrettyRadioButton;
m_alongsideButton->setIconSize( iconSize ); m_alongsideButton->setIconSize( iconSize );
m_alongsideButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionAlongside, m_alongsideButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionAlongside,
CalamaresUtils::Original, CalamaresUtils::Original,
iconSize ) ); iconSize ) );
grp->addButton( m_alongsideButton->buttonWidget(), Alongside ); m_grp->addButton( m_alongsideButton->buttonWidget(), Alongside );
m_eraseButton = createEraseButton(); m_eraseButton = createEraseButton();
@ -191,7 +191,7 @@ ChoicePage::setupChoices()
m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto, m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
CalamaresUtils::Original, CalamaresUtils::Original,
iconSize ) ); iconSize ) );
grp->addButton( m_eraseButton->buttonWidget(), Erase ); m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
m_replaceButton = new PrettyRadioButton; m_replaceButton = new PrettyRadioButton;
@ -199,7 +199,7 @@ ChoicePage::setupChoices()
m_replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs, m_replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs,
CalamaresUtils::Original, CalamaresUtils::Original,
iconSize ) ); iconSize ) );
grp->addButton( m_replaceButton->buttonWidget(), Replace ); m_grp->addButton( m_replaceButton->buttonWidget(), Replace );
m_itemsLayout->addWidget( m_alongsideButton ); m_itemsLayout->addWidget( m_alongsideButton );
m_itemsLayout->addWidget( m_replaceButton ); m_itemsLayout->addWidget( m_replaceButton );
@ -216,12 +216,12 @@ ChoicePage::setupChoices()
CalamaresUtils::Original, CalamaresUtils::Original,
iconSize ) ); iconSize ) );
m_itemsLayout->addWidget( m_somethingElseButton ); m_itemsLayout->addWidget( m_somethingElseButton );
grp->addButton( m_somethingElseButton->buttonWidget(), Manual ); m_grp->addButton( m_somethingElseButton->buttonWidget(), Manual );
m_itemsLayout->addStretch(); m_itemsLayout->addStretch();
connect( grp, static_cast< void( QButtonGroup::* )( int, bool ) >( &QButtonGroup::buttonToggled ), connect( m_grp, static_cast< void( QButtonGroup::* )( int, bool ) >( &QButtonGroup::buttonToggled ),
this, [ this, grp ]( int id, bool checked ) this, [ this, m_grp ]( int id, bool checked )
{ {
if ( checked ) // An action was picked. if ( checked ) // An action was picked.
{ {
@ -238,7 +238,7 @@ ChoicePage::setupChoices()
} }
else // An action was unpicked, either on its own or because of another selection. else // An action was unpicked, either on its own or because of another selection.
{ {
if ( grp->checkedButton() == nullptr ) // If no other action is chosen, we must if ( m_grp->checkedButton() == nullptr ) // If no other action is chosen, we must
{ // set m_choice to NoChoice and reset previews. { // set m_choice to NoChoice and reset previews.
m_choice == NoChoice; m_choice == NoChoice;
setNextEnabled( false ); setNextEnabled( false );

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

@ -95,6 +95,7 @@ private:
bool m_isEfi; bool m_isEfi;
QComboBox* m_drivesCombo; QComboBox* m_drivesCombo;
QButtonGroup* m_grp;
PrettyRadioButton* m_alongsideButton; PrettyRadioButton* m_alongsideButton;
ExpandableRadioButton* m_eraseButton; ExpandableRadioButton* m_eraseButton;
PrettyRadioButton* m_replaceButton; PrettyRadioButton* m_replaceButton;