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

[netinstall] Inherit criticalness in groups

Browse Source 
- Groups inherit slightly differently: if a subgroup **explicitly**
  configures criticalness, use that. It would be weird, but possibly,
  to have a non-critical subgroup of a critical group.
This commit is contained in:
Adriaan de Groot 2020-03-27 20:51:52 +01:00
parent 83a89c144c
commit 433ed8384f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/netinstall/PackageTreeItem.cpp
View File

@ -22,6 +22,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"
/** @brief Should a package be selected, given its parent's state? */
static Qt::CheckState static Qt::CheckState
parentCheckState( PackageTreeItem* parent ) parentCheckState( PackageTreeItem* parent )
{ {
@ -36,6 +37,20 @@ parentCheckState( PackageTreeItem* parent )
} }
} }
/** @brief Should a subgroup be marked critical?
*
* If set explicitly, then use that, otherwise use the parent's critical-ness.
*/
static bool
parentCriticality( const QVariantMap& groupData, PackageTreeItem* parent )
{
if ( groupData.contains( "critical" ) )
{
return CalamaresUtils::getBool( groupData, "critical", false );
}
return parent ? parent->isCritical() : false;
}
PackageTreeItem::PackageTreeItem( const QString& packageName, PackageTreeItem* parent ) PackageTreeItem::PackageTreeItem( const QString& packageName, PackageTreeItem* parent )
: m_parentItem( parent ) : m_parentItem( parent )
, m_packageName( packageName ) , m_packageName( packageName )
@ -54,7 +69,7 @@ PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, PackageTreeItem*
, m_preScript( CalamaresUtils::getString( groupData, "pre-install" ) ) , m_preScript( CalamaresUtils::getString( groupData, "pre-install" ) )
, m_postScript( CalamaresUtils::getString( groupData, "post-install" ) ) , m_postScript( CalamaresUtils::getString( groupData, "post-install" ) )
, m_isGroup( true ) , m_isGroup( true )
, m_isCritical( CalamaresUtils::getBool( groupData, "critical", false ) ) , m_isCritical( parentCriticality( groupData, parent ) )
, m_isHidden( CalamaresUtils::getBool( groupData, "hidden", false ) ) , m_isHidden( CalamaresUtils::getBool( groupData, "hidden", false ) )
, m_showReadOnly( CalamaresUtils::getBool( groupData, "immutable", false ) ) , m_showReadOnly( CalamaresUtils::getBool( groupData, "immutable", false ) )
, m_startExpanded( CalamaresUtils::getBool( groupData, "expanded", false ) ) , m_startExpanded( CalamaresUtils::getBool( groupData, "expanded", false ) )