3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"

Browse source 
This reverts commit 6120d8a054, reversing
changes made to 95652556fe.
This commit is contained in:
Jaime van Kessel 2021-05-27 16:06:20 +02:00
parent 38ce22ba7c
commit 70e4e9640e
No known key found for this signature in database
GPG key ID: 3710727397403C91
283 changed files with 1518 additions and 945 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/ExtruderIcon.qml
View file

@ -22,7 +22,7 @@ Item
id: mainIcon
anchors.fill: parent
source: UM.Theme.getIcon("Extruder", "medium")
source: UM.Theme.getIcon("extruder_button")
color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
}
@ -32,14 +32,15 @@ Item
width: height
height: Math.round(parent.height / 2)
radius: Math.round(width)
radius: Math.round(width / 2)
color: UM.Theme.getColor("toolbar_background")
anchors
{
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: (parent.height - height) / 2
// The circle needs to be slightly off center (so it sits in the middle of the square bit of the icon)
topMargin: (parent.height - height) / 2 - 0.1 * parent.height
}
Label
@ -63,9 +64,9 @@ Item
anchors.fill: parent
anchors.margins: UM.Theme.getSize("thick_lining").width
sourceSize.height: width
source: UM.Theme.getIcon("Cancel")
source: UM.Theme.getIcon("cross1")
visible: !extruderEnabled
color: UM.Theme.getColor("text")
}
}
}
}