[license] Massage the messages some more

- split shared <h1> message off
 - do some string-concatenation, but only of whole sentences
 - shave off some vertical space by dropping the mainsubtext item
main
Adriaan de Groot 5 years ago
parent 1de6062233
commit 0b126b2c62

@ -144,7 +144,7 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
m_allLicensesOptional &= !entry.isRequired(); m_allLicensesOptional &= !entry.isRequired();
} }
ui->acceptCheckBox->setChecked(false); ui->acceptCheckBox->setChecked( false );
checkAcceptance( false ); checkAcceptance( false );
} }
@ -152,20 +152,27 @@ void
LicensePage::retranslate() LicensePage::retranslate()
{ {
ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) ); ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) );
QString header = tr( "<h1>License Agreement</h1>" );
QString review = tr( "Please review the End User License Agreements (EULAs)." );
const auto br = QStringLiteral( "<br/>" );
if ( !m_allLicensesOptional ) if ( !m_allLicensesOptional )
{ {
ui->mainText->setText( tr( "<h1>License Agreement</h1>" ui->mainText->setText( header
"This setup procedure will install proprietary " + tr( "This setup procedure will install proprietary "
"software that is subject to licensing terms." ) ); "software that is subject to licensing terms." )
+ br + review );
ui->additionalText->setText( tr( "If you do not agree with the terms, the setup procedure cannot continue." ) ); ui->additionalText->setText( tr( "If you do not agree with the terms, the setup procedure cannot continue." ) );
} }
else else
{ {
ui->mainText->setText( tr( "<h1>License Agreement</h1>" ui->mainText->setText( header
"This setup procedure can install proprietary " + tr( "This setup procedure can install proprietary "
"software that is subject to licensing terms " "software that is subject to licensing terms "
"in order to provide additional features and enhance the user " "in order to provide additional features and enhance the user "
"experience." ) ); "experience." )
+ br + review );
ui->additionalText->setText( tr( "If you do not agree with the terms, proprietary software will not " ui->additionalText->setText( tr( "If you do not agree with the terms, proprietary software will not "
"be installed, and open source alternatives will be used instead." ) ); "be installed, and open source alternatives will be used instead." ) );
} }

@ -32,16 +32,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="mainSubText">
<property name="toolTip">
<string notr="true"/>
</property>
<property name="text">
<string>Please review the End User License Agreements (EULAs).</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">

Loading…
Cancel
Save