billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=7469037003838a454bcc7fd1e61a1905e2b313ae
commit 7469037003838a454bcc7fd1e61a1905e2b313ae
Author: Boris Faure <bill...@gmail.com>
Date: Tue Nov 17 23:20:15 2020 +0100
themes: use only HIGHLIGHT
instead of CURSOR_HIGHLIGHT and GLOW_HIGHLIGHT
---
data/themes/default/background.edc | 34 ++++++++++++++--------------
data/themes/default/colors.edc | 3 +--
data/themes/default/cursor.edc | 6 ++---
data/themes/default/media.edc | 2 +-
data/themes/mild.edc | 46 +++++++++++++++++++-------------------
src/bin/colors.c | 3 +--
6 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/data/themes/default/background.edc
b/data/themes/default/background.edc
index 203c309..87b28f5 100644
--- a/data/themes/default/background.edc
+++ b/data/themes/default/background.edc
@@ -281,12 +281,12 @@ group { name: "terminology/background";
rel1.relative: 0.05 0.05;
rel2.relative: 0.45 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r1"; type: RECT;
@@ -298,12 +298,12 @@ group { name: "terminology/background";
rel1.relative: 0.55 0.05;
rel2.relative: 0.95 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r2"; type: RECT;
@@ -315,12 +315,12 @@ group { name: "terminology/background";
rel1.relative: 0.05 0.55;
rel2.relative: 0.45 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r3"; type: RECT;
@@ -332,12 +332,12 @@ group { name: "terminology/background";
rel1.relative: 0.55 0.55;
rel2.relative: 0.95 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "terminology.tabcount.control"; type: SWALLOW;
@@ -1272,12 +1272,12 @@ group { name: "terminology/background";
rel1.relative: 0.05 0.05;
rel2.relative: 0.45 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tab_btn_r1"; type: RECT;
@@ -1289,12 +1289,12 @@ group { name: "terminology/background";
rel1.relative: 0.55 0.05;
rel2.relative: 0.95 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tab_btn_r2"; type: RECT;
@@ -1306,12 +1306,12 @@ group { name: "terminology/background";
rel1.relative: 0.05 0.55;
rel2.relative: 0.45 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tab_btn_r3"; type: RECT;
@@ -1323,12 +1323,12 @@ group { name: "terminology/background";
rel1.relative: 0.55 0.55;
rel2.relative: 0.95 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "terminology.tab_btn"; type: SWALLOW;
@@ -2054,7 +2054,7 @@ group { name: "terminology/background";
description { state: "active" 0.0; \
inherit: "default" 0.0; \
color: 255 255 255 255; \
- color_class: "GLOW_HIGHLIGHT"; \
+ color_class: "HIGHLIGHT"; \
visible: 1; \
} \
} \
diff --git a/data/themes/default/colors.edc b/data/themes/default/colors.edc
index 294e881..c350c40 100644
--- a/data/themes/default/colors.edc
+++ b/data/themes/default/colors.edc
@@ -3,9 +3,8 @@ color_class { name: "FG"; color: FG_COLOR ; }
#ifndef PROVIDE_CURSOR
color_class { name: "CURSOR"; color: 51 153 255 255; }
#endif
-color_class { name: "CURSOR_HIGHLIGHT"; color: 255 255 255 255; }
color_class { name: "GLOW"; color: 51 153 255 255; }
-color_class { name: "GLOW_HIGHLIGHT"; color: 255 255 255 255; }
+color_class { name: "HIGHLIGHT"; color: 255 255 255 255; }
color_class { name: "GLOW_TXT";
color: 51 153 255 255;
color2: 51 153 255 255;
diff --git a/data/themes/default/cursor.edc b/data/themes/default/cursor.edc
index 7d5504a..af586f9 100644
--- a/data/themes/default/cursor.edc
+++ b/data/themes/default/cursor.edc
@@ -118,7 +118,7 @@ group { name: "terminology/cursor";
description { state: "focused" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "CURSOR_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
programs {
@@ -339,7 +339,7 @@ group { name: "terminology/cursor_bar";
description { state: "focused" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "CURSOR_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
programs {
@@ -561,7 +561,7 @@ group { name: "terminology/cursor_underline";
description { state: "focused" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "CURSOR_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
programs {
diff --git a/data/themes/default/media.edc b/data/themes/default/media.edc
index a2352a9..43755e1 100644
--- a/data/themes/default/media.edc
+++ b/data/themes/default/media.edc
@@ -56,7 +56,7 @@ group { name: "terminology/mediabusy";
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "knob";
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index d79df6b..19264a3 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -187,7 +187,7 @@ collections {
rel1.relative: -0.2 0.0;
rel2.relative: -0.2 1.0;
color: 255 255 255 64;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
align: 1.0 0.5;
text { font: "Sans"; size: 8;
align: 1.0 0.5;
@@ -198,7 +198,7 @@ collections {
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r0"; type: RECT;
@@ -209,12 +209,12 @@ collections {
rel1.relative: 0.05 0.05;
rel2.relative: 0.45 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r1"; type: RECT;
@@ -225,12 +225,12 @@ collections {
rel1.relative: 0.55 0.05;
rel2.relative: 0.95 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r2"; type: RECT;
@@ -241,12 +241,12 @@ collections {
rel1.relative: 0.05 0.55;
rel2.relative: 0.45 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tabcount_r3"; type: RECT;
@@ -257,12 +257,12 @@ collections {
rel1.relative: 0.55 0.55;
rel2.relative: 0.95 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "terminology.tabcount.control"; type: SWALLOW;
@@ -854,12 +854,12 @@ collections {
rel1.relative: 0.05 0.05;
rel2.relative: 0.45 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tab_btn_r1"; type: RECT;
@@ -871,12 +871,12 @@ collections {
rel1.relative: 0.55 0.05;
rel2.relative: 0.95 0.45;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tab_btn_r2"; type: RECT;
@@ -888,12 +888,12 @@ collections {
rel1.relative: 0.05 0.55;
rel2.relative: 0.45 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "tab_btn_r3"; type: RECT;
@@ -905,12 +905,12 @@ collections {
rel1.relative: 0.55 0.55;
rel2.relative: 0.95 0.95;
color: 255 255 255 32;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color_class: "GLOW_HIGHLIGHT";
+ color_class: "HIGHLIGHT";
}
}
part { name: "terminology.tab_btn"; type: SWALLOW;
@@ -1575,7 +1575,7 @@ collections {
border: 4 4 4 4; \
} \
color: 255 255 255 64; \
- color_class: "GLOW_HIGHLIGHT"; \
+ color_class: "HIGHLIGHT"; \
visible: 0; \
} \
description { state: "hdrag,off" 0.0; \
@@ -1584,13 +1584,13 @@ collections {
description { state: "on" 0.0; \
inherit: "default" 0.0; \
color: 255 255 255 255; \
- color_class: "GLOW_HIGHLIGHT"; \
+ color_class: "HIGHLIGHT"; \
visible: 1; \
} \
description { state: "out" 0.0; \
inherit: "default" 0.0; \
color: 255 255 255 0; \
- color_class: "GLOW_HIGHLIGHT"; \
+ color_class: "HIGHLIGHT"; \
rel1.offset: -8 -8; \
rel2.offset: 7 7; \
visible: 1; \
@@ -1608,7 +1608,7 @@ collections {
border: 3 3 3 3; \
} \
color: 255 255 255 80; \
- color_class: "GLOW_HIGHLIGHT"; \
+ color_class: "HIGHLIGHT"; \
visible: 0; \
} \
description { state: "hdrag,off" 0.0; \
@@ -1618,7 +1618,7 @@ collections {
description { state: "active" 0.0; \
inherit: "default" 0.0; \
color: 255 255 255 255; \
- color_class: "GLOW_HIGHLIGHT"; \
+ color_class: "HIGHLIGHT"; \
visible: 1; \
} \
} \
diff --git a/src/bin/colors.c b/src/bin/colors.c
index 4bde21a..48887c1 100644
--- a/src/bin/colors.c
+++ b/src/bin/colors.c
@@ -632,9 +632,8 @@ color_scheme_apply(Evas_Object *edje,
CS_SET("BG", bg);
CS_SET("FG", normal.def);
CS_SET("CURSOR", main);
- CS_SET("CURSOR_HIGHLIGHT", hl);
CS_SET("GLOW", main);
- CS_SET("GLOW_HIGHLIGHT", hl);
+ CS_SET("HIGHLIGHT", hl);
CS_SET("GLOW_TXT", main);
CS_SET_MANY("GLOW_TXT_HIGHLIGHT", hl, main, main);
--
