diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp index 414250582..3dfacb8f6 100644 --- a/src/modules/welcome/checker/CheckerContainer.cpp +++ b/src/modules/welcome/checker/CheckerContainer.cpp @@ -29,6 +29,8 @@ #include "utils/Retranslator.h" #include "widgets/WaitingWidget.h" +#include + CheckerContainer::CheckerContainer( QWidget* parent ) : QWidget( parent ) , m_waitingWidget( new WaitingWidget( QString(), this ) ) diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index 7f68d22ff..d7fdf5437 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -29,10 +29,10 @@ #include "widgets/FixedAspectRatioLabel.h" #include -#include #include #include #include +#include static void createResultWidgets( QLayout* layout, @@ -157,6 +157,13 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem 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; }; @@ -182,11 +189,6 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem } } - QLabel* textLabel = new QLabel; - - textLabel->setWordWrap( true ); - entriesLayout->insertWidget( 0, textLabel ); - textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); if ( !requirementsSatisfied ) { @@ -203,9 +205,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem "requirements for installing %1.
" "Installation cannot continue. " "Details..." ); - textLabel->setText( message.arg( *Calamares::Branding::ShortVersionedName ) ); ) - textLabel->setOpenExternalLinks( false ); - connect( textLabel, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked ); + m_explanation->setText( message.arg( *Calamares::Branding::ShortVersionedName ) ); ) } else { @@ -218,7 +218,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem "recommended requirements for installing %1.
" "Installation can continue, but some features " "might be disabled." ); - textLabel->setText( message.arg( *Calamares::Branding::ShortVersionedName ) ); ) + m_explanation->setText( message.arg( *Calamares::Branding::ShortVersionedName ) ); ) } } @@ -249,10 +249,10 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem 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 ); ) + CALAMARES_RETRANSLATE( m_explanation->setText( tr( "This program will ask you some questions and " + "set up %2 on your computer." ) + .arg( *Calamares::Branding::ProductName ) ); + m_explanation->setAlignment( Qt::AlignCenter ); ) } else { diff --git a/src/modules/welcome/checker/ResultsListWidget.h b/src/modules/welcome/checker/ResultsListWidget.h index 4685ded9b..62f2d1a17 100644 --- a/src/modules/welcome/checker/ResultsListWidget.h +++ b/src/modules/welcome/checker/ResultsListWidget.h @@ -22,9 +22,10 @@ #include "modulesystem/Requirement.h" -#include #include +class QLabel; + class ResultsListWidget : public QWidget { Q_OBJECT @@ -36,6 +37,7 @@ private: void linkClicked( const QString& link ); void retranslate(); + QLabel* m_explanation = nullptr; ///< Explanatory text above the list, with link const Calamares::RequirementsList& m_entries; };