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

[license] Massage the messages some more

Browse Source 
- split shared <h1> message off
 - do some string-concatenation, but only of whole sentences
 - shave off some vertical space by dropping the mainsubtext item
This commit is contained in:
Adriaan de Groot 2019-12-03 12:49:11 +01:00
parent 1de6062233
commit 0b126b2c62
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/license/LicensePage.cpp
View File

@ -144,7 +144,7 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
m_allLicensesOptional &= !entry.isRequired();
}
ui->acceptCheckBox->setChecked(false);
ui->acceptCheckBox->setChecked( false );
checkAcceptance( false );
}
@ -152,20 +152,27 @@ void
LicensePage::retranslate()
{
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 )
{
ui->mainText->setText( tr( "<h1>License Agreement</h1>"
"This setup procedure will install proprietary "
"software that is subject to licensing terms." ) );
ui->mainText->setText( header
+ tr( "This setup procedure will install proprietary "
"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." ) );
}
else
{
ui->mainText->setText( tr( "<h1>License Agreement</h1>"
"This setup procedure can install proprietary "
"software that is subject to licensing terms "
"in order to provide additional features and enhance the user "
"experience." ) );
ui->mainText->setText( header
+ tr( "This setup procedure can install proprietary "
"software that is subject to licensing terms "
"in order to provide additional features and enhance the user "
"experience." )
+ br + review );
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." ) );
}

10
src/modules/license/LicensePage.ui
View File

@ -32,16 +32,6 @@
</property>
</widget>
</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>
<spacer name="verticalSpacer">
<property name="orientation">