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

Make after partition views members in ChoicePage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-24 13:06:35 +01:00
parent 8a44ffe462
commit 2a61114d9e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,22 +559,22 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
case Erase:
case Replace:
{
PartitionBarsView* preview = new PartitionBarsView( m_previewAfterFrame );
PartitionLabelsView* previewLabels = new PartitionLabelsView( m_previewAfterFrame );
previewLabels->setCustomNewRootLabel( Calamares::Branding::instance()->
m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame );
m_afterPartitionLabelsView = new PartitionLabelsView( m_previewAfterFrame );
m_afterPartitionLabelsView->setCustomNewRootLabel( Calamares::Branding::instance()->
string( Calamares::Branding::BootloaderEntryName ) );
PartitionModel* model = m_core->partitionModelForDevice( selectedDevice() );
// The QObject parents tree is meaningful for memory management here,
// see qDeleteAll above.
preview->setModel( model );
previewLabels->setModel( model );
preview->setSelectionMode( QAbstractItemView::NoSelection );
previewLabels->setSelectionMode( QAbstractItemView::NoSelection );
m_afterPartitionBarsView->setModel( model );
m_afterPartitionLabelsView->setModel( model );
m_afterPartitionBarsView->setSelectionMode( QAbstractItemView::NoSelection );
m_afterPartitionLabelsView->setSelectionMode( QAbstractItemView::NoSelection );
layout->addWidget( preview );
layout->addWidget( previewLabels );
layout->addWidget( m_afterPartitionBarsView );
layout->addWidget( m_afterPartitionLabelsView );
m_previewAfterFrame->show();

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

@ -101,6 +101,8 @@ private:
QPointer< PartitionBarsView > m_beforePartitionBarsView;
QPointer< PartitionLabelsView > m_beforePartitionLabelsView;
QPointer< PartitionBarsView > m_afterPartitionBarsView;
QPointer< PartitionLabelsView > m_afterPartitionLabelsView;
int m_lastSelectedDeviceIndex;
};