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

Use ReplaceWidget in ChoicePage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-11-20 14:49:37 +01:00
parent 26ac809d6e
commit 47b5c6eeb4
2 changed files with 91 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include "core/PartitionModel.h"
#include "core/OsproberEntry.h"
#include "ReplaceWidget.h"
#include "PrettyRadioButton.h"
#include "ExpandableRadioButton.h"
#include "PartitionPreview.h"
@ -213,7 +214,8 @@ ChoicePage::setupChoices()
iconSize ) );
grp->addButton( m_eraseButton->buttonWidget() );
m_replaceButton = new PrettyRadioButton;
m_replaceButton = createReplaceButton();
m_replaceButton->setIconSize( iconSize );
m_replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs,
CalamaresUtils::Original,
@ -307,6 +309,55 @@ ChoicePage::setupChoices()
}
QComboBox*
ChoicePage::createBootloaderComboBox( ExpandableRadioButton* parentButton )
{
QComboBox* bcb = new QComboBox;
bcb->setModel( m_core->bootLoaderModel() );
// When the chosen bootloader device changes, we update the choice in the PCM
connect( bcb, static_cast< void (QComboBox::*)(int) >( &QComboBox::currentIndexChanged ),
[=]( int newIndex )
{
QVariant var = bcb->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 = [bcb]( Device* currd )
{
if ( !currd )
return;
QString devPath = currd->deviceNode();
for ( int i = 0; i < bcb->count(); ++i )
{
QVariant var = bcb->itemData( i , BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
continue;
if ( var.toString() == devPath )
{
bcb->setCurrentIndex( i );
return;
}
}
};
connect( this, &ChoicePage::deviceChosen,
this, updateBootloaderDevice );
connect( parentButton, &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.
return bcb;
}
ExpandableRadioButton*
ChoicePage::createEraseButton()
{
@ -321,57 +372,51 @@ ChoicePage::createEraseButton()
QLabel* eraseBootloaderLabel = new QLabel( eraseWidget );
eraseLayout->addWidget( eraseBootloaderLabel );
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
QComboBox* eraseBootloaderCombo = new QComboBox;
QComboBox* eraseBootloaderCombo = createBootloaderComboBox( eraseButton );
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;
}
ExpandableRadioButton*
ChoicePage::createReplaceButton()
{
ExpandableRadioButton* replaceButton = new ExpandableRadioButton;
QWidget* replaceContainer = new QWidget;
QVBoxLayout* mainReplaceLayout = new QVBoxLayout;
replaceContainer->setLayout( mainReplaceLayout );
CalamaresUtils::unmarginLayout( mainReplaceLayout );
ReplaceWidget* replaceWidget = new ReplaceWidget( m_core, 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;
}
/**
* @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.

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

@ -28,6 +28,7 @@
#include <QMutex>
class QBoxLayout;
class QComboBox;
class QLabel;
class QListView;
@ -69,7 +70,9 @@ private:
bool compact();
void setNextEnabled( bool enabled );
void setupChoices();
QComboBox* createBootloaderComboBox( ExpandableRadioButton* parentButton );
ExpandableRadioButton* createEraseButton();
ExpandableRadioButton* createReplaceButton();
Device* selectedDevice();
void applyDeviceChoice();
void updateDeviceStatePreview( Device* currentDevice );
@ -91,7 +94,7 @@ private:
PrettyRadioButton* m_alongsideButton;
ExpandableRadioButton* m_eraseButton;
PrettyRadioButton* m_replaceButton;
ExpandableRadioButton* m_replaceButton;
PrettyRadioButton* m_somethingElseButton;
int m_lastSelectedDeviceIndex;