From 2a61114d9ed2d2510585edbeb0d6c9b4b19045bc Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 24 Dec 2015 13:06:35 +0100 Subject: [PATCH] Make after partition views members in ChoicePage. --- src/modules/partition/gui/ChoicePage.cpp | 18 +++++++++--------- src/modules/partition/gui/ChoicePage.h | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index db199ce9f..de07edca0 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -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(); diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 96211572e..dc9ae1e55 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -101,6 +101,8 @@ private: QPointer< PartitionBarsView > m_beforePartitionBarsView; QPointer< PartitionLabelsView > m_beforePartitionLabelsView; + QPointer< PartitionBarsView > m_afterPartitionBarsView; + QPointer< PartitionLabelsView > m_afterPartitionLabelsView; int m_lastSelectedDeviceIndex; };