Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2017-01-27 09:33:13 +01:00
commit 48e5a2237d
31 changed files with 182 additions and 90 deletions

View file

@ -156,11 +156,10 @@ UM.Dialog
anchors.verticalCenter: parent.verticalCenter
}
Rectangle {
Item {
width: 180
height: 20
Layout.fillWidth:true
color: "transparent"
Layout.fillWidth: true
Slider {
id: smoothing

View file

@ -41,8 +41,9 @@ Item
width: valueLabel.width + UM.Theme.getSize("default_margin").width
Behavior on height { NumberAnimation { duration: 50; } }
border.width: UM.Theme.getSize("default_lining").width;
border.color: UM.Theme.getColor("slider_groove_border");
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("slider_groove_border")
color: UM.Theme.getColor("tool_panel_background")
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false