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

[welcome] [welcomeq] Chase API change for requirements progress

Browse Source
This commit is contained in:
Adriaan de Groot 2020-05-12 17:07:15 +02:00
parent 5c8a99c77b
commit 1a1fde1885
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/welcome/WelcomePage.cpp
View File

@ -31,6 +31,7 @@
#include "locale/LabelModel.h" #include "locale/LabelModel.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "modulesystem/RequirementsModel.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/NamedEnum.h" #include "utils/NamedEnum.h"
@ -90,8 +91,8 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent )
&Calamares::ModuleManager::requirementsComplete, &Calamares::ModuleManager::requirementsComplete,
m_checkingWidget, m_checkingWidget,
&CheckerContainer::requirementsComplete ); &CheckerContainer::requirementsComplete );
connect( Calamares::ModuleManager::instance(), connect( Calamares::ModuleManager::instance()->requirementsModel(),
&Calamares::ModuleManager::requirementsProgress, &Calamares::RequirementsModel::progressMessageChanged,
m_checkingWidget, m_checkingWidget,
&CheckerContainer::requirementsProgress ); &CheckerContainer::requirementsProgress );
} }

8
src/modules/welcomeq/WelcomeQmlViewStep.cpp
View File

@ -37,6 +37,10 @@ WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent )
, m_config( new Config( this ) ) , m_config( new Config( this ) )
, m_requirementsChecker( new GeneralRequirements( this ) ) , m_requirementsChecker( new GeneralRequirements( this ) )
{ {
connect( Calamares::ModuleManager::instance(),
&Calamares::ModuleManager::requirementsComplete,
this,
&WelcomeQmlViewStep::nextStatusChanged );
} }
@ -49,9 +53,7 @@ WelcomeQmlViewStep::prettyName() const
bool bool
WelcomeQmlViewStep::isNextEnabled() const WelcomeQmlViewStep::isNextEnabled() const
{ {
// TODO: should return true return m_config->requirementsModel()->satisfiedMandatory();
// return m_config->property("isNextEnabled").toBool();
return true;
} }
bool bool

1
src/modules/welcomeq/WelcomeQmlViewStep.h
View File

@ -73,7 +73,6 @@ public:
QObject* getConfig() override; QObject* getConfig() override;
private: private:
// TODO: a generic QML viewstep should return a config object from a method
Config* m_config; Config* m_config;
GeneralRequirements* m_requirementsChecker; GeneralRequirements* m_requirementsChecker;
}; };