GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-03 11:25:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2020-04-29 13:51:35 +02:00
commit 481da09975
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View File

@ -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:

4
resources/qml/WelcomePages/CloudContent.qml
View File

@ -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)