summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2016-05-22 13:25:21 +0200
committerDave Andreoli <dave@gurumeditation.it>2016-05-22 13:25:21 +0200
commitf891cdc251f77b7e124c84c694533598106c6aaf (patch)
tree3aabc9fa5667528466dd6a7bc0cec3e2e534d2bc
parent07a47cae0dc37419d5b6d2e89a74265ce9f49ed4 (diff)
downloadefl-f891cdc251f77b7e124c84c694533598106c6aaf.tar.gz
FDO icons: better icons for zoom-*
-rw-r--r--data/elementary/themes/edc/elm/icon_fdo.edc8
-rw-r--r--data/elementary/themes/fdo/actions/128-svg/zoom-fill.svg108
-rw-r--r--data/elementary/themes/fdo/actions/128-svg/zoom-fit-best.svg20
-rw-r--r--data/elementary/themes/fdo/actions/128-svg/zoom-fit.svg108
-rw-r--r--data/elementary/themes/fdo/actions/128-svg/zoom-in.svg35
-rw-r--r--data/elementary/themes/fdo/actions/128-svg/zoom-original.svg36
-rw-r--r--data/elementary/themes/fdo/actions/128-svg/zoom-out.svg36
-rw-r--r--data/elementary/themes/fdo/actions/128/zoom-fill.pngbin0 -> 3378 bytes
-rw-r--r--data/elementary/themes/fdo/actions/128/zoom-fit-best.pngbin3107 -> 3289 bytes
-rw-r--r--data/elementary/themes/fdo/actions/128/zoom-fit.pngbin3107 -> 3392 bytes
-rw-r--r--data/elementary/themes/fdo/actions/128/zoom-in.pngbin3195 -> 3439 bytes
-rw-r--r--data/elementary/themes/fdo/actions/128/zoom-original.pngbin3168 -> 3592 bytes
-rw-r--r--data/elementary/themes/fdo/actions/128/zoom-out.pngbin3094 -> 3356 bytes
-rw-r--r--src/bin/elementary/test_icon.c7
14 files changed, 309 insertions, 49 deletions
diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index dea70e8b08..6518540706 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -229,12 +229,12 @@ ICO1(CTX, "help-about", 128)
ICO1(CTX, "help-contents", 128)
// TODO help-faq
-ICO1(CTX, "zoom-fit-best", 128)
-ICO1(CTX, "zoom-fit", 128) /* */
-// TODO ICO1(CTX, "zoom-fill", 128) /* */
ICO1(CTX, "zoom-in", 128)
-ICO1(CTX, "zoom-original", 128)
ICO1(CTX, "zoom-out", 128)
+ICO1(CTX, "zoom-original", 128)
+ICO1(CTX, "zoom-fit", 128) /* */
+ICO1(CTX, "zoom-fill", 128) /* */
+ICO1(CTX, "zoom-fit-best", 128)
#undef CTX
diff --git a/data/elementary/themes/fdo/actions/128-svg/zoom-fill.svg b/data/elementary/themes/fdo/actions/128-svg/zoom-fill.svg
new file mode 100644
index 0000000000..0470a6b61c
--- /dev/null
+++ b/data/elementary/themes/fdo/actions/128-svg/zoom-fill.svg
@@ -0,0 +1,108 @@
+<?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="128"
+ height="128"
+ id="svg3027"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="zoom-fill.svg"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata5">
+ <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>
+ <defs
+ id="defs3029" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2"
+ inkscape:cx="50.74763"
+ inkscape:cy="116.14138"
+ inkscape:document-units="px"
+ inkscape:current-layer="svg3027"
+ showgrid="true"
+ inkscape:window-width="1115"
+ inkscape:window-height="886"
+ inkscape:window-x="1870"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0"
+ inkscape:showpageshadow="false"
+ borderlayer="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-to-guides="false"
+ inkscape:snap-grids="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2981"
+ empspacing="4"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="4px"
+ spacingy="4px"
+ dotted="false" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="0,120"
+ id="guide2999" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="120,128"
+ id="guide3001" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="0,8"
+ id="guide3003" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="8,128"
+ id="guide3005" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50.892857,109.73214"
+ id="guide3027" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="19.303384,77.055699"
+ id="guide3029" />
+ </sodipodi:namedview>
+ <path
+ style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
+ d="m 50.867131,3.9162872 c -11.977712,0 -23.941625,4.7975526 -33.0738,13.9297358 -18.26436296,18.264358 -18.26436296,47.808782 0,66.073128 14.459284,14.459269 35.903619,17.373439 53.335236,8.938867 9.770308,-4.85627 11.157421,-0.233333 17.229814,6.503172 l 22.879849,22.65637 c 0.0296,-0.0296 5.3749,5.57518 10.95011,0 5.59672,-5.59673 0.0814,-11.1456 0,-11.24807 L 99.53196,88.187602 C 90.918877,81.059485 88.554416,82.316668 93.103278,71.181266 101.53787,53.749648 98.47472,32.305306 84.015432,17.846023 74.883257,8.7138398 62.844843,3.9162872 50.867131,3.9162872 z m 0,11.9184908 c 19.372276,0 35.159546,15.712778 35.159546,35.085053 0,19.372267 -15.78727,35.159546 -35.159546,35.159546 -19.372276,0 -35.085045,-15.787279 -35.085045,-35.159546 0,-19.372275 15.712769,-35.085053 35.085045,-35.085053 z"
+ id="path3102"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssscccscccsssssss" />
+ <rect
+ style="opacity:0.97000002;fill:none;stroke:#3399ff;stroke-width:5.65363455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3129"
+ width="104.39635"
+ height="76.896362"
+ x="12.317443"
+ y="12.614318"
+ rx="0"
+ ry="0" />
+</svg>
diff --git a/data/elementary/themes/fdo/actions/128-svg/zoom-fit-best.svg b/data/elementary/themes/fdo/actions/128-svg/zoom-fit-best.svg
index 5b9f754f7c..0d793210d6 100644
--- a/data/elementary/themes/fdo/actions/128-svg/zoom-fit-best.svg
+++ b/data/elementary/themes/fdo/actions/128-svg/zoom-fit-best.svg
@@ -14,7 +14,7 @@
id="svg3027"
version="1.1"
inkscape:version="0.48.5 r10040"
- sodipodi:docname="zoom-out.svg"
+ sodipodi:docname="zoom-fit.svg"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<metadata
@@ -38,16 +38,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.9899495"
- inkscape:cx="-25.614983"
- inkscape:cy="227.03907"
+ inkscape:zoom="3.959798"
+ inkscape:cx="69.394273"
+ inkscape:cy="66.776983"
inkscape:document-units="px"
inkscape:current-layer="svg3027"
showgrid="true"
- inkscape:window-width="1013"
- inkscape:window-height="847"
- inkscape:window-x="1932"
- inkscape:window-y="-22"
+ inkscape:window-width="1115"
+ inkscape:window-height="886"
+ inkscape:window-x="1866"
+ inkscape:window-y="35"
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
borderlayer="false"
@@ -84,8 +84,8 @@
</sodipodi:namedview>
<path
style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
- d="m 49.589616,7.9568974 c -10.61581,0 -21.21939,4.2520566 -29.31321,12.3458826 -16.1876496,16.187646 -16.1876496,42.37278 0,58.560415 12.81522,12.81521 31.82127,15.398027 47.27086,7.922491 0.40657,-0.196689 0.91915,-0.383448 1.32041,-0.594187 2.50794,-0.990459 8.75036,-2.935314 12.0818,0.396125 2.47103,2.471014 1.63367,5.726947 5.41371,9.506989 l 22.050934,21.852867 c 0.0262,-0.0262 4.76376,4.94127 9.70505,0 4.96036,-4.96036 0.0721,-9.87831 0,-9.96913 L 96.266296,86.191499 c -3.78004,-3.780042 -6.77188,-2.942687 -9.24291,-5.413702 -4.07377,-4.073787 -0.24337,-12.684647 0,-13.204151 7.47555,-15.449591 4.76069,-34.455647 -8.05453,-47.270866 C 70.875036,12.208954 60.205426,7.9568974 49.589616,7.9568974 z m 0,10.5633226 c 17.16959,0 31.1618,13.926188 31.1618,31.095777 0,17.169582 -13.99221,31.1618 -31.1618,31.1618 -17.16959,0 -31.09577,-13.992218 -31.09577,-31.1618 0,-17.169589 13.92618,-31.095777 31.09577,-31.095777 z"
+ d="m 50.867131,3.9162872 c -11.977712,0 -23.941625,4.7975526 -33.0738,13.9297358 -18.26436296,18.264358 -18.26436296,47.808782 0,66.073128 14.459284,14.459269 35.903619,17.373439 53.335236,8.938867 9.770308,-4.85627 11.157421,-0.233333 17.229814,6.503172 l 22.879849,22.65637 c 0.0296,-0.0296 5.3749,5.57518 10.95011,0 5.59672,-5.59673 0.0814,-11.1456 0,-11.24807 L 99.53196,88.187602 C 90.918877,81.059485 88.554416,82.316668 93.103278,71.181266 101.53787,53.749648 98.47472,32.305306 84.015432,17.846023 74.883257,8.7138398 62.844843,3.9162872 50.867131,3.9162872 z m 0,11.9184908 c 19.372276,0 35.159546,15.712778 35.159546,35.085053 0,19.372267 -15.78727,35.159546 -35.159546,35.159546 -19.372276,0 -35.085045,-15.787279 -35.085045,-35.159546 0,-19.372275 15.712769,-35.085053 35.085045,-35.085053 z"
id="path3102"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="sssccsccsccscsssssss" />
+ sodipodi:nodetypes="ssscccscccsssssss" />
</svg>
diff --git a/data/elementary/themes/fdo/actions/128-svg/zoom-fit.svg b/data/elementary/themes/fdo/actions/128-svg/zoom-fit.svg
new file mode 100644
index 0000000000..6a9500bdd1
--- /dev/null
+++ b/data/elementary/themes/fdo/actions/128-svg/zoom-fit.svg
@@ -0,0 +1,108 @@
+<?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="128"
+ height="128"
+ id="svg3027"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="zoom-original.svg"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata5">
+ <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>
+ <defs
+ id="defs3029" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4142136"
+ inkscape:cx="-41.921158"
+ inkscape:cy="57.35019"
+ inkscape:document-units="px"
+ inkscape:current-layer="svg3027"
+ showgrid="true"
+ inkscape:window-width="1115"
+ inkscape:window-height="886"
+ inkscape:window-x="1867"
+ inkscape:window-y="35"
+ inkscape:window-maximized="0"
+ inkscape:showpageshadow="false"
+ borderlayer="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-to-guides="false"
+ inkscape:snap-grids="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2981"
+ empspacing="4"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="4px"
+ spacingy="4px"
+ dotted="false" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="0,120"
+ id="guide2999" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="120,128"
+ id="guide3001" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="0,8"
+ id="guide3003" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="8,128"
+ id="guide3005" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50.892857,109.73214"
+ id="guide3027" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="19.303384,77.055699"
+ id="guide3029" />
+ </sodipodi:namedview>
+ <path
+ style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
+ d="m 50.867131,3.9162872 c -11.977712,0 -23.941625,4.7975526 -33.0738,13.9297358 -18.26436296,18.264358 -18.26436296,47.808782 0,66.073128 14.459284,14.459269 35.903619,17.373439 53.335236,8.938867 9.770308,-4.85627 11.157421,-0.233333 17.229814,6.503172 l 22.879849,22.65637 c 0.0296,-0.0296 5.3749,5.57518 10.95011,0 5.59672,-5.59673 0.0814,-11.1456 0,-11.24807 L 99.53196,88.187602 C 90.918877,81.059485 88.554416,82.316668 93.103278,71.181266 101.53787,53.749648 98.47472,32.305306 84.015432,17.846023 74.883257,8.7138398 62.844843,3.9162872 50.867131,3.9162872 z m 0,11.9184908 c 19.372276,0 35.159546,15.712778 35.159546,35.085053 0,19.372267 -15.78727,35.159546 -35.159546,35.159546 -19.372276,0 -35.085045,-15.787279 -35.085045,-35.159546 0,-19.372275 15.712769,-35.085053 35.085045,-35.085053 z"
+ id="path3102"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssscccscccsssssss" />
+ <rect
+ style="opacity:0.97000002;fill:none;stroke:#3399ff;stroke-width:5.78559113;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3129"
+ width="42.014408"
+ height="42.014408"
+ x="29.883421"
+ y="29.930296"
+ rx="0"
+ ry="0" />
+</svg>
diff --git a/data/elementary/themes/fdo/actions/128-svg/zoom-in.svg b/data/elementary/themes/fdo/actions/128-svg/zoom-in.svg
index 7abce7d7d3..d773a3505c 100644
--- a/data/elementary/themes/fdo/actions/128-svg/zoom-in.svg
+++ b/data/elementary/themes/fdo/actions/128-svg/zoom-in.svg
@@ -14,7 +14,7 @@
id="svg3027"
version="1.1"
inkscape:version="0.48.5 r10040"
- sodipodi:docname="zoom-fit.svg"
+ sodipodi:docname="zoom-fit-best.svg"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<metadata
@@ -38,16 +38,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="29.243606"
- inkscape:cy="123.7708"
+ inkscape:zoom="4"
+ inkscape:cx="77.375856"
+ inkscape:cy="54.268769"
inkscape:document-units="px"
inkscape:current-layer="svg3027"
showgrid="true"
- inkscape:window-width="1013"
- inkscape:window-height="847"
- inkscape:window-x="1932"
- inkscape:window-y="-22"
+ inkscape:window-width="1115"
+ inkscape:window-height="886"
+ inkscape:window-x="1867"
+ inkscape:window-y="35"
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
borderlayer="false"
@@ -81,10 +81,25 @@
orientation="1,0"
position="8,128"
id="guide3005" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50.892857,109.73214"
+ id="guide3027" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="19.303384,77.055699"
+ id="guide3029" />
</sodipodi:namedview>
<path
style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
- d="m 49.427554,8.0112677 c -10.591915,0 -21.171634,4.2424863 -29.247244,12.3180953 -16.1512104,16.151212 -16.1512104,42.277405 0,58.428611 12.78638,12.786372 31.749659,15.363392 47.164473,7.904662 0.405652,-0.19625 0.917078,-0.38259 1.317443,-0.59285 2.502291,-0.98823 8.730659,-2.92871 12.054607,0.39523 2.465465,2.46548 1.629987,5.71406 5.401517,9.48559 l 22.0013,21.803694 c 0.0262,-0.0261 4.75304,4.93014 9.68321,0 4.9492,-4.94921 0.0719,-9.85608 0,-9.9467 L 95.999175,86.069786 c -3.771533,-3.771536 -6.756642,-2.936067 -9.222103,-5.401519 -4.064608,-4.064619 -0.242827,-12.656096 0,-13.174433 C 94.235793,52.079018 91.527043,33.115739 78.740668,20.329363 70.665061,12.253754 60.019471,8.0112677 49.427554,8.0112677 z m 0,10.5395473 c 17.130939,0 31.091662,13.894845 31.091662,31.02579 0,17.130947 -13.960717,31.091662 -31.091662,31.091662 -17.130947,0 -31.025794,-13.960715 -31.025794,-31.091662 0,-17.130945 13.894849,-31.02579 31.025794,-31.02579 z m -6.191983,12.318095 0,12.647455 -12.647456,0 0,12.647456 12.647456,0 0,12.647456 12.647455,0 0,-12.647456 12.647456,0 0,-12.647456 -12.647456,0 0,-12.647455 -12.647455,0 z"
+ d="m 50.867131,3.9162872 c -11.977712,0 -23.941625,4.7975526 -33.0738,13.9297358 -18.26436296,18.264358 -18.26436296,47.808782 0,66.073128 14.459284,14.459269 35.903619,17.373439 53.335236,8.938867 9.770308,-4.85627 11.157421,-0.233333 17.229814,6.503172 l 22.879849,22.65637 c 0.0296,-0.0296 5.3749,5.57518 10.95011,0 5.59672,-5.59673 0.0814,-11.1456 0,-11.24807 L 99.53196,88.187602 C 90.918877,81.059485 88.554416,82.316668 93.103278,71.181266 101.53787,53.749648 98.47472,32.305306 84.015432,17.846023 74.883257,8.7138398 62.844843,3.9162872 50.867131,3.9162872 z m 0,11.9184908 c 19.372276,0 35.159546,15.712778 35.159546,35.085053 0,19.372267 -15.78727,35.159546 -35.159546,35.159546 -19.372276,0 -35.085045,-15.787279 -35.085045,-35.159546 0,-19.372275 15.712769,-35.085053 35.085045,-35.085053 z"
+ id="path3102"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssscccscccsssssss" />
+ <path
+ style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
+ d="m 44.031551,24.385066 0,19.706978 -19.706985,0 0,13.706981 19.706985,0 0,19.706979 13.706972,0 0,-19.706979 19.706985,0 0,-13.706981 -19.706985,0 0,-19.706978 z"
id="path3869"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccc" />
</svg>
diff --git a/data/elementary/themes/fdo/actions/128-svg/zoom-original.svg b/data/elementary/themes/fdo/actions/128-svg/zoom-original.svg
index 9bd3ba188d..95aee285f5 100644
--- a/data/elementary/themes/fdo/actions/128-svg/zoom-original.svg
+++ b/data/elementary/themes/fdo/actions/128-svg/zoom-original.svg
@@ -14,7 +14,7 @@
id="svg3027"
version="1.1"
inkscape:version="0.48.5 r10040"
- sodipodi:docname="zoom-in.svg"
+ sodipodi:docname="zoom-out.svg"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<metadata
@@ -38,16 +38,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="34.222631"
- inkscape:cy="111.94977"
+ inkscape:zoom="2"
+ inkscape:cx="37.830081"
+ inkscape:cy="99.74356"
inkscape:document-units="px"
inkscape:current-layer="svg3027"
showgrid="true"
- inkscape:window-width="1013"
- inkscape:window-height="847"
- inkscape:window-x="1941"
- inkscape:window-y="32"
+ inkscape:window-width="1115"
+ inkscape:window-height="886"
+ inkscape:window-x="1867"
+ inkscape:window-y="35"
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
borderlayer="false"
@@ -81,11 +81,25 @@
orientation="1,0"
position="8,128"
id="guide3005" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50.892857,109.73214"
+ id="guide3027" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="19.303384,77.055699"
+ id="guide3029" />
</sodipodi:namedview>
<path
style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
- d="m 49.356186,8.0112678 c -10.59192,0 -21.17164,4.2424842 -29.24725,12.3180932 -16.1512091,16.151212 -16.1512091,42.277403 0,58.428604 12.78638,12.786389 31.74966,15.363392 47.16448,7.90466 0.40565,-0.196246 0.91707,-0.382564 1.31744,-0.592849 2.50229,-0.98823 8.73066,-2.928708 12.0546,0.395233 2.46547,2.465474 1.62999,5.714057 5.40152,9.485592 l 22.001314,21.803689 c 0.0262,-0.0261 4.75304,4.93017 9.68321,0 4.9492,-4.9492 0.0719,-9.85606 0,-9.9467 L 95.927806,86.069776 c -3.77154,-3.771535 -6.75664,-2.936065 -9.22211,-5.401518 -4.0646,-4.064618 -0.24282,-12.656098 0,-13.174433 7.45873,-15.414803 4.74998,-34.378089 -8.0364,-47.164464 -8.07561,-8.075609 -18.7212,-12.3180932 -29.31311,-12.3180932 z m 0,10.5395452 c 17.13094,0 31.09166,13.894844 31.09166,31.025783 0,17.130958 -13.96072,31.091662 -31.09166,31.091662 -17.13095,0 -31.02579,-13.960704 -31.02579,-31.091662 0,-17.130939 13.89484,-31.025783 31.02579,-31.025783 z m -6.19199,12.318095 c -2.10791,4.215818 -4.21582,6.323727 -8.43163,6.323727 l 0,10.539541 8.43163,0 0,21.079092 12.64746,0 0,-37.94236 z"
- id="path3102-1"
+ d="m 50.867131,3.9162872 c -11.977712,0 -23.941625,4.7975526 -33.0738,13.9297358 -18.26436296,18.264358 -18.26436296,47.808782 0,66.073128 14.459284,14.459269 35.903619,17.373439 53.335236,8.938867 9.770308,-4.85627 11.157421,-0.233333 17.229814,6.503172 l 22.879849,22.65637 c 0.0296,-0.0296 5.3749,5.57518 10.95011,0 5.59672,-5.59673 0.0814,-11.1456 0,-11.24807 L 99.53196,88.187602 C 90.918877,81.059485 88.554416,82.316668 93.103278,71.181266 101.53787,53.749648 98.47472,32.305306 84.015432,17.846023 74.883257,8.7138398 62.844843,3.9162872 50.867131,3.9162872 z m 0,11.9184908 c 19.372276,0 35.159546,15.712778 35.159546,35.085053 0,19.372267 -15.78727,35.159546 -35.159546,35.159546 -19.372276,0 -35.085045,-15.787279 -35.085045,-35.159546 0,-19.372275 15.712769,-35.085053 35.085045,-35.085053 z"
+ id="path3102"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssscccscccsssssss" />
+ <path
+ sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="sssccsccsccscssssssscccccccc" />
+ id="path3102-1"
+ d="M 47.565529,23.323869 C 44.436242,29.58244 37.306955,34.711725 31.048396,34.711725 l 0,11.646422 16.517133,-2 0,35.292858 14.775723,0 0,-56.327136 z"
+ style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline" />
</svg>
diff --git a/data/elementary/themes/fdo/actions/128-svg/zoom-out.svg b/data/elementary/themes/fdo/actions/128-svg/zoom-out.svg
index 3ffa9350b4..cb73daaaa8 100644
--- a/data/elementary/themes/fdo/actions/128-svg/zoom-out.svg
+++ b/data/elementary/themes/fdo/actions/128-svg/zoom-out.svg
@@ -14,7 +14,7 @@
id="svg3027"
version="1.1"
inkscape:version="0.48.5 r10040"
- sodipodi:docname="zoom-fit.svg"
+ sodipodi:docname="zoom-in.svg"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<metadata
@@ -38,16 +38,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="45.532984"
- inkscape:cy="125.01644"
+ inkscape:zoom="2"
+ inkscape:cx="82.358494"
+ inkscape:cy="97.143887"
inkscape:document-units="px"
inkscape:current-layer="svg3027"
showgrid="true"
- inkscape:window-width="1013"
- inkscape:window-height="847"
- inkscape:window-x="1932"
- inkscape:window-y="-22"
+ inkscape:window-width="1115"
+ inkscape:window-height="886"
+ inkscape:window-x="1867"
+ inkscape:window-y="35"
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
borderlayer="false"
@@ -81,11 +81,25 @@
orientation="1,0"
position="8,128"
id="guide3005" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50.892857,109.73214"
+ id="guide3027" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="19.303384,77.055699"
+ id="guide3029" />
</sodipodi:namedview>
<path
style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
- d="m 49.358734,8.0015524 c -10.591916,0 -21.171635,4.2424826 -29.247243,12.3180946 -16.151209,16.151223 -16.1512111,42.277411 0,58.428614 12.786379,12.786388 31.749658,15.363392 47.164473,7.90466 0.405653,-0.196247 0.917078,-0.382565 1.317443,-0.59285 2.502291,-0.98823 8.73066,-2.928708 12.054607,0.395233 2.465466,2.465474 1.629988,5.714058 5.401518,9.485593 l 22.001308,21.803683 c 0.0261,-0.0261 4.75304,4.93017 9.68321,0 4.9492,-4.9492 0.0719,-9.85605 0,-9.94669 L 95.930357,86.060071 c -3.771532,-3.771534 -6.756642,-2.936065 -9.222103,-5.401518 -4.064608,-4.064597 -0.242827,-12.656098 0,-13.174433 C 94.166975,52.069316 91.458225,33.106036 78.671849,20.319647 70.596242,12.244035 59.950652,8.0015524 49.358734,8.0015524 z m 0,10.5395466 c 17.13094,0 31.091664,13.894853 31.091664,31.025791 0,17.130958 -13.960718,31.091663 -31.091664,31.091663 -17.130948,0 -31.025791,-13.960705 -31.025791,-31.091663 0,-17.130938 13.894845,-31.025791 31.025791,-31.025791 z m -18.83944,24.965551 0,12.647457 37.942369,0 0,-12.647457 z"
- id="path3102-3"
+ d="m 50.867131,3.9162872 c -11.977712,0 -23.941625,4.7975526 -33.0738,13.9297358 -18.26436296,18.264358 -18.26436296,47.808782 0,66.073128 14.459284,14.459269 35.903619,17.373439 53.335236,8.938867 9.770308,-4.85627 11.157421,-0.233333 17.229814,6.503172 l 22.879849,22.65637 c 0.0296,-0.0296 5.3749,5.57518 10.95011,0 5.59672,-5.59673 0.0814,-11.1456 0,-11.24807 L 99.53196,88.187602 C 90.918877,81.059485 88.554416,82.316668 93.103278,71.181266 101.53787,53.749648 98.47472,32.305306 84.015432,17.846023 74.883257,8.7138398 62.844843,3.9162872 50.867131,3.9162872 z m 0,11.9184908 c 19.372276,0 35.159546,15.712778 35.159546,35.085053 0,19.372267 -15.78727,35.159546 -35.159546,35.159546 -19.372276,0 -35.085045,-15.787279 -35.085045,-35.159546 0,-19.372275 15.712769,-35.085053 35.085045,-35.085053 z"
+ id="path3102"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssscccscccsssssss" />
+ <path
+ style="fill:#3399ff;fill-opacity:1;stroke:none;display:inline"
+ d="m 24.324566,44.092044 0,13.706981 c 0,0 16.946717,0 53.120942,0 l 0,-13.706981 c 0,0 -16.946717,0 -53.120942,0 z"
+ id="path3869"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="sssccsccsccscsssssssccccc" />
+ sodipodi:nodetypes="ccccc" />
</svg>
diff --git a/data/elementary/themes/fdo/actions/128/zoom-fill.png b/data/elementary/themes/fdo/actions/128/zoom-fill.png
new file mode 100644
index 0000000000..01b6c3c6dc
--- /dev/null
+++ b/data/elementary/themes/fdo/actions/128/zoom-fill.png
Binary files differ
diff --git a/data/elementary/themes/fdo/actions/128/zoom-fit-best.png b/data/elementary/themes/fdo/actions/128/zoom-fit-best.png
index f1c66840a4..fe2af5bb16 100644
--- a/data/elementary/themes/fdo/actions/128/zoom-fit-best.png
+++ b/data/elementary/themes/fdo/actions/128/zoom-fit-best.png
Binary files differ
diff --git a/data/elementary/themes/fdo/actions/128/zoom-fit.png b/data/elementary/themes/fdo/actions/128/zoom-fit.png
index f1c66840a4..a45defa884 100644
--- a/data/elementary/themes/fdo/actions/128/zoom-fit.png
+++ b/data/elementary/themes/fdo/actions/128/zoom-fit.png
Binary files differ
diff --git a/data/elementary/themes/fdo/actions/128/zoom-in.png b/data/elementary/themes/fdo/actions/128/zoom-in.png
index 7912d755da..7bb06ad21f 100644
--- a/data/elementary/themes/fdo/actions/128/zoom-in.png
+++ b/data/elementary/themes/fdo/actions/128/zoom-in.png
Binary files differ
diff --git a/data/elementary/themes/fdo/actions/128/zoom-original.png b/data/elementary/themes/fdo/actions/128/zoom-original.png
index 41b1104246..b51ebe98fb 100644
--- a/data/elementary/themes/fdo/actions/128/zoom-original.png
+++ b/data/elementary/themes/fdo/actions/128/zoom-original.png
Binary files differ
diff --git a/data/elementary/themes/fdo/actions/128/zoom-out.png b/data/elementary/themes/fdo/actions/128/zoom-out.png
index ad09e7758f..c91b4ee64e 100644
--- a/data/elementary/themes/fdo/actions/128/zoom-out.png
+++ b/data/elementary/themes/fdo/actions/128/zoom-out.png
Binary files differ
diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c
index a5a5b917bd..776c26bf97 100644
--- a/src/bin/elementary/test_icon.c
+++ b/src/bin/elementary/test_icon.c
@@ -323,11 +323,12 @@ _standard_genlist_populate(Evas_Object *gl)
IC("system-search")
IC("help-about")
IC("help-contents")
- IC("zoom-fit-best")
- IC("zoom-fit")
IC("zoom-in")
- IC("zoom-original")
IC("zoom-out")
+ IC("zoom-original")
+ IC("zoom-fit")
+ IC("zoom-fill")
+ IC("zoom-fit-best")
CONTEXT("Status")
IC("audio-volume-high")