diff --git a/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml b/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml
index 0e88e0373f..c76979fecf 100644
--- a/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml
+++ b/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml
@@ -50,6 +50,7 @@ Control
PrinterCard
{
id: ultimakerPrinterCard
+ Layout.alignment: Qt.AlignBottom
onClicked: goToUltimakerPrinter
text: catalog.i18nc("@button", "Ultimaker printer")
imageSource: UM.Theme.getImage("ultimaker_printer")
@@ -58,6 +59,7 @@ Control
PrinterCard
{
id: thrirdPartyPrinterCard
+ Layout.alignment: Qt.AlignBottom
onClicked: goToThirdPartyPrinter
text: catalog.i18nc("@button", "Non Ultimaker printer")
imageSource: UM.Theme.getImage("third_party_printer")
diff --git a/resources/qml/WelcomePages/AddUltimakerPrinter.qml b/resources/qml/WelcomePages/AddUltimakerPrinter.qml
index a2b08a45b6..f175942e06 100644
--- a/resources/qml/WelcomePages/AddUltimakerPrinter.qml
+++ b/resources/qml/WelcomePages/AddUltimakerPrinter.qml
@@ -22,10 +22,6 @@ Control
{
base.goToPage("add_cloud_printers")
}
- else
- {
- goToThirdPartyPrinter()
- }
}
contentItem: ColumnLayout
@@ -39,7 +35,7 @@ Control
RowLayout
{
- Layout.fillWidth: true
+ Layout.alignment: Qt.AlignHCenter
Image
{
@@ -51,30 +47,42 @@ Control
ColumnLayout
{
Layout.fillHeight: true
+ Layout.fillWidth: false
Layout.alignment: Qt.AlignVCenter
spacing: UM.Theme.getSize("default_margin").height
UM.Label
{
- Layout.fillWidth: true
+ Layout.fillWidth: false
Layout.alignment: Qt.AlignTop
wrapMode: Text.WordWrap
font: UM.Theme.getFont("default_bold")
text: catalog.i18nc("@label", "If you are trying to add a new Ultimaker printer to Cura")
}
- UM.Label
+ ColumnLayout
{
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignTop
- wrapMode: Text.WordWrap
- text: {
- const steps = [
+ spacing: 0
+
+ FontMetrics
+ {
+ id: fontMetrics
+ font: UM.Theme.getFont("default")
+ }
+
+ Repeater {
+ model: [
catalog.i18nc("@info", "Sign in into Ultimaker Digilal Factory"),
catalog.i18nc("@info", "Follow the procedure to add a new printer"),
catalog.i18nc("@info", "Your new printer will automatically appear in Cura"),
- ];
- return steps.join("
");
+ ]
+ UM.Label
+ {
+ Layout.alignment: Qt.AlignTop
+ font: fontMetrics.font
+ Layout.preferredHeight: fontMetrics.height
+ text: `${index + 1}. ${modelData}`
+ }
}
}
@@ -83,6 +91,7 @@ Control
id: learnMoreButton
Layout.fillWidth: true
Layout.alignment: Qt.AlignTop
+ leftPadding: 0
text: catalog.i18nc("@button", "Learn more")
iconSource: UM.Theme.getIcon("LinkExternal")
isIconOnRightSide: true
@@ -115,6 +124,7 @@ Control
text: catalog.i18nc("@button", "Sign in to Digital Factory")
onClicked: function()
{
+ Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/printers?add_printer=true&utm_source=cura&utm_medium=software&utm_campaign=onboarding-add-printer")
text = catalog.i18nc("@button", "Waiting for new printers")
busy = true;
enabled = false;
diff --git a/resources/qml/WelcomePages/PrinterCard.qml b/resources/qml/WelcomePages/PrinterCard.qml
index 6b0a5bb526..8d0cc0dd06 100644
--- a/resources/qml/WelcomePages/PrinterCard.qml
+++ b/resources/qml/WelcomePages/PrinterCard.qml
@@ -42,7 +42,6 @@ Control
onClicked: root.onClicked && root.onClicked()
}
- topPadding: UM.Theme.getSize("wide_margin").height
rightPadding: UM.Theme.getSize("wide_margin").width
bottomPadding: UM.Theme.getSize("wide_margin").height
leftPadding: UM.Theme.getSize("wide_margin").width
@@ -50,7 +49,7 @@ Control
background: Rectangle
{
id: background
- anchors.fill: parent
+ height: parent.height
border.color: UM.Theme.getColor("primary_button")
color: "transparent"
border.width: 1
@@ -59,6 +58,7 @@ Control
contentItem: ColumnLayout
{
+ id: column
spacing: UM.Theme.getSize("wide_margin").height
height: childrenRect.height
width: childrenRect.width
@@ -68,7 +68,6 @@ Control
id: image
source: imageSource
width: 180 * screenScaleFactor
- height: 180 * screenScaleFactor
sourceSize.width: width
sourceSize.height: height
}
diff --git a/resources/themes/cura-light/images/third_party_printer.svg b/resources/themes/cura-light/images/third_party_printer.svg
index d2444d2d28..14e73c2d9e 100644
--- a/resources/themes/cura-light/images/third_party_printer.svg
+++ b/resources/themes/cura-light/images/third_party_printer.svg
@@ -1,2 +1,60 @@
-
+
diff --git a/resources/themes/cura-light/images/ultimaker_printer.svg b/resources/themes/cura-light/images/ultimaker_printer.svg
index f2184d4bd1..e65682fe53 100644
--- a/resources/themes/cura-light/images/ultimaker_printer.svg
+++ b/resources/themes/cura-light/images/ultimaker_printer.svg
@@ -1 +1,35 @@
-
+