3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1

Browse source
This commit is contained in:
Diego Prado Gesto 2019-05-01 15:51:12 +02:00
commit 5b06efdd19
26 changed files with 341 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,40 +48,69 @@ Item
spacing: UM.Theme.getSize("wide_margin").height
Image
Label
{
id: curaImage
id: topLabel
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
source: UM.Theme.getImage("first_run_share_data")
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:")
wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Grid {
columns: 2
spacing: UM.Theme.getSize("wide_margin").height
anchors.horizontalCenter: parent.horizontalCenter
ImageTile
{
text: catalog.i18nc("@text", "Machine types")
imageSource: UM.Theme.getImage("first_run_machine_types")
}
ImageTile
{
text: catalog.i18nc("@text", "Material usage")
imageSource: UM.Theme.getImage("first_run_material_usage")
}
ImageTile
{
text: catalog.i18nc("@text", "Number of slices")
imageSource: UM.Theme.getImage("first_run_number_slices")
}
ImageTile
{
text: catalog.i18nc("@text", "Print settings")
imageSource: UM.Theme.getImage("first_run_print_settings")
}
}
Label
{
id: textLabel
id: bottomLabel
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text:
{
var t = catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience.")
var t = catalog.i18nc("@text", "The data that Ultimaker Cura collects will not contain any information about your model.")
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
}
textFormat: Text.RichText
wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
renderType: Text.NativeRendering
MouseArea
{
anchors.fill: parent
onClicked:
{
CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
}
}
}
}
}

39
resources/qml/WelcomePages/ImageTile.qml Normal file
View file

@ -0,0 +1,39 @@
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3
import UM 1.3 as UM
//
// This component places a text on top of an image.
//
Column
{
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height
property alias text: label.text
property alias imageSource: image.source
Label
{
id: label
width: image.width
anchors.horizontalCenter: image.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: ""
wrapMode: Text.WordWrap
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Image
{
id: image
source: ""
}
}

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

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