From 59ea0417fc693adb45c4a4d72dc46a467f834f64 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Dec 2019 17:25:07 +0100
Subject: [PATCH] [license] Move a less-useful message to tooltip

 - the message about setup continuing can be a tooltip
---
 src/modules/license/LicensePage.cpp | 10 +++++-----
 src/modules/license/LicensePage.ui  | 20 ++------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index 8f6f700ca..526820920 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -110,8 +110,6 @@ LicensePage::LicensePage( QWidget* parent )
     ui->mainText->setWordWrap( true );
     ui->mainText->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
 
-    ui->additionalText->setWordWrap( true );
-
     ui->acceptFrame->setFrameStyle( QFrame::NoFrame | QFrame::Plain );
     ui->acceptFrame->setStyleSheet( mustAccept );
     ui->acceptFrame->layout()->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
@@ -157,7 +155,8 @@ LicensePage::retranslate()
         ui->mainText->setText( 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." ) );
+        QString mustAcceptText( tr( "If you do not agree with the terms, the setup procedure cannot continue." ) );
+        ui->acceptCheckBox->setToolTip( mustAcceptText );
     }
     else
     {
@@ -166,8 +165,9 @@ LicensePage::retranslate()
                                    "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." ) );
+        QString okAcceptText( tr( "If you do not agree with the terms, proprietary software will not "
+                                  "be installed, and open source alternatives will be used instead." ) );
+        ui->acceptCheckBox->setToolTip( okAcceptText );
     }
     ui->retranslateUi( this );
 
diff --git a/src/modules/license/LicensePage.ui b/src/modules/license/LicensePage.ui
index a81fae2b8..b5936d5de 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,0">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0">
      <item>
       <widget class="QLabel" name="titleLabel">
        <property name="text">
@@ -87,7 +87,7 @@
           <x>0</x>
           <y>0</y>
           <width>765</width>
-          <height>81</height>
+          <height>89</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="licenseEntriesLayout"/>
@@ -107,22 +107,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QLabel" name="additionalText">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string notr="true"/>
-       </property>
-       <property name="text">
-        <string notr="true">&lt;additionalText&gt;</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <property name="spacing">