|
|
@ -204,7 +204,6 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
PackageChooserMode::Required );
|
|
|
|
PackageChooserMode::Required );
|
|
|
|
m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
|
|
|
|
m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
|
|
|
|
PackageChooserMethod::Legacy );
|
|
|
|
PackageChooserMethod::Legacy );
|
|
|
|
setPackageChoice( CalamaresUtils::getString( configurationMap, "pkgc" ) );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( m_method == PackageChooserMethod::Legacy )
|
|
|
|
if ( m_method == PackageChooserMethod::Legacy )
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -233,7 +232,6 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
if ( configurationMap.contains( "items" ) )
|
|
|
|
if ( configurationMap.contains( "items" ) )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
fillModel( m_model, configurationMap.value( "items" ).toList() );
|
|
|
|
fillModel( m_model, configurationMap.value( "items" ).toList() );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
|
|
|
|
QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
|
|
|
|
if ( !default_item_id.isEmpty() )
|
|
|
|
if ( !default_item_id.isEmpty() )
|
|
|
@ -250,4 +248,9 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) );
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|