GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-14 22:13:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor error after rebase

Browse Source
This commit is contained in:
Arjen Hiemstra 2016-02-15 08:39:38 +01:00 committed by Ghostkeeper
parent 19c25895bf
commit 4e139ae710
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/qml/SaveButton.qml
View File

@ -58,15 +58,9 @@ Rectangle {
Rectangle{ Rectangle{
width: Math.max(parent.width * base.progress) width: Math.max(parent.width * base.progress)
height: parent.height height: parent.height
<<<<<<< 041fa2b3592e015eebe779169c9d7f4565b3a788
color: UM.Theme.colors.progressbar_control
radius: UM.Theme.sizes.progressbar_radius.width
visible: base.backendState == 1 ? true : false
=======
color: UM.Theme.getColor("progressbar_control") color: UM.Theme.getColor("progressbar_control")
radius: UM.Theme.getSize("progressbar_radius").width radius: UM.Theme.getSize("progressbar_radius").width
visible: base.progress > 0.99 ? false : true visible: base.backendState == 1 ? true : false
>>>>>>> Replace Theme property accessors with getThing calls
} }
} }