mirror of
https://github.com/parchlinux/calamares.git
synced 2025-07-02 11:55:36 -04:00
[libcalamaresui] Move requirements information out of welcome module.
- Move type and rename it; put in Calamares namespace - Emit signals from the viewmanager as results come in - Remove state changing from welcome view step based on its internal requirements checking (for now this breaks progressing past the welcome page) - Log checking of the requirements
This commit is contained in:
parent
24e04645b6
commit
27b921bde1
12 changed files with 106 additions and 37 deletions
|
@ -23,6 +23,7 @@
|
|||
#include "CheckerWidget.h"
|
||||
#include "partman_devices.h"
|
||||
|
||||
#include "modulesystem/Requirement.h"
|
||||
#include "widgets/WaitingWidget.h"
|
||||
#include "utils/CalamaresUtilsGui.h"
|
||||
#include "utils/Logger.h"
|
||||
|
@ -30,6 +31,7 @@
|
|||
#include "utils/CalamaresUtilsSystem.h"
|
||||
#include "utils/Units.h"
|
||||
|
||||
|
||||
#include "JobQueue.h"
|
||||
#include "GlobalStorage.h"
|
||||
|
||||
|
@ -107,7 +109,7 @@ RequirementsChecker::RequirementsChecker( QObject* parent )
|
|||
<< " hasInternet:" << hasInternet
|
||||
<< " isRoot:" << isRoot;
|
||||
|
||||
QList< PrepareEntry > checkEntries;
|
||||
Calamares::RequirementsList checkEntries;
|
||||
foreach ( const QString& entry, m_entriesToCheck )
|
||||
{
|
||||
if ( entry == "storage" )
|
||||
|
@ -171,7 +173,7 @@ RequirementsChecker::RequirementsChecker( QObject* parent )
|
|||
m_widget->layout()->addWidget( m_actualWidget );
|
||||
|
||||
bool canGoNext = true;
|
||||
foreach ( const PrepareEntry& entry, checkEntries )
|
||||
foreach ( const auto& entry, checkEntries )
|
||||
{
|
||||
if ( !entry.checked && entry.required )
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue