[libcalamaresui] Defer requirements checking of ViewModules to their ViewSteps
This commit is contained in:
parent
27b921bde1
commit
b6fed964ce
@ -126,4 +126,10 @@ ViewModule::~ViewModule()
|
|||||||
delete m_loader;
|
delete m_loader;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RequirementsList
|
||||||
|
ViewModule::checkRequirements()
|
||||||
|
{
|
||||||
|
return m_viewStep->checkRequirements();
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Calamares
|
} // namespace Calamares
|
||||||
|
@ -39,6 +39,8 @@ public:
|
|||||||
void loadSelf() override;
|
void loadSelf() override;
|
||||||
JobList jobs() const override;
|
JobList jobs() const override;
|
||||||
|
|
||||||
|
RequirementsList checkRequirements() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void initFrom( const QVariantMap& moduleDescriptor ) override;
|
void initFrom( const QVariantMap& moduleDescriptor ) override;
|
||||||
|
|
||||||
|
@ -66,4 +66,10 @@ ViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
|||||||
Q_UNUSED( configurationMap );
|
Q_UNUSED( configurationMap );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
RequirementsList ViewStep::checkRequirements()
|
||||||
|
{
|
||||||
|
return RequirementsList();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
|
#include "modulesystem/Requirement.h"
|
||||||
#include "../UiDllMacro.h"
|
#include "../UiDllMacro.h"
|
||||||
#include "Typedefs.h"
|
#include "Typedefs.h"
|
||||||
|
|
||||||
@ -101,6 +102,8 @@ public:
|
|||||||
|
|
||||||
virtual void setConfigurationMap( const QVariantMap& configurationMap );
|
virtual void setConfigurationMap( const QVariantMap& configurationMap );
|
||||||
|
|
||||||
|
virtual RequirementsList checkRequirements();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void nextStatusChanged( bool status );
|
void nextStatusChanged( bool status );
|
||||||
void done();
|
void done();
|
||||||
|
Loading…
Reference in New Issue
Block a user