3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-17 18:02:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '4.9' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2021-04-12 13:50:13 +02:00
commit 69df31629b
No known key found for this signature in database
GPG key ID: 3710727397403C91
5 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Cura.qml
View file

@ -863,6 +863,8 @@ UM.MainWindow
{
id: whatsNewDialog
title: catalog.i18nc("@title:window", "What's New")
minimumWidth: UM.Theme.getSize("welcome_wizard_window").width
minimumHeight: UM.Theme.getSize("welcome_wizard_window").height
model: CuraApplication.getWhatsNewPagesModel()
progressBarVisible: false
visible: false

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

@ -44,7 +44,7 @@ Item
textArea.textFormat: Text.RichText
textArea.wrapMode: Text.WordWrap
textArea.readOnly: true
textArea.font: UM.Theme.getFont("medium")
textArea.font: UM.Theme.getFont("default")
textArea.onLinkActivated: Qt.openUrlExternally(link)
}

46
resources/qml/WelcomePages/WhatsNewContent.qml
View file

@ -31,23 +31,16 @@ Item
renderType: Text.NativeRendering
}
Item
{
id: topSpacer
anchors.top: titleLabel.bottom
height: UM.Theme.getSize("default_margin").height
width: UM.Theme.getSize("default_margin").width
}
Rectangle
{
anchors
{
top: topSpacer.bottom
top: titleLabel.bottom
topMargin: UM.Theme.getSize("default_margin").width
bottom: whatsNewDots.top
bottomMargin: UM.Theme.getSize("narrow_margin").width
left: parent.left
right: parent.right
margins: UM.Theme.getSize("default_margin").width * 2
}
color: UM.Theme.getColor("viewport_overlay")
@ -59,7 +52,6 @@ Item
anchors
{
top: parent.top
topMargin: UM.Theme.getSize("default_margin").width
horizontalCenter: parent.horizontalCenter
}
height: parent.height
@ -69,12 +61,6 @@ Item
Repeater
{
anchors
{
top: parent.top
topMargin: UM.Theme.getSize("default_margin").width / 2
horizontalCenter: parent.horizontalCenter
}
model: manager.subpageCount
@ -82,6 +68,8 @@ Item
{
Layout.alignment: Qt.AlignHCenter
color: UM.Theme.getColor("viewport_overlay")
width: whatsNewViewport.width
height: whatsNewViewport.height
Image
{
@ -89,12 +77,15 @@ Item
anchors
{
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: UM.Theme.getSize("default_margin").width
topMargin: UM.Theme.getSize("thick_margin").width
left: parent.left
leftMargin: UM.Theme.getSize("thick_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("thick_margin").width
}
width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2))
height: Math.round((parent.height - UM.Theme.getSize("default_margin").height) * 0.75)
width: sourceSize.width
sourceSize.width: Math.round(parent.width - (UM.Theme.getSize("thick_margin").height * 2))
fillMode: Image.PreserveAspectFit
source: manager.getSubpageImageSource(index)
@ -107,10 +98,12 @@ Item
anchors
{
top: subpageImage.bottom
topMargin: UM.Theme.getSize("default_margin").height
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
bottomMargin: UM.Theme.getSize("thick_margin").height
left: subpageImage.left
right: subpageImage.right
}
width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2))
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
@ -121,8 +114,10 @@ Item
textArea.text: manager.getSubpageText(index)
textArea.textFormat: Text.RichText
textArea.readOnly: true
textArea.font: UM.Theme.getFont("medium")
textArea.font: UM.Theme.getFont("default")
textArea.onLinkActivated: Qt.openUrlExternally(link)
textArea.leftPadding: 0
textArea.rightPadding: 0
}
}
}
@ -139,7 +134,8 @@ Item
anchors
{
bottom: bottomSpacer.top
bottom: whatsNewNextButton.top
bottomMargin: UM.Theme.getSize("narrow_margin").height
horizontalCenter: parent.horizontalCenter
}

3
resources/qml/WelcomePages/WizardPanel.qml
View file

@ -53,7 +53,7 @@ Item
anchors.left: parent.left
anchors.right: parent.right
height: UM.Theme.getSize("progressbar").height
height: visible ? UM.Theme.getSize("progressbar").height : 0
value: base.progressValue
}
@ -64,7 +64,6 @@ Item
anchors
{
margins: UM.Theme.getSize("wide_margin").width
bottomMargin: UM.Theme.getSize("default_margin").width
top: progressBar.bottom
bottom: parent.bottom
left: parent.left

2
resources/texts/whats_new/1.html
View file

@ -1,3 +1,3 @@
<h4>Better visual representation</h4>
<p>The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product. </br>
<p>The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product. <br>
<i>Thanks to BasF0 for contributing to this feature.</i> </p>