GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 18:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change SyncRow copy

Browse Source 
CURA-7290
This commit is contained in:
Nino van Hooff 2020-05-13 16:35:39 +02:00
parent de0ef8ae62
commit 6caa0360b9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/Account/SyncState.qml
View File

@ -50,7 +50,7 @@ Row // sync state icon + message
Label Label
{ {
id: stateLabel 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") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -83,7 +83,7 @@ Row // sync state icon + message
stateLabel.text = catalog.i18nc("@label", "Checking...") stateLabel.text = catalog.i18nc("@label", "Checking...")
} else if (newState == Cura.AccountSyncState.SUCCESS) { } else if (newState == Cura.AccountSyncState.SUCCESS) {
icon.source = UM.Theme.getIcon("checked") 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) { } else if (newState == Cura.AccountSyncState.ERROR) {
icon.source = UM.Theme.getIcon("warning_light") icon.source = UM.Theme.getIcon("warning_light")
stateLabel.text = catalog.i18nc("@label", "Something went wrong...") stateLabel.text = catalog.i18nc("@label", "Something went wrong...")

9
resources/qml/Account/UserOperations.qml
View File

@ -9,7 +9,10 @@ import Cura 1.1 as Cura
Column 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 spacing: UM.Theme.getSize("default_margin").height
@ -29,7 +32,9 @@ Column
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }
SyncState {} SyncState {
id: syncRow
}
Label Label
{ {