raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=59b4732444235d9932daff368ca90a958a1a80ec
commit 59b4732444235d9932daff368ca90a958a1a80ec
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Mon Jun 28 17:32:39 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 9 +++
data/elementary/themes/edc/menu.edc | 5 --
data/elementary/themes/edc/mixer.edc | 49 +++++++-------
data/elementary/themes/img/speaker-clip-040.png | Bin 0 -> 858 bytes
data/elementary/themes/img/speaker-clip-080.png | Bin 0 -> 1751 bytes
data/elementary/themes/img/speaker-clip-160.png | Bin 0 -> 3853 bytes
data/elementary/themes/img/svg/speaker2.svg | 82 ++++++++++++++++++++++++
7 files changed, 118 insertions(+), 27 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 63f51f98af..701049c236 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -478,6 +478,15 @@ color_classes {
color: 255 51 153 255; }
color_class { name: "/fg/normal/gadgets/cpufreq/hands/average";
color: 255 153 51 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/gadgets/mixer/base";
+ color: 32 32 32 255; }
+ color_class { name: "/bg/normal/gadgets/mixer/middle";
+ color: 48 48 48 255; }
+ color_class { name: "/fg/normal/gadgets/mixer/volume/normal";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/mixer/volume/mute";
+ color: 255 153 51 255; }
diff --git a/data/elementary/themes/edc/menu.edc
b/data/elementary/themes/edc/menu.edc
index 62fb43b1bb..343eead955 100644
--- a/data/elementary/themes/edc/menu.edc
+++ b/data/elementary/themes/edc/menu.edc
@@ -158,11 +158,6 @@ group { name: "e/widgets/menu/default/icon";
group { name: "e/widgets/menu/default/label";
parts {
-// part { name: "base"; type: RECT;
-// description { state: "default";
-// color: 0 0 0 0; // no cc
-// }
-// }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
diff --git a/data/elementary/themes/edc/mixer.edc
b/data/elementary/themes/edc/mixer.edc
index 1a2251bf6f..cc701afa44 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -1,7 +1,9 @@
group { name: "e/modules/mixer/main";
- images.image: "speaker.png" COMP;
- images.image: "speaker_clip.png" COMP;
- images.image: "speaker_vol.png" COMP;
+ set { name: "speaker_clip";
+ image { image: "speaker-clip-160.png" COMP; size: 81 81 99999 99999; }
+ image { image: "speaker-clip-080.png" COMP; size: 41 41 80 80 99999; }
+ image { image: "speaker-clip-040.png" COMP; size: 0 0 40 40; }
+ }
max: 160 160;
min: 16 16;
script {
@@ -42,19 +44,27 @@ group { name: "e/modules/mixer/main";
parts {
part { name: "base";
description { state: "default" 0.0;
- rel1.relative: (25/380) (25/380);
- rel2.relative: (365/380) (365/380);
+ image.normal: "clock_base";
aspect: 1.0 1.0; aspect_preference: BOTH;
- image.normal: "speaker.png";
+ color_class: "/bg/normal/gadgets/mixer/base";
+ }
+ }
+ part { name: "middle";
+ description { state: "default" 0.0;
+ rel.to: "base";
+ rel1.relative: 0.3 0.3;
+ rel2.relative: 0.7 0.7;
+ image.normal: "clock_base";
+ color_class: "/bg/normal/gadgets/mixer/middle";
}
}
part { name: "state"; type: RECT;
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/fg/normal/gadgets/mixer/volume/normal";
}
description { state: "mute" 0.0;
inherit: "default" 0.0;
- color: 255 153 51 255;
+ color_class: "/fg/normal/gadgets/mixer/volume/mute";
}
}
part { name: "state-l"; type: RECT;
@@ -74,39 +84,34 @@ group { name: "e/modules/mixer/main";
part { name: "vclip-l";
clip_to: "state-l";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "speaker_clip.png";
+ rel.to: "base";
+ image.normal: "speaker_clip";
}
}
part { name: "vclip-r";
clip_to: "state-r";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "speaker_clip.png";
+ rel.to: "base";
+ image.normal: "speaker_clip";
}
}
part { name: "vol-l";
clip_to: "vclip-l";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "speaker_vol.png";
+ rel.to: "base";
+ image.normal: "clock_base";
}
}
part { name: "vol-r";
clip_to: "vclip-r";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- rel2.offset: 0 0;
- image.normal: "speaker_vol.png";
+ rel.to: "base";
+ image.normal: "clock_base";
}
}
part { name: "over"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 0 0 0 0; // no cc
}
}
}
diff --git a/data/elementary/themes/img/speaker-clip-040.png
b/data/elementary/themes/img/speaker-clip-040.png
new file mode 100644
index 0000000000..fad440c469
Binary files /dev/null and b/data/elementary/themes/img/speaker-clip-040.png
differ
diff --git a/data/elementary/themes/img/speaker-clip-080.png
b/data/elementary/themes/img/speaker-clip-080.png
new file mode 100644
index 0000000000..bde3965636
Binary files /dev/null and b/data/elementary/themes/img/speaker-clip-080.png
differ
diff --git a/data/elementary/themes/img/speaker-clip-160.png
b/data/elementary/themes/img/speaker-clip-160.png
new file mode 100644
index 0000000000..28e1dc011e
Binary files /dev/null and b/data/elementary/themes/img/speaker-clip-160.png
differ
diff --git a/data/elementary/themes/img/svg/speaker2.svg
b/data/elementary/themes/img/svg/speaker2.svg
new file mode 100644
index 0000000000..d4800f773d
--- /dev/null
+++ b/data/elementary/themes/img/svg/speaker2.svg
@@ -0,0 +1,82 @@
+<?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="speaker2.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.2625"
+ inkscape:cx="40"
+ inkscape:cy="40"
+ 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:#202020;stroke:none;stroke-width:3.77953;fill-opacity:1"
+ id="path839"
+ cx="39.959396"
+ cy="40"
+ r="36" />
+ <circle
+ style="fill:#303030;stroke-width:3.77953;fill-opacity:1"
+ id="path1655"
+ cx="40"
+ cy="40"
+ r="12" />
+ <path
+ id="path839-3"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.77953"
+ d="M 39.959396,4 A 36,36 0 0 0 3.9593964,40 36,36 0 0 0 39.959396,76 a
36,36 0 0 0 36,-36 36,36 0 0 0 -36,-36 z m 0.04102,8 a 28,28 0 0 1 28,28 28,28
0 0 1 -28,28 28,28 0 0 1 -28,-28 28,28 0 0 1 28,-28 z" />
+ </g>
+</svg>
--
