raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=62000272b2c82497b8cefb6ba88edbd1dba084d8
commit 62000272b2c82497b8cefb6ba88edbd1dba084d8
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Tue Jun 29 18:20:02 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 47 +++++++---
data/elementary/themes/edc/packagekit.edc | 59 ++++++++++---
data/elementary/themes/img/pkg-base-040.png | Bin 0 -> 192 bytes
data/elementary/themes/img/pkg-base-080.png | Bin 0 -> 294 bytes
data/elementary/themes/img/pkg-base-160.png | Bin 0 -> 500 bytes
data/elementary/themes/img/pkg-label-040.png | Bin 0 -> 210 bytes
data/elementary/themes/img/pkg-label-080.png | Bin 0 -> 277 bytes
data/elementary/themes/img/pkg-label-160.png | Bin 0 -> 464 bytes
data/elementary/themes/img/pkg-shade-040.png | Bin 0 -> 554 bytes
data/elementary/themes/img/pkg-shade-080.png | Bin 0 -> 1090 bytes
data/elementary/themes/img/pkg-shade-160.png | Bin 0 -> 2196 bytes
data/elementary/themes/img/svg/package.svg | 125 +++++++++++----------------
12 files changed, 129 insertions(+), 102 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 5d416cad3a..5e08474e2b 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -367,6 +367,25 @@ color_classes {
color: 96 96 96 255; }
color_class { name: "/bg/pressed/scroller/bar";
color: 255 255 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/notification";
+ color: 0 0 0 200; }
+ color_class { name: "/fg/normal/notification/button/close";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/notification/button/close";
+ color: 200 200 200 255; }
+ color_class { name: "/fg/normal/notification/logo";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text/title";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/normal/notification/text/subject";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/notification/text/bold";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text/underline";
+ color: 51 153 255 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/shelf/translucent";
color: 64 64 64 128; }
@@ -505,24 +524,24 @@ color_classes {
color_class { name: "/fg/normal/gadgets/music_control/text/tag";
color: 51 153 255 255; }
///////////////////////////////////////////////////////////////////////////////
- color_class { name: "/bg/normal/notification";
- color: 0 0 0 200; }
- color_class { name: "/fg/normal/notification/button/close";
+ color_class { name: "/fg/normal/gadgets/packagekit/label";
color: 255 255 255 255; }
- color_class { name: "/fg/pressed/notification/button/close";
- color: 200 200 200 255; }
- color_class { name: "/fg/normal/notification/logo";
+ color_class { name: "/fg/normal/gadgets/packagekit/text";
color: 255 255 255 255; }
- color_class { name: "/fg/normal/notification/text/title";
+ color_class { name: "/fg/normal/gadgets/packagekit/status";
color: 255 255 255 255; }
- color_class { name: "/fg/normal/notification/text";
- color: 160 160 160 255; }
- color_class { name: "/fg/normal/notification/text/subject";
- color: 51 153 255 255; }
- color_class { name: "/fg/normal/notification/text/bold";
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/bug";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/enhancement";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/important";
+ color: 255 51 153 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/low-priority";
+ color: 255 255 255 128; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/normal";
color: 255 255 255 255; }
- color_class { name: "/fg/normal/notification/text/underline";
- color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/security";
+ color: 255 153 51 255; }
diff --git a/data/elementary/themes/edc/packagekit.edc
b/data/elementary/themes/edc/packagekit.edc
index 672327b88b..76c366c02d 100644
--- a/data/elementary/themes/edc/packagekit.edc
+++ b/data/elementary/themes/edc/packagekit.edc
@@ -5,7 +5,7 @@ group { name: "e/modules/packagekit/icon/bugfix";
description { state: "default" 0.0;
image.normal: "pkg-bug.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 51 153 255 255;
+ color_class: "/fg/normal/gadgets/packagekit/pkg/bug";
}
}
}
@@ -18,7 +18,7 @@ group { name: "e/modules/packagekit/icon/enhancement";
description { state: "default" 0.0;
image.normal: "pkg-enhance.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 153 255 51 255;
+ color_class: "/fg/normal/gadgets/packagekit/pkg/enhancement";
}
}
}
@@ -31,7 +31,7 @@ group { name: "e/modules/packagekit/icon/important";
description { state: "default" 0.0;
image.normal: "pkg-important.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 255 153 51 255;
+ color_class: "/fg/normal/gadgets/packagekit/pkg/important";
}
}
}
@@ -44,7 +44,7 @@ group { name: "e/modules/packagekit/icon/low";
description { state: "default" 0.0;
image.normal: "pkg-low.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 255 255 255 128;
+ color_class: "/fg/normal/gadgets/packagekit/pkg/low-priority";
}
}
}
@@ -57,7 +57,7 @@ group { name: "e/modules/packagekit/icon/normal";
description { state: "default" 0.0;
image.normal: "pkg-normal.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 255 255 255 128;
+ color_class: "/fg/normal/gadgets/packagekit/pkg/normal";
}
}
}
@@ -70,7 +70,7 @@ group { name: "e/modules/packagekit/icon/security";
description { state: "default" 0.0;
image.normal: "pkg-security.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 255 255 255 255;
+ color_class: "/fg/normal/gadgets/packagekit/pkg/security";
}
}
}
@@ -78,9 +78,24 @@ group { name: "e/modules/packagekit/icon/security";
group { name: "e/modules/packagekit/main";
max: 160 160;
- images.image: "pkg-base.png" COMP;
+ set { name: "pkg_base";
+ image { image: "pkg-base-160.png" COMP; size: 81 81 99999 99999; }
+ image { image: "pkg-base-080.png" COMP; size: 41 41 80 80 99999; }
+ image { image: "pkg-base-040.png" COMP; size: 0 0 40 40; }
+ }
+ set { name: "pkg_shade";
+ image { image: "pkg-shade-160.png" COMP; size: 81 81 99999 99999; }
+ image { image: "pkg-shade-080.png" COMP; size: 41 41 80 80 99999; }
+ image { image: "pkg-shade-040.png" COMP; size: 0 0 40 40; }
+ }
+ set { name: "pkg_label";
+ image { image: "pkg-label-160.png" COMP; size: 81 81 99999 99999; }
+ image { image: "pkg-label-080.png" COMP; size: 41 41 80 80 99999; }
+ image { image: "pkg-label-040.png" COMP; size: 0 0 40 40; }
+ }
images.image: "pkg-ok.png" COMP;
images.image: "pkg-err.png" COMP;
+
images.image: "pkg-busy1.png" COMP;
images.image: "pkg-busy2.png" COMP;
images.image: "pkg-busy3.png" COMP;
@@ -89,7 +104,21 @@ group { name: "e/modules/packagekit/main";
part { name: "base";
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
- image.normal: "pkg-base.png";
+ color_class: "/fg/normal/gadgets/packagekit/base";
+ image.normal: "pkg_base";
+ }
+ }
+ part { name: "shade";
+ description { state: "default" 0.0;
+ rel.to: "base";
+ image.normal: "pkg_shade";
+ }
+ }
+ part { name: "label";
+ description { state: "default" 0.0;
+ rel.to: "base";
+ image.normal: "pkg_label";
+ color_class: "/fg/normal/gadgets/packagekit/label";
}
}
part { name: "num_updates"; type: TEXT;
@@ -97,7 +126,7 @@ group { name: "e/modules/packagekit/main";
description { state: "default" 0.0;
rel1.relative: (8/40) (8/40);
rel2.relative: (32/40) (32/40);
- color: 255 255 255 255;
+ color_class: "/fg/normal/gadgets/packagekit/text/updates";
text { font: FN; size: 10;
}
}
@@ -121,7 +150,7 @@ group { name: "e/modules/packagekit/main";
rel1.relative: (15/40) (15/40);
rel2.relative: (25/40) (25/40);
image.normal: "pkg-ok.png";
- color: 255 255 255 255;
+ color_class: "/fg/normal/gadgets/packagekit/status/ok";
}
description { state: "error" 0.0;
inherit: "default" 0.0;
@@ -129,17 +158,17 @@ group { name: "e/modules/packagekit/main";
rel1.relative: (15/40) (15/40);
rel2.relative: (25/40) (25/40);
image.normal: "pkg-err.png";
- color: 255 255 255 255;
+ color_class: "/fg/normal/gadgets/packagekit/status/error";
}
}
part { name: "busy_clip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
visible: 0;
}
description { state: "busy" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
@@ -153,6 +182,7 @@ group { name: "e/modules/packagekit/main";
map.on: 1;
map.smooth: 1;
map.rotation.center: "busy1";
+ color_class: "/fg/normal/gadgets/packagekit/status/busy/1";
}
description { state: "spin" 0.0;
inherit: "default" 0.0;
@@ -169,6 +199,7 @@ group { name: "e/modules/packagekit/main";
map.on: 1;
map.smooth: 1;
map.rotation.center: "busy1";
+ color_class: "/fg/normal/gadgets/packagekit/status/busy/2";
}
description { state: "spin" 0.0;
inherit: "default" 0.0;
@@ -185,6 +216,7 @@ group { name: "e/modules/packagekit/main";
map.on: 1;
map.smooth: 1;
map.rotation.center: "busy1";
+ color_class: "/fg/normal/gadgets/packagekit/status/busy/3";
}
description { state: "spin" 0.0;
inherit: "default" 0.0;
@@ -201,6 +233,7 @@ group { name: "e/modules/packagekit/main";
map.on: 1;
map.smooth: 1;
map.rotation.center: "busy1";
+ color_class: "/fg/normal/gadgets/packagekit/status/busy/4";
}
description { state: "spin" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/img/pkg-base-040.png
b/data/elementary/themes/img/pkg-base-040.png
new file mode 100644
index 0000000000..442067993a
Binary files /dev/null and b/data/elementary/themes/img/pkg-base-040.png differ
diff --git a/data/elementary/themes/img/pkg-base-080.png
b/data/elementary/themes/img/pkg-base-080.png
new file mode 100644
index 0000000000..a57d062ee3
Binary files /dev/null and b/data/elementary/themes/img/pkg-base-080.png differ
diff --git a/data/elementary/themes/img/pkg-base-160.png
b/data/elementary/themes/img/pkg-base-160.png
new file mode 100644
index 0000000000..53cfb43e61
Binary files /dev/null and b/data/elementary/themes/img/pkg-base-160.png differ
diff --git a/data/elementary/themes/img/pkg-label-040.png
b/data/elementary/themes/img/pkg-label-040.png
new file mode 100644
index 0000000000..463c6a7305
Binary files /dev/null and b/data/elementary/themes/img/pkg-label-040.png differ
diff --git a/data/elementary/themes/img/pkg-label-080.png
b/data/elementary/themes/img/pkg-label-080.png
new file mode 100644
index 0000000000..d7ccc4926d
Binary files /dev/null and b/data/elementary/themes/img/pkg-label-080.png differ
diff --git a/data/elementary/themes/img/pkg-label-160.png
b/data/elementary/themes/img/pkg-label-160.png
new file mode 100644
index 0000000000..cce4152a2d
Binary files /dev/null and b/data/elementary/themes/img/pkg-label-160.png differ
diff --git a/data/elementary/themes/img/pkg-shade-040.png
b/data/elementary/themes/img/pkg-shade-040.png
new file mode 100644
index 0000000000..705c1ee330
Binary files /dev/null and b/data/elementary/themes/img/pkg-shade-040.png differ
diff --git a/data/elementary/themes/img/pkg-shade-080.png
b/data/elementary/themes/img/pkg-shade-080.png
new file mode 100644
index 0000000000..765e7bebd6
Binary files /dev/null and b/data/elementary/themes/img/pkg-shade-080.png differ
diff --git a/data/elementary/themes/img/pkg-shade-160.png
b/data/elementary/themes/img/pkg-shade-160.png
new file mode 100644
index 0000000000..dfcff7e32c
Binary files /dev/null and b/data/elementary/themes/img/pkg-shade-160.png differ
diff --git a/data/elementary/themes/img/svg/package.svg
b/data/elementary/themes/img/svg/package.svg
index f9ab52f2a4..e5d6915381 100644
--- a/data/elementary/themes/img/svg/package.svg
+++ b/data/elementary/themes/img/svg/package.svg
@@ -2,24 +2,24 @@
<!-- 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:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg2"
version="1.1"
- inkscape:version="0.92.4 5da689c313, 2019-01-14"
+ inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
width="40"
height="40"
viewBox="0 0 40 40"
sodipodi:docname="package.svg"
inkscape:export-filename="/home/raster/C/th-efl/th/img/pkg-base.png"
inkscape:export-xdpi="384"
- inkscape:export-ydpi="384">
+ inkscape:export-ydpi="384"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ 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>
@@ -28,7 +28,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>
@@ -36,15 +35,15 @@
id="defs6">
<linearGradient
inkscape:collect="always"
- id="linearGradient1128">
+ id="linearGradient2418">
<stop
- style="stop-color:#b4b4b4;stop-opacity:1"
+ style="stop-color:#000000;stop-opacity:0.1"
offset="0"
- id="stop1124" />
+ id="stop2414" />
<stop
- style="stop-color:#a0a0a0;stop-opacity:1"
+ style="stop-color:#000000;stop-opacity:0;"
offset="1"
- id="stop1126" />
+ id="stop2416" />
</linearGradient>
<mask
maskUnits="userSpaceOnUse"
@@ -55,41 +54,28 @@
d="M 2,2 38,38 V 2 Z"
style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
</mask>
- <filter
- inkscape:collect="always"
- style="color-interpolation-filters:sRGB"
- id="filter1119"
- x="-0.276"
- width="1.552"
- y="-0.276"
- height="1.552">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="3.22"
- id="feGaussianBlur1121" />
- </filter>
<radialGradient
inkscape:collect="always"
- xlink:href="#linearGradient1128"
- id="radialGradient1130"
- cx="2"
- cy="2"
- fx="2"
- fy="2"
- r="18"
+ xlink:href="#linearGradient2418"
+ id="radialGradient2420"
+ cx="20"
+ cy="20"
+ fx="20"
+ fy="20"
+ r="16"
gradientUnits="userSpaceOnUse"
-
gradientTransform="matrix(1.8655692e-8,1.7777778,-1.7777777,0,7.5555555,0.44444463)"
/>
+
gradientTransform="matrix(0.9375,-0.93750003,0.1875,0.1875,-2.5,35.000001)" />
<radialGradient
inkscape:collect="always"
- xlink:href="#linearGradient1128"
- id="radialGradient1166"
+ xlink:href="#linearGradient2418"
+ id="radialGradient3055"
gradientUnits="userSpaceOnUse"
-
gradientTransform="matrix(-1.8655692e-8,1.7777778,1.7777777,0,32.444443,0.44444463)"
- cx="2"
- cy="2"
- fx="2"
- fy="2"
- r="18" />
+
gradientTransform="matrix(-0.9375,-0.93750003,-0.1875,0.1875,42.5,35.000001)"
+ cx="20"
+ cy="20"
+ fx="20"
+ fy="20"
+ r="16" />
</defs>
<sodipodi:namedview
pagecolor="#404040"
@@ -114,20 +100,21 @@
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
- inkscape:zoom="30.675"
- inkscape:cx="10.888345"
- inkscape:cy="19.452347"
+ inkscape:zoom="30.525"
+ inkscape:cx="20"
+ inkscape:cy="20"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
- inkscape:showpageshadow="false">
+ inkscape:showpageshadow="false"
+ inkscape:pagecheckerboard="0">
<inkscape:grid
type="xygrid"
id="grid4138"
enabled="true"
visible="true"
- empspacing="5" />
+ empspacing="4" />
</sodipodi:namedview>
<path
style="fill:#a0a0a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.23076916px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
@@ -135,35 +122,23 @@
id="path824"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:url(#radialGradient2420);fill-opacity:1;stroke-width:3.77953"
+ d="M 4,36 36,4 H 4 Z"
+ id="path2412" />
+ <path
+ style="fill:url(#radialGradient3055);fill-opacity:1;stroke-width:3.77953"
+ d="M 20,20 4,4 h 32 z"
+ id="path2916"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:#000000;stroke-width:3.77953;fill-opacity:0.1"
+ d="M 4,4 20,20 36,4 Z"
+ id="path2212" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 16,4 v 7 l 2,-3 2,2 2,-3 2,2 V 4"
id="path836"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
- <path
-
style="fill:url(#radialGradient1130);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88888884px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 35.999999,36 4,4.0000002 V 36 Z"
- id="path831"
- inkscape:connector-curvature="0" />
- <path
-
style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1119)"
- d="M 2.0000002,38 2,10 c 13,0 28,15 28,28 z"
- id="path833"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc"
- mask="url(#mask1019)" />
- <path
- inkscape:connector-curvature="0"
- id="path1160"
- d="M 4,36 35.999999,4.0000002 V 36 Z"
-
style="fill:url(#radialGradient1166);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88888884px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
- <path
- mask="url(#mask1019)"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path1162"
- d="M 2.0000002,38 2,10 c 13,0 28,15 28,28 z"
-
style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1119)"
- transform="matrix(-1,0,0,1,40,0)" />
</svg>
--
