From 7bb76c70ba6a897f9bdf137248ed8d378e3c9199 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 10 Feb 2016 14:59:17 +0100 Subject: [PATCH] Set the nested partitions mode in ChoicePage. --- src/modules/partition/gui/ChoicePage.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 9ca187af5..e836ae7c4 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -594,7 +594,12 @@ ChoicePage::updateDeviceStatePreview() CalamaresUtils::unmarginLayout( layout ); layout->setSpacing( 6 ); + PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()-> + value( "drawNestedPartitions" ).toBool() ? + PartitionBarsView::DrawNestedPartitions : + PartitionBarsView::NoNestedPartitions; m_beforePartitionBarsView = new PartitionBarsView( m_previewBeforeFrame ); + m_beforePartitionBarsView->setNestedPartitionsMode( mode ); m_beforePartitionLabelsView = new PartitionLabelsView( m_previewBeforeFrame ); Device* deviceBefore = m_core->createImmutableDeviceCopy( currentDevice ); @@ -701,7 +706,12 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) case Replace: { m_previewBeforeLabel->setText( tr( "Current:" ) ); + PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()-> + value( "drawNestedPartitions" ).toBool() ? + PartitionBarsView::DrawNestedPartitions : + PartitionBarsView::NoNestedPartitions; m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame ); + m_afterPartitionBarsView->setNestedPartitionsMode( mode ); m_afterPartitionLabelsView = new PartitionLabelsView( m_previewAfterFrame ); m_afterPartitionLabelsView->setCustomNewRootLabel( Calamares::Branding::instance()-> string( Calamares::Branding::BootloaderEntryName ) );