From 6caa0360b9783e50b7ab6ace006cde6cde6cb4e0 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 13 May 2020 16:35:39 +0200 Subject: [PATCH] Change SyncRow copy CURA-7290 --- resources/qml/Account/SyncState.qml | 4 ++-- resources/qml/Account/UserOperations.qml | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/qml/Account/SyncState.qml b/resources/qml/Account/SyncState.qml index 4457ece465..3f96ddad1f 100644 --- a/resources/qml/Account/SyncState.qml +++ b/resources/qml/Account/SyncState.qml @@ -50,7 +50,7 @@ Row // sync state icon + message Label { id: stateLabel - text: catalog.i18nc("@state", "Checking...") + text: catalog.i18nc("@state", catalog.i18nc("@label", "You are in sync with your account")) color: UM.Theme.getColor("text") font: UM.Theme.getFont("medium") renderType: Text.NativeRendering @@ -83,7 +83,7 @@ Row // sync state icon + message stateLabel.text = catalog.i18nc("@label", "Checking...") } else if (newState == Cura.AccountSyncState.SUCCESS) { icon.source = UM.Theme.getIcon("checked") - stateLabel.text = catalog.i18nc("@label", "You are up to date") + stateLabel.text = catalog.i18nc("@label", "You are in sync with your account") } else if (newState == Cura.AccountSyncState.ERROR) { icon.source = UM.Theme.getIcon("warning_light") stateLabel.text = catalog.i18nc("@label", "Something went wrong...") diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index c8e3b81d08..7578f34623 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -9,7 +9,10 @@ import Cura 1.1 as Cura Column { - width: Math.max(title.width, accountButton.width) + 2 * UM.Theme.getSize("default_margin").width + width: Match.max( + Math.max(title.width, accountButton.width) + 2 * UM.Theme.getSize("default_margin").width, + syncRow.width + ) spacing: UM.Theme.getSize("default_margin").height @@ -29,7 +32,9 @@ Column color: UM.Theme.getColor("text") } - SyncState {} + SyncState { + id: syncRow + } Label {