nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved icons: Further closes #5722

Browse source 
Fixes some icon issues associated with this ticket.  Custom
toolbar icons now shown at full size.
This commit is contained in:
Jim Nelson 2012-09-10 18:46:39 -07:00
parent 760a82859b
commit 0818b9ad4b
7 changed files with 508 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

225
icons/16x16/tags.svg Normal file
View file

@ -0,0 +1,225 @@
<?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:xlink="http://www.w3.org/1999/xlink"
version="1.1"
width="16"
height="16"
id="svg3279">
<defs
id="defs3281">
<linearGradient
x1="17.591623"
y1="7"
x2="17.591623"
y2="-0.02451775"
id="linearGradient2863"
xlink:href="#linearGradient3251"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6666711,0,0,0.6666711,-0.66667106,-1.3337988)" />
<linearGradient
id="linearGradient3251">
<stop
id="stop3253"
style="stop-color:#917f6e;stop-opacity:1"
offset="0" />
<stop
id="stop3255"
style="stop-color:#cbbaa9;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
x1="40.006763"
y1="12.910877"
x2="40.006763"
y2="7.0924568"
id="linearGradient2866"
xlink:href="#linearGradient4222"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.82996661,0,0,0.83014725,-23.704279,-4.8028556)" />
<linearGradient
id="linearGradient4222">
<stop
id="stop4224"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop4226"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="38.382198"
y1="5.90625"
x2="38.382198"
y2="22.697742"
id="linearGradient2869"
xlink:href="#linearGradient4222"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.63241105,0,0,0.63366331,-16.06917,-2.5594049)" />
<linearGradient
id="linearGradient3243">
<stop
id="stop3245"
style="stop-color:#fff4e9;stop-opacity:1"
offset="0" />
<stop
id="stop3247"
style="stop-color:#e7d6c5;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
x1="39.905758"
y1="6.1230369"
x2="39.905758"
y2="24.0341"
id="linearGradient3275"
xlink:href="#linearGradient3243"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6666711,0,0,0.6666711,-17.166785,-3.1667713)" />
<linearGradient
x1="32.015705"
y1="24.011269"
x2="32.015705"
y2="5"
id="linearGradient3277"
xlink:href="#linearGradient3251"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6666711,0,0,0.6666711,-17.166785,-3.1667713)" />
<linearGradient
x1="17.591623"
y1="7"
x2="17.591623"
y2="-0.02451775"
id="linearGradient2863-0"
xlink:href="#linearGradient3251-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6666711,0,0,0.6666711,0.3333289,1.6662013)" />
<linearGradient
id="linearGradient3251-4">
<stop
id="stop3253-9"
style="stop-color:#917f6e;stop-opacity:1"
offset="0" />
<stop
id="stop3255-0"
style="stop-color:#cbbaa9;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
x1="40.006763"
y1="12.910877"
x2="40.006763"
y2="7.0924568"
id="linearGradient2866-8"
xlink:href="#linearGradient4222-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.82996661,0,0,0.83014725,-22.704279,-1.8028555)" />
<linearGradient
id="linearGradient4222-5">
<stop
id="stop4224-8"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop4226-8"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="38.382198"
y1="5.90625"
x2="38.382198"
y2="22.697742"
id="linearGradient2869-1"
xlink:href="#linearGradient4222-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.63241105,0,0,0.63366331,-15.06917,0.44059524)" />
<linearGradient
id="linearGradient3243-9">
<stop
id="stop3245-2"
style="stop-color:#fff4e9;stop-opacity:1"
offset="0" />
<stop
id="stop3247-1"
style="stop-color:#e7d6c5;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
x1="39.905758"
y1="6.1230369"
x2="39.905758"
y2="24.0341"
id="linearGradient3056"
xlink:href="#linearGradient3243-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6666711,0,0,0.6666711,-16.166785,-0.16677116)" />
<linearGradient
x1="32.015705"
y1="24.011269"
x2="32.015705"
y2="5"
id="linearGradient3058"
xlink:href="#linearGradient3251-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6666711,0,0,0.6666711,-16.166785,-0.16677116)" />
</defs>
<metadata
id="metadata3284">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1">
<path
d="M 6.8333755,0.49991904 0.50000006,7.062463 6.0000368,12.5 12.500078,6.166624 l 0,-5.66670496 -5.6667025,0 z M 9.5000604,2.499933 c 0.5520026,0 1.0000066,0.448002 1.0000066,1.000006 0,0.552004 -0.448004,1.000007 -1.0000066,1.000007 -0.5520042,0 -1.0000072,-0.448003 -1.0000072,-1.000007 0,-0.552004 0.448003,-1.000006 1.0000072,-1.000006 z"
id="path2463"
style="fill:url(#linearGradient3275);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3277);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="m 7.3435443,1.5000002 c 0,0 -5.4055851,5.4975779 -5.4055851,5.4975779 0,0 4.1443391,4.3564349 4.1443391,4.3564349 0,0 5.3593077,-5.5623318 5.3593077,-5.5623318 0,0 0.05839,-4.291681 0.05839,-4.291681 0,0 -4.1564557,0 -4.1564557,0 z"
id="path3265"
style="opacity:0.6;fill:none;stroke:url(#linearGradient2869);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="M 9.4943871,1.5010734 C 10.750366,1.4567936 11.785978,2.790953 11.428498,3.997178 11.163042,5.1808173 9.7058904,5.8629498 8.6294138,5.2988448 7.5214098,4.8093156 7.1351849,3.2507988 7.8946109,2.304299 8.263526,1.804975 8.8728487,1.4962644 9.4943871,1.5010734 z"
id="path3294"
style="opacity:0.6;fill:none;stroke:url(#linearGradient2866);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="m 13.500078,2.499919 -5.6667025,0 -6.3333754,6.5625439"
id="path2463-3-7"
style="opacity:0.1;fill:none;stroke:#000000;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="m 10.333402,2.9995632 c 0.73935,-0.391482 1.702694,-0.511416 2.617932,-0.53183 0.411434,-0.0092 0.8273,0.0746 1.231029,-0.02143 0.513831,-0.122222 0.863993,-0.498679 0.812771,-0.842839 -0.06877,-0.461979 -0.68935,-0.80302096 -1.271382,-1.04707196 -0.516276,-0.216476 -0.913636,-0.60223516 -1.123633,-1.00974656 -0.106098,-0.20589 0.07919,-0.4220767 0.376399,-0.4884432 0.269998,-0.060291 0.552791,-0.084123 0.827535,-0.022904 0.418164,0.093175 0.911794,0.2068481 1.106321,0.5031098"
id="path3298"
style="fill:none;stroke:url(#linearGradient2863);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="M 7.8333755,3.4999191 1.5000001,10.062463 7.0000368,15.5 13.500078,9.1666241 l 0,-5.666705 -5.6667025,0 z m 2.6666845,2.000014 c 0.552003,0 1.000007,0.448002 1.000007,1.000006 0,0.552004 -0.448004,1.000007 -1.000007,1.000007 -0.552004,0 -1.000007,-0.448003 -1.000007,-1.000007 0,-0.552004 0.448003,-1.000006 1.000007,-1.000006 z"
id="path2463-3"
style="fill:url(#linearGradient3056);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3058);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="m 8.343544,4.5000003 c 0,0 -5.4055848,5.4975779 -5.4055848,5.4975779 0,0 4.1443391,4.3564348 4.1443391,4.3564348 0,0 5.3593077,-5.5623317 5.3593077,-5.5623317 0,0 0.05839,-4.291681 0.05839,-4.291681 0,0 -4.156456,0 -4.156456,0 z"
id="path3265-6"
style="opacity:0.6;fill:none;stroke:url(#linearGradient2869-1);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="m 10.494387,4.5010735 c 1.255979,-0.04428 2.291591,1.2898796 1.934111,2.4961046 C 12.163042,8.1808174 10.70589,8.8629499 9.629414,8.2988449 8.52141,7.8093157 8.135185,6.2507989 8.894611,5.3042991 9.263526,4.8049751 9.872849,4.4962645 10.494387,4.5010735 z"
id="path3294-1"
style="opacity:0.6;fill:none;stroke:url(#linearGradient2866-8);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
d="m 11.333402,5.9995633 c 0.73935,-0.391482 1.702694,-0.511416 2.617932,-0.53183 0.411434,-0.0092 0.8273,0.0746 1.231029,-0.02143 0.513831,-0.122222 0.863993,-0.498679 0.812771,-0.842839 -0.06877,-0.461979 -0.68935,-0.803021 -1.271382,-1.047072 -0.516276,-0.216476 -0.913636,-0.6022352 -1.123633,-1.0097466 -0.106098,-0.20589 0.07919,-0.4220767 0.376399,-0.4884432 0.269998,-0.060291 0.552791,-0.084123 0.827535,-0.022904 0.418164,0.093175 0.911794,0.2068481 1.106321,0.5031098"
id="path3298-3"
style="fill:none;stroke:url(#linearGradient2863-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 9.8 KiB

316
icons/24x24/mail-move.svg
View file

@ -2,66 +2,202 @@
<!-- 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:xlink="http://www.w3.org/1999/xlink"
version="1.0"
version="1.1"
width="24"
height="24"
id="svg2">
id="svg4532">
<defs
id="defs4">
id="defs4534">
<linearGradient
x1="14.125"
y1="79.81311"
x2="14.125"
y2="75.499176"
id="linearGradient3785-2"
xlink:href="#linearGradient6934-1"
x1="25.525208"
y1="35.429005"
x2="25.525208"
y2="15.737678"
id="linearGradient4313"
xlink:href="#linearGradient3866-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.5277777,0,0,0.52,1.5972161,-19.84)" />
gradientTransform="matrix(0.42307923,0,0,0.39244743,3.8461899,12.352884)"
spreadMethod="reflect" />
<linearGradient
id="linearGradient6934-1">
id="linearGradient3866-6">
<stop
id="stop6936-7"
style="stop-color:#babdb6;stop-opacity:1"
id="stop3868-7"
style="stop-color:#969696;stop-opacity:1"
offset="0" />
<stop
id="stop6938-8"
style="stop-color:#babdb6;stop-opacity:0"
id="stop3872-0"
style="stop-color:#858585;stop-opacity:0.63478261"
offset="0.5" />
<stop
id="stop3870-0"
style="stop-color:#939393;stop-opacity:0"
offset="1" />
</linearGradient>
<radialGradient
cx="13.107393"
cy="61.48016"
r="18.5"
fx="13.107393"
fy="61.48016"
id="radialGradient3803-5"
xlink:href="#linearGradient6945-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3366501,0,0,1.1735875,-11.336515,-60.583067)" />
<linearGradient
id="linearGradient6945-7">
x1="23.99999"
y1="6.6759877"
x2="23.99999"
y2="41.184601"
id="linearGradient4333"
xlink:href="#linearGradient4366"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.45945946,0,0,0.29729728,2.9729738,16.864867)" />
<linearGradient
id="linearGradient4366">
<stop
id="stop6947-4"
id="stop4368"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop6949-1"
style="stop-color:#d3d7cf;stop-opacity:1"
id="stop4370"
style="stop-color:#ffffff;stop-opacity:0.23529412"
offset="0.01864429" />
<stop
id="stop4372"
style="stop-color:#ffffff;stop-opacity:0.15686275"
offset="0.98085731" />
<stop
id="stop4374"
style="stop-color:#ffffff;stop-opacity:0.39215687"
offset="1" />
</linearGradient>
<radialGradient
cx="12.5"
cy="15.927882"
r="18.5"
fx="12.5"
fy="15.927882"
id="radialGradient3797-8"
xlink:href="#linearGradient6945-7"
<linearGradient
x1="16.626165"
y1="15.298182"
x2="20.054544"
y2="24.627615"
id="linearGradient4336"
xlink:href="#linearGradient8265-821-176-38-919-66-249-7-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0627115,0,0,0.9079494,-5.6172342,-2.776712)" />
gradientTransform="matrix(0.39078075,0,0,0.4337445,4.6029954,15.522359)" />
<linearGradient
id="linearGradient8265-821-176-38-919-66-249-7-7">
<stop
id="stop2687-1-9"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop2689-5-4"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="25.525208"
y1="30.188753"
x2="25.525208"
y2="15.737678"
id="linearGradient4339"
xlink:href="#linearGradient3333-4-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.42307923,0,0,0.39244743,3.8461899,11.014342)"
spreadMethod="reflect" />
<linearGradient
id="linearGradient3333-4-4">
<stop
id="stop3335-4-6"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop3337-7-2"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="23.903786"
y1="35.75"
x2="23.903786"
y2="20.443331"
id="linearGradient4342"
xlink:href="#linearGradient3495"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.42223777,0,0,0.41882295,3.9070099,12.452607)" />
<linearGradient
id="linearGradient3495">
<stop
id="stop3497"
style="stop-color:#000000;stop-opacity:1"
offset="0" />
<stop
id="stop3874"
style="stop-color:#000000;stop-opacity:0.49803922"
offset="0.5" />
<stop
id="stop3499"
style="stop-color:#000000;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="25.525208"
y1="30.188753"
x2="25.525208"
y2="15.737678"
id="linearGradient4345"
xlink:href="#linearGradient3333-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.42307923,0,0,0.39244743,3.8461899,13.747128)"
spreadMethod="reflect" />
<linearGradient
id="linearGradient3333-4">
<stop
id="stop3335-4"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop3337-7"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="25.525208"
y1="30.188753"
x2="25.525208"
y2="15.737678"
id="linearGradient4348"
xlink:href="#linearGradient3866"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.42307923,0,0,0.39244743,3.8461899,12.352884)"
spreadMethod="reflect" />
<linearGradient
id="linearGradient3866">
<stop
id="stop3868"
style="stop-color:#a0a0a0;stop-opacity:1"
offset="0" />
<stop
id="stop3872"
style="stop-color:#8f8f8f;stop-opacity:0.63478261"
offset="0.5" />
<stop
id="stop3870"
style="stop-color:#9d9d9d;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="20.052792"
y1="10.636821"
x2="20.052792"
y2="45.243549"
id="linearGradient4351"
xlink:href="#linearGradient3600"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.40000003,0,0,0.36363633,4.4000003,13.81818)" />
<linearGradient
id="linearGradient3600">
<stop
id="stop3602"
style="stop-color:#f4f4f4;stop-opacity:1"
offset="0" />
<stop
id="stop3604"
style="stop-color:#dbdbdb;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
x1="302.85715"
y1="366.64789"
@ -118,7 +254,20 @@
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" />
</defs>
<metadata
id="metadata4537">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(0,-8)"
id="layer1">
<rect
width="19"
@ -126,11 +275,20 @@
rx="0.80965537"
ry="0.79772371"
x="0.5"
y="1.5"
y="11.5"
id="rect11046-8"
style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.99236642;stroke-dasharray:3, 1;stroke-dashoffset:0" />
<rect
width="19"
height="13"
rx="0.80965537"
ry="0.79772371"
x="0.5"
y="10.471"
id="rect11046"
style="fill:none;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.99236642;stroke-dasharray:3, 1;stroke-dashoffset:0" />
style="opacity:0.4;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.99236642;stroke-dasharray:3, 1;stroke-dashoffset:0" />
<g
transform="matrix(0.01045062,0,0,0.00543807,22.29515,21.24716)"
transform="matrix(0.01045062,0,0,0.00543807,22.29515,30.21816)"
id="g11038-9"
style="opacity:0.7;display:inline">
<rect
@ -149,38 +307,54 @@
id="path11044-3"
style="opacity:0.40206185;fill:url(#radialGradient2901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
</g>
<rect
width="18"
height="12"
rx="0.5"
ry="0.5"
x="5"
y="18"
id="rect2396-9"
style="fill:url(#linearGradient4351);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 11.739261,24.322531 -5.7012291,5.350022 z m 4.534881,0.02453 5.740893,5.227129 z"
id="path3341-2"
style="fill:none;stroke:url(#linearGradient4348);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 11.739261,25.716773 -3.8538679,3.665908 z m 4.534881,0.02453 3.923509,3.558336 z"
id="path3341-2-6"
style="opacity:0.7;fill:none;stroke:url(#linearGradient4345);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 7.4264159,21.420414 6.6143001,5.494264 6.533049,-5.494264"
id="path3493"
style="opacity:0.06000001;fill:none;stroke:url(#linearGradient4342);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
d="M 6.4197241,18.557066 14.000091,24.75 21.464083,18.549406"
id="path3926"
style="opacity:0.7;fill:none;stroke:url(#linearGradient4339);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="M 5.6151563,18 C 5.2934335,18 5,18.194425 5,18.49027 L 5.0059595,26 C 5.5237759,25.991948 22.606961,23.05103 23,22.909569 l 0,-4.323715 C 23,18.359719 22.728991,18 22.450415,18 z"
id="path3333"
style="opacity:0.2;fill:url(#linearGradient4336);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<rect
width="17"
height="11"
x="5.5"
y="18.5"
id="rect6741-1-5"
style="fill:none;stroke:url(#linearGradient4333);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<rect
width="19"
height="13"
rx="0.80965537"
ry="0.79772371"
x="4.4999933"
y="8.5"
id="rect11046-3"
style="fill:url(#radialGradient3797-8);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.99236642;stroke-dasharray:none;stroke-dashoffset:0.69999992" />
height="13.000001"
rx="1"
ry="1"
x="4.5"
y="17.499998"
id="rect2396-9-3"
style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 4.7638825,21.240001 5.3602425,-5.89875 c 0.247725,-0.244074 0.493129,-0.564191 1.039062,-0.78 0.545934,-0.215808 1.363588,-0.34125 2.836806,-0.34125 1.467291,-10e-7 2.289739,0.125648 2.836806,0.34125 0.547065,0.215602 0.790634,0.535234 1.039062,0.78 l 5.360243,5.89875 -5.360243,-5.37875 c -1.078783,-1.024189 -2.384631,-1.181521 -3.875868,-1.12125 -1.409615,0.02576 -2.883938,-1.72e-4 -3.875868,1.12125 l -5.3602425,5.37875 z"
id="path11050-3"
style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
d="m 4.7638825,21.25118 5.3602425,-4.85875 c 0.99193,-1.121421 2.466253,-1.095489 3.875868,-1.12125 1.491237,-0.06027 2.797085,0.09706 3.875868,1.12125 l 5.360243,4.85875 -5.360243,-5.37875 c -1.078783,-1.024189 -2.384631,-1.181521 -3.875868,-1.12125 -1.409615,0.02576 -2.883938,-1.72e-4 -3.875868,1.12125 l -5.3602425,5.37875 z"
id="path11052-8"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
d="m 5.4964349,8.9999997 c -0.2814806,0 -0.4964413,0.2218685 -0.4964413,0.5123967 l 0,0.7438016 5.5729534,5.752066 c 0.270179,0.278863 0.415214,0.498153 0.848754,0.677686 C 11.855242,16.865483 12.598593,17 13.999993,17 c 1.395527,0 2.142982,-0.13433 2.578292,-0.31405 0.43531,-0.179721 0.579181,-0.399449 0.848754,-0.677686 l 5.572954,-5.752066 0,-0.7438016 c 0,-0.2905272 -0.21496,-0.5123966 -0.496442,-0.5123966 l -17.0071161,0 z"
id="path11054-6"
style="fill:url(#radialGradient3803-5);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
d="m 4.7638825,10.060001 5.3602425,5.89875 c 0.247725,0.244074 0.493129,0.564191 1.039062,0.78 0.545934,0.215808 1.363588,0.34125 2.836806,0.34125 1.467291,1e-6 2.289739,-0.125648 2.836806,-0.34125 0.547065,-0.215602 0.790634,-0.535234 1.039062,-0.78 l 5.360243,-5.89875 -5.360243,5.37875 C 16.797078,16.46294 15.49123,16.560271 13.999993,16.5 12.590378,16.47424 11.116055,16.56017 10.124125,15.438751 l -5.3602425,-5.37875 z"
id="path11056-0"
style="fill:#888a85;fill-opacity:0.99607843;fill-rule:evenodd;stroke:none" />
<path
d="m 5.7031185,9.5000009 c -0.1282668,0 -0.203125,0.071603 -0.203125,0.1942935 l 0,10.6114136 c 0,0.122689 0.074858,0.194293 0.203125,0.194294 l 16.5937495,0 c 0.128266,0 0.203125,-0.0716 0.203125,-0.194294 l 0,-10.6114136 c 0,-0.1226897 -0.07486,-0.1942935 -0.203125,-0.1942935 l -16.5937495,0 z"
id="path11060-4"
style="opacity:0.7;fill:none;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.99236642;stroke-dasharray:none;stroke-dashoffset:0.69999992" />
<path
d="m 4.7638825,19.111252 0,1.657499 c 0,0.270923 0.2033216,0.47125 0.4782986,0.47125 l 17.5156229,0 c 0.274978,0 0.4783,-0.200327 0.4783,-0.47125 l 0,-1.657499 -18.4722215,0 z"
id="path11062-8"
style="opacity:0.55597014;fill:url(#linearGradient3785-2);fill-opacity:1;fill-rule:evenodd;stroke:none" />
d="m 5.2155719,18.774502 8.7845191,7.314042 8.917279,-7.363225"
id="path3341-2-2"
style="fill:none;stroke:url(#linearGradient4313);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

5
src/client/models/folder-list.vala
View file

@ -37,7 +37,7 @@ public class FolderList : Sidebar.Tree {
public Icon? get_sidebar_icon() {
switch (folder.get_special_folder_type()) {
case Geary.SpecialFolderType.NONE:
return IconFactory.instance.label_icon;
return IconFactory.instance.get_custom_icon("tag", IconFactory.ICON_SIDEBAR);
case Geary.SpecialFolderType.INBOX:
return new ThemedIcon("mail-inbox");
@ -132,7 +132,8 @@ public class FolderList : Sidebar.Tree {
}
private void reset_user_folder_group() {
user_folder_group = new Sidebar.Grouping("", IconFactory.instance.label_folder_icon);
user_folder_group = new Sidebar.Grouping("",
IconFactory.instance.get_custom_icon("tags", IconFactory.ICON_SIDEBAR));
user_folder_branch = new Sidebar.Branch(user_folder_group,
Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, user_folder_comparator);
}

4
src/client/ui/folder-menu.vala
View file

@ -12,7 +12,7 @@ public class FolderMenu {
public signal void folder_selected(Geary.Folder folder);
public FolderMenu(Gtk.ToggleToolButton button, string? icon_name, string? label) {
public FolderMenu(Gtk.ToggleToolButton button, Icon? icon, string? label) {
this.button = button;
// TODO Add fancy filter option.
@ -28,7 +28,7 @@ public class FolderMenu {
add_proxy_menu(button, label, proxy_menu);
// only use label for proxy, not the toolbar
make_menu_dropdown_button(button, icon_name, null);
make_menu_dropdown_button(button, icon, null);
}
public void add_folder(Geary.Folder folder) {

33
src/client/ui/icon-factory.vala
View file

@ -6,6 +6,9 @@
// Singleton class to hold icons.
public class IconFactory {
public const Gtk.IconSize ICON_TOOLBAR = Gtk.IconSize.LARGE_TOOLBAR;
public const Gtk.IconSize ICON_SIDEBAR = Gtk.IconSize.MENU;
private static IconFactory? _instance = null;
public static IconFactory instance {
get {
@ -23,19 +26,19 @@ public class IconFactory {
public const int UNREAD_ICON_SIZE = 16;
public Gdk.Pixbuf unread { get; private set; }
public const int STAR_ICON_SIZE = 16;
public Gdk.Pixbuf starred { get; private set; }
public Gdk.Pixbuf unstarred { get; private set; }
public ThemedIcon label_icon { get; private set; default = new ThemedIcon("tag"); }
public ThemedIcon label_folder_icon { get; private set; default = new ThemedIcon("tag"); }
private Gtk.IconTheme icon_theme { get; private set; }
private File icons_dir;
// Creates the icon factory.
private IconFactory() {
icon_theme = Gtk.IconTheme.get_default();
icons_dir = GearyApplication.instance.get_resource_directory().get_child("icons");
append_icons_search_path(null);
append_icons_search_path("128x128");
@ -50,13 +53,27 @@ public class IconFactory {
unstarred = load("non-starred-grey", STAR_ICON_SIZE);
}
private void append_icons_search_path(string? name) {
File basedir = GearyApplication.instance.get_resource_directory().get_child("icons");
public Icon get_custom_icon(string name, Gtk.IconSize size) {
int pixels;
switch (size) {
case ICON_SIDEBAR:
pixels = 16;
break;
case ICON_TOOLBAR:
default:
pixels = 24;
break;
}
return new FileIcon(icons_dir.get_child("%dx%d".printf(pixels, pixels)).get_child("%s.svg".printf(name)));
}
private void append_icons_search_path(string? name) {
if (Geary.String.is_empty(name))
icon_theme.append_search_path(basedir.get_path());
icon_theme.append_search_path(icons_dir.get_path());
else
icon_theme.append_search_path(basedir.get_child(name).get_path());
icon_theme.append_search_path(icons_dir.get_child(name).get_path());
}
private Gdk.Pixbuf? load(string icon_name, int size, Gtk.IconLookupFlags flags = 0) {

6
src/client/ui/main-toolbar.vala
View file

@ -26,11 +26,13 @@ public class MainToolbar : Gtk.Box {
// Setup the folder menus (move/copy).
Gtk.ToggleToolButton copy_menu_button = set_toolbutton_action(builder,
GearyController.ACTION_COPY_MENU) as Gtk.ToggleToolButton;
copy_folder_menu = new FolderMenu(copy_menu_button, "tag-new", _("Label as"));
copy_folder_menu = new FolderMenu(copy_menu_button,
IconFactory.instance.get_custom_icon("tag-new", IconFactory.ICON_TOOLBAR), _("Label as"));
Gtk.ToggleToolButton move_menu_button = set_toolbutton_action(builder,
GearyController.ACTION_MOVE_MENU) as Gtk.ToggleToolButton;
move_folder_menu = new FolderMenu(move_menu_button, "mail-move", _("Move to"));
move_folder_menu = new FolderMenu(move_menu_button,
IconFactory.instance.get_custom_icon("mail-move", IconFactory.ICON_TOOLBAR), _("Move to"));
// Assemble mark menu button.
GearyApplication.instance.load_ui_file("toolbar_mark_menu.ui");

8
src/client/util/util-menu.vala
View file

@ -25,7 +25,7 @@ public void menu_popup_relative(Gtk.Menu menu, out int x, out int y, out bool pu
}
// This method must be called AFTER the button is added to the toolbar.
public void make_menu_dropdown_button(Gtk.ToggleToolButton toggle_tool_button, string? icon_name, string? label) {
public void make_menu_dropdown_button(Gtk.ToggleToolButton toggle_tool_button, Icon? icon, string? label) {
Gtk.ToggleButton? toggle_button = toggle_tool_button.get_child() as Gtk.ToggleButton;
if (toggle_button == null) {
debug("Problem making dropdown button: ToggleToolButton's child is not a ToggleButton");
@ -39,13 +39,13 @@ public void make_menu_dropdown_button(Gtk.ToggleToolButton toggle_tool_button, s
Gtk.Box box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
box.set_homogeneous(false);
if (icon_name != null)
box.pack_start(new Gtk.Image.from_icon_name(icon_name, Gtk.IconSize.SMALL_TOOLBAR));
if (icon != null)
box.pack_start(new Gtk.Image.from_gicon(icon, Gtk.IconSize.LARGE_TOOLBAR));
if (label != null)
box.pack_start(new Gtk.Label(label));
box.pack_end(new Gtk.Image.from_icon_name("menu-down", Gtk.IconSize.SMALL_TOOLBAR));
box.pack_end(new Gtk.Image.from_icon_name("menu-down", Gtk.IconSize.LARGE_TOOLBAR));
toggle_button.add(box);
}