3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'CURA-8112_Inform_the_user_about_their_subscription_limits'

Browse source
This commit is contained in:
Ghostkeeper 2021-07-16 10:04:43 +02:00
commit cc82ff97a7
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
6 changed files with 82 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/ActionButton.qml
View file

@ -18,6 +18,7 @@ Button
property alias textFont: buttonText.font
property alias cornerRadius: backgroundRect.radius
property alias tooltip: tooltip.tooltipText
property alias tooltipWidth: tooltip.width
property color color: UM.Theme.getColor("primary")
property color hoverColor: UM.Theme.getColor("primary_hover")

10
resources/qml/Cura.qml
View file

@ -417,6 +417,7 @@ UM.MainWindow
Cura.PrimaryButton
{
text: model.name
iconSource: UM.Theme.getIcon(model.icon)
height: UM.Theme.getSize("message_action_button").height
}
}
@ -426,6 +427,7 @@ UM.MainWindow
Cura.SecondaryButton
{
text: model.name
iconSource: UM.Theme.getIcon(model.icon)
height: UM.Theme.getSize("message_action_button").height
}
}
@ -434,6 +436,14 @@ UM.MainWindow
Cura.TertiaryButton
{
text: model.name
iconSource:
{
if (model.icon == null || model.icon == "")
{
return UM.Theme.getIcon("LinkExternal")
}
return UM.Theme.getIcon(model.icon)
}
height: UM.Theme.getSize("message_action_button").height
}
}