Fix rendering pre-heat button text twice

It was rendered by the button and again by the style for the button. I'm just using the style since it has the proper styling. Thanks, fieldOfView.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-10 09:38:38 +01:00
parent 0c9b9a3033
commit 45c045131b
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75

View file

@ -328,7 +328,6 @@ Column
Button //The pre-heat button.
{
id: preheatButton
text: preheatCountdownTimer.running ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat")
tooltip: catalog.i18nc("@tooltip of pre-heat", "Heat the bed in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the bed to heat up when you're ready to print.")
height: UM.Theme.getSize("setting_control").height
enabled:
@ -438,7 +437,7 @@ Column
}
}
font: UM.Theme.getFont("action_button")
text: control.text;
text: preheatCountdownTimer.running ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat")
}
}
}