mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-26 08:58:22 -04:00
Rearrange WelcomePage checker layout to make more space for reports.
This commit is contained in:
parent
02f4ab1501
commit
43698b18f5
3 changed files with 25 additions and 30 deletions
|
@ -78,14 +78,15 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries )
|
|||
}
|
||||
}
|
||||
|
||||
QLabel* textLabel = new QLabel;
|
||||
|
||||
textLabel->setWordWrap( true );
|
||||
m_entriesLayout->insertWidget( 0, textLabel );
|
||||
textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
|
||||
|
||||
if ( !allChecked )
|
||||
{
|
||||
QLabel* textLabel = new QLabel;
|
||||
|
||||
textLabel->setWordWrap( true );
|
||||
m_entriesLayout->insertWidget( 0, textLabel );
|
||||
m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
|
||||
textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
|
||||
|
||||
if ( !requirementsSatisfied )
|
||||
{
|
||||
|
@ -117,6 +118,17 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries )
|
|||
)
|
||||
}
|
||||
}
|
||||
|
||||
if ( allChecked && requirementsSatisfied )
|
||||
{
|
||||
CALAMARES_RETRANSLATE(
|
||||
textLabel->setText( tr( "This program will ask you some questions and "
|
||||
"set up %2 on your computer." )
|
||||
.arg( Calamares::Branding::instance()->
|
||||
string( Calamares::Branding::ProductName ) ) );
|
||||
textLabel->setAlignment( Qt::AlignCenter );
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -138,6 +150,9 @@ CheckerWidget::showDetailsDialog( const QList< PrepareEntry >& checkEntries )
|
|||
|
||||
for ( const PrepareEntry& entry : checkEntries )
|
||||
{
|
||||
if ( entry.enumerationText().isEmpty() )
|
||||
continue;
|
||||
|
||||
CheckItemWidget* ciw = new CheckItemWidget( entry.checked );
|
||||
CALAMARES_RETRANSLATE( ciw->setText( entry.enumerationText() ); )
|
||||
entriesLayout->addWidget( ciw );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue