raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dc621dc6ca23c851b4ba15660f195d7f35a01c6c
commit dc621dc6ca23c851b4ba15660f195d7f35a01c6c Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Jun 16 20:00:21 2021 +0100 elm theme - more cc --- data/elementary/themes/colorclasses.edc | 13 ++ data/elementary/themes/edc/clock.edc | 20 +-- data/elementary/themes/edc/cpufreq.edc | 99 +++++++++------ data/elementary/themes/img/cpu_clip_1-040.png | Bin 0 -> 779 bytes data/elementary/themes/img/cpu_clip_1-080.png | Bin 0 -> 1612 bytes data/elementary/themes/img/cpu_clip_1-160.png | Bin 0 -> 3530 bytes data/elementary/themes/img/cpu_clip_2-040.png | Bin 0 -> 697 bytes data/elementary/themes/img/cpu_clip_2-080.png | Bin 0 -> 1395 bytes data/elementary/themes/img/cpu_clip_2-160.png | Bin 0 -> 2865 bytes data/elementary/themes/img/cpu_clip_3-040.png | Bin 0 -> 556 bytes data/elementary/themes/img/cpu_clip_3-080.png | Bin 0 -> 1084 bytes data/elementary/themes/img/cpu_clip_3-160.png | Bin 0 -> 2309 bytes data/elementary/themes/img/cpu_detail-040.png | Bin 0 -> 200 bytes data/elementary/themes/img/cpu_detail-080.png | Bin 0 -> 275 bytes data/elementary/themes/img/cpu_detail-160.png | Bin 0 -> 474 bytes data/elementary/themes/img/cpu_markers-040.png | Bin 0 -> 235 bytes data/elementary/themes/img/cpu_markers-080.png | Bin 0 -> 398 bytes data/elementary/themes/img/cpu_markers-160.png | Bin 0 -> 742 bytes data/elementary/themes/img/svg/cpufreq.svg | 165 +++++++++++++++++++++++++ 19 files changed, 251 insertions(+), 46 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 2f5b482897..de6788c216 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -365,6 +365,19 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg/normal/gadgets/clock/cal/daydate-sep"; color: 255 255 255 32; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/gadgets/cpufreq/base"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/gadgets/cpufreq/detail"; + color: 56 56 56 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/text"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/min"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/max"; + color: 255 51 153 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/average"; + color: 255 153 51 255; } diff --git a/data/elementary/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc index 27812d64aa..bfd77c642f 100644 --- a/data/elementary/themes/edc/clock.edc +++ b/data/elementary/themes/edc/clock.edc @@ -516,29 +516,29 @@ group { name: "e/modules/clock/digital"; group { name: "e/modules/clock/main"; set { name: "clock_base"; - image { image: "clock_base-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_base-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_base-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_base-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_base-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_base_digits"; - image { image: "clock_base_digits-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_base_digits-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_base_digits-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_base_digits-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_base_digits-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_secs"; - image { image: "clock_hand_secs-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_hand_secs-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_hand_secs-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_secs-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_secs-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_mins"; - image { image: "clock_hand_mins-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_hand_mins-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_hand_mins-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_mins-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_mins-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_hours"; - image { image: "clock_hand_hours-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_hand_hours-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_hand_hours-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_hours-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_hours-040.png" COMP; size: 0 0 40 40; } } min: 16 16; max: 160 160; diff --git a/data/elementary/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc index e65fc71626..f4bcab037f 100644 --- a/data/elementary/themes/edc/cpufreq.edc +++ b/data/elementary/themes/edc/cpufreq.edc @@ -1,9 +1,30 @@ group { name: "e/modules/cpufreq/main"; - images.image: "cpu_base.png" COMP; - images.image: "cpu_clip1.png" COMP; - images.image: "cpu_clip2.png" COMP; - images.image: "cpu_clip3.png" COMP; - set { name: "marker"; + set { name: "cpu_markers"; + image { image: "cpu_markers-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_markers-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_markers-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_detail"; + image { image: "cpu_detail-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_detail-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_detail-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_clip_1"; + image { image: "cpu_clip_1-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_clip_1-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_clip_1-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_clip_2"; + image { image: "cpu_clip_2-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_clip_2-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_clip_2-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_clip_3"; + image { image: "cpu_clip_3-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_clip_3-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_clip_3-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_marker"; image { image: "cpu_marker.png" COMP; size: 72 72 99999 99999; } image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; } image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; } @@ -152,42 +173,53 @@ group { name: "e/modules/cpufreq/main"; parts { part { name: "fade_clip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 255; } description { state: "faded" 0.0; - color: 255 255 255 128; + color: 255 255 255 128; // no cc } } part { name: "clip1"; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "cpu_clip1.png"; + rel.to: "base"; + image.normal: "cpu_clip_1"; } } part { name: "clip2"; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "cpu_clip2.png"; + rel.to: "base"; + image.normal: "cpu_clip_2"; } } part { name: "clip3"; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "cpu_clip3.png"; + rel.to: "base"; + image.normal: "cpu_clip_3"; } } part { name: "base"; description { state: "default" 0.0; - rel1.relative: (25/380) (25/380); - rel2.relative: (365/380) (365/380); aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "cpu_base.png"; + image.normal: "clock_base"; + color_class: "/bg/normal/gadgets/cpufreq/base"; + } + } + part { name: "base_detail"; + description { state: "default" 0.0; + rel.to: "base"; + aspect: 1.0 1.0; aspect_preference: BOTH; + image.normal: "cpu_detail"; + color_class: "/bg/normal/gadgets/cpufreq/detail"; + } + } + part { name: "base_markers"; + description { state: "default" 0.0; + rel.to: "base"; + aspect: 1.0 1.0; aspect_preference: BOTH; + image.normal: "cpu_markers"; + color_class: "/fg/normal/gadgets/cpufreq/digits"; } } part { name: "readout"; type: TEXT; mouse_events: 0; @@ -196,7 +228,7 @@ group { name: "e/modules/cpufreq/main"; description { state: "default" 0.0; rel1.relative: (56/144) (56/144); rel2.relative: (88/144) (88/144); - color: 255 255 255 255; + color_class: "/fg/normal/gadgets/cpufreq/text"; text { font: FN; size: 6; min: 1 1; ellipsis: -1; @@ -207,10 +239,9 @@ group { name: "e/modules/cpufreq/main"; part { name: "meter_min"; mouse_events: 0; clip_to: "clip3"; description { state: "default" 0.0; - image.normal: "marker"; - color: 51 153 255 255; - rel1.to: "base"; - rel2.to: "base"; + image.normal: "cpu_marker"; + color_class: "/fg/normal/gadgets/cpufreq/hands/min"; + rel.to: "base"; map { on: 1; rotation.center: "base"; @@ -220,10 +251,9 @@ group { name: "e/modules/cpufreq/main"; part { name: "meter_max"; mouse_events: 0; clip_to: "clip1"; description { state: "default" 0.0; - image.normal: "marker"; - color: 255 0 0 255; - rel1.to: "base"; - rel2.to: "base"; + image.normal: "cpu_marker"; + color_class: "/fg/normal/gadgets/cpufreq/hands/max"; + rel.to: "base"; map { on: 1; rotation.center: "base"; @@ -233,10 +263,9 @@ group { name: "e/modules/cpufreq/main"; part { name: "meter"; mouse_events: 0; clip_to: "clip2"; description { state: "default" 0.0000; - color: 255 153 51 255; - image.normal: "marker"; - rel1.to: "base"; - rel2.to: "base"; + image.normal: "cpu_marker"; + color_class: "/fg/normal/gadgets/cpufreq/hands/average"; + rel.to: "base"; map { on: 1; rotation.center: "base"; @@ -245,13 +274,11 @@ group { name: "e/modules/cpufreq/main"; } } programs { - program { - signal: "e,state,enabled"; source: "e"; + program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "fade_clip"; } - program { - signal: "e,state,disabled"; source: "e"; + program { signal: "e,state,disabled"; source: "e"; action: STATE_SET "faded" 0.0; target: "fade_clip"; } diff --git a/data/elementary/themes/img/cpu_clip_1-040.png b/data/elementary/themes/img/cpu_clip_1-040.png new file mode 100644 index 0000000000..8b069ae40d Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_1-040.png differ diff --git a/data/elementary/themes/img/cpu_clip_1-080.png b/data/elementary/themes/img/cpu_clip_1-080.png new file mode 100644 index 0000000000..9e58674dd5 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_1-080.png differ diff --git a/data/elementary/themes/img/cpu_clip_1-160.png b/data/elementary/themes/img/cpu_clip_1-160.png new file mode 100644 index 0000000000..7d01037729 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_1-160.png differ diff --git a/data/elementary/themes/img/cpu_clip_2-040.png b/data/elementary/themes/img/cpu_clip_2-040.png new file mode 100644 index 0000000000..c10ca9e8b8 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_2-040.png differ diff --git a/data/elementary/themes/img/cpu_clip_2-080.png b/data/elementary/themes/img/cpu_clip_2-080.png new file mode 100644 index 0000000000..a0da46e09a Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_2-080.png differ diff --git a/data/elementary/themes/img/cpu_clip_2-160.png b/data/elementary/themes/img/cpu_clip_2-160.png new file mode 100644 index 0000000000..3cc6557ccb Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_2-160.png differ diff --git a/data/elementary/themes/img/cpu_clip_3-040.png b/data/elementary/themes/img/cpu_clip_3-040.png new file mode 100644 index 0000000000..bc4c2efb48 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_3-040.png differ diff --git a/data/elementary/themes/img/cpu_clip_3-080.png b/data/elementary/themes/img/cpu_clip_3-080.png new file mode 100644 index 0000000000..81af1361af Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_3-080.png differ diff --git a/data/elementary/themes/img/cpu_clip_3-160.png b/data/elementary/themes/img/cpu_clip_3-160.png new file mode 100644 index 0000000000..ec5a509a42 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_3-160.png differ diff --git a/data/elementary/themes/img/cpu_detail-040.png b/data/elementary/themes/img/cpu_detail-040.png new file mode 100644 index 0000000000..8c6797c2a4 Binary files /dev/null and b/data/elementary/themes/img/cpu_detail-040.png differ diff --git a/data/elementary/themes/img/cpu_detail-080.png b/data/elementary/themes/img/cpu_detail-080.png new file mode 100644 index 0000000000..e1166d4038 Binary files /dev/null and b/data/elementary/themes/img/cpu_detail-080.png differ diff --git a/data/elementary/themes/img/cpu_detail-160.png b/data/elementary/themes/img/cpu_detail-160.png new file mode 100644 index 0000000000..cc7e3c038f Binary files /dev/null and b/data/elementary/themes/img/cpu_detail-160.png differ diff --git a/data/elementary/themes/img/cpu_markers-040.png b/data/elementary/themes/img/cpu_markers-040.png new file mode 100644 index 0000000000..f2e3049875 Binary files /dev/null and b/data/elementary/themes/img/cpu_markers-040.png differ diff --git a/data/elementary/themes/img/cpu_markers-080.png b/data/elementary/themes/img/cpu_markers-080.png new file mode 100644 index 0000000000..003813bd41 Binary files /dev/null and b/data/elementary/themes/img/cpu_markers-080.png differ diff --git a/data/elementary/themes/img/cpu_markers-160.png b/data/elementary/themes/img/cpu_markers-160.png new file mode 100644 index 0000000000..e959a82c8a Binary files /dev/null and b/data/elementary/themes/img/cpu_markers-160.png differ diff --git a/data/elementary/themes/img/svg/cpufreq.svg b/data/elementary/themes/img/svg/cpufreq.svg new file mode 100644 index 0000000000..79d9643316 --- /dev/null +++ b/data/elementary/themes/img/svg/cpufreq.svg @@ -0,0 +1,165 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + id="svg2" + width="80" + height="80" + viewBox="0 0 80 80" + sodipodi:docname="cpufreq.svg" + inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)" + inkscape:export-filename="/home/raster/C/th-efl/img/clock_base-040.png" + inkscape:export-xdpi="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> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <sodipodi:namedview + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1377" + id="namedview4" + showgrid="true" + inkscape:zoom="15.1" + inkscape:cx="20.728477" + inkscape:cy="40.033113" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="g10" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + inkscape:pagecheckerboard="0"> + <inkscape:grid + type="xygrid" + id="grid837" + empspacing="4" /> + </sodipodi:namedview> + <g + inkscape:groupmode="layer" + inkscape:label="Image" + id="g10"> + <circle + style="fill:#ffffff;stroke:none;stroke-width:3.77953" + id="path839" + cx="39.959396" + cy="40" + r="36" /> + <rect + style="fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:3.77953" + id="rect1563" + width="8" + height="4.0406051" + x="-32.089706" + y="54.553341" + ry="2" + inkscape:transform-center-x="19.91403" + inkscape:transform-center-y="19.819462" + transform="rotate(-45)" /> + <rect + style="fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:3.77953" + id="rect1565" + width="8" + height="4.0406051" + x="63.959396" + y="38" + ry="2" /> + <rect + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4287" + width="28" + height="27.99999" + x="26" + y="26" /> + <rect + y="-58" + x="38" + height="36" + width="4" + id="rect4496" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="rotate(90)" /> + <rect + y="-58" + x="30" + height="36" + width="4" + id="rect569" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="rotate(90)" /> + <rect + y="-58" + x="46" + height="36" + width="4" + id="rect1131" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="rotate(90)" /> + <rect + y="-58" + x="-34" + height="36" + width="4" + id="rect1133" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="scale(-1)" /> + <rect + y="-58" + x="-42" + height="36" + width="4" + id="rect1295" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="scale(-1)" /> + <rect + y="-58" + x="-50" + height="36" + width="4" + id="rect1297" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="scale(-1)" /> + <path + id="path2586" + style="fill:#999999;stroke-width:3.77953" + d="M 40 6 A 34 34 0 0 0 6 40 A 34 34 0 0 0 40 74 A 34 34 0 0 0 74 40 A 34 34 0 0 0 40 6 z M 40 10 A 30 30 0 0 1 70 40 A 30 30 0 0 1 40 70 A 30 30 0 0 1 10 40 A 30 30 0 0 1 40 10 z " /> + <path + id="path2693" + style="fill:#999999;stroke-width:3.77953" + d="M 40 12 A 28 28 0 0 0 12 40 A 28 28 0 0 0 40 68 A 28 28 0 0 0 68 40 A 28 28 0 0 0 40 12 z M 40 16 A 24 24 0 0 1 64 40 A 24 24 0 0 1 40 64 A 24 24 0 0 1 16 40 A 24 24 0 0 1 40 16 z " /> + <path + id="path2800" + style="fill:#999999;stroke-width:3.77953" + d="M 40 18 A 22 22 0 0 0 18 40 A 22 22 0 0 0 40 62 A 22 22 0 0 0 62 40 A 22 22 0 0 0 40 18 z M 40 22 A 18 18 0 0 1 58 40 A 18 18 0 0 1 40 58 A 18 18 0 0 1 22 40 A 18 18 0 0 1 40 22 z " /> + <path + inkscape:connector-curvature="0" + style="fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 40,4 A 36,36 0 0 0 36.029294,4.262695 L 40,40 43.973635,4.237305 A 36,36 0 0 0 40,4 Z" + id="circle4437" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> +</svg> --