Merge pull request #1117 from a-wai/partition-layout-add-maxsize

[partition] Add max size parameter
This commit is contained in:
Adriaan de Groot 2019-04-11 11:39:44 +02:00 committed by GitHub
commit 547dc7d334
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 11 deletions

View file

@ -788,6 +788,7 @@ PartitionCoreModule::initLayout( const QVariantList& config )
{
QString sizeString;
QString minSizeString;
QString maxSizeString;
m_partLayout = new PartitionLayout();
@ -805,11 +806,17 @@ PartitionCoreModule::initLayout( const QVariantList& config )
else
minSizeString = CalamaresUtils::getString( pentry, "minSize" );
if ( pentry.contains("maxSize") && CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 100 ) );
else
maxSizeString = CalamaresUtils::getString( pentry, "maxSize" );
m_partLayout->addEntry( CalamaresUtils::getString( pentry, "name" ),
CalamaresUtils::getString( pentry, "mountPoint" ),
CalamaresUtils::getString( pentry, "filesystem" ),
sizeString,
minSizeString
minSizeString,
maxSizeString
);
}
}