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

[welcome] Display a countdown while (re)checking requirements

Browse Source
This commit is contained in:
Adriaan de Groot 2022-04-15 12:47:12 +02:00
parent 514b728449
commit 075185547a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "widgets/FixedAspectRatioLabel.h" #include "widgets/FixedAspectRatioLabel.h"
#include "widgets/WaitingWidget.h"
#include <QAbstractButton> #include <QAbstractButton>
#include <QDialog> #include <QDialog>
@ -169,12 +170,18 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
spacerLayout->addSpacing( paddingSize ); spacerLayout->addSpacing( paddingSize );
CalamaresUtils::unmarginLayout( spacerLayout ); CalamaresUtils::unmarginLayout( spacerLayout );
QHBoxLayout* explanationLayout = new QHBoxLayout;
m_explanation = new QLabel( m_config->warningMessage() ); m_explanation = new QLabel( m_config->warningMessage() );
m_explanation->setWordWrap( true ); m_explanation->setWordWrap( true );
m_explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); m_explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
m_explanation->setOpenExternalLinks( false ); m_explanation->setOpenExternalLinks( false );
m_explanation->setObjectName( "resultsExplanation" ); m_explanation->setObjectName( "resultsExplanation" );
m_entriesLayout->addWidget( m_explanation ); explanationLayout->addWidget( m_explanation );
m_countdown = new CountdownWaitingWidget;
explanationLayout->addWidget( m_countdown );
m_countdown->start();
m_entriesLayout->addLayout( explanationLayout );
m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 ); m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
m_mainLayout->addStretch(); m_mainLayout->addStretch();
@ -258,6 +265,8 @@ ResultsListWidget::requirementsChanged()
} }
else else
{ {
m_countdown->stop();
m_countdown->hide();
if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() ) if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
{ {
QPixmap theImage QPixmap theImage

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

@ -17,8 +17,11 @@
#include <QWidget> #include <QWidget>
class CountdownWaitingWidget;
class QBoxLayout; class QBoxLayout;
class QLabel; class QLabel;
class ResultsListWidget : public QWidget class ResultsListWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
@ -56,6 +59,7 @@ private:
// UI parts, which need updating when the model changes // UI parts, which need updating when the model changes
QLabel* m_explanation = nullptr; QLabel* m_explanation = nullptr;
CountdownWaitingWidget* m_countdown = nullptr;
QBoxLayout* m_mainLayout = nullptr; QBoxLayout* m_mainLayout = nullptr;
QBoxLayout* m_entriesLayout = nullptr; QBoxLayout* m_entriesLayout = nullptr;
int m_requirementsSeen = 0; int m_requirementsSeen = 0;