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

Add config option for always showing partition labels.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-06-23 10:00:55 +02:00
parent 5520972e5a
commit 3940e2b09d
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,6 +477,17 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
gs->insert( "drawNestedPartitions", false ); gs->insert( "drawNestedPartitions", false );
} }
if ( configurationMap.contains( "alwaysShowPartitionLabels" ) &&
configurationMap.value( "alwaysShowPartitionLabels" ).type() == QVariant::Bool )
{
gs->insert( "alwaysShowPartitionLabels",
configurationMap.value( "alwaysShowPartitionLabels", true ).toBool() );
}
else
{
gs->insert( "alwaysShowPartitionLabels", true );
}
if ( configurationMap.contains( "defaultFileSystemType" ) && if ( configurationMap.contains( "defaultFileSystemType" ) &&
configurationMap.value( "defaultFileSystemType" ).type() == QVariant::String && configurationMap.value( "defaultFileSystemType" ).type() == QVariant::String &&
!configurationMap.value( "defaultFileSystemType" ).toString().isEmpty() ) !configurationMap.value( "defaultFileSystemType" ).toString().isEmpty() )

3
src/modules/partition/partition.conf
View File

@ -9,6 +9,9 @@ ensureSuspendToDisk: true
# Correctly draw nested (e.g. logical) partitions as such. # Correctly draw nested (e.g. logical) partitions as such.
drawNestedPartitions: false drawNestedPartitions: false
# Show/hide partition labels on manual partitioning page.
alwaysShowPartitionLabels: true
# Default filesystem type, pre-selected in the "Create Partition" dialog. # Default filesystem type, pre-selected in the "Create Partition" dialog.
# The filesystem type selected here is also used for automated install # The filesystem type selected here is also used for automated install
# modes (Erase, Replace and Alongside). # modes (Erase, Replace and Alongside).