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

Read the setting from partitions.conf and apply it in PVS.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-02-10 14:58:53 +01:00
parent 266f4fe8e3
commit 1ed1841e89
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -57,7 +57,6 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
, m_core( new PartitionCoreModule( this ) ) , m_core( new PartitionCoreModule( this ) )
, m_choicePage( nullptr ) , m_choicePage( nullptr )
, m_manualPartitionPage( new PartitionPage( m_core ) ) , m_manualPartitionPage( new PartitionPage( m_core ) )
, m_compactMode( true )
{ {
m_widget->setContentsMargins( 0, 0, 0, 0 ); m_widget->setContentsMargins( 0, 0, 0, 0 );
@ -206,7 +205,12 @@ PartitionViewStep::createSummaryWidget() const
PartitionLabelsView* previewLabels; PartitionLabelsView* previewLabels;
QVBoxLayout* field; QVBoxLayout* field;
PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()->
value( "drawNestedPartitions" ).toBool() ?
PartitionBarsView::DrawNestedPartitions :
PartitionBarsView::NoNestedPartitions;
preview = new PartitionBarsView; preview = new PartitionBarsView;
preview->setNestedPartitionsMode( mode );
previewLabels = new PartitionLabelsView; previewLabels = new PartitionLabelsView;
preview->setModel( info.partitionModelBefore ); preview->setModel( info.partitionModelBefore );
previewLabels->setModel( info.partitionModelBefore ); previewLabels->setModel( info.partitionModelBefore );
@ -221,6 +225,7 @@ PartitionViewStep::createSummaryWidget() const
formLayout->addRow( tr( "Current:" ), field ); formLayout->addRow( tr( "Current:" ), field );
preview = new PartitionBarsView; preview = new PartitionBarsView;
preview->setNestedPartitionsMode( mode );
previewLabels = new PartitionLabelsView; previewLabels = new PartitionLabelsView;
preview->setModel( info.partitionModelAfter ); preview->setModel( info.partitionModelAfter );
previewLabels->setModel( info.partitionModelAfter ); previewLabels->setModel( info.partitionModelAfter );
@ -389,10 +394,14 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
gs->insert( "ensureSuspendToDisk", true ); gs->insert( "ensureSuspendToDisk", true );
} }
if ( configurationMap.contains( "compactMode" ) && if ( configurationMap.contains( "drawNestedPartitions" ) &&
configurationMap.value( "compactMode" ).type() == QVariant::Bool ) configurationMap.value( "drawNestedPartitions" ).type() == QVariant::Bool )
{ {
m_compactMode = configurationMap.value( "compactMode", true ).toBool(); gs->insert( "drawNestedPartitions", configurationMap.value( "nestedPartitions", false ).toBool() );
}
else
{
gs->insert( "drawNestedPartitions", false );
} }
QTimer::singleShot( 0, this, &PartitionViewStep::continueLoading ); QTimer::singleShot( 0, this, &PartitionViewStep::continueLoading );

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

@ -74,8 +74,6 @@ private:
PartitionPage* m_manualPartitionPage; PartitionPage* m_manualPartitionPage;
QWidget* m_waitingWidget; QWidget* m_waitingWidget;
bool m_compactMode;
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( PartitionViewStepFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( PartitionViewStepFactory )