Commit ae64fc1d authored by Bruno Coudoin's avatar Bruno Coudoin
Browse files

color_mix, improved plus and minus icons

parent 0348273c
......@@ -22,27 +22,22 @@ import QtQuick 2.0
import "../../core"
Rectangle {
Item {
id: button
height: parent.height / 4
width: height
z: 3
color: "#A8ffffff"
radius: width / 2
border.color: "#a82a2a2a"
property alias text: buttonText.text
property alias source: buttonImage.source
signal clicked
GCText {
id: buttonText
Image {
id: buttonImage
anchors.centerIn: parent
sourceSize.width: parent.width
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
fontSize: Math.max(parent.height * 0.8, 10)
color: "#2a2a2a"
}
MouseArea {
......
......@@ -102,7 +102,7 @@ Image {
}
ColorButton {
text: "+"
source: Activity.url + "plus.svg"
anchors {
verticalCenter: parent.verticalCenter
right: parent.right
......@@ -111,7 +111,7 @@ Image {
}
ColorButton {
text: "-"
source: Activity.url + "minus.svg"
anchors {
verticalCenter: parent.verticalCenter
left: parent.left
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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="40mm"
height="40mm"
viewBox="0 0 141.73228 141.73228"
id="svg4222"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="minus.svg">
<defs
id="defs4224" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.2"
inkscape:cx="52.096786"
inkscape:cy="66.085992"
inkscape:document-units="px"
inkscape:current-layer="g3854"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="3200"
inkscape:window-height="1679"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata4227">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-118.31488,-321.77036)">
<g
transform="translate(18.385046,-95.812957)"
id="g3854">
<path
inkscape:connector-curvature="0"
style="fill:#d87f7f;fill-opacity:1"
sodipodi:nodetypes="cccscsccscssc"
d="m 195.88054,508.16421 c 9.5927,0 19.187,0 28.782,-0.002 2.9548,0 6.1916,0.38541 8.7794,-1.361 3.9903,-2.6959 3.516,-7.1962 3.516,-11.364 0,-6.4428 2.8601,-21.5 -3.5189,-25.809 -5.5744,-3.7652 -17.14,-0.97931 -23.248,-2.1218 -2.3867,-0.44643 -11.98,0.34897 -17.56,-0.0932 l -40.364,0.8525 -25.671,0 c -6.7886,0 -18.644,-1.8739 -18.642,8.3283 0,7.8337 9.7e-4,15.668 9.7e-4,23.502 0,10.271 14.188,8.4454 20.845,8.4454 2.0014,0 23.707,-0.6339 23.707,-0.13452"
id="path3035" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssscccsccccssccccccssscsscccsccsccc"
d="m 125.08529,464.62857 c -3.7534,0 -8.66829,0.65356 -12.83929,1.79018 -2.0855,0.56831 -4.0754,1.582 -5.5,3.3125 -1.4246,1.7305 -2.2187,4.1213 -2.2187,7.1562 0,7.4589 -0.79992,15.466 -0.0469,23.188 -0.33033,2.71508 0.11161,7.08723 1.82813,8.62505 1.8633,1.6474 5.5216,1.205 8.0625,1.625 5.0818,0.84007 10.70343,1.49554 14.22743,1.49554 1.5049,0 6.43996,-0.004 11.51786,-0.0134 29.448,0.44545 54.16871,0.10218 83.28571,0.10218 3.123,0 7.0391,-0.88104 10.438,-3.17857 2.4825,-1.6778 3.688,-4.0393 4.1875,-6.4062 0.49949,-2.367 0.40625,-4.7843 0.40625,-7 0,-3.2548 1.5938,-8.8468 1.45536,-14.219 -0.13844,-5.372 -1.94196,-10.848 -6.04906,-13.625 -3.3932,-2.2975 -7.3099,-2.67406 -10.438,-2.67406 l -29.688,0.79916 c -25.105,-1.95633 -45.93939,-0.98054 -68.62879,-0.97758 z m 63.06214,5.03539 c 11.51449,3.00734 24.18926,0.31971 35.44157,0.75451 2.0467,0.0855 3.8563,0.24788 5.25,0.5 1.3937,0.25212 2.3589,0.66146 2.625,0.875 2.0046,1.61 2.04003,6.088 2.00893,11.062 -0.0311,4.9745 0.0536,10.19 0.0536,13.469 0,1.9614 0.0467,3.8584 -0.34375,5.3438 -0.39044,1.4854 -1.051,2.54 -2.75,3.375 -1.933,0.94928 -5.5415,0.5625 -8.5312,0.5625 -31.08278,0.7799 -65.38513,-2.41171 -93.1432,0.8195 -5.5229,0.32796 -9.637,0.004 -13.512,-0.9125 -1.9376,-0.45839 -3.4628,-1.1676 -4.4063,-2.0312 -0.94345,-0.86364 -1.4075,-1.8359 -1.4062,-3.4062 l 0,-23.188 c 0,-2.2005 0.59392,-3.4666 1.5312,-4.375 0.93733,-0.9084 2.3392,-1.496 4.0938,-1.8125 3.509,-0.63292 8.1232,-0.0937 11.625,-0.0937 23.89403,-0.25538 37.0567,-2.52543 61.46358,-0.94221 z"
id="path3031"
style="fill:#000000;fill-opacity:1" />
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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="40mm"
height="40mm"
viewBox="0 0 141.73228 141.73228"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="plus.svg">
<defs
id="defs4">
<radialGradient
r="105.16"
gradientTransform="matrix(0.96594,0,0,0.96594,106.15716,55.534461)"
cx="52.408001"
cy="36.195"
gradientUnits="userSpaceOnUse"
id="radialGradient3016">
<stop
offset="0"
stop-color="#d1f593"
id="stop8" />
<stop
offset="1"
stop-color="#81ce09"
id="stop10" />
</radialGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.2"
inkscape:cx="51.139735"
inkscape:cy="81.031223"
inkscape:document-units="px"
inkscape:current-layer="g3012"
showgrid="false"
inkscape:window-width="3200"
inkscape:window-height="1679"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-910.62992)">
<g
transform="translate(-327.42894,-413.63747)"
inkscape:label="Calque 1"
id="layer1-4">
<g
transform="translate(330.7567,1326.9016)"
id="g3012">
<path
d="m 87.342272,122.79985 0,-35.140003 c 0,-2.27 1.3069,-1.4315 3.4764,-1.4315 9.592698,0 19.186998,0 28.781998,-0.002 2.9548,0 6.1916,0.38541 8.7794,-1.361 3.9903,-2.6959 3.516,-7.1962 3.516,-11.364 0,-6.4428 2.8601,-21.5 -3.5189,-25.809 -5.5744,-3.765199 -17.838,-1.3629 -24.052,-1.3629 -2.8331,0 -16.979998,1.7329 -16.979998,-1.432499 0,-9.2971 0,-18.593 -0.002,-27.889 0,-7.6773004 -0.0222,-15.2310004 -9.9965,-15.2310004 l -13.741,0 c -3.3933,0 -8.0482,-0.7428 -11.286,0.62786 -7.458,3.1547 -4.8751,16.7360004 -4.8751,23.0350004 0,1.6537 0.26273,20.889999 -0.24052,20.889999 l -25.671,0 c -6.7886,0 -18.6439997,-1.873899 -18.6419997,8.3283 0,7.8337 9.6e-4,15.668 9.6e-4,23.502 0,10.271 13.2009997,8.0694 19.8579997,8.0694 2.0014,0 24.694,-0.2579 24.694,0.24148 0,9.6941 9.7e-4,19.387003 9.7e-4,29.080003 0,3.1374 -0.63655,7.3662 0.62593,10.356 2.2062,5.2209 7.4338,4.8741 12.099,4.8741 7.1103,-0.002 27.177,3.6029 27.172,-7.9815"
inkscape:connector-curvature="0"
style="fill:#72c84f;fill-opacity:1"
id="path12" />
<path
d="m 77.259153,-0.61253934 c -3.7949,-0.11197 -8.634553,-0.31884533 -11.260153,-0.31884533 -3.2247,0 -7.7162,0.77012067 -11.812,1.48144067 -2.0482,0.35566 -4.922583,0.6667928 -6.571383,1.9648928 -1.6488,1.2982 -2.000317,3.5895072 -2.522317,6.1288072 -1.2573,6.1145 -1.882409,12.98732 -1.481441,18.594 l 1.262691,17.656 c -8.0331,-0.0057 -15.808462,-1.894945 -23.841462,-1.894036 -3.7534,0 -8.831538,0.339744 -13.002538,1.476364 -2.0855,0.56831 -4.4542072,1.455731 -5.8788072,3.186231 -1.4246,1.7305 -1.8398928,5.383991 -1.8398928,8.418891 0,7.4589 -0.72179,15.466 0.03125,23.188 l -0.03015,0 c 0,0.05868 0.030481,0.09804 0.03125,0.15625 0.041293,3.1259 1.1708,5.6015 3,7.2188 1.8633,1.6474 4.2716,2.455 6.8125,2.875 5.0818,0.84007 10.882,0.15625 14.406,0.15625 1.5049,0 6.7971,-0.27202 11.875,-0.28125 2.5389,-0.0046 5.011,0.04385 6.75,0.21875 0.77038,0.07748 1.3095,0.21382 1.6875,0.3125 l -1.136422,27.028464 c -0.185092,4.40221 1.403472,8.75884 3.292622,12.00254 1.88915,3.2437 5.5401,5.2812 11.094,5.2812 l 14.125,0 c 3.5899,0.002 8.7911,0.91748 12.781,-1.75 3.8735,-2.5907 4.837,-7.5126 5.0312,-12.312 0.19428,-4.7999 -0.560323,-9.78358 -0.40625,-12.844 l 0.631345,-12.540699 c 0.07975,-1.584094 -0.805195,-4.726605 -0.787595,-5.020305 0.05547,-0.01555 0.23534,-0.09375 0.8125,-0.09375 l 28.875,0 c 3.123,0 7.0391,0.54753 10.438,-1.75 2.4825,-1.6778 3.688,-4.0393 4.1875,-6.4062 0.49949,-2.367 0.40625,-4.7843 0.40625,-7 0,-3.2548 0.70094,-8.8468 0.5625,-14.219 -0.13844,-5.372 -1.0491,-10.848 -5.1562,-13.625 -3.3932,-2.2975 -7.3142,-3.460352 -10.438,-3.296429 l -28.875,1.515229 c -0.576307,0.03024 -0.75706,-0.0782 -0.8125,-0.09375 -0.01763,-0.29387 0.121589,-1.414779 0.15625,-3 l 0.631345,-28.875 c 0.005,-3.188 -0.859345,-6.7335 -3.656345,-9.5292 -3.503605,-2.79544576 -5.556341,-4.34482302 -9.372247,-4.01014534 z M 57.155,5.081306 c 1.6947,-0.00561 3.513,0.15625 5.125,0.15625 4.9831,0.00193 9.9566,0 14.938,0 2.3565,0 3.8518,0.48968 4.875,1.2188 1.0232,0.72907 1.6708,1.7322 2.0938,3.0938 0.84585,2.7231 -0.06808,6.685723 0.01339,10.517357 l 0.580357,27.294643 c 0.01922,0.904056 0.7075,1.5728 1.2188,1.8438 0.51125,0.27098 1.0058,0.39378 1.5938,0.5 1.1758,0.21245 2.6718,0.28402 4.4688,0.3125 3.594,0.05697 8.3457,0.768247 13.25,0.611607 4.9043,-0.15664 9.9692,-1.188857 14.062,-1.017857 2.0467,0.0855 3.8563,0.24788 5.25,0.5 1.3937,0.25212 2.3589,0.66146 2.625,0.875 2.0046,1.61 2.8436,6.088 2.8125,11.062 -0.0311,4.9745 -0.75,10.19 -0.75,13.469 0,1.9614 0.0467,3.8584 -0.34375,5.3438 -0.39044,1.4854 -1.051,2.54 -2.75,3.375 -1.933,0.94928 -6.61419,-0.327833 -9.60263,-0.241071 L 88.9365,84.799506 c -0.85428,0.0248 -1.3285,-0.26318 -2.4375,0 -0.55449,0.13159 -1.2398,0.71288 -1.4688,1.2812 -0.22898,0.56837 -0.25,1.0392 -0.25,1.625 l 0,12.813004 c 0,7.6852 0.94826,15.843 0.03125,23.094 -0.01439,0.0618 -0.02483,0.1244 -0.03125,0.1875 0,2.1271 -0.78102,3.2486 -2.3125,4.1875 -1.5315,0.93888 -3.9032,1.4953 -6.5312,1.7188 -5.2561,0.44692 -11.393,-0.375 -14.812,-0.375 -2.203,-0.001 -4.4867,0.19924 -6.375,-0.0937 -1.8883,-0.29299 -3.2739,-0.91337 -4.2812,-2.6562 -1.1141,-1.9287 -0.6875,-5.7387 -0.6875,-8.875 l 0,-30.003004 c 1.19e-4,-0.83208 -0.43657,-1.6898 -1.0312,-2.1875 -0.59468,-0.49774 -1.2907,-0.7557 -2.0312,-0.93755 -1.481,-0.36371 -3.2922,-0.39455 -5.4375,-0.34375 -4.2905,0.10159 -9.8521,0.70329 -15.375,1.0312 -5.5229,0.32796 -11,0.35429 -14.875,-0.5625 -1.9376,-0.45839 -3.4628,-1.1676 -4.4063,-2.0312 -0.94345,-0.86364 -1.4075,-1.8359 -1.4062,-3.4062 l 0,-23.188 c 0,-2.2005 0.59392,-3.4666 1.5312,-4.375 0.93733,-0.9084 2.3392,-1.496 4.0938,-1.8125 3.509,-0.63292 8.1232,-0.09375 11.625,-0.09375 l 25.562,0 c 0.60966,0 1.0238,-0.38905 1.1875,-0.59375 0.16365,-0.2047 0.21082,-0.33618 0.25,-0.4375 0.07835,-0.20263 0.10355,-0.28725 0.125,-0.40625 0.04291,-0.238 0.04029,-0.49322 0.0625,-0.78125 0.04443,-0.57607 0.10141,-1.3295 0.125,-2.25 0.04718,-1.841 0.329897,-4.2868 0.330357,-6.7812 9.24e-4,-4.9889 -0.0625,-10.231 -0.0625,-10.969 0,-3.0959 -0.925447,-7.9539 -0.767857,-12.438 0.07879,-2.2418 0.3762,-4.3619 0.96875,-6 0.59255,-1.6381 1.4065,-2.7446 2.625,-3.3438 1.0629,-0.52271 2.5877,-0.71315 4.2812,-0.71875 z"
inkscape:connector-curvature="0"
id="path3795"
style="fill:#000000;fill-opacity:1"
sodipodi:nodetypes="cscccsccsssccsccssscssscccsscssccsscsscscccccsccssscsssscssscssscsscccccccscsssscccsccssccccsssssccc" />
</g>
</g>
</g>
</svg>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment