Merge branch 'master' into feature_slider_for_quality

This commit is contained in:
ChrisTerBeke 2017-09-14 10:34:34 +02:00 committed by GitHub
commit e7ad4b7f17
6 changed files with 101 additions and 24 deletions

View file

@ -35,6 +35,7 @@ Item
{
width: childrenRect.width
height: childrenRect.height
color: UM.Theme.getColor("sidebar")
//
// Quality profile
@ -854,7 +855,7 @@ Item
anchors.top: parent.top
wrapMode: Text.WordWrap
//: Tips label
text: catalog.i18nc("@label", "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>").arg("https://ultimaker.com/en/troubleshooting") + "<img src='%1'></img>".arg(UM.Theme.getIcon("play"))
text: catalog.i18nc("@label", "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>").arg("https://ultimaker.com/en/troubleshooting")
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
linkColor: UM.Theme.getColor("text_link")