raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=329266937a1e63e4e26f3e6c4f985e1adfbf91af
commit 329266937a1e63e4e26f3e6c4f985e1adfbf91af
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Sat Jul 17 23:12:21 2021 +0100
elm theme - fix fprint icon to be recolored right
---
data/elementary/themes/edc/icons.edc | 7 +-
data/elementary/themes/ic.edc | 3 +-
data/elementary/themes/img/ic/fingerprint-040.png | Bin 2459 -> 1581 bytes
data/elementary/themes/img/ic/fingerprint-080.png | Bin 5835 -> 3759 bytes
data/elementary/themes/img/ic/fingerprint-160.png | Bin 12638 -> 8215 bytes
data/elementary/themes/img/svg/fingerprint.svg | 88 +++++++++++++++-------
6 files changed, 67 insertions(+), 31 deletions(-)
diff --git a/data/elementary/themes/edc/icons.edc
b/data/elementary/themes/edc/icons.edc
index 52ee2c4778..9ac95ce10e 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -83,7 +83,6 @@ ICON("preferences-desktop-mouse-extra", "i-mouse-extra")
ICON("preferences-desktop-keyboard", "i-keyboard")
ICON("preferences-desktop-signal-bindings", "i-signal-bindings")
ICON("preferences-behavior", "i-input")
-ICON("preferences-interaction", "i-fingerprint") // pretty bad for touch icon
- FIXME
ICON("preferences-focus", "i-window-focus")
ICON("preferences-window-geometry", "i-window-geometry")
ICON("preferences-desktop-window-remember", "i-window-remember")
@@ -217,6 +216,10 @@ ICON("preferences-position-left-bottom", "i-shelf-lb")
ICON("preferences-position-right-top", "i-shelf-rt")
ICON("preferences-position-right", "i-shelf-rc")
ICON("preferences-position-right-bottom", "i-shelf-rb")
+
+ICON("preferences-interaction", "i-fingerprint") // pretty bad for touch icon
- FIXME
+
+ICON("fprint", "i-fingerprint")
#undef ICON
// mono border action icons
@@ -724,6 +727,8 @@ ICON("non-starred", "i-star-off")
ICON("utilities-terminal", "i-termprompt")
+ICON("fprint", "i-fingerprint")
+
#undef ICON
// regular icons
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 8a612465f0..44e0083703 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -275,7 +275,6 @@ I160("i-screen-around", "screen-around")
I160("i-bulb", "bulb")
I160("i-key", "key")
I160("i-gesture", "gesture")
-I160("i-fingerprint", "fingerprint")
I160("i-mouse", "mouse")
I160("i-keyboard", "keyboard")
I160("i-input", "input")
@@ -538,6 +537,8 @@ I160("i-system-lock", "system-lock")
I160("i-system-logout", "system-logout")
I160("i-enlightenment", "enlightenment")
+I160("i-fingerprint", "fingerprint")
+
///////////////////////////////////////////////////////////////////////////////
// misc larger icons
I160("i-unknown", "unknown")
diff --git a/data/elementary/themes/img/ic/fingerprint-040.png
b/data/elementary/themes/img/ic/fingerprint-040.png
index 9ce6eb4038..6ba039055e 100644
Binary files a/data/elementary/themes/img/ic/fingerprint-040.png and
b/data/elementary/themes/img/ic/fingerprint-040.png differ
diff --git a/data/elementary/themes/img/ic/fingerprint-080.png
b/data/elementary/themes/img/ic/fingerprint-080.png
index 85cca0d154..a72811fcd7 100644
Binary files a/data/elementary/themes/img/ic/fingerprint-080.png and
b/data/elementary/themes/img/ic/fingerprint-080.png differ
diff --git a/data/elementary/themes/img/ic/fingerprint-160.png
b/data/elementary/themes/img/ic/fingerprint-160.png
index e3d40b39f2..55a11eb5e5 100644
Binary files a/data/elementary/themes/img/ic/fingerprint-160.png and
b/data/elementary/themes/img/ic/fingerprint-160.png differ
diff --git a/data/elementary/themes/img/svg/fingerprint.svg
b/data/elementary/themes/img/svg/fingerprint.svg
index b8010a256a..85659ebdec 100644
--- a/data/elementary/themes/img/svg/fingerprint.svg
+++ b/data/elementary/themes/img/svg/fingerprint.svg
@@ -1,22 +1,22 @@
<?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";
version="1.1"
id="svg2"
width="80"
height="80"
viewBox="0 0 80 80"
sodipodi:docname="fingerprint.svg"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/fingerprint-040.png"
+ inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+ inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-040.png"
inkscape:export-xdpi="48"
- inkscape:export-ydpi="48">
+ inkscape:export-ydpi="48"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";>
<metadata
id="metadata8">
<rdf:RDF>
@@ -25,7 +25,6 @@
<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>
@@ -54,12 +53,12 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1354"
- inkscape:window-height="1372"
+ inkscape:window-height="1001"
id="namedview4"
showgrid="true"
inkscape:zoom="8.1375"
inkscape:cx="40"
- inkscape:cy="40.061444"
+ inkscape:cy="40.122888"
inkscape:window-x="1206"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -68,7 +67,8 @@
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:snap-others="false"
- inkscape:snap-nodes="true">
+ inkscape:snap-nodes="true"
+ inkscape:pagecheckerboard="0">
<inkscape:grid
type="xygrid"
id="grid837" />
@@ -82,7 +82,10 @@
cy="40"
cx="40"
id="path5067"
-
style="opacity:1;fill:none;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke:#a0a0a0;stroke-opacity:1"
/>
+
style="opacity:1;fill:none;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke:#fffffd;stroke-opacity:1"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
d="m 43.975455,43.03245 a 5,5 0 0 1 -6.464136,1.304192 5,5 0 0 1
-2.135227,-6.239133 5,5 0 0 1 5.90778,-2.929866"
sodipodi:arc-type="arc"
@@ -95,9 +98,12 @@
sodipodi:cx="40"
sodipodi:type="arc"
id="path5069"
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path5071"
sodipodi:type="arc"
sodipodi:cx="40"
@@ -108,7 +114,10 @@
sodipodi:end="5.9000004"
sodipodi:open="true"
sodipodi:arc-type="arc"
- d="m 30.978949,44.315165 a 10,10 0 0 1 0.894023,-10.141949 10,10 0 0 1
9.31837,-4.101998 10,10 0 0 1 8.083444,6.190019" />
+ d="m 30.978949,44.315165 a 10,10 0 0 1 0.894023,-10.141949 10,10 0 0 1
9.31837,-4.101998 10,10 0 0 1 8.083444,6.190019"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
d="M 54.96884,40.966349 A 15,15 0 0 1 44.144681,54.41602 15,15 0 0 1
27.83009,48.768881 15,15 0 0 1 27.6369,31.505662"
sodipodi:arc-type="arc"
@@ -121,10 +130,13 @@
sodipodi:cx="40"
sodipodi:type="arc"
id="path5073"
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
sodipodi:open="true"
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path5075"
sodipodi:type="arc"
sodipodi:cx="40"
@@ -134,7 +146,10 @@
sodipodi:start="1.4555675"
sodipodi:end="4.4180899"
sodipodi:arc-type="arc"
- d="M 42.29948,59.86737 A 20,20 0 0 1 20.41782,44.066721 20,20 0 0 1
34.198617,20.859886" />
+ d="M 42.29948,59.86737 A 20,20 0 0 1 20.41782,44.066721 20,20 0 0 1
34.198617,20.859886"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
d="M 45.46173,15.603904 A 25,25 0 0 1 64.900594,42.227205 25,25 0 0 1
41.04551,64.978129 25,25 0 0 1 15.372628,44.300298"
sodipodi:arc-type="arc"
@@ -147,7 +162,10 @@
sodipodi:cx="40"
sodipodi:type="arc"
id="path5077"
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
d="m 47.923024,46.101286 a 10,10 0 0 1 -9.499196,3.773717"
sodipodi:arc-type="arc"
@@ -160,9 +178,12 @@
sodipodi:cx="40"
sodipodi:type="arc"
id="path5079"
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path5081"
sodipodi:type="arc"
sodipodi:cx="40"
@@ -173,7 +194,10 @@
sodipodi:end="5.6642139"
sodipodi:open="true"
sodipodi:arc-type="arc"
- d="m 43.434922,25.398585 a 15,15 0 0 1 8.782213,5.898449" />
+ d="m 43.434922,25.398585 a 15,15 0 0 1 8.782213,5.898449"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
d="m 52.406889,24.31341 a 20,20 0 0 1 5.301636,24.982189"
sodipodi:arc-type="arc"
@@ -185,10 +209,13 @@
sodipodi:cx="40"
sodipodi:type="arc"
id="path5083"
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:open="true" />
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:open="true"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
<path
-
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#fffffd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path5085"
sodipodi:type="arc"
sodipodi:cx="40"
@@ -199,6 +226,9 @@
sodipodi:end="4.1880314"
sodipodi:open="true"
sodipodi:arc-type="arc"
- d="m 20.185423,24.755901 a 25,25 0 0 1 7.298152,-6.397045" />
+ d="m 20.185423,24.755901 a 25,25 0 0 1 7.298152,-6.397045"
+
inkscape:export-filename="/home/raster/C/th-efl/img/ic/fingerprint-160.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192" />
</g>
</svg>
--
