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

Set the nested partitions mode in ChoicePage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-02-10 14:59:17 +01:00
parent 1ed1841e89
commit 7bb76c70ba
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ) );