From 001a153791674fc4e48eb3c2dbca820aac81d0f6 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 25 Jul 2021 22:19:10 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/edc/desklock.edc | 2 +- data/elementary/themes/edc/elm/border.edc | 4 ++-- data/elementary/themes/edc/elm/button.edc | 14 +++++++------- data/elementary/themes/edc/elm/check.edc | 8 ++++---- data/elementary/themes/edc/elm/spinner.edc | 10 +++++----- data/elementary/themes/edc/elm/tooltip.edc | 16 ++++++++-------- data/elementary/themes/edc/elm/uiclock.edc | 20 +++++++++----------- data/elementary/themes/edc/elm/video.edc | 4 ++-- 8 files changed, 38 insertions(+), 40 deletions(-) diff --git a/data/elementary/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc index b0e40b9449..e0b2272de9 100644 --- a/data/elementary/themes/edc/desklock.edc +++ b/data/elementary/themes/edc/desklock.edc @@ -340,7 +340,7 @@ group { name: "e/desklock/pin_box"; rel2.offset: -4 -3; color_class: "/fg/normal/desklock/text/title/pin"; align: 0.5 0.0; - text { font: "Sans:style=Bold"; size: 10; + text { font: FNBD; size: 10; min: 0 1; align: 0.5 0.5; text_class: "desklock_title"; diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc index ebf8c47265..eccd61ddba 100644 --- a/data/elementary/themes/edc/elm/border.edc +++ b/data/elementary/themes/edc/elm/border.edc @@ -622,12 +622,12 @@ group { name: "elm/border/base/default"; rect { "indicator_bg"; clip: "bg_clip"; desc { "default"; - color: 148 23 45 255; // never see this... + color: 148 23 45 255; // no cc never see this... rel.to: "elm.swallow.indicator"; } desc { "bg_transparent"; inherit: "default"; - color: 0 0 0 0; // never see this... + color: 0 0 0 0; // no cc never see this... } } swallow { "elm.swallow.indicator"; diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc index 0e95d1cecc..6e7dc9f37b 100644 --- a/data/elementary/themes/edc/elm/button.edc +++ b/data/elementary/themes/edc/elm/button.edc @@ -455,7 +455,7 @@ group { name: "elm/button/base/anchor"; } rect { "event"; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } desc { "disabled"; inherit: "default"; @@ -580,15 +580,15 @@ group { name: "elm/button/base/blank"; } part { name: "base"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "pressed" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 1; } description { state: "disabled" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } } @@ -1358,7 +1358,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default"; } part { name: "disabler"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "disabled" 0.0; @@ -1469,7 +1469,7 @@ group { name: "elm/button/base/combobox_vertical/default"; } rect { name: "event"; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } desc { "disabled"; inherit: "default"; @@ -1538,7 +1538,7 @@ group { name: "elm/button/base/combobox_vertical/default"; } rect { name: "event2"; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel.to: "base"; rel2.to_x: "select_line"; rel2.relative: 0.0 1.0; diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc index 60422da36f..461f84a3b5 100644 --- a/data/elementary/themes/edc/elm/check.edc +++ b/data/elementary/themes/edc/elm/check.edc @@ -465,7 +465,7 @@ group { name: "elm/check/base/toggle"; rel.to: "tog"; min: 15 15; max: 15 99999; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } rect { name: "base_but"; nomouse; @@ -485,7 +485,7 @@ group { name: "elm/check/base/toggle"; rect { name: "button_events"; dragable.events: "button"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } text { "elm.text"; nomouse; @@ -553,7 +553,7 @@ group { name: "elm/check/base/toggle"; } rect { "event2"; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } desc { "disabled"; inherit; @@ -563,7 +563,7 @@ group { name: "elm/check/base/toggle"; rect { "event"; repeat; ignore_flags: ON_HOLD; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } desc { "disabled"; inherit; visible: 0; diff --git a/data/elementary/themes/edc/elm/spinner.edc b/data/elementary/themes/edc/elm/spinner.edc index 63531e178f..044966e5da 100644 --- a/data/elementary/themes/edc/elm/spinner.edc +++ b/data/elementary/themes/edc/elm/spinner.edc @@ -9,14 +9,14 @@ group { name: "elm/spinner/base/default"; part { name: "bg"; type: RECT; scale: 1; description { state: "default" 0.0; - color: DARK_GREY_BG_COLOR; + color_class: "/bg-dark/normal/spinner/base"; } } part { name: "access"; type: RECT; repeat_events: 1; description { state: "default" 0.0; fixed: 1 1; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "active" 0.0; @@ -82,14 +82,14 @@ group { name: "elm/spinner/base/default"; description { state: "default" 0.0; fixed: 1 0; rel.to: "elm.swallow.text_button"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "disabler"; type: RECT; repeat_events: 0; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "disabled" 0.0; @@ -192,7 +192,7 @@ group { name: "elm/spinner/base/vertical"; description { state: "default" 0.0; fixed: 1 0; rel.to: "elm.swallow.text_button"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } diff --git a/data/elementary/themes/edc/elm/tooltip.edc b/data/elementary/themes/edc/elm/tooltip.edc index 7854305e39..1b94187443 100644 --- a/data/elementary/themes/edc/elm/tooltip.edc +++ b/data/elementary/themes/edc/elm/tooltip.edc @@ -146,14 +146,14 @@ group { name: "elm/tooltip/base/default"; part { name: "clipper"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc rel1 { to: "pop"; offset: -500 -500; } rel2 { to: "pop"; offset: 499 499; } offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "shadow"; mouse_events: 0; @@ -232,7 +232,7 @@ group { name: "elm/tooltip/base/default"; part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ description { state: "default" 0.0; \ - color: 0 0 0 0; \ + color: 0 0 0 0; /* no cc */ \ min: 12 11; \ align: ax 0.5; \ fixed: 1 1; \ @@ -256,7 +256,7 @@ group { name: "elm/tooltip/base/default"; confine: "edge-area-"name_; \ } \ description { state: "default" 0.0; \ - color: 0 0 0 0; \ + color: 0 0 0 0; /* no cc */ \ min: 12 11; \ rel.to: "edge-area-"name_; \ } \ @@ -302,7 +302,7 @@ group { name: "elm/tooltip/base/default"; part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ description { state: "default" 0.0; \ - color: 0 0 0 0; \ + color: 0 0 0 0; /* no cc */ \ min: 11 12; \ align: 0.5 ay; \ fixed: 1 1; \ @@ -317,7 +317,7 @@ group { name: "elm/tooltip/base/default"; confine: "edge-area-"name_; \ } \ description { state: "default" 0.0; \ - color: 0 0 0 0; \ + color: 0 0 0 0; /* no cc */ \ min: 11 12; \ rel.to: "edge-area-"name_; \ } \ @@ -338,12 +338,12 @@ group { name: "elm/tooltip/base/default"; part { name: "clipper_content"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc rel.to: "elm.swallow.content"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "elm.swallow.content"; type: SWALLOW; diff --git a/data/elementary/themes/edc/elm/uiclock.edc b/data/elementary/themes/edc/elm/uiclock.edc index cc94fceff7..8c291c4709 100644 --- a/data/elementary/themes/edc/elm/uiclock.edc +++ b/data/elementary/themes/edc/elm/uiclock.edc @@ -49,9 +49,9 @@ relative: 1.0 1.0; \ to: "elm.field"#_after; \ } \ - color: FN_COL_DEFAULT; \ + color_class: "/fg/normal/clock/separator"; \ text { \ - font: "Sans"; size: 10; \ + font: FN; size: 10; \ min: 1 0; \ ellipsis: -1; \ align: 0.5 0.5; \ @@ -72,10 +72,10 @@ visible: 0; \ rel1.to: "elm.separator"#_pos; \ rel2.to: "elm.separator"#_pos; \ - color: FN_COL_DISABLE; \ + color_class: "/fg/disabled/clock/separator"; \ text { \ text_source: "elm.separator"#_pos; \ - font: "Sans"; size: 10; \ + font: FN; size: 10; \ text_class: "datetime_separator_text_disabled"; \ } \ } \ @@ -102,7 +102,7 @@ group { name: "elm/uiclock/base/default"; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "clip"; type: RECT; @@ -171,7 +171,7 @@ group { name: "elm/uiclock/base/default"; rel1.to: "elm.separator0"; rel2.to: "elm.separator7"; visible: 0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -180,20 +180,18 @@ group { name: "elm/uiclock/base/default"; } part { name: "elm.access"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } programs { - program { - signal: "elm,state,disabled"; source: "elm"; + program { signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.0; target: "disclip"; target: "disclip2"; target: "discover"; } - program { - signal: "elm,state,enabled"; source: "elm"; + program { signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.0; target: "disclip"; target: "disclip2"; diff --git a/data/elementary/themes/edc/elm/video.edc b/data/elementary/themes/edc/elm/video.edc index 9085ec2900..d27e9e9c14 100644 --- a/data/elementary/themes/edc/elm/video.edc +++ b/data/elementary/themes/edc/elm/video.edc @@ -2,10 +2,10 @@ group { name: "elm/video/base/default"; parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } description { state: "darker" 0.0; - color: 128 128 128 255; + color: 128 128 128 255; // no cc } } part { name: "elm.swallow.video"; type: SWALLOW;