applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[packagechooser] Switch to a list form

Browse source 
- Using id's as keys in a map orders them indeterminately -- in
   practice, alphabetically by key. Switch to a list form so that
   the products stick to the order they have in the config file
   (which means distro's can list "preferred" versions at top).
This commit is contained in:
Adriaan de Groot 2019-08-04 20:19:56 +02:00
parent 9a52430e74
commit b16354133d
3 changed files with 43 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/modules/packagechooser/PackageChooserViewStep.cpp
View file

@ -178,12 +178,9 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
}
bool first_time = !m_model;
ok = false;
QVariantMap items = CalamaresUtils::getSubMap( configurationMap, "items", ok );
if ( ok )
if ( configurationMap.contains( "items" ) )
{
fillModel( items );
fillModel( configurationMap.value( "items" ).toList() );
}
// TODO: replace this hard-coded model
@ -210,31 +207,42 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
}
void
PackageChooserViewStep::fillModel( const QVariantMap& items )
PackageChooserViewStep::fillModel( const QVariantList& items )
{
if ( !m_model )
{
m_model = new PackageListModel( nullptr );
}
cDebug() << "Loading PackageChooser model items from config";
for ( auto item_it = items.constKeyValueBegin(); item_it != items.constKeyValueEnd(); ++item_it )
if ( items.isEmpty() )
{
QString id = ( *item_it ).first;
cWarning() << "No *items* for PackageChooser module.";
return;
}
QVariantMap item_map = ( *item_it ).second.toMap();
cDebug() << "Loading PackageChooser model items from config";
int item_index = 0;
for ( const auto& item_it : items )
{
++item_index;
QVariantMap item_map = item_it.toMap();
if ( item_map.isEmpty() )
{
cWarning() << "PackageChooser item" << id << "is not valid.";
cWarning() << "PackageChooser entry" << item_index << "is not valid.";
continue;
}
QString id = CalamaresUtils::getString( item_map, "id" );
QString package = CalamaresUtils::getString( item_map, "package" );
QString name = CalamaresUtils::getString( item_map, "name" );
QString description = CalamaresUtils::getString( item_map, "description" );
QString screenshot = CalamaresUtils::getString( item_map, "screenshot" );
if ( name.isEmpty() )
if ( name.isEmpty() && id.isEmpty() )
{
name = tr( "No product" );
}
else if ( name.isEmpty() )
{
cWarning() << "PackageChooser item" << id << "has an empty name.";
continue;