Fix reset to formula button and use new icon

CURA-5407
This commit is contained in:
Lipu Fei 2018-06-13 12:25:52 +02:00
parent 3a00ddb01d
commit cf0efea4c3
2 changed files with 55 additions and 2 deletions

View File

@ -264,7 +264,7 @@ Item {
{
// Another special case. The setting that is overriden is only 1 instance container deeper,
// so we can remove it.
propertyProvider.removeFromContainer(0)
propertyProvider.removeFromContainer(last_entry - 1)
}
else
{
@ -281,7 +281,7 @@ Item {
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("notice");
iconSource: UM.Theme.getIcon("formula");
onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) }
onExited: base.showTooltip(base.tooltipText);

View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="15"
height="15"
viewBox="0 0 15 15"
version="1.1"
id="svg3763"
sodipodi:docname="formula.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata3769">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3767" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1176"
id="namedview3765"
showgrid="false"
inkscape:zoom="40.8"
inkscape:cx="7.5"
inkscape:cy="7.9433209"
inkscape:window-x="1920"
inkscape:window-y="360"
inkscape:window-maximized="1"
inkscape:current-layer="svg3763" />
<path
d="M 7.5371094 0.037109375 A 7.5 7.5 0 0 0 0.037109375 7.5371094 A 7.5 7.5 0 0 0 7.5371094 15.037109 A 7.5 7.5 0 0 0 15.037109 7.5371094 A 7.5 7.5 0 0 0 7.5371094 0.037109375 z M 7.8867188 1.9335938 L 9.0195312 1.9335938 L 8.8105469 2.9375 L 7.6660156 2.9375 C 7.2319879 2.9375 6.9144965 3.0236545 6.7148438 3.1972656 C 6.515191 3.3708767 6.3719618 3.6833767 6.2851562 4.1347656 L 6.1542969 4.7734375 L 8.1347656 4.7734375 L 7.9511719 5.6972656 L 5.9726562 5.6972656 L 4.6972656 12.064453 L 3.4980469 12.064453 L 4.7753906 5.6972656 L 3.6289062 5.6972656 L 3.8105469 4.7734375 L 4.9570312 4.7734375 L 5.0605469 4.265625 C 5.2254774 3.4496528 5.5299479 2.8587239 5.9726562 2.4941406 C 6.4240451 2.1208767 7.062066 1.9335938 7.8867188 1.9335938 z M 7.1699219 8.3632812 L 8.0175781 8.3632812 L 8.8691406 9.921875 L 10.337891 8.3632812 L 11.185547 8.3632812 L 9.1777344 10.492188 L 10.392578 12.738281 L 9.5449219 12.738281 L 8.6152344 11.019531 L 6.9980469 12.738281 L 6.1503906 12.738281 L 8.3105469 10.449219 L 7.1699219 8.3632812 z "
id="path3773" />
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB