applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[welcome] Hoist explanatory-label code

Browse source 
- Create the label once, and it's ok for it to respond to links
   even if there's none in the code.
 - Turn into a member variable in preparation for retranslation-refactor.
This commit is contained in:
Adriaan de Groot 2020-01-28 13:32:53 +01:00
parent b476e4b386
commit 38d58e5b16
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/welcome/checker/CheckerContainer.cpp
View file

@ -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 ) )

28
src/modules/welcome/checker/ResultsListWidget.cpp
View file

@ -29,10 +29,10 @@
#include "widgets/FixedAspectRatioLabel.h"
#include <QAbstractButton>
#include <QBoxLayout>
#include <QDialog>
#include <QDialogButtonBox>
#include <QLabel>
#include <QVBoxLayout>
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.<br/>"
"Installation cannot continue. "
"<a href=\"#details\">Details...</a>" );
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.<br/>"
"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
{

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

@ -22,9 +22,10 @@
#include "modulesystem/Requirement.h"
#include <QBoxLayout>
#include <QWidget>
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;
};