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

moved netinstall to a tree based ui

Browse source
This commit is contained in:
Kyle Robertze 2017-01-23 14:42:40 +02:00 • committed by Teo Mrnjavac
parent d465617432
commit a4aef3bce5
12 changed files with 642 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/netinstall/NetInstallViewStep.cpp
View file

@ -125,32 +125,17 @@ NetInstallViewStep::onLeave()
cDebug() << "Leaving netinstall, adding packages to be installed"
<< "to global storage";
const QList<Group>& selectedGroups = m_widget->selectedGroups();
QMap<QString, QVariant> packagesWithOperation;
QList<QVariant> installPackages = m_widget->selectedPackages(true);
QList<QVariant> tryInstallPackages = m_widget->selectedPackages(false);
if ( !selectedGroups.empty() )
if ( !installPackages.empty() )
packagesWithOperation.insert( "install", installPackages );
if ( !tryInstallPackages.empty() )
packagesWithOperation.insert( "try-install", tryInstallPackages );
if ( !packagesWithOperation.isEmpty() )
{
QMap<QString, QVariant> packagesWithOperation;
QStringList packages, critical_packages;
// We have two types of groups: "critical" (failing to install any of
// the packages makes Calamares fail) and "non critical" (we only log
// an error if the installation fails). We distinguish them here and select
// the correct package operation.
for (const Group& group : selectedGroups) {
if (group.critical) {
critical_packages += group.packages;
} else {
packages += group.packages;
}
}
if (!critical_packages.empty()) {
packagesWithOperation.insert( "install", critical_packages );
}
if (!packages.empty()) {
packagesWithOperation.insert( "try_install", packages);
}
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
gs->insert( "packageOperations", QVariant( packagesWithOperation ) );
}