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

[packagechooser,netinstall] Change globalstorage keys to camel case

Browse Source
This commit is contained in:
dalto 2022-01-25 17:43:19 -06:00
parent 22c9d888b4
commit 63ed2e5fb8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/netinstall/NetInstallPage.cpp
View File

@ -66,14 +66,14 @@ NetInstallPage::onActivate()
// The NetInstallSelect global storage value can be used to make additional items selected by default // The NetInstallSelect global storage value can be used to make additional items selected by default
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
const QStringList selectNames = gs->value( "NetinstallSelect" ).toStringList(); const QStringList selectNames = gs->value( "netinstallSelect" ).toStringList();
if ( !selectNames.isEmpty() ) if ( !selectNames.isEmpty() )
{ {
m_config->model()->setSelections( selectNames ); m_config->model()->setSelections( selectNames );
} }
// If NetInstallAdd is found in global storage, add those items to the tree // If NetInstallAdd is found in global storage, add those items to the tree
const QVariantList groups = gs->value( "NetinstallAdd" ).toList(); const QVariantList groups = gs->value( "netinstallAdd" ).toList();
if ( !groups.isEmpty() ) if ( !groups.isEmpty() )
{ {
m_config->model()->appendModelData( groups ); m_config->model()->appendModelData( groups );

10
src/modules/packagechooser/Config.cpp
View File

@ -132,7 +132,7 @@ Config::updateGlobalStorage( const QStringList& selected ) const
} }
else else
{ {
Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallAdd", netinstallDataList ); Calamares::JobQueue::instance()->globalStorage()->insert( "netinstallAdd", netinstallDataList );
} }
} }
else if ( m_method == PackageChooserMethod::NetSelect ) else if ( m_method == PackageChooserMethod::NetSelect )
@ -142,9 +142,9 @@ Config::updateGlobalStorage( const QStringList& selected ) const
auto* gs = Calamares::JobQueue::instance()->globalStorage(); auto* gs = Calamares::JobQueue::instance()->globalStorage();
// If an earlier packagechooser instance added this data to global storage, combine them // If an earlier packagechooser instance added this data to global storage, combine them
if ( gs->contains( "NetinstallSelect" ) ) if ( gs->contains( "netinstallSelect" ) )
{ {
auto selectedOrig = gs->value( "NetinstallSelect" ); auto selectedOrig = gs->value( "netinstallSelect" );
if ( selectedOrig.canConvert( QVariant::StringList ) ) if ( selectedOrig.canConvert( QVariant::StringList ) )
{ {
newSelected += selectedOrig.toStringList(); newSelected += selectedOrig.toStringList();
@ -153,9 +153,9 @@ Config::updateGlobalStorage( const QStringList& selected ) const
{ {
cWarning() << "Invalid NetinstallSelect data in global storage. Earlier selections purged"; cWarning() << "Invalid NetinstallSelect data in global storage. Earlier selections purged";
} }
gs->remove( "NetinstallSelect" ); gs->remove( "netinstallSelect" );
} }
gs->insert( "NetinstallSelect", newSelected ); gs->insert( "netinstallSelect", newSelected );
} }
else else
{ {