applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'requirements-checking'

Browse source
This commit is contained in:
Adriaan de Groot 2019-02-25 10:00:43 -05:00
commit 8cf3c217f7
29 changed files with 805 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/welcome/WelcomeViewStep.cpp
View file

@ -20,9 +20,10 @@
#include "WelcomeViewStep.h"
#include "WelcomePage.h"
#include "checker/RequirementsChecker.h"
#include "utils/Logger.h"
#include "checker/GeneralRequirements.h"
#include "modulesystem/ModuleManager.h"
#include "utils/Logger.h"
#include <QVariant>
@ -30,12 +31,10 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeViewStepFactory, registerPlugin<Welc
WelcomeViewStep::WelcomeViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_requirementsChecker( new RequirementsChecker( this ) )
, m_requirementsChecker( new GeneralRequirements( this ) )
{
emit nextStatusChanged( true );
m_widget = new WelcomePage( m_requirementsChecker );
connect( m_requirementsChecker, &RequirementsChecker::verdictChanged,
this, &WelcomeViewStep::nextStatusChanged );
connect( Calamares::ModuleManager::instance(), &Calamares::ModuleManager::requirementsComplete, this, &WelcomeViewStep::nextStatusChanged );
m_widget = new WelcomePage();
}
@ -63,7 +62,7 @@ WelcomeViewStep::widget()
bool
WelcomeViewStep::isNextEnabled() const
{
return m_requirementsChecker->verdict();
return m_widget->verdict();
}
@ -88,10 +87,10 @@ WelcomeViewStep::isAtEnd() const
}
QList< Calamares::job_ptr >
Calamares::JobList
WelcomeViewStep::jobs() const
{
return QList< Calamares::job_ptr >();
return Calamares::JobList();
}
@ -123,3 +122,7 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
"module configuration.";
}
Calamares::RequirementsList WelcomeViewStep::checkRequirements()
{
return m_requirementsChecker->checkRequirements();
}