aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-06-19 13:37:51 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-06-19 16:00:57 +0900
commitd70de304273334eff033e41b86d65ddbdc4bd412 (patch)
treef2ade7fa0123dd434a2a46aa6a0078ac19df5ee2
parentTheme: Fix task bar changing ellipsis issue (diff)
downloadelementary-devs/jpeg/theme.tar.gz
Theme: Use color class for the clock widgetsdevs/jpeg/theme
- desaturate & brighten image resources - add new color classes - use those cc for the widgets
-rw-r--r--data/themes/colorclasses.edc27
-rw-r--r--data/themes/edc/clock.edc19
-rw-r--r--data/themes/edc/elm/clock.edc4
-rw-r--r--data/themes/fonts.edc2
-rw-r--r--data/themes/img/digit_0.pngbin2490 -> 2526 bytes
-rw-r--r--data/themes/img/digit_1.pngbin523 -> 577 bytes
-rw-r--r--data/themes/img/digit_2.pngbin2380 -> 2443 bytes
-rw-r--r--data/themes/img/digit_3.pngbin2134 -> 2236 bytes
-rw-r--r--data/themes/img/digit_4.pngbin1511 -> 1563 bytes
-rw-r--r--data/themes/img/digit_5.pngbin2295 -> 2335 bytes
-rw-r--r--data/themes/img/digit_6.pngbin2534 -> 2588 bytes
-rw-r--r--data/themes/img/digit_7.pngbin1485 -> 1542 bytes
-rw-r--r--data/themes/img/digit_8.pngbin2608 -> 2669 bytes
-rw-r--r--data/themes/img/digit_9.pngbin2607 -> 2663 bytes
-rw-r--r--data/themes/img/digit_am.pngbin1292 -> 1347 bytes
-rw-r--r--data/themes/img/digit_na.pngbin4333 -> 2014 bytes
-rw-r--r--data/themes/img/digit_nm.pngbin924 -> 533 bytes
-rw-r--r--data/themes/img/digit_pm.pngbin1164 -> 1224 bytes
18 files changed, 46 insertions, 6 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 9cc9b9b62..c3a7477e9 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -223,7 +223,32 @@ color_classes {
color: FN_COL_HIGHLIGHT;
desc: "Text of an active hoverselector item";
}
-
+
+ color_class { name: "clock_digit";
+ color: FN_COL_HIGHLIGHT;
+ desc: "Digits of a clock widget";
+ }
+
+ color_class { name: "clock_bgdigit";
+ color: FN_COL_CLOCK_BGDIGIT;
+ desc: "Background digits of a clock widget";
+ }
+
+ color_class { name: "clock_hand_hour";
+ color: 255 255 255 255;
+ desc: "Analog clock hand for hours";
+ }
+
+ color_class { name: "clock_hand_min";
+ color: 255 255 255 255;
+ desc: "Analog clock hand for minutes";
+ }
+
+ color_class { name: "clock_hand_sec";
+ color: 255 0 0 255;
+ desc: "Analog clock hand for seconds";
+ }
+
// modules
color_class { name: "module_label";
color: FN_COL_DEFAULT;
diff --git a/data/themes/edc/clock.edc b/data/themes/edc/clock.edc
index 730861c00..f92dc8804 100644
--- a/data/themes/edc/clock.edc
+++ b/data/themes/edc/clock.edc
@@ -308,6 +308,7 @@ group { name: "e/modules/clock/digital";
image.normal: "digit_"_DIGIT".png"; \
visible: 0; \
color: 255 255 255 0; \
+ color_class: "clock_digit"; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
@@ -335,6 +336,7 @@ group { name: "e/modules/clock/digital";
image.normal: "digit_"_DIGIT".png"; \
visible: 0; \
color: 255 255 255 0; \
+ color_class: "clock_digit"; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
@@ -361,6 +363,7 @@ group { name: "e/modules/clock/digital";
rel1.to: _TO; rel2.to: _TO; \
aspect: (48/31) (48/31); aspect_preference: BOTH; \
image.normal: "digit_am.png"; \
+ color_class: "clock_digit"; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
@@ -373,7 +376,8 @@ group { name: "e/modules/clock/digital";
rel1.to: _BASE; \
rel2.to: _BASE; \
image.normal: _IMG; \
- color: 255 255 255 128; \
+ color: 255 255 255 255; \
+ color_class: "clock_bgdigit"; \
} \
}
#define BASEC(_NAME, _CLIP, _BASE, _IMG) \
@@ -383,7 +387,8 @@ group { name: "e/modules/clock/digital";
rel1.to: _BASE; \
rel2.to: _BASE; \
image.normal: _IMG; \
- color: 255 255 255 128; \
+ color: 255 255 255 255; \
+ color_class: "clock_bgdigit"; \
} \
}
@@ -420,7 +425,10 @@ group { name: "e/modules/clock/digital";
rel1.offset: 0 1;
rel2.offset: -1 1;
align: 0.5 1.0;
- color: FN_COL_HIGHLIGHT;
+ color: 255 255 255 255;
+ color2: 255 255 255 255;
+ color3: 255 255 255 255;
+ color_class: "clock_digit";
text { font: FN; size: 8;
text_class: "module_small";
align: 0.5 0.5;
@@ -664,7 +672,8 @@ group { name: "e/modules/clock/main";
part { name: "seconds"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "tacho_hand_big";
- color: 255 0 0 255;
+ color: 255 255 255 255;
+ color_class: "clock_hand_sec";
rel1.to: "base";
rel2.to: "base";
map {
@@ -691,6 +700,7 @@ group { name: "e/modules/clock/main";
part { name: "minutes"; mouse_events: 0;
description { state: "default" 0.0000;
color: 255 255 255 255;
+ color_class: "clock_hand_min";
image.normal: "tacho_hand_big";
rel1.to: "base";
rel2.to: "base";
@@ -719,6 +729,7 @@ group { name: "e/modules/clock/main";
description { state: "default" 0.0;
image.normal: "tacho_hand_small_min";
color: 255 255 255 255;
+ color_class: "clock_hand_hour";
rel1.to: "base";
rel2.to: "base";
map {
diff --git a/data/themes/edc/elm/clock.edc b/data/themes/edc/elm/clock.edc
index 60d8c3866..2edd97fdd 100644
--- a/data/themes/edc/elm/clock.edc
+++ b/data/themes/edc/elm/clock.edc
@@ -48,7 +48,8 @@ group { name: "elm/clock/flipdigit/default";
rel1.to: "digit";
rel2.to: "digit";
image.normal: "digit_na.png";
- color: 255 255 255 128;
+ color: 255 255 255 255;
+ color_class: "clock_bgdigit";
}
}
part { name: "b";
@@ -89,6 +90,7 @@ group { name: "elm/clock/flipdigit/default";
rel2.relative: 1.0 0.0;
aspect: (52/72) (52/72); aspect_preference: BOTH;
image.normal: "digit_0.png";
+ color_class: "clock_digit";
}
#define DIGIT_DESC(_DIGIT) \
description { state: _DIGIT 0.0; \
diff --git a/data/themes/fonts.edc b/data/themes/fonts.edc
index a7fba6d1f..ffde25071 100644
--- a/data/themes/fonts.edc
+++ b/data/themes/fonts.edc
@@ -46,6 +46,8 @@
/* xkbswitch.edc */
#define FN_COL_OUTLINE_TRANSPARENT 255 255 255 0; color2: 0 0 0 0; color3: 0 0 0 0;
#define FN_COL_OUTLINE_DEFAULT 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 24;
+/* clock widgets */
+#define FN_COL_CLOCK_BGDIGIT 30 30 30 128;
#define ENABLED_TEXTBLOCK_TAGS \
tag: "em" "+ font_style=Oblique"; \
diff --git a/data/themes/img/digit_0.png b/data/themes/img/digit_0.png
index 9cdc3b189..63d7c5203 100644
--- a/data/themes/img/digit_0.png
+++ b/data/themes/img/digit_0.png
Binary files differ
diff --git a/data/themes/img/digit_1.png b/data/themes/img/digit_1.png
index e68ef0a62..b78f02c1c 100644
--- a/data/themes/img/digit_1.png
+++ b/data/themes/img/digit_1.png
Binary files differ
diff --git a/data/themes/img/digit_2.png b/data/themes/img/digit_2.png
index 463a6a1ac..6c0089c82 100644
--- a/data/themes/img/digit_2.png
+++ b/data/themes/img/digit_2.png
Binary files differ
diff --git a/data/themes/img/digit_3.png b/data/themes/img/digit_3.png
index 1f9c5f443..d044a754d 100644
--- a/data/themes/img/digit_3.png
+++ b/data/themes/img/digit_3.png
Binary files differ
diff --git a/data/themes/img/digit_4.png b/data/themes/img/digit_4.png
index 58b1c0723..e1c1814be 100644
--- a/data/themes/img/digit_4.png
+++ b/data/themes/img/digit_4.png
Binary files differ
diff --git a/data/themes/img/digit_5.png b/data/themes/img/digit_5.png
index d9f648323..32592bdb2 100644
--- a/data/themes/img/digit_5.png
+++ b/data/themes/img/digit_5.png
Binary files differ
diff --git a/data/themes/img/digit_6.png b/data/themes/img/digit_6.png
index 0f5a55d42..2815fc3c0 100644
--- a/data/themes/img/digit_6.png
+++ b/data/themes/img/digit_6.png
Binary files differ
diff --git a/data/themes/img/digit_7.png b/data/themes/img/digit_7.png
index 0d36ec28e..37f84bcd7 100644
--- a/data/themes/img/digit_7.png
+++ b/data/themes/img/digit_7.png
Binary files differ
diff --git a/data/themes/img/digit_8.png b/data/themes/img/digit_8.png
index cd24056eb..dc4857808 100644
--- a/data/themes/img/digit_8.png
+++ b/data/themes/img/digit_8.png
Binary files differ
diff --git a/data/themes/img/digit_9.png b/data/themes/img/digit_9.png
index 4691191f4..4b99f6221 100644
--- a/data/themes/img/digit_9.png
+++ b/data/themes/img/digit_9.png
Binary files differ
diff --git a/data/themes/img/digit_am.png b/data/themes/img/digit_am.png
index a77956332..c6bdd3d9d 100644
--- a/data/themes/img/digit_am.png
+++ b/data/themes/img/digit_am.png
Binary files differ
diff --git a/data/themes/img/digit_na.png b/data/themes/img/digit_na.png
index e8652ef03..aff73970b 100644
--- a/data/themes/img/digit_na.png
+++ b/data/themes/img/digit_na.png
Binary files differ
diff --git a/data/themes/img/digit_nm.png b/data/themes/img/digit_nm.png
index 292a2a3b6..5710e77b0 100644
--- a/data/themes/img/digit_nm.png
+++ b/data/themes/img/digit_nm.png
Binary files differ
diff --git a/data/themes/img/digit_pm.png b/data/themes/img/digit_pm.png
index e3ccf7777..967bdfa1a 100644
--- a/data/themes/img/digit_pm.png
+++ b/data/themes/img/digit_pm.png
Binary files differ