raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=484c9f5818e0802547adfc9a9311ac59acdf497b
commit 484c9f5818e0802547adfc9a9311ac59acdf497b Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Apr 5 23:43:25 2021 +0100 e - module icons ... the great flattening begins... (partly done) did a chunk of the module icons, but not all. it now matches flat. --- src/modules/appmenu/e-module-appmenu.edj | Bin 13065 -> 8040 bytes src/modules/backlight/e-module-backlight.edj | Bin 8910 -> 8056 bytes src/modules/battery/e-module-battery.edj | Bin 7340 -> 6980 bytes src/modules/bluez5/e-module-bluez5.edj | Bin 59845 -> 11362 bytes src/modules/clock/e-module-clock.edj | Bin 26710 -> 8992 bytes src/modules/connman/e-module-connman.edj | Bin 19913 -> 8207 bytes src/modules/cpufreq/e-module-cpufreq.edj | Bin 16972 -> 7656 bytes .../everything/e-module-everything-start.edj | Bin 24666 -> 8160 bytes src/modules/everything/e-module-everything.edj | Bin 17660 -> 8160 bytes src/modules/fileman/e-module-fileman.edj | Bin 15937 -> 7240 bytes .../fileman_opinfo/e-module-fileman_opinfo.edj | Bin 9833 -> 9625 bytes src/modules/geolocation/e-module-geolocation.edc | 52 -------- src/modules/geolocation/e-module-geolocation.edj | Bin 13492 -> 14976 bytes .../geolocation/images/geolocation-icon.svg | 138 --------------------- src/modules/geolocation/images/location_off.png | Bin 2491 -> 0 bytes src/modules/geolocation/images/location_on.png | Bin 2381 -> 0 bytes src/modules/ibar/e-module-ibar.edj | Bin 13065 -> 7720 bytes src/modules/ibox/e-module-ibox.edj | Bin 13065 -> 8848 bytes src/modules/msgbus/e-module-msgbus.edj | Bin 23422 -> 7600 bytes .../music-control/e-module-music-control.edj | Bin 46337 -> 7456 bytes src/modules/packagekit/e-module-packagekit.edj | Bin 15007 -> 8273 bytes src/modules/pager/e-module-pager.edj | Bin 12522 -> 6952 bytes src/modules/procstats/e-module-procstats.edj | Bin 12522 -> 7232 bytes src/modules/quickaccess/e-module-quickaccess.edj | Bin 12056 -> 8479 bytes src/modules/shot/e-module-shot.edj | Bin 9475 -> 8152 bytes src/modules/start/e-module-start.edj | Bin 24666 -> 7112 bytes src/modules/systray/e-module-systray.edj | Bin 10045 -> 11496 bytes src/modules/tasks/e-module-tasks.edj | Bin 12522 -> 7920 bytes src/modules/temperature/e-module-temperature.edj | Bin 16980 -> 7520 bytes .../wl_desktop_shell/e-module-wl_desktop_shell.edj | Bin 13048 -> 7832 bytes 30 files changed, 190 deletions(-) diff --git a/src/modules/appmenu/e-module-appmenu.edj b/src/modules/appmenu/e-module-appmenu.edj index f2dd5d4bb..a62cf79d9 100644 Binary files a/src/modules/appmenu/e-module-appmenu.edj and b/src/modules/appmenu/e-module-appmenu.edj differ diff --git a/src/modules/backlight/e-module-backlight.edj b/src/modules/backlight/e-module-backlight.edj index c16263fee..c66a89701 100644 Binary files a/src/modules/backlight/e-module-backlight.edj and b/src/modules/backlight/e-module-backlight.edj differ diff --git a/src/modules/battery/e-module-battery.edj b/src/modules/battery/e-module-battery.edj index b861ae1b1..40654e96a 100644 Binary files a/src/modules/battery/e-module-battery.edj and b/src/modules/battery/e-module-battery.edj differ diff --git a/src/modules/bluez5/e-module-bluez5.edj b/src/modules/bluez5/e-module-bluez5.edj index 383b4460e..93f43b000 100644 Binary files a/src/modules/bluez5/e-module-bluez5.edj and b/src/modules/bluez5/e-module-bluez5.edj differ diff --git a/src/modules/clock/e-module-clock.edj b/src/modules/clock/e-module-clock.edj index a25237bdf..12bdf6b7b 100644 Binary files a/src/modules/clock/e-module-clock.edj and b/src/modules/clock/e-module-clock.edj differ diff --git a/src/modules/connman/e-module-connman.edj b/src/modules/connman/e-module-connman.edj index 07d9162d3..b9a6fd6be 100644 Binary files a/src/modules/connman/e-module-connman.edj and b/src/modules/connman/e-module-connman.edj differ diff --git a/src/modules/cpufreq/e-module-cpufreq.edj b/src/modules/cpufreq/e-module-cpufreq.edj index dd4317469..235cf3dd9 100644 Binary files a/src/modules/cpufreq/e-module-cpufreq.edj and b/src/modules/cpufreq/e-module-cpufreq.edj differ diff --git a/src/modules/everything/e-module-everything-start.edj b/src/modules/everything/e-module-everything-start.edj index 57abea352..75afbcf5a 100644 Binary files a/src/modules/everything/e-module-everything-start.edj and b/src/modules/everything/e-module-everything-start.edj differ diff --git a/src/modules/everything/e-module-everything.edj b/src/modules/everything/e-module-everything.edj index 20e4b3cf5..75afbcf5a 100644 Binary files a/src/modules/everything/e-module-everything.edj and b/src/modules/everything/e-module-everything.edj differ diff --git a/src/modules/fileman/e-module-fileman.edj b/src/modules/fileman/e-module-fileman.edj index a56820ced..4fac746df 100644 Binary files a/src/modules/fileman/e-module-fileman.edj and b/src/modules/fileman/e-module-fileman.edj differ diff --git a/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj b/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj index 78521145e..00d03eb83 100644 Binary files a/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj and b/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj differ diff --git a/src/modules/geolocation/e-module-geolocation.edc b/src/modules/geolocation/e-module-geolocation.edc deleted file mode 100644 index b56f5b2f0..000000000 --- a/src/modules/geolocation/e-module-geolocation.edc +++ /dev/null @@ -1,52 +0,0 @@ -images { - image: "location_off.png" COMP; - image: "location_on.png" COMP; -} -collections { - group { - name: "icon"; - parts { - part { - name: "image"; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image.normal: "location_on.png"; - } - } - } - } - group { name: "e/modules/geolocation/main"; - min: 16 16; - max: 160 160; - parts { - part { name: "in_use"; - description { state: "default" 0.0; - rel1.relative: (4/160) (4/160); - rel2.relative: (156/160) (156/160); - aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "location_off.png"; - max: 152 152; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - image.normal: "location_on.png"; - } - } - } - programs { - program { - signal: "e,state,location_on"; source: "e"; - action: STATE_SET "visible" 0.0; - target: "in_use"; - } - program { - signal: "e,state,location_off"; source: "e"; - action: STATE_SET "default" 0.0; - target: "in_use"; - } - } - } -} diff --git a/src/modules/geolocation/e-module-geolocation.edj b/src/modules/geolocation/e-module-geolocation.edj index 93f6ce427..f3c7c0317 100644 Binary files a/src/modules/geolocation/e-module-geolocation.edj and b/src/modules/geolocation/e-module-geolocation.edj differ diff --git a/src/modules/geolocation/images/geolocation-icon.svg b/src/modules/geolocation/images/geolocation-icon.svg deleted file mode 100644 index bab996232..000000000 --- a/src/modules/geolocation/images/geolocation-icon.svg +++ /dev/null @@ -1,138 +0,0 @@ -<?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="744.09448819" - height="1052.3622047" - id="svg2998" - version="1.1" - inkscape:version="0.48.5 r10040" - sodipodi:docname="geolocation-icon.svg"> - <defs - id="defs3000" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.7" - inkscape:cx="122.85714" - inkscape:cy="520" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:window-width="1159" - inkscape:window-height="859" - inkscape:window-x="1940" - inkscape:window-y="86" - inkscape:window-maximized="0" - inkscape:snap-object-midpoints="true" - inkscape:snap-grids="true" - inkscape:snap-to-guides="true"> - <inkscape:grid - type="xygrid" - id="grid3855" - empspacing="5" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <metadata - id="metadata3003"> - <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 - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <path - sodipodi:type="arc" - style="fill:none;stroke:#bebebe;stroke-width:53;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3008" - sodipodi:cx="265.71429" - sodipodi:cy="415.21933" - sodipodi:rx="177.14285" - sodipodi:ry="177.14285" - d="m 442.85715,415.21933 a 177.14285,177.14285 0 1 1 -354.285708,0 177.14285,177.14285 0 1 1 354.285708,0 z" - transform="translate(14.285706,0)" - inkscape:export-filename="/home/stefan/location_off.png" - inkscape:export-xdpi="11.39" - inkscape:export-ydpi="11.39" /> - <path - sodipodi:type="arc" - style="fill:#bebebe;fill-opacity:1;stroke:#bebebe;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3799" - sodipodi:cx="250" - sodipodi:cy="399.50504" - sodipodi:rx="71.428574" - sodipodi:ry="71.428574" - d="m 321.42857,399.50504 a 71.428574,71.428574 0 1 1 -142.85714,0 71.428574,71.428574 0 1 1 142.85714,0 z" - transform="matrix(0.58000001,0,0,0.52604653,135,202.20395)" - inkscape:export-filename="/home/stefan/location_off.png" - inkscape:export-xdpi="11.39" - inkscape:export-ydpi="11.39" /> - <rect - style="fill:#3399ff;fill-opacity:1;stroke:#bebebe;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect3803" - width="118.57143" - height="5.7142859" - x="527.76569" - y="-287.85635" - ry="2.8571429" - transform="matrix(-0.00970952,0.99995286,-0.99995286,-0.00970952,0,0)" - inkscape:export-filename="/home/stefan/location_off.png" - inkscape:export-xdpi="11.39" - inkscape:export-ydpi="11.39" /> - <rect - style="fill:#3399ff;fill-opacity:1;stroke:#bebebe;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect3803-1" - width="118.57143" - height="5.7142859" - x="44.714287" - y="409.50504" - ry="2.8571429" - inkscape:export-filename="/home/stefan/location_off.png" - inkscape:export-xdpi="11.39" - inkscape:export-ydpi="11.39" /> - <rect - style="fill:#3399ff;fill-opacity:1;stroke:#bebebe;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect3803-3" - width="118.57143" - height="5.7142859" - x="396.71429" - y="409.50504" - ry="2.8571429" - inkscape:export-filename="/home/stefan/location_off.png" - inkscape:export-xdpi="11.39" - inkscape:export-ydpi="11.39" /> - <rect - style="fill:#3399ff;fill-opacity:1;stroke:#bebebe;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect3803-5" - width="118.57143" - height="5.7142859" - x="174.61848" - y="-286.57022" - ry="2.8571429" - transform="matrix(-0.00970952,0.99995286,-0.99995286,-0.00970952,0,0)" - inkscape:export-filename="/home/stefan/location_off.png" - inkscape:export-xdpi="11.39" - inkscape:export-ydpi="11.39" /> - </g> -</svg> diff --git a/src/modules/geolocation/images/location_off.png b/src/modules/geolocation/images/location_off.png deleted file mode 100644 index b87b5d4a9..000000000 Binary files a/src/modules/geolocation/images/location_off.png and /dev/null differ diff --git a/src/modules/geolocation/images/location_on.png b/src/modules/geolocation/images/location_on.png deleted file mode 100644 index 6bdc3ebe0..000000000 Binary files a/src/modules/geolocation/images/location_on.png and /dev/null differ diff --git a/src/modules/ibar/e-module-ibar.edj b/src/modules/ibar/e-module-ibar.edj index f2dd5d4bb..67ff3749d 100644 Binary files a/src/modules/ibar/e-module-ibar.edj and b/src/modules/ibar/e-module-ibar.edj differ diff --git a/src/modules/ibox/e-module-ibox.edj b/src/modules/ibox/e-module-ibox.edj index f2dd5d4bb..25431dfb8 100644 Binary files a/src/modules/ibox/e-module-ibox.edj and b/src/modules/ibox/e-module-ibox.edj differ diff --git a/src/modules/msgbus/e-module-msgbus.edj b/src/modules/msgbus/e-module-msgbus.edj index 02b45421b..875f61e50 100644 Binary files a/src/modules/msgbus/e-module-msgbus.edj and b/src/modules/msgbus/e-module-msgbus.edj differ diff --git a/src/modules/music-control/e-module-music-control.edj b/src/modules/music-control/e-module-music-control.edj index 7d161edb3..4cab2778f 100644 Binary files a/src/modules/music-control/e-module-music-control.edj and b/src/modules/music-control/e-module-music-control.edj differ diff --git a/src/modules/packagekit/e-module-packagekit.edj b/src/modules/packagekit/e-module-packagekit.edj index abf13f179..00ac0774f 100644 Binary files a/src/modules/packagekit/e-module-packagekit.edj and b/src/modules/packagekit/e-module-packagekit.edj differ diff --git a/src/modules/pager/e-module-pager.edj b/src/modules/pager/e-module-pager.edj index 75aa3dc0b..0a373e99c 100644 Binary files a/src/modules/pager/e-module-pager.edj and b/src/modules/pager/e-module-pager.edj differ diff --git a/src/modules/procstats/e-module-procstats.edj b/src/modules/procstats/e-module-procstats.edj index 75aa3dc0b..08865365a 100644 Binary files a/src/modules/procstats/e-module-procstats.edj and b/src/modules/procstats/e-module-procstats.edj differ diff --git a/src/modules/quickaccess/e-module-quickaccess.edj b/src/modules/quickaccess/e-module-quickaccess.edj index 300a961d1..6c1783eb8 100644 Binary files a/src/modules/quickaccess/e-module-quickaccess.edj and b/src/modules/quickaccess/e-module-quickaccess.edj differ diff --git a/src/modules/shot/e-module-shot.edj b/src/modules/shot/e-module-shot.edj index a50790686..d91252fa0 100644 Binary files a/src/modules/shot/e-module-shot.edj and b/src/modules/shot/e-module-shot.edj differ diff --git a/src/modules/start/e-module-start.edj b/src/modules/start/e-module-start.edj index 57abea352..24232808f 100644 Binary files a/src/modules/start/e-module-start.edj and b/src/modules/start/e-module-start.edj differ diff --git a/src/modules/systray/e-module-systray.edj b/src/modules/systray/e-module-systray.edj index f7fd8fd55..80164fc9f 100644 Binary files a/src/modules/systray/e-module-systray.edj and b/src/modules/systray/e-module-systray.edj differ diff --git a/src/modules/tasks/e-module-tasks.edj b/src/modules/tasks/e-module-tasks.edj index 75aa3dc0b..2c5bc750b 100644 Binary files a/src/modules/tasks/e-module-tasks.edj and b/src/modules/tasks/e-module-tasks.edj differ diff --git a/src/modules/temperature/e-module-temperature.edj b/src/modules/temperature/e-module-temperature.edj index 3eece6ad4..e67b9ecb7 100644 Binary files a/src/modules/temperature/e-module-temperature.edj and b/src/modules/temperature/e-module-temperature.edj differ diff --git a/src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj b/src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj index 2c1f4d26e..f7c268d95 100644 Binary files a/src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj and b/src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj differ --