3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add two labels instead of one

Browse source 
Change the link to adhere to the color scheme

Contributes to CURA-6434.
This commit is contained in:
Diego Prado Gesto 2019-04-29 13:45:55 +02:00
parent 25bbc1e66e
commit 9d48a90f8f
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -48,6 +48,19 @@ Item
spacing: UM.Theme.getSize("wide_margin").height spacing: UM.Theme.getSize("wide_margin").height
Label
{
id: topLabel
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience. For instance:")
wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Image Image
{ {
id: curaImage id: curaImage
@ -57,31 +70,24 @@ Item
Label Label
{ {
id: textLabel id: bottomLabel
width: parent.width width: parent.width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: text:
{ {
var t = catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience.") var t = catalog.i18nc("@text", "Ultimaker Cura will not collect any information on the model.")
var t2 = catalog.i18nc("@text", "More information") var t2 = catalog.i18nc("@text", "More information")
t += " <span style=\"color: rgb(0,0,255)\">" + t2 + "</span>" t += " <a href='https://notusedref'>" + t2 + "</a>"
return t return t
} }
textFormat: Text.RichText textFormat: Text.RichText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
renderType: Text.NativeRendering renderType: Text.NativeRendering
MouseArea
{
anchors.fill: parent
onClicked:
{
CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
}
}
} }
} }
} }

2
resources/qml/WelcomePages/WelcomeContent.qml
View file

@ -19,7 +19,7 @@ Item
{ {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
spacing: UM.Theme.getSize("wide_margin").height spacing: 2 * UM.Theme.getSize("wide_margin").height
Label Label
{ {