Skip to content

Commit

Permalink
Merge branch 'master' into python_type_hinting
Browse files Browse the repository at this point in the history
  • Loading branch information
sedwards2009 committed Feb 14, 2017
2 parents cb400f0 + 6d8df73 commit 2451921
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions resources/qml/PrintMonitor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Column
Label //Temperature indication.
{
text: (connectedPrinter != null && connectedPrinter.hotendTemperatures[index] != null) ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : ""
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("large")
anchors.right: parent.right
anchors.top: parent.top
Expand Down

0 comments on commit 2451921

Please sign in to comment.