raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=01b08c7a0af1e143920b490e1ab89ac4eac77180
commit 01b08c7a0af1e143920b490e1ab89ac4eac77180
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Mon Jun 7 18:51:18 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 23 ++
data/elementary/themes/edc/clock.edc | 354 ++++++++++-----------
data/elementary/themes/img/clock_base-040.png | Bin 0 -> 620 bytes
data/elementary/themes/img/clock_base-080.png | Bin 0 -> 1369 bytes
data/elementary/themes/img/clock_base-160.png | Bin 0 -> 2874 bytes
data/elementary/themes/img/clock_base.png | Bin 4184 -> 0 bytes
.../themes/img/clock_base_digits-040.png | Bin 0 -> 227 bytes
.../themes/img/clock_base_digits-080.png | Bin 0 -> 393 bytes
.../themes/img/clock_base_digits-160.png | Bin 0 -> 840 bytes
.../elementary/themes/img/clock_hand_hours-040.png | Bin 0 -> 4744 bytes
.../elementary/themes/img/clock_hand_hours-080.png | Bin 0 -> 4832 bytes
.../elementary/themes/img/clock_hand_hours-160.png | Bin 0 -> 5059 bytes
data/elementary/themes/img/clock_hand_mins-040.png | Bin 0 -> 4761 bytes
data/elementary/themes/img/clock_hand_mins-080.png | Bin 0 -> 4877 bytes
data/elementary/themes/img/clock_hand_mins-160.png | Bin 0 -> 5178 bytes
data/elementary/themes/img/clock_hand_secs-040.png | Bin 0 -> 236 bytes
data/elementary/themes/img/clock_hand_secs-080.png | Bin 0 -> 370 bytes
data/elementary/themes/img/clock_hand_secs-160.png | Bin 0 -> 758 bytes
data/elementary/themes/img/svg/clock.svg | 143 +++++----
19 files changed, 281 insertions(+), 239 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 7912824982..28c36c3177 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -304,6 +304,29 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/gadgets/bluez/scan";
color: 255 153 51 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/gadgets/clock/digital/separator";
+ color: 160 160 160 255; }
+ color_class { name: "/bg/normal/gadgets/clock/analog/base";
+ color: 32 32 32 255; }
+ color_class { name: "/fg/normal/gadgets/clock/analog/hands/secs";
+ color: 255 64 32 255; }
+ color_class { name: "/fg/normal/gadgets/clock/analog/hands/mins";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/clock/analog/hands/hours";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/normal/gadgets/clock/cal/day/name/weekend";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/clock/cal/day/date/weekend";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/clock/cal/day/date/hidden";
+ color: 40 40 40 255; }
+ color_class { name: "/bg/normal/gadgets/clock/cal/day/date/today";
+ color: 0 0 0 64; }
+ color_class { name: "/fg/normal/gadgets/clock/cal/day/date/today";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/clock/cal/daydate-sep";
+ color: 255 255 255 32; }
diff --git a/data/elementary/themes/edc/clock.edc
b/data/elementary/themes/edc/clock.edc
index 9150871961..27812d64aa 100644
--- a/data/elementary/themes/edc/clock.edc
+++ b/data/elementary/themes/edc/clock.edc
@@ -28,19 +28,19 @@ group { name: "e/modules/clock/digital";
PART:"secs2", PART:"secs2",
PART:"ampm", PART:"ampm"
};
-
+
mul = 4;
if (get_int(do_date)) {
mul = 3;
}
-
+
for (i = 0; i < 14; i += 2) {
custom_state(parts[i], "default", 0.0);
}
v[0] = 0; v[1] = 2; v[2] = 2; v[3] = 4; // hrs
v[4] = 5; v[5] = 7; v[6] = 7; v[7] = 9; // mins
tot = 9;
-
+
dosec = get_int(do_seconds);
do24h = get_int(do_24h);
if ((dosec) && (!do24h)) { // sec + ampm
@@ -78,7 +78,7 @@ group { name: "e/modules/clock/digital";
}
reset() {
new tim;
-
+
evalsize();
tim = get_int(tick_timer);
if (tim) {
@@ -89,7 +89,7 @@ group { name: "e/modules/clock/digital";
}
valset(name[], v) {
new buf[20], i;
-
+
for (i = 0; i < 10; i++) {
if (i == v) {
snprintf(buf, 20, "show,%s-%i", name, i);
@@ -108,7 +108,7 @@ group { name: "e/modules/clock/digital";
new year, month, day, yearday, weekday, hour, minute;
new Float:second;
new v, dosec, do24h, tim;
-
+
date(year, month, day, yearday, weekday, hour, minute, second);
dosec = get_int(do_seconds);
if (dosec) {
@@ -123,11 +123,11 @@ group { name: "e/modules/clock/digital";
tim = timer(60.0 - (second), "clock_cb", 1);
}
set_int(tick_timer, tim);
-
+
// set minutes to minute
valset("m0", minute / 10);
valset("m1", minute % 10);
-
+
// set hours to hour
do24h = get_int(do_24h);
if (do24h) {
@@ -136,7 +136,7 @@ group { name: "e/modules/clock/digital";
}
else {
new pm;
-
+
// if 12 or later, its pm
if (hour >= 12) {
pm = 1;
@@ -252,7 +252,7 @@ group { name: "e/modules/clock/digital";
rel2.to: "mins1";
rel2.relative: 0.0 0.45;
image.normal: "digit_sep.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/digital/separator";
aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
@@ -263,7 +263,7 @@ group { name: "e/modules/clock/digital";
rel2.to: "mins1";
rel2.relative: 0.0 0.61;
image.normal: "digit_sep.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/digital/separator";
aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
@@ -275,7 +275,7 @@ group { name: "e/modules/clock/digital";
rel2.to: "secs1";
rel2.relative: 0.0 0.45;
image.normal: "digit_sep.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/digital/separator";
aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
@@ -287,37 +287,38 @@ group { name: "e/modules/clock/digital";
rel2.to: "secs1";
rel2.relative: 0.0 0.61;
image.normal: "digit_sep.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/digital/separator";
aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
-#define ELEM(_NAME, _TO, _DIGIT) \
+#define ELEM(_NAME, _TO, _DIGIT, _CC) \
part { name: _NAME; \
description { state: "default" 0.0; \
rel1.to: _TO; rel2.to: _TO; \
aspect: (52/72) (52/72); aspect_preference: BOTH; \
image.normal: "digit_"_DIGIT".png"; \
visible: 0; \
- color: 160 160 160 0; \
+ color: 255 255 255 0; /* no cc */ \
+ color_class: _CC; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
visible: 1; \
- color: 160 160 160 255; \
+ color: 255 255 255 255; /* no cc */ \
} \
}
-#define DIGIT(_NAME, _TO) \
- ELEM(_NAME"-0", _TO, "0") \
- ELEM(_NAME"-1", _TO, "1") \
- ELEM(_NAME"-2", _TO, "2") \
- ELEM(_NAME"-3", _TO, "3") \
- ELEM(_NAME"-4", _TO, "4") \
- ELEM(_NAME"-5", _TO, "5") \
- ELEM(_NAME"-6", _TO, "6") \
- ELEM(_NAME"-7", _TO, "7") \
- ELEM(_NAME"-8", _TO, "8") \
- ELEM(_NAME"-9", _TO, "9")
-#define ELEMC(_NAME, _TO, _DIGIT, _CLIP) \
+#define DIGIT(_NAME, _TO, _CC) \
+ ELEM(_NAME"-0", _TO, "0", _CC) \
+ ELEM(_NAME"-1", _TO, "1", _CC) \
+ ELEM(_NAME"-2", _TO, "2", _CC) \
+ ELEM(_NAME"-3", _TO, "3", _CC) \
+ ELEM(_NAME"-4", _TO, "4", _CC) \
+ ELEM(_NAME"-5", _TO, "5", _CC) \
+ ELEM(_NAME"-6", _TO, "6", _CC) \
+ ELEM(_NAME"-7", _TO, "7", _CC) \
+ ELEM(_NAME"-8", _TO, "8", _CC) \
+ ELEM(_NAME"-9", _TO, "9", _CC)
+#define ELEMC(_NAME, _TO, _DIGIT, _CLIP, _CC) \
part { name: _NAME; \
clip_to: _CLIP; \
description { state: "default" 0.0; \
@@ -325,47 +326,51 @@ group { name: "e/modules/clock/digital";
aspect: (52/72) (52/72); aspect_preference: BOTH; \
image.normal: "digit_"_DIGIT".png"; \
visible: 0; \
- color: 160 160 160 0; \
+ color: 255 255 255 0; /* no cc */ \
+ color_class: _CC; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
visible: 1; \
- color: 160 160 160 255; \
+ color: 255 255 255 255; /* no cc */ \
} \
}
-#define DIGITC(_NAME, _TO, _CLIP) \
- ELEMC(_NAME"-0", _TO, "0", _CLIP) \
- ELEMC(_NAME"-1", _TO, "1", _CLIP) \
- ELEMC(_NAME"-2", _TO, "2", _CLIP) \
- ELEMC(_NAME"-3", _TO, "3", _CLIP) \
- ELEMC(_NAME"-4", _TO, "4", _CLIP) \
- ELEMC(_NAME"-5", _TO, "5", _CLIP) \
- ELEMC(_NAME"-6", _TO, "6", _CLIP) \
- ELEMC(_NAME"-7", _TO, "7", _CLIP) \
- ELEMC(_NAME"-8", _TO, "8", _CLIP) \
- ELEMC(_NAME"-9", _TO, "9", _CLIP)
-
-#define TAG(_NAME, _TO, _CLIP) \
+#define DIGITC(_NAME, _TO, _CLIP, _CC) \
+ ELEMC(_NAME"-0", _TO, "0", _CLIP, _CC) \
+ ELEMC(_NAME"-1", _TO, "1", _CLIP, _CC) \
+ ELEMC(_NAME"-2", _TO, "2", _CLIP, _CC) \
+ ELEMC(_NAME"-3", _TO, "3", _CLIP, _CC) \
+ ELEMC(_NAME"-4", _TO, "4", _CLIP, _CC) \
+ ELEMC(_NAME"-5", _TO, "5", _CLIP, _CC) \
+ ELEMC(_NAME"-6", _TO, "6", _CLIP, _CC) \
+ ELEMC(_NAME"-7", _TO, "7", _CLIP, _CC) \
+ ELEMC(_NAME"-8", _TO, "8", _CLIP, _CC) \
+ ELEMC(_NAME"-9", _TO, "9", _CLIP, _CC)
+#define TAG(_NAME, _TO, _CLIP, _CC) \
part { name: _NAME; \
clip_to: _CLIP; \
description { state: "default" 0.0; \
rel1.to: _TO; rel2.to: _TO; \
aspect: (48/31) (48/31); aspect_preference: BOTH; \
image.normal: "digit_am.png"; \
- color: 160 160 160 255; \
+ color_class: _CC; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
image.normal: "digit_pm.png"; \
} \
}
- DIGIT ("h0", "hours1")
- DIGIT ("h1", "hours2")
- DIGIT ("m0", "mins1")
- DIGIT ("m1", "mins2")
- DIGITC("s0", "secs1", "secclip")
- DIGITC("s1", "secs2", "secclip")
- TAG("ap", "ampm", "ampmclip")
+// color_class: "/fg/normal/gadgets/clock/time/digital/hours";
+// color_class: "/fg/normal/gadgets/clock/time/digital/mins";
+// color_class: "/fg/normal/gadgets/clock/time/digital/secs";
+// color_class: "/fg/normal/gadgets/clock/time/digital/ampm";
+ DIGIT ("h0", "hours1", "/fg/normal/gadgets/clock/time/digital/hours")
+ DIGIT ("h1", "hours2", "/fg/normal/gadgets/clock/time/digital/hours")
+ DIGIT ("m0", "mins1", "/fg/normal/gadgets/clock/time/digital/mins")
+ DIGIT ("m1", "mins2", "/fg/normal/gadgets/clock/time/digital/mins")
+ DIGITC("s0", "secs1", "secclip",
"/fg/normal/gadgets/clock/time/digital/secs")
+ DIGITC("s1", "secs2", "secclip",
"/fg/normal/gadgets/clock/time/digital/secs")
+ TAG("ap", "ampm", "ampmclip",
"/fg/normal/gadgets/clock/time/digital/ampm")
#undef TAG
#undef TAG
#undef ELEM
@@ -380,7 +385,7 @@ group { name: "e/modules/clock/digital";
rel1.offset: 0 1;
rel2.offset: -1 -1;
align: 0.5 1.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/time/text/date";
text { font: FN; size: 8;
text_class: "module_small";
align: 0.5 0.5;
@@ -399,19 +404,17 @@ group { name: "e/modules/clock/digital";
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
programs {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
script {
reset();
}
}
- program {
- signal: "e,state,date,on"; source: "e";
+ program { signal: "e,state,date,on"; source: "e";
script {
set_int(do_date, 1);
set_state(PART:"timearea", "date", 0.0);
@@ -419,8 +422,7 @@ group { name: "e/modules/clock/digital";
reset();
}
}
- program {
- signal: "e,state,date,off"; source: "e";
+ program { signal: "e,state,date,off"; source: "e";
script {
set_int(do_date, 0);
set_state(PART:"timearea", "default", 0.0);
@@ -428,32 +430,28 @@ group { name: "e/modules/clock/digital";
reset();
}
}
- program {
- signal: "e,state,seconds,on"; source: "e";
+ program { signal: "e,state,seconds,on"; source: "e";
script {
set_int(do_seconds, 1);
set_state(PART:"secclip", "default", 0.0);
reset();
}
}
- program {
- signal: "e,state,seconds,off"; source: "e";
+ program { signal: "e,state,seconds,off"; source: "e";
script {
set_int(do_seconds, 0);
set_state(PART:"secclip", "hidden", 0.0);
reset();
}
}
- program {
- signal: "e,state,24h,on"; source: "e";
+ program { signal: "e,state,24h,on"; source: "e";
script {
set_int(do_24h, 1);
set_state(PART:"ampmclip", "hidden", 0.0);
reset();
}
}
- program {
- signal: "e,state,24h,off"; source: "e";
+ program { signal: "e,state,24h,off"; source: "e";
script {
set_int(do_24h, 0);
set_state(PART:"ampmclip", "default", 0.0);
@@ -461,13 +459,11 @@ group { name: "e/modules/clock/digital";
}
}
#define DIGPRG(_NAME) \
- program { \
- signal: "show,"_NAME; source: "c"; \
+ program { signal: "show,"_NAME; source: "c"; \
action: STATE_SET "active" 0.0; \
target: _NAME; \
} \
- program { \
- signal: "hide,"_NAME; source: "c"; \
+ program { signal: "hide,"_NAME; source: "c"; \
action: STATE_SET "default" 0.0; \
transition: DECELERATE 0.1; \
target: _NAME; \
@@ -519,24 +515,30 @@ group { name: "e/modules/clock/digital";
}
group { name: "e/modules/clock/main";
- images.image: "clock_base.png" COMP;
- set { name: "tacho_hand_big";
- image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
- image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
- image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
- image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
+ set { name: "clock_base";
+ image { image: "clock_base-040.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; }
}
- set { name: "tacho_hand_small_min";
- image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999;
}
- image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
- image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
- image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
+ set { name: "clock_base_digits";
+ image { image: "clock_base_digits-040.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; }
}
- set { name: "tacho_hand_small_sec";
- image { image: "tacho_hand_small_sec.png" COMP; size: 73 73 99999 99999;
}
- image { image: "tacho_hand_small_sec2.png" COMP; size: 37 37 72 72; }
- image { image: "tacho_hand_small_sec3.png" COMP; size: 19 19 36 36; }
- image { image: "tacho_hand_small_sec4.png" COMP; size: 0 0 18 18; }
+ set { name: "clock_hand_secs";
+ image { image: "clock_hand_secs-040.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; }
+ }
+ set { name: "clock_hand_mins";
+ image { image: "clock_hand_mins-040.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; }
+ }
+ set { name: "clock_hand_hours";
+ image { image: "clock_hand_hours-040.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; }
}
min: 16 16;
max: 160 160;
@@ -575,20 +577,24 @@ group { name: "e/modules/clock/main";
parts {
part { name: "base"; mouse_events: 0;
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: "clock_base.png";
+ image.normal: "clock_base";
+ color_class: "/bg/normal/gadgets/clock/analog/base";
+ }
+ }
+ part { name: "digits"; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ image.normal: "clock_base_digits";
+ color_class: "/fg/normal/gadgets/clock/analog/digits";
}
}
part { name: "seconds"; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "tacho_hand_small_sec";
- color: 255 0 0 255;
- rel1.to: "base";
- rel2.to: "base";
- map {
- on: 1;
+ image.normal: "clock_hand_secs";
+ color_class: "/fg/normal/gadgets/clock/analog/hands/secs";
+ rel.to: "base";
+ map { on: 1;
rotation.center: "base";
}
}
@@ -598,32 +604,28 @@ group { name: "e/modules/clock/main";
}
}
part { name: "minutes"; mouse_events: 0;
- description { state: "default" 0.0000;
- color: 255 255 255 255;
- image.normal: "tacho_hand_big";
- rel1.to: "base";
- rel2.to: "base";
- map {
- on: 1;
+ description { state: "default" 0.0;
+ image.normal: "clock_hand_mins";
+ color_class: "/fg/normal/gadgets/clock/analog/hands/mins";
+ rel.to: "base";
+ map { on: 1;
rotation.center: "base";
}
}
}
part { name: "hours"; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "tacho_hand_small_min";
- color: 255 255 255 255;
- rel1.to: "base";
- rel2.to: "base";
- map {
- on: 1;
+ image.normal: "clock_hand_hours";
+ color_class: "/fg/normal/gadgets/clock/analog/hands/hours";
+ rel.to: "base";
+ map { on: 1;
rotation.center: "base";
}
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
@@ -700,7 +702,7 @@ group { name: "e/modules/clock/calendar/dayname";
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/cal/day/name/week";
text { font: FN; size: 8;
text: "WWe";
min: 1 1;
@@ -711,18 +713,16 @@ group { name: "e/modules/clock/calendar/dayname";
}
description { state: "weekend" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/fg/normal/gadgets/clock/cal/day/name/weekend";
}
}
}
programs {
- program {
- signal: "e,state,weekend"; source: "e";
+ program { signal: "e,state,weekend"; source: "e";
action: STATE_SET "weekend" 0.0;
target: "e.text.label";
}
- program {
- signal: "e,state,weekday"; source: "e";
+ program { signal: "e,state,weekday"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.text.label";
}
@@ -735,47 +735,51 @@ group { name: "e/modules/clock/calendar/day";
evalstate() {
new vv = get_int(day_state);
- if (vv & 2)
- {
- set_state(PART:"e.text.label", "today", 0.0);
- set_state(PART:"label2", "today", 0.0);
- set_state(PART:"base", "today", 0.0);
- }
- else if (vv & 4)
- {
- set_state(PART:"e.text.label", "hidden", 0.0);
- set_state(PART:"label2", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- }
- else if (vv & 1)
- {
- set_state(PART:"e.text.label", "weekend", 0.0);
- set_state(PART:"label2", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- }
- else
- {
- set_state(PART:"e.text.label", "default", 0.0);
- set_state(PART:"label2", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- }
+ if (vv & 2) {
+ set_state(PART:"e.text.label", "today", 0.0);
+ set_state(PART:"label2", "today", 0.0);
+ set_state(PART:"base", "today", 0.0);
+ } else if (vv & 4) {
+ set_state(PART:"e.text.label", "hidden", 0.0);
+ set_state(PART:"label2", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
+ } else if (vv & 1) {
+ set_state(PART:"e.text.label", "weekend", 0.0);
+ set_state(PART:"label2", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
+ } else {
+ set_state(PART:"e.text.label", "default", 0.0);
+ set_state(PART:"label2", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
+ }
}
}
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 0 0 0 64;
+ color_class: "/bg/normal/gadgets/clock/cal/day/date/normal";
visible: 0;
}
description { state: "today" 0.0;
inherit: "default" 0.0;
+ color_class: "/bg/normal/gadgets/clock/cal/day/date/today";
+ visible: 1;
+ }
+ description { state: "weekend" 0.0;
+ inherit: "default" 0.0;
+ color_class: "/bg/normal/gadgets/clock/cal/day/date/weekend";
+ visible: 1;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ color_class: "/bg/normal/gadgets/clock/cal/day/date/hidden";
visible: 1;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/cal/day/date/normal";
rel1.offset: 3 3;
rel2.offset: -4 -4;
offscale;
@@ -788,23 +792,23 @@ group { name: "e/modules/clock/calendar/day";
}
description { state: "today" 0.0;
inherit: "default" 0.0;
+ color_class: "/fg/normal/gadgets/clock/cal/day/date/today";
visible: 0;
}
description { state: "weekend" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/fg/normal/gadgets/clock/cal/day/date/weekend";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
- color: 40 40 40 255;
+ color_class: "/fg/normal/gadgets/clock/cal/day/date/faded";
}
}
part { name: "label2"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: 255 255 255 255;
- rel1.to: "e.text.label";
- rel2.to: "e.text.label";
+ color_class: "/fg/normal/gadgets/clock/cal/day/date/today";
+ rel.to: "e.text.label";
text { font: FN; size: 10;
text_source: "e.text.label";
min: 1 1;
@@ -820,16 +824,14 @@ group { name: "e/modules/clock/calendar/day";
}
}
programs {
- program {
- signal: "e,state,weekend"; source: "e";
+ program { signal: "e,state,weekend"; source: "e";
script {
new vv = get_int(day_state);
set_int(day_state, vv | 1);
evalstate();
}
}
- program {
- signal: "e,state,weekday"; source: "e";
+ program { signal: "e,state,weekday"; source: "e";
script {
new vv = get_int(day_state);
set_int(day_state, vv & (~1));
@@ -837,16 +839,14 @@ group { name: "e/modules/clock/calendar/day";
}
}
- program {
- signal: "e,state,today"; source: "e";
+ program { signal: "e,state,today"; source: "e";
script {
new vv = get_int(day_state);
set_int(day_state, vv | 2);
evalstate();
}
}
- program {
- signal: "e,state,someday"; source: "e";
+ program { signal: "e,state,someday"; source: "e";
script {
new vv = get_int(day_state);
set_int(day_state, vv & (~2));
@@ -854,16 +854,14 @@ group { name: "e/modules/clock/calendar/day";
}
}
- program {
- signal: "e,state,hidden"; source: "e";
+ program { signal: "e,state,hidden"; source: "e";
script {
new vv = get_int(day_state);
set_int(day_state, vv | 4);
evalstate();
}
}
- program {
- signal: "e,state,visible"; source: "e";
+ program { signal: "e,state,visible"; source: "e";
script {
new vv = get_int(day_state);
set_int(day_state, vv & (~4));
@@ -885,7 +883,7 @@ group { name: "e/modules/clock/calendar";
rel1.relative: 1.0 0.0;
rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/cal/month";
text { font: FNBD; size: 10;
text: "000000000000";
align: 0.0 0.5;
@@ -903,7 +901,7 @@ group { name: "e/modules/clock/calendar";
rel2.to_x: "next";
rel2.offset: -5 -1;
rel2.relative: 0.0 0.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/cal/year";
text { font: FNBD; size: 10;
text: "0000";
align: 1.0 0.5;
@@ -920,35 +918,32 @@ group { name: "e/modules/clock/calendar";
max: 15 15;
rel.to: "prev";
image.normal: "i-arrow-l";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/cal/prev";
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/gadgets/clock/cal/prev";
}
}
part { name: "prev"; type: RECT;
description { state: "default" 0.0;
align: 0.0 0.5;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.to_y: "e.text.month";
rel1.relative: 0.0 0.0;
rel2.to_y: "e.text.month";
rel2.relative: 0.0 1.0;
}
- program { name: "prev_down";
- signal: "mouse,down,1*"; source: "prev";
+ program { signal: "mouse,down,1*"; source: "prev";
action: STATE_SET "pressed" 0.0;
target: "previm";
}
- program { name: "prev_up";
- signal: "mouse,up,1"; source: "prev";
+ program { signal: "mouse,up,1"; source: "prev";
action: STATE_SET "default" 0.0;
target: "previm";
}
- program { name: "prev_clicked";
- signal: "mouse,clicked,1*"; source: "prev";
+ program { signal: "mouse,clicked,1*"; source: "prev";
action: SIGNAL_EMIT "e,action,prev" "";
}
}
@@ -960,41 +955,38 @@ group { name: "e/modules/clock/calendar";
max: 15 15;
rel.to: "next";
image.normal: "i-arrow-r";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/clock/cal/next";
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/gadgets/clock/cal/next";
}
}
part { name: "next"; type: RECT;
description { state: "default" 0.0;
align: 1.0 0.5;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.to_y: "e.text.month";
rel1.relative: 1.0 0.0;
rel2.to_y: "e.text.month";
rel2.relative: 1.0 1.0;
}
- program { name: "next_down";
- signal: "mouse,down,1"; source: "next";
+ program { signal: "mouse,down,1"; source: "next";
action: STATE_SET "pressed" 0.0;
target: "nextim";
}
- program { name: "next_up";
- signal: "mouse,up,1"; source: "next";
+ program { signal: "mouse,up,1"; source: "next";
action: STATE_SET "default" 0.0;
target: "nextim";
}
- program { name: "next_clicked";
- signal: "mouse,clicked,1"; source: "next";
+ program { signal: "mouse,clicked,1"; source: "next";
action: SIGNAL_EMIT "e,action,next" "";
}
}
part { name: "sep"; type: RECT;
description { state: "default" 0.0;
- color: 80 80 80 255;
+ color_class: "/fg/normal/gadgets/clock/cal/daydate-sep";
rel1.relative: 0.0 1.0;
rel1.offset: 8 0;
rel1.to: "e.table.daynames";
@@ -1039,11 +1031,13 @@ item { \
}
}
part { name: "e.table.days"; type: TABLE;
+ scale: 1;
description { state: "default" 0.0;
rel1.to_y: "e.table.daynames";
rel1.relative: 0.0 1.0;
rel1.offset: 8 16;
rel2.offset: -9 -9;
+ offscale;
step: 7 5;
table { homogeneous: TABLE;
padding: 1 1;
diff --git a/data/elementary/themes/img/clock_base-040.png
b/data/elementary/themes/img/clock_base-040.png
new file mode 100644
index 0000000000..64d9dae37c
Binary files /dev/null and b/data/elementary/themes/img/clock_base-040.png
differ
diff --git a/data/elementary/themes/img/clock_base-080.png
b/data/elementary/themes/img/clock_base-080.png
new file mode 100644
index 0000000000..9242836cd7
Binary files /dev/null and b/data/elementary/themes/img/clock_base-080.png
differ
diff --git a/data/elementary/themes/img/clock_base-160.png
b/data/elementary/themes/img/clock_base-160.png
new file mode 100644
index 0000000000..824bb459e1
Binary files /dev/null and b/data/elementary/themes/img/clock_base-160.png
differ
diff --git a/data/elementary/themes/img/clock_base.png
b/data/elementary/themes/img/clock_base.png
deleted file mode 100644
index 2c594c1c65..0000000000
Binary files a/data/elementary/themes/img/clock_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/clock_base_digits-040.png
b/data/elementary/themes/img/clock_base_digits-040.png
new file mode 100644
index 0000000000..8603f289fd
Binary files /dev/null and
b/data/elementary/themes/img/clock_base_digits-040.png differ
diff --git a/data/elementary/themes/img/clock_base_digits-080.png
b/data/elementary/themes/img/clock_base_digits-080.png
new file mode 100644
index 0000000000..cee8728ed9
Binary files /dev/null and
b/data/elementary/themes/img/clock_base_digits-080.png differ
diff --git a/data/elementary/themes/img/clock_base_digits-160.png
b/data/elementary/themes/img/clock_base_digits-160.png
new file mode 100644
index 0000000000..07b1c401de
Binary files /dev/null and
b/data/elementary/themes/img/clock_base_digits-160.png differ
diff --git a/data/elementary/themes/img/clock_hand_hours-040.png
b/data/elementary/themes/img/clock_hand_hours-040.png
new file mode 100644
index 0000000000..bdeb8759ef
Binary files /dev/null and
b/data/elementary/themes/img/clock_hand_hours-040.png differ
diff --git a/data/elementary/themes/img/clock_hand_hours-080.png
b/data/elementary/themes/img/clock_hand_hours-080.png
new file mode 100644
index 0000000000..50cc8b708d
Binary files /dev/null and
b/data/elementary/themes/img/clock_hand_hours-080.png differ
diff --git a/data/elementary/themes/img/clock_hand_hours-160.png
b/data/elementary/themes/img/clock_hand_hours-160.png
new file mode 100644
index 0000000000..cabda08c74
Binary files /dev/null and
b/data/elementary/themes/img/clock_hand_hours-160.png differ
diff --git a/data/elementary/themes/img/clock_hand_mins-040.png
b/data/elementary/themes/img/clock_hand_mins-040.png
new file mode 100644
index 0000000000..2acbee30cd
Binary files /dev/null and b/data/elementary/themes/img/clock_hand_mins-040.png
differ
diff --git a/data/elementary/themes/img/clock_hand_mins-080.png
b/data/elementary/themes/img/clock_hand_mins-080.png
new file mode 100644
index 0000000000..d77f6a593d
Binary files /dev/null and b/data/elementary/themes/img/clock_hand_mins-080.png
differ
diff --git a/data/elementary/themes/img/clock_hand_mins-160.png
b/data/elementary/themes/img/clock_hand_mins-160.png
new file mode 100644
index 0000000000..65bb6b326f
Binary files /dev/null and b/data/elementary/themes/img/clock_hand_mins-160.png
differ
diff --git a/data/elementary/themes/img/clock_hand_secs-040.png
b/data/elementary/themes/img/clock_hand_secs-040.png
new file mode 100644
index 0000000000..300d342d4e
Binary files /dev/null and b/data/elementary/themes/img/clock_hand_secs-040.png
differ
diff --git a/data/elementary/themes/img/clock_hand_secs-080.png
b/data/elementary/themes/img/clock_hand_secs-080.png
new file mode 100644
index 0000000000..69257cd4b8
Binary files /dev/null and b/data/elementary/themes/img/clock_hand_secs-080.png
differ
diff --git a/data/elementary/themes/img/clock_hand_secs-160.png
b/data/elementary/themes/img/clock_hand_secs-160.png
new file mode 100644
index 0000000000..f475180b32
Binary files /dev/null and b/data/elementary/themes/img/clock_hand_secs-160.png
differ
diff --git a/data/elementary/themes/img/svg/clock.svg
b/data/elementary/themes/img/svg/clock.svg
index ccc59a7579..1dcb2c8ce0 100644
--- a/data/elementary/themes/img/svg/clock.svg
+++ b/data/elementary/themes/img/svg/clock.svg
@@ -7,16 +7,16 @@
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";
- inkscape:export-ydpi="96"
- inkscape:export-xdpi="96"
- inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/clock-040.png"
- inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
- sodipodi:docname="clock.svg"
- viewBox="0 0 40 40"
- height="40"
- width="40"
+ version="1.1"
id="svg2"
- version="1.1">
+ width="80"
+ height="80"
+ viewBox="0 0 80 80"
+ sodipodi:docname="clock.svg"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"
+ inkscape:export-filename="/home/raster/C/th-efl/img/clock_base-040.png"
+ inkscape:export-xdpi="48"
+ inkscape:export-ydpi="48">
<metadata
id="metadata8">
<rdf:RDF>
@@ -32,71 +32,96 @@
<defs
id="defs6" />
<sodipodi:namedview
- inkscape:current-layer="g10"
- inkscape:window-maximized="1"
- inkscape:window-y="0"
- inkscape:window-x="0"
- inkscape:cy="20.023923"
- inkscape:cx="20"
- inkscape:zoom="20.9"
- showgrid="true"
- id="namedview4"
- inkscape:window-height="1017"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
pagecolor="#404040"
- inkscape:document-rotation="0"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1372"
+ id="namedview4"
+ showgrid="true"
+ inkscape:zoom="15.1"
+ inkscape:cx="40"
+ inkscape:cy="40"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="g10"
inkscape:snap-bbox="true"
- inkscape:bbox-nodes="true"
- inkscape:bbox-paths="true">
+ inkscape:bbox-nodes="true">
<inkscape:grid
- spacingy="0.5"
- spacingx="0.5"
+ type="xygrid"
id="grid837"
- type="xygrid" />
+ empspacing="4" />
</sodipodi:namedview>
<g
- id="g10"
+ inkscape:groupmode="layer"
inkscape:label="Image"
- inkscape:groupmode="layer">
- <circle
-
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.944882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path3951"
- cx="20"
- cy="20"
- r="16" />
+ id="g10">
<circle
-
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.82677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="circle3953"
- cx="20"
- cy="20"
- r="14" />
+ style="fill:#ffffff;stroke:none;stroke-width:3.77953"
+ id="path839"
+ cx="39.959396"
+ cy="40"
+ r="36" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.77953"
+ id="rect1569"
+ width="8"
+ height="4.0406051"
+ x="-16"
+ y="37.959396"
+ ry="2"
+ transform="rotate(-90)" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.77953"
+ id="rect1563"
+ width="8"
+ height="4.0406051"
+ x="7.9593949"
+ y="37.959396"
+ ry="2" />
+ <rect
+ style="fill:#000000;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:3.77953"
+ id="rect1567"
+ width="8"
+ height="4.0406051"
+ x="-72"
+ y="37.959396"
+ ry="2"
+ transform="rotate(-90)" />
<path
style="fill:#aa0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.88938px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 19.139696,19.488528 c -0.25,0.433012 -0.06699,1.116025
0.366025,1.366025 l 11.758331,5.633975 -10.758331,-7.366026 c -0.433012,-0.25
-1.116025,-0.06699 -1.366025,0.366026 z"
+ d="m 40,43 c 1.460745,2e-6 3.000005,-1.539246 3,-3 L 40,4 37,40 c
0,1.460748 1.539243,3.000005 3,3 z"
id="path3955"
- inkscape:transform-center-x="-5.1523903"
- inkscape:transform-center-y="2.7596476"
+ inkscape:transform-center-x="0.0206694"
+ inkscape:transform-center-y="-17.560215"
sodipodi:nodetypes="zcccz" />
<path
-
style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.88938px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 21.001404,21.73196 c 0.866026,-0.5 1.232051,-1.866026
0.732051,-2.732051 L 14.001404,9.6076039 18.269353,20.999909 c 0.5,0.866025
1.866026,1.232051 2.732051,0.732051 z"
- id="path3901"
- inkscape:transform-center-x="2.0199861"
- inkscape:transform-center-y="-4.2144361"
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.88938px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 40,43 c 1.460745,2e-6 3.000005,-1.539246 3,-3 L 40,8 37,40 c
0,1.460748 1.539243,3.000005 3,3 z"
+ id="path1559"
+ inkscape:transform-center-x="0.0206694"
+ inkscape:transform-center-y="-17.560215"
sodipodi:nodetypes="zcccz" />
<path
-
style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.88938px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 21.419314,18.586543 c -0.707107,-0.707107 -2.12132,-0.707108
-2.828427,0 l -4.242641,7.071067 7.071068,-4.24264 c 0.707107,-0.707107
0.707107,-2.121321 0,-2.828427 z"
- id="path3897"
- inkscape:transform-center-x="1.8526924"
- inkscape:transform-center-y="1.8503763"
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.88938px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 40,43 c 1.460745,2e-6 3.000005,-1.539246 3,-3 L 40,16 37,40 c
0,1.460748 1.539243,3.000005 3,3 z"
+ id="path1561"
+ inkscape:transform-center-x="0.0206694"
+ inkscape:transform-center-y="-17.560215"
sodipodi:nodetypes="zcccz" />
</g>
</svg>
--
