diff options
author | p.kuiper <p.kuiper@ultimaker.com> | 2022-05-30 08:59:50 +0300 |
---|---|---|
committer | p.kuiper <p.kuiper@ultimaker.com> | 2022-05-30 08:59:50 +0300 |
commit | 0db75501a312dc9561eabfde26fbecef5f137c5a (patch) | |
tree | 53a934ec39348aabd7b5002739092c9b089a333d /resources/qml/WelcomePages/AddCloudPrintersView.qml | |
parent | 9fdeffd564aab5f896bd6405176b7a8491c69303 (diff) | |
parent | 596c24657d39804c8bc94e6e8f99436115d7e411 (diff) |
Merge remote-tracking branch 'origin/main' into PP-3_improved_experimental_bridge_settings
# Conflicts:
# resources/definitions/ultimaker.def.json
Diffstat (limited to 'resources/qml/WelcomePages/AddCloudPrintersView.qml')
-rw-r--r-- | resources/qml/WelcomePages/AddCloudPrintersView.qml | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/resources/qml/WelcomePages/AddCloudPrintersView.qml b/resources/qml/WelcomePages/AddCloudPrintersView.qml index 0b94d21fae..3f2d3dbab2 100644 --- a/resources/qml/WelcomePages/AddCloudPrintersView.qml +++ b/resources/qml/WelcomePages/AddCloudPrintersView.qml @@ -38,7 +38,7 @@ Item bottomMargin: UM.Theme.getSize("default_margin").height } - Label + UM.Label { id: titleLabel anchors.top: parent.top @@ -47,7 +47,6 @@ Item text: catalog.i18nc("@label", "Add a Cloud printer") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") - renderType: Text.NativeRendering } // Component that contains a busy indicator and a message, while it waits for Cura to discover a cloud printer @@ -65,7 +64,7 @@ Item running: searchingForCloudPrinters palette.dark: UM.Theme.getColor("text") } - Label + UM.Label { id: waitingLabel anchors.top: waitingIndicator.bottom @@ -73,10 +72,8 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Waiting for Cloud response") font: UM.Theme.getFont("large") - renderType: Text.NativeRendering - color: UM.Theme.getColor("text") } - Label + UM.Label { id: noPrintersFoundLabel anchors.top: waitingLabel.bottom @@ -85,9 +82,8 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "No printers found in your account?") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") } - Label + UM.Label { text: "Sign in with a different account" anchors.top: noPrintersFoundLabel.bottom @@ -112,7 +108,7 @@ Item } // Label displayed when a new cloud printer is discovered - Label + UM.Label { anchors.top: titleLabel.bottom anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height @@ -121,7 +117,6 @@ Item text: catalog.i18nc("@label", "The following printers in your account have been added in Cura:") height: contentHeight + 2 * UM.Theme.getSize("default_margin").height visible: discoveredCloudPrintersModel.count > 0 - color: UM.Theme.getColor("text") } // The scrollView that contains the list of newly discovered Ultimaker Cloud printers. Visible only when @@ -153,32 +148,29 @@ Item Column { id: contentColumn - Label + UM.Label { id: cloudPrinterNameLabel leftPadding: UM.Theme.getSize("default_margin").width text: model.name ? model.name : "" font: UM.Theme.getFont("large_bold") - color: UM.Theme.getColor("text") elide: Text.ElideRight } - Label + UM.Label { id: cloudPrinterTypeLabel leftPadding: 2 * UM.Theme.getSize("default_margin").width topPadding: UM.Theme.getSize("thin_margin").height - text: {"Type: " + model.machine_type} + text: "Type: " + model.machine_type font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } - Label + UM.Label { id: cloudPrinterFirmwareVersionLabel leftPadding: 2 * UM.Theme.getSize("default_margin").width - text: {"Firmware version: " + model.firmware_version} + text: "Firmware version: " + model.firmware_version font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } |