From 16fbe4dc8c998d1c2aa3dc64f0488128dd976118 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 2 Dec 2017 11:42:56 -0500 Subject: [PATCH] [partition] Sample of requirement checking - There should be at least device to select, overwise we can't continue. The check currently **always** fails, so it blocks installation. --- src/modules/partition/gui/PartitionViewStep.cpp | 16 ++++++++++++++++ src/modules/partition/gui/PartitionViewStep.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 7f113ce88..07a6920fe 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -579,5 +579,21 @@ PartitionViewStep::jobs() const return m_core->jobs(); } +Calamares::RequirementsList PartitionViewStep::checkRequirements() +{ + Calamares::RequirementsList l; + l.append( + { + QLatin1Literal("partitions"), + []{ return QString(); }, + [this]{ return tr("There are no partitons to install on."); }, + false, // satisfied + true // required + }); + + return l; + +} + CALAMARES_PLUGIN_FACTORY_DEFINITION( PartitionViewStepFactory, registerPlugin(); ) diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 1aa8190f9..5a57d5074 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -66,6 +66,8 @@ public: QList< Calamares::job_ptr > jobs() const override; + Calamares::RequirementsList checkRequirements() override; + private: void initPartitionCoreModule(); void continueLoading();