From 0b126b2c62d7a8f31a5d116895645fd05665f087 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Dec 2019 12:49:11 +0100
Subject: [PATCH] [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
---
 src/modules/license/LicensePage.cpp | 25 ++++++++++++++++---------
 src/modules/license/LicensePage.ui  | 10 ----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index 45205dcd4..915b396a7 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -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." ) );
     }
diff --git a/src/modules/license/LicensePage.ui b/src/modules/license/LicensePage.ui
index c5857a716..13c4d94b1 100644
--- a/src/modules/license/LicensePage.ui
+++ b/src/modules/license/LicensePage.ui
@@ -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">