3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'CURA-7473_account_pending_update_button' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-29 15:11:42 +02:00
commit 22de878e5c
No known key found for this signature in database
GPG key ID: 3710727397403C91
4 changed files with 128 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resources/qml/Account/SyncState.qml
View file

@ -49,7 +49,7 @@ Row // Sync state icon + message
width: 20 * screenScaleFactor
height: width
source: Cura.API.account.manualSyncEnabled ? UM.Theme.getIcon("update") : UM.Theme.getIcon("checked")
// source is determined by State
color: UM.Theme.getColor("account_sync_state_icon")
RotationAnimator
@ -80,14 +80,36 @@ Row // Sync state icon + message
Label
{
id: stateLabel
text: catalog.i18nc("@state", catalog.i18nc("@label", "Account synced"))
// text is determined by State
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
width: contentWidth + UM.Theme.getSize("default_margin").height
height: contentHeight
verticalAlignment: Text.AlignVCenter
visible: !Cura.API.account.manualSyncEnabled
visible: !Cura.API.account.manualSyncEnabled && !Cura.API.account.updatePackagesEnabled
}
Label
{
id: updatePackagesButton
text: catalog.i18nc("@button", "Install pending updates")
color: UM.Theme.getColor("secondary_button_text")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
height: contentHeight
width: contentWidth + UM.Theme.getSize("default_margin").height
visible: Cura.API.account.updatePackagesEnabled
MouseArea
{
anchors.fill: parent
onClicked: Cura.API.account.onUpdatePackagesClicked()
hoverEnabled: true
onEntered: updatePackagesButton.font.underline = true
onExited: updatePackagesButton.font.underline = false
}
}
Label