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

[license] Move the 'please review' text to the top.

Browse Source
This commit is contained in:
Adriaan de Groot 2019-11-28 11:24:56 +01:00
parent 3e4fc281ab
commit 2a0716bf43
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,9 +157,7 @@ LicensePage::retranslate()
ui->mainText->setText( tr( "<h1>License Agreement</h1>" ui->mainText->setText( tr( "<h1>License Agreement</h1>"
"This setup procedure will install proprietary " "This setup procedure will install proprietary "
"software that is subject to licensing terms." ) ); "software that is subject to licensing terms." ) );
ui->additionalText->setText( tr( "Please review the End User License " ui->additionalText->setText( tr( "If you do not agree with the terms, the setup procedure cannot continue." ) );
"Agreements (EULAs) above.<br/>"
"If you do not agree with the terms, the setup procedure cannot continue." ) );
} }
else else
{ {
@ -168,9 +166,7 @@ LicensePage::retranslate()
"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." ) );
ui->additionalText->setText( tr( "Please review the End User License " ui->additionalText->setText( tr( "If you do not agree with the terms, proprietary software will not "
"Agreements (EULAs) above.<br/>"
"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." ) );
} }
ui->retranslateUi( this ); ui->retranslateUi( this );

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

@ -15,7 +15,7 @@
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <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> <item>
<widget class="QLabel" name="mainText"> <widget class="QLabel" name="mainText">
<property name="sizePolicy"> <property name="sizePolicy">
@ -32,6 +32,16 @@
</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">
@ -47,6 +57,12 @@
</item> </item>
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@ -65,7 +81,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>765</width> <width>765</width>
<height>94</height> <height>86</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="licenseEntriesLayout"/> <layout class="QVBoxLayout" name="licenseEntriesLayout"/>