From 2a0716bf43d765c5d4b675a690b941e2350f9723 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 28 Nov 2019 11:24:56 +0100
Subject: [PATCH] [license] Move the 'please review' text to the top.

---
 src/modules/license/LicensePage.cpp |  8 ++------
 src/modules/license/LicensePage.ui  | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index c5ba38133..fcbe62b3d 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -157,9 +157,7 @@ LicensePage::retranslate()
         ui->mainText->setText( tr( "<h1>License Agreement</h1>"
                                    "This setup procedure will install proprietary "
                                    "software that is subject to licensing terms." ) );
-        ui->additionalText->setText( tr( "Please review the End User License "
-                                         "Agreements (EULAs) above.<br/>"
-                                         "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
     {
@@ -168,9 +166,7 @@ LicensePage::retranslate()
                                    "software that is subject to licensing terms "
                                    "in order to provide additional features and enhance the user "
                                    "experience." ) );
-        ui->additionalText->setText( tr( "Please review the End User License "
-                                         "Agreements (EULAs) above.<br/>"
-                                         "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." ) );
     }
     ui->retranslateUi( this );
diff --git a/src/modules/license/LicensePage.ui b/src/modules/license/LicensePage.ui
index 767b392a0..c5857a716 100644
--- a/src/modules/license/LicensePage.ui
+++ b/src/modules/license/LicensePage.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0">
      <item>
       <widget class="QLabel" name="mainText">
        <property name="sizePolicy">
@@ -32,6 +32,16 @@
        </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">
@@ -47,6 +57,12 @@
      </item>
      <item>
       <widget class="QScrollArea" name="scrollArea">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
@@ -65,7 +81,7 @@
           <x>0</x>
           <y>0</y>
           <width>765</width>
-          <height>94</height>
+          <height>86</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="licenseEntriesLayout"/>