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

Merge branch 'issue-1307'

Browse Source 
FIXES #1307
This commit is contained in:
Adriaan de Groot 2020-01-28 14:31:27 +01:00
commit ac96d91a65
3 changed files with 242 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/welcome/checker/CheckerContainer.cpp
View File

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2017, 2019-2020, Adriaan de Groot <groot@kde.org>
* Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
*
* Calamares is free software: you can redistribute it and/or modify
@ -29,6 +29,8 @@
#include "utils/Retranslator.h"
#include "widgets/WaitingWidget.h"
#include <QHBoxLayout>
CheckerContainer::CheckerContainer( QWidget* parent )
: QWidget( parent )
, m_waitingWidget( new WaitingWidget( QString(), this ) )
@ -40,10 +42,7 @@ CheckerContainer::CheckerContainer( QWidget* parent )
CalamaresUtils::unmarginLayout( mainLayout );
mainLayout->addWidget( m_waitingWidget );
CALAMARES_RETRANSLATE(
if ( m_waitingWidget )
m_waitingWidget->setText( tr( "Gathering system information..." ) );
)
CALAMARES_RETRANSLATE( if ( m_waitingWidget ) m_waitingWidget->setText( tr( "Gathering system information..." ) ); )
}
CheckerContainer::~CheckerContainer()
@ -52,32 +51,37 @@ CheckerContainer::~CheckerContainer()
delete m_checkerWidget;
}
void CheckerContainer::requirementsComplete( bool ok )
void
CheckerContainer::requirementsComplete( bool ok )
{
layout()->removeWidget( m_waitingWidget );
m_waitingWidget->deleteLater();
m_waitingWidget = nullptr; // Don't delete in destructor
m_checkerWidget = new ResultsListWidget( this );
m_checkerWidget->init( m_requirements );
m_checkerWidget = new ResultsListWidget( this, m_requirements );
layout()->addWidget( m_checkerWidget );
m_verdict = ok;
}
void CheckerContainer::requirementsChecked(const Calamares::RequirementsList& l)
void
CheckerContainer::requirementsChecked( const Calamares::RequirementsList& l )
{
m_requirements.append( l );
}
void CheckerContainer::requirementsProgress(const QString& message)
void
CheckerContainer::requirementsProgress( const QString& message )
{
if ( m_waitingWidget )
{
m_waitingWidget->setText( message );
}
}
bool CheckerContainer::verdict() const
bool
CheckerContainer::verdict() const
{
return m_verdict;
}

338
src/modules/welcome/checker/ResultsListWidget.cpp
View File

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2017, 2019-2020, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -24,53 +24,45 @@
#include "Branding.h"
#include "Settings.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "widgets/FixedAspectRatioLabel.h"
#include <QAbstractButton>
#include <QBoxLayout>
#include <QDialog>
#include <QDialogButtonBox>
#include <QLabel>
#include <QVBoxLayout>
ResultsListWidget::ResultsListWidget( QWidget* parent )
: QWidget( parent )
/** @brief Add widgets to @p layout for the list @p checkEntries
*
* The @p resultWidgets is filled with pointers to the widgets;
* for each entry in @p checkEntries that satisfies @p predicate,
* a widget is created, otherwise a nullptr is added instead.
*
* Adds all the widgets to the given @p layout.
*
* Afterwards, @p resultWidgets has a length equal to @p checkEntries.
*/
static void
createResultWidgets( QLayout* layout,
QList< ResultWidget* >& resultWidgets,
const Calamares::RequirementsList& checkEntries,
std::function< bool( const Calamares::RequirementEntry& ) > predicate )
{
setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
m_mainLayout = new QVBoxLayout;
setLayout( m_mainLayout );
QHBoxLayout* spacerLayout = new QHBoxLayout;
m_mainLayout->addLayout( spacerLayout );
m_paddingSize = qBound( 32, CalamaresUtils::defaultFontHeight() * 4, 128 );
spacerLayout->addSpacing( m_paddingSize );
m_entriesLayout = new QVBoxLayout;
spacerLayout->addLayout( m_entriesLayout );
spacerLayout->addSpacing( m_paddingSize );
CalamaresUtils::unmarginLayout( spacerLayout );
}
void
ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
{
bool allChecked = true;
bool requirementsSatisfied = true;
resultWidgets.clear();
resultWidgets.reserve( checkEntries.count() );
for ( const auto& entry : checkEntries )
{
if ( !entry.satisfied )
if ( !predicate( entry ) )
{
ResultWidget* ciw = new ResultWidget( entry.satisfied, entry.mandatory );
CALAMARES_RETRANSLATE( ciw->setText( entry.negatedText() ); )
m_entriesLayout->addWidget( ciw );
ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
resultWidgets.append( nullptr );
continue;
}
allChecked = false;
if ( entry.mandatory )
requirementsSatisfied = false;
ResultWidget* ciw = new ResultWidget( entry.satisfied, entry.mandatory );
layout->addWidget( ciw );
ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
ciw->setAutoFillBackground( true );
QPalette pal( ciw->palette() );
@ -79,65 +71,129 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
bgColor.setHsv( bgHue, 64, bgColor.value() );
pal.setColor( QPalette::Window, bgColor );
ciw->setPalette( pal );
resultWidgets.append( ciw );
}
}
QLabel* textLabel = new QLabel;
textLabel->setWordWrap( true );
m_entriesLayout->insertWidget( 0, textLabel );
textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
if ( !allChecked )
/** @brief A "details" dialog for the results-list
*
* This displays the same RequirementsList as ResultsListWidget,
* but the *details* part rather than the show description.
*
* This is an internal-to-the-widget class.
*/
class ResultsListDialog : public QDialog
{
m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
public:
/** @brief Create a dialog for the given @p checkEntries list of requirements.
*
* The list must continue to exist for the lifetime of the dialog,
* or UB happens.
*/
ResultsListDialog( QWidget* parent, const Calamares::RequirementsList& checkEntries );
virtual ~ResultsListDialog();
private:
QLabel* m_title;
QList< ResultWidget* > m_resultWidgets; ///< One widget for each entry with details available
const Calamares::RequirementsList& m_entries;
void retranslate();
};
ResultsListDialog::ResultsListDialog( QWidget* parent, const Calamares::RequirementsList& checkEntries )
: QDialog( parent )
, m_entries( checkEntries )
{
auto* mainLayout = new QVBoxLayout;
auto* entriesLayout = new QVBoxLayout;
m_title = new QLabel( this );
createResultWidgets( entriesLayout, m_resultWidgets, checkEntries, []( const Calamares::RequirementEntry& e ) {
return e.hasDetails();
} );
QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
mainLayout->addWidget( m_title );
mainLayout->addLayout( entriesLayout );
mainLayout->addWidget( buttonBox );
setLayout( mainLayout );
connect( buttonBox, &QDialogButtonBox::clicked, this, &QDialog::close );
CALAMARES_RETRANSLATE_SLOT( &ResultsListDialog::retranslate )
retranslate(); // Do it now to fill in the texts
}
ResultsListDialog::~ResultsListDialog() {}
void
ResultsListDialog::retranslate()
{
m_title->setText( tr( "For best results, please ensure that this computer:" ) );
setWindowTitle( tr( "System requirements" ) );
int i = 0;
for ( const auto& entry : m_entries )
{
if ( m_resultWidgets[ i ] )
{
m_resultWidgets[ i ]->setText( entry.enumerationText() );
}
i++;
}
}
ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::RequirementsList& checkEntries )
: QWidget( parent )
, m_entries( checkEntries )
{
setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
QBoxLayout* mainLayout = new QVBoxLayout;
QBoxLayout* entriesLayout = new QVBoxLayout;
setLayout( mainLayout );
int paddingSize = qBound( 32, CalamaresUtils::defaultFontHeight() * 4, 128 );
QHBoxLayout* spacerLayout = new QHBoxLayout;
mainLayout->addLayout( spacerLayout );
spacerLayout->addSpacing( paddingSize );
spacerLayout->addLayout( entriesLayout );
spacerLayout->addSpacing( paddingSize );
CalamaresUtils::unmarginLayout( spacerLayout );
m_explanation = new QLabel;
m_explanation->setWordWrap( true );
m_explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
m_explanation->setOpenExternalLinks( false );
connect( m_explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
entriesLayout->addWidget( m_explanation );
// Check that all are satisfied (gives warnings if not) and
// all *mandatory* entries are satisfied (gives errors if not).
auto isUnSatisfied = []( const Calamares::RequirementEntry& e ) { return !e.satisfied; };
const bool requirementsSatisfied = std::none_of( checkEntries.begin(), checkEntries.end(), isUnSatisfied );
createResultWidgets( entriesLayout, m_resultWidgets, checkEntries, isUnSatisfied );
if ( !requirementsSatisfied )
{
CALAMARES_RETRANSLATE(
QString message = Calamares::Settings::instance()->isSetupMode()
? tr( "This computer does not satisfy the minimum "
"requirements for setting up %1.<br/>"
"Setup cannot continue. "
"<a href=\"#details\">Details...</a>" )
: tr( "This computer does not satisfy the minimum "
"requirements for installing %1.<br/>"
"Installation cannot continue. "
"<a href=\"#details\">Details...</a>" );
textLabel->setText( message.arg( *Calamares::Branding::ShortVersionedName ) );
)
textLabel->setOpenExternalLinks( false );
connect( textLabel, &QLabel::linkActivated,
this, [ this, checkEntries ]( const QString& link )
{
if ( link == "#details" )
showDetailsDialog( checkEntries );
} );
entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
mainLayout->addStretch();
}
else
{
CALAMARES_RETRANSLATE(
QString message = Calamares::Settings::instance()->isSetupMode()
? tr( "This computer does not satisfy some of the "
"recommended requirements for setting up %1.<br/>"
"Setup can continue, but some features "
"might be disabled." )
: tr( "This computer does not satisfy some of the "
"recommended requirements for installing %1.<br/>"
"Installation can continue, but some features "
"might be disabled." );
textLabel->setText( message.arg( *Calamares::Branding::ShortVersionedName ) );
)
}
}
if ( allChecked && requirementsSatisfied )
if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
{
if ( !Calamares::Branding::instance()->
imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
{
QPixmap theImage = QPixmap( Calamares::Branding::instance()->
imagePath( Calamares::Branding::ProductWelcome ) );
QPixmap theImage
= QPixmap( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ) );
if ( !theImage.isNull() )
{
QLabel* imageLabel;
@ -154,68 +210,82 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
}
imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight() * 3 / 4, 4, 4 );
m_mainLayout->addWidget( imageLabel );
mainLayout->addWidget( imageLabel );
imageLabel->setAlignment( Qt::AlignCenter );
imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
}
}
CALAMARES_RETRANSLATE(
textLabel->setText( tr( "This program will ask you some questions and "
"set up %2 on your computer." )
.arg( *Calamares::Branding::ProductName ) );
textLabel->setAlignment( Qt::AlignCenter );
)
m_explanation->setAlignment( Qt::AlignCenter );
}
else
m_mainLayout->addStretch();
CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate )
retranslate();
}
void
ResultsListWidget::showDetailsDialog( const Calamares::RequirementsList& checkEntries )
ResultsListWidget::linkClicked( const QString& link )
{
QDialog* detailsDialog = new QDialog( this );
QBoxLayout* mainLayout = new QVBoxLayout;
detailsDialog->setLayout( mainLayout );
QLabel* textLabel = new QLabel;
mainLayout->addWidget( textLabel );
CALAMARES_RETRANSLATE(
textLabel->setText( tr( "For best results, please ensure that this computer:" ) );
)
QBoxLayout* entriesLayout = new QVBoxLayout;
CalamaresUtils::unmarginLayout( entriesLayout );
mainLayout->addLayout( entriesLayout );
for ( const auto& entry : checkEntries )
if ( link == "#details" )
{
if ( !entry.hasDetails() )
continue;
ResultWidget* ciw = new ResultWidget( entry.satisfied, entry.mandatory );
CALAMARES_RETRANSLATE( ciw->setText( entry.enumerationText() ); )
entriesLayout->addWidget( ciw );
ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
ciw->setAutoFillBackground( true );
QPalette pal( ciw->palette() );
QColor bgColor = pal.window().color();
int bgHue = ( entry.satisfied ) ? bgColor.hue() : ( entry.mandatory ) ? 0 : 60;
bgColor.setHsv( bgHue, 64, bgColor.value() );
pal.setColor( QPalette::Window, bgColor );
ciw->setPalette( pal );
auto* dialog = new ResultsListDialog( this, m_entries );
dialog->exec();
dialog->deleteLater();
}
}
QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close,
Qt::Horizontal,
this );
mainLayout->addWidget( buttonBox );
detailsDialog->setModal( true );
detailsDialog->setWindowTitle( tr( "System requirements" ) );
connect( buttonBox, &QDialogButtonBox::clicked,
detailsDialog, &QDialog::close );
detailsDialog->exec();
detailsDialog->deleteLater();
void
ResultsListWidget::retranslate()
{
int i = 0;
for ( const auto& entry : m_entries )
{
if ( m_resultWidgets[ i ] )
{
m_resultWidgets[ i ]->setText( entry.negatedText() );
}
i++;
}
// Check that all are satisfied (gives warnings if not) and
// all *mandatory* entries are satisfied (gives errors if not).
auto isUnSatisfied = []( const Calamares::RequirementEntry& e ) { return !e.satisfied; };
auto isMandatoryAndUnSatisfied = []( const Calamares::RequirementEntry& e ) { return e.mandatory && !e.satisfied; };
const bool requirementsSatisfied = std::none_of( m_entries.begin(), m_entries.end(), isUnSatisfied );
const bool mandatorySatisfied = std::none_of( m_entries.begin(), m_entries.end(), isMandatoryAndUnSatisfied );
if ( !requirementsSatisfied )
{
QString message;
const bool setup = Calamares::Settings::instance()->isSetupMode();
if ( !mandatorySatisfied )
{
message = setup ? tr( "This computer does not satisfy the minimum "
"requirements for setting up %1.<br/>"
"Setup cannot continue. "
"<a href=\"#details\">Details...</a>" )
: tr( "This computer does not satisfy the minimum "
"requirements for installing %1.<br/>"
"Installation cannot continue. "
"<a href=\"#details\">Details...</a>" );
}
else
{
message = setup ? tr( "This computer does not satisfy some of the "
"recommended requirements for setting up %1.<br/>"
"Setup can continue, but some features "
"might be disabled." )
: tr( "This computer does not satisfy some of the "
"recommended requirements for installing %1.<br/>"
"Installation can continue, but some features "
"might be disabled." );
}
m_explanation->setText( message.arg( *Calamares::Branding::ShortVersionedName ) );
}
else
{
m_explanation->setText( tr( "This program will ask you some questions and "
"set up %2 on your computer." )
.arg( *Calamares::Branding::ProductName ) );
}
}

21
src/modules/welcome/checker/ResultsListWidget.h
View File

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,25 +20,28 @@
#ifndef CHECKER_RESULTSLISTWIDGET_H
#define CHECKER_RESULTSLISTWIDGET_H
#include "ResultWidget.h"
#include "modulesystem/Requirement.h"
#include <QBoxLayout>
#include <QWidget>
class QLabel;
class ResultsListWidget : public QWidget
{
Q_OBJECT
public:
explicit ResultsListWidget( QWidget* parent = nullptr );
void init( const Calamares::RequirementsList& checkEntries );
explicit ResultsListWidget( QWidget* parent, const Calamares::RequirementsList& checkEntries );
private:
void showDetailsDialog( const Calamares::RequirementsList& checkEntries );
/// @brief A link in the explanatory text has been clicked
void linkClicked( const QString& link );
void retranslate();
QBoxLayout* m_mainLayout;
QBoxLayout* m_entriesLayout;
int m_paddingSize;
QLabel* m_explanation = nullptr; ///< Explanatory text above the list, with link
const Calamares::RequirementsList& m_entries;
QList< ResultWidget* > m_resultWidgets; ///< One widget for each unsatisfied entry
};
#endif // CHECKER_RESULTSLISTWIDGET_H