[packagechooser] Add configuration setting for selection mode
- Add a *mode* key to the configuration file - Change some names around to be more consistent (not user-visible)
This commit is contained in:
parent
fb3204262c
commit
76077743af
@ -150,6 +150,16 @@ void
|
|||||||
PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
||||||
{
|
{
|
||||||
// TODO: use the configurationMap
|
// TODO: use the configurationMap
|
||||||
|
QString mode = CalamaresUtils::getString( configurationMap, "mode" );
|
||||||
|
bool ok = false;
|
||||||
|
if ( !mode.isEmpty() )
|
||||||
|
{
|
||||||
|
m_mode = roleNames().find( mode, ok );
|
||||||
|
}
|
||||||
|
if ( !ok )
|
||||||
|
{
|
||||||
|
m_mode = PackageChooserMode::Required;
|
||||||
|
}
|
||||||
|
|
||||||
if ( !m_model )
|
if ( !m_model )
|
||||||
{
|
{
|
||||||
|
@ -25,17 +25,16 @@ roleNames()
|
|||||||
{
|
{
|
||||||
static const NamedEnumTable< PackageChooserMode > names {
|
static const NamedEnumTable< PackageChooserMode > names {
|
||||||
{ "optional", PackageChooserMode::Optional },
|
{ "optional", PackageChooserMode::Optional },
|
||||||
{ "exclusive", PackageChooserMode::Exclusive },
|
{ "required", PackageChooserMode::Required },
|
||||||
{ "multiple", PackageChooserMode::Multiple },
|
{ "optionalmultiple", PackageChooserMode::OptionalMultiple },
|
||||||
{ "requiredmultiple",
|
{ "requiredmultiple", PackageChooserMode::RequiredMultiple },
|
||||||
PackageChooserMode::RequiredMultiple },
|
|
||||||
// and a bunch of aliases
|
// and a bunch of aliases
|
||||||
{ "zero-or-one", PackageChooserMode::Optional },
|
{ "zero-or-one", PackageChooserMode::Optional },
|
||||||
{ "radio", PackageChooserMode::Exclusive },
|
{ "radio", PackageChooserMode::Required },
|
||||||
{ "one", PackageChooserMode::Exclusive },
|
{ "one", PackageChooserMode::Required },
|
||||||
{ "set", PackageChooserMode::Multiple },
|
{ "set", PackageChooserMode::OptionalMultiple },
|
||||||
{ "zero-or-more", PackageChooserMode::Multiple },
|
{ "zero-or-more", PackageChooserMode::OptionalMultiple },
|
||||||
{ "required", PackageChooserMode::RequiredMultiple },
|
{ "multiple", PackageChooserMode::RequiredMultiple },
|
||||||
{ "one-or-more", PackageChooserMode::RequiredMultiple } };
|
{ "one-or-more", PackageChooserMode::RequiredMultiple } };
|
||||||
return names;
|
return names;
|
||||||
}
|
}
|
||||||
|
@ -29,8 +29,8 @@
|
|||||||
enum class PackageChooserMode
|
enum class PackageChooserMode
|
||||||
{
|
{
|
||||||
Optional, // zero or one
|
Optional, // zero or one
|
||||||
Exclusive, // exactly one
|
Required, // exactly one
|
||||||
Multiple, // zero or more
|
OptionalMultiple, // zero or more
|
||||||
RequiredMultiple // one or more
|
RequiredMultiple // one or more
|
||||||
};
|
};
|
||||||
|
|
||||||
|
9
src/modules/packagechooser/packagechooser.conf
Normal file
9
src/modules/packagechooser/packagechooser.conf
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# Configuration for the low-density software chooser
|
||||||
|
---
|
||||||
|
# Software selection mode, to set whether the software packages
|
||||||
|
# can be chosen singly, or multiply.
|
||||||
|
#
|
||||||
|
# Possible modes are "optional", "required" (for zero or one)
|
||||||
|
# or "optionalmultiple", "requiredmultiple" (for zero-or-more
|
||||||
|
# or one-or-more).
|
||||||
|
mode: required
|
Loading…
Reference in New Issue
Block a user