Add new pages in add-printer flow

Pages added - Page to select Ultimaker or third party printer - Page with information how to add Ultimaker printer(s) contributes to CURA-8689
2025-08-05 13:03:59 -06:00 · 2022-11-01 16:11:34 +01:00 · 2022-11-01 16:11:34 +01:00 · 5cb67ab8c4
commit 5cb67ab8c4
parent 24c12fd3eb
7 changed files with 343 additions and 20 deletions
--- a/resources/qml/WelcomePages/AddUltimakerPrinter.qml
+++ b/resources/qml/WelcomePages/AddUltimakerPrinter.qml
@ -0,0 +1,122 @@
+// Copyright (c) 2022 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+
+import UM 1.5 as UM
+import Cura 1.1 as Cura
+
+Control
+{
+    UM.I18nCatalog { id: catalog; name: "cura" }
+
+    property var goToThirdPartyPrinter
+
+    signal cloudPrintersDetected(bool newCloudPrintersDetected)
+    Component.onCompleted: CuraApplication.getDiscoveredCloudPrintersModel().cloudPrintersDetectedChanged.connect(cloudPrintersDetected)
+    onCloudPrintersDetected: function(newCloudPrintersDetected)
+    {
+        if(newCloudPrintersDetected)
+        {
+            base.goToPage("add_cloud_printers")
+        }
+        else
+        {
+            goToThirdPartyPrinter()
+        }
+    }
+
+    contentItem: ColumnLayout
+    {
+        UM.Label
+        {
+            text: catalog.i18nc("@label", "New Ultimaker printers can be connected to Digital Factory and monitored remotely.")
+        }
+
+        RowLayout
+        {
+            Layout.fillWidth: true
+
+            Image
+            {
+                source: UM.Theme.getImage("add_printer")
+                Layout.preferredWidth: 200
+                Layout.preferredHeight: 200
+            }
+
+            ColumnLayout
+            {
+                Layout.fillHeight: true
+                Layout.alignment: Qt.AlignVCenter
+                spacing: UM.Theme.getSize("default_margin").height
+
+                UM.Label
+                {
+                    Layout.fillWidth: true
+                    Layout.alignment: Qt.AlignTop
+                    wrapMode: Text.WordWrap
+                    font: UM.Theme.getFont("default_bold")
+                    text: catalog.i18nc("@label", "New Ultimaker printers can be connected to Digital Factory and monitored remotely.")
+                }
+
+                UM.Label
+                {
+                    Layout.fillWidth: true
+                    Layout.alignment: Qt.AlignTop
+                    wrapMode: Text.WordWrap
+                    text: {
+                        const steps = [
+                            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 `<ol>${steps.map(step => `<li>${step}</il>`).join('')}</ol>`;
+                    }
+                }
+
+                Cura.TertiaryButton
+                {
+                    Layout.fillWidth: true
+                    Layout.alignment: Qt.AlignTop
+                    text: catalog.i18nc("@button", "Learn more about adding printers to Digital Factory")
+                    iconSource: UM.Theme.getIcon("LinkExternal")
+                    isIconOnRightSide: true
+                    textFont: UM.Theme.getFont("small")
+                    onClicked: Qt.openUrlExternally("") // TODO: Update url
+                }
+            }
+        }
+
+        Control
+        {
+            Layout.alignment: Qt.AlignBottom
+            Layout.fillWidth: true
+
+            contentItem: RowLayout
+            {
+
+                Cura.SecondaryButton
+                {
+                    Layout.alignment: Qt.AlignLeft
+                    text: catalog.i18nc("@button", "Add local printer")
+                    onClicked: goToThirdPartyPrinter()
+                }
+
+                Cura.PrimaryButton
+                {
+                    Layout.alignment: Qt.AlignRight
+                    text: catalog.i18nc("@button", "Sign in to Digital Factory")
+                    onClicked: function()
+                    {
+                        text = catalog.i18nc("@button", "Waiting for new printers")
+                        busy = true;
+                        enabled = false;
+                        Cura.API.account.login();
+                    }
+                }
+            }
+        }
+    }
+}