diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index a7701cf059..294a2474d6 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -113,14 +113,14 @@ UM.Dialog TableViewColumn { role: "original_value" - title: catalog.i18nc("@title:column", "Default") + title: Cura.MachineManager.activeQualityDisplayNameMap["main"] width: (tableView.width * 0.3) | 0 delegate: defaultDelegate } TableViewColumn { role: "user_value" - title: catalog.i18nc("@title:column", "Customized") + title: catalog.i18nc("@title:column", "Current changes") width: (tableView.width * 0.3) | 0 } section.property: "category" @@ -192,7 +192,7 @@ UM.Dialog Button { id: discardButton - text: catalog.i18nc("@action:button", "Discard"); + text: catalog.i18nc("@action:button", "Discard changes"); anchors.right: parent.right onClicked: { @@ -205,7 +205,7 @@ UM.Dialog Button { id: keepButton - text: catalog.i18nc("@action:button", "Keep"); + text: catalog.i18nc("@action:button", "Keep changes"); anchors.right: discardButton.left anchors.rightMargin: UM.Theme.getSize("default_margin").width onClicked: diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index a14c6600cd..36a7b9a923 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -16,8 +16,10 @@ Item UM.I18nCatalog { id: catalog; name: "cura" } property bool newCloudPrintersDetected: Cura.API.account.newCloudPrintersDetected + signal cloudPrintersDetected(bool newCloudPrintersDetected) - onNewCloudPrintersDetectedChanged: + Component.onCompleted: Cura.API.account.cloudPrintersDetectedChanged.connect(cloudPrintersDetected) + onCloudPrintersDetected: { // When the user signs in successfully, it will be checked whether he/she has cloud printers connected to // the account. If he/she does, then the welcome wizard can close. If not, then proceed to the next page (if any)