3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 05:41:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs

Browse source 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
This commit is contained in:
casper 2022-02-11 10:44:52 +01:00
commit 1c711129e2
9 changed files with 132 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,8 @@ Row // Sync state icon + message
font: UM.Theme.getFont("medium")
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.rightMargin: UM.Theme.getSize("default_margin").width
wrapMode: Text.NoWrap
height: contentHeight
visible: !Cura.API.account.manualSyncEnabled && !Cura.API.account.updatePackagesEnabled
}
@ -94,6 +96,7 @@ Row // Sync state icon + message
color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("medium")
height: contentHeight
wrapMode: Text.NoWrap
width: contentWidth + UM.Theme.getSize("default_margin").height
visible: Cura.API.account.updatePackagesEnabled
@ -113,6 +116,7 @@ Row // Sync state icon + message
text: catalog.i18nc("@button", "Check for account updates")
color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("medium")
wrapMode: Text.NoWrap
height: contentHeight
width: contentWidth + UM.Theme.getSize("default_margin").height
visible: Cura.API.account.manualSyncEnabled