diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index dfcad9dd5f..6029e4c607 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -433,6 +433,18 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/selected/toolbar/base"; color: 32 32 32 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/winlist/text/title"; + color: 255 255 255 255; } + color_class { name: "/bg/selected/winlist/item/base"; + color: 32 32 32 255; } + color_class { name: "/fg/normal/winlist/item/text/iconified"; + color: 96 96 96 255; } + color_class { name: "/fg/selected/winlist/item/text/iconified"; + color: 160 160 160 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/wizard/text/title"; + color: 255 255 255 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/gadgets/temperature/low"; color: 51 153 255 255; } diff --git a/data/elementary/themes/edc/wallpaper.edc b/data/elementary/themes/edc/wallpaper.edc index ea4be80fad..108bd6da7d 100644 --- a/data/elementary/themes/edc/wallpaper.edc +++ b/data/elementary/themes/edc/wallpaper.edc @@ -5,7 +5,7 @@ parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/conf/wallpaper/base"; } } part { name: "e.swallow.preview"; type: SWALLOW; @@ -20,22 +20,25 @@ } part { name: "events"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "bot1"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg-dark/normal/conf/wallpaper/bottom"; rel1 { to_y: "e.swallow.buttons"; relative: 0.0 0.0; offset: 0 -8; } + offscale; } } part { name: "e.text.filename"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; + color_class: "/fg/normal/conf/wallpaper/text"; fixed: 0 1; rel1 { to: "bot1"; offset: 4 4; @@ -43,7 +46,7 @@ rel2 { to: "bot1"; offset: -5 -5; } - color: 255 255 255 255; + offscale; text { font: FN; size: 10; @@ -54,6 +57,7 @@ } } part { name: "e.swallow.buttons"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 1.0 1.0; fixed: 1 1; @@ -65,11 +69,12 @@ relative: 1.0 1.0; offset: -8 -8; } + offscale; } } part { name: "cover"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "out" 0.0; @@ -78,8 +83,9 @@ } } part { name: "extas_base"; type: RECT; + scale: 1; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/conf/wallpaper/extras"; rel1 { to: "e.swallow.extras"; relative: 0.0 0.0; @@ -90,9 +96,11 @@ relative: 1.0 1.0; offset: 7 7; } + offscale; } } part { name: "e.swallow.extras"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 0.0 0.0; fixed: 1 1; @@ -104,6 +112,7 @@ relative: 0.0 1.0; offset: 8 8; } + offscale; } description { state: "out" 0.0; inherit: "default" 0.0; @@ -113,7 +122,9 @@ } } part { name: "aup"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; + color_class: "/fg/normal/conf/wallpaper/arrow"; fixed: 1 1; align: 0.0 0.0; min: 30 30; @@ -129,19 +140,19 @@ offset: 8 8; } image.normal: "i-arrow-u"; - color: 160 160 160 255; + offscale; } } part { name: "ain"; type: RECT; description { state: "default" 0.0; rel.to: "aup"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "aout"; type: RECT; description { state: "default" 0.0; rel.to: "aup"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "out" 0.0; inherit: "default" 0.0; @@ -151,11 +162,11 @@ part { name: "busy_clip"; type: RECT; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "visible" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "e.text.busy_label"; type: TEXT; @@ -175,7 +186,7 @@ relative: 0.0 0.0; offset: 8 -9; } - color: 255 255 255 255; + color_class: "/fg/normal/conf/wallpaper/text/busy"; text { font: FNBD; size: 10; @@ -183,6 +194,7 @@ ellipsis: -1; align: 0.0 1.0; } + offscale; } } } @@ -245,15 +257,18 @@ description { state: "default" 0.0; rel.to: "base"; WIN_SHADOW_SMALL; + color_class: "/shadow/normal/frame"; } } part { name: "base"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; visible: 0; rel.to: "icon_zoom"; rel1.offset: 8 8; rel2.offset: -9 -9; - color: 255 255 255 255; + color_class: "/bg/normal/conf/wallpaper/mini"; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -262,7 +277,7 @@ description { state: "selected" 0.0; inherit: "default" 0.0; visible: 1; - color: 51 153 255 255; + color_class: "/bg/selected/conf/wallpaper/mini"; } } part { name: "icon_zoom"; type: RECT; mouse_events: 0; @@ -287,8 +302,9 @@ } } part { name: "e.swallow.content"; type: SWALLOW; - description { - state: "default" 0.0; + scale: 1; + description { state: "default" 0.0; + offscale; rel1 { to: "base"; offset: 2 2; @@ -301,7 +317,7 @@ } part { name: "events"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "visible" 0.0; @@ -369,12 +385,14 @@ parts { part { name: "theme"; type: TEXT; mouse_events: 0; insert_after: "e.swallow.content"; + scale: 1; description { state: "default" 0.0; visible: 0; rel.to: "e.swallow.content"; rel1.offset: 4 4; rel2.offset: -5 -5; - color: 255 255 255 255; + color_class: "/fg/selected/conf/wallpaper/mini-theme/text"; + offscale; text { font: FNBD; size: 10; text: "THEME"; align: 1.0 1.0; diff --git a/data/elementary/themes/edc/winlist.edc b/data/elementary/themes/edc/winlist.edc index 1d1bad5dad..80df9ab517 100644 --- a/data/elementary/themes/edc/winlist.edc +++ b/data/elementary/themes/edc/winlist.edc @@ -2,7 +2,7 @@ group { name: "e/widgets/winlist/main"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/winlist/base"; } } part { name: "e.text.title"; type: TEXT; mouse_events: 0; @@ -13,7 +13,7 @@ group { name: "e/widgets/winlist/main"; rel2.relative: 1.0 0.0; rel2.offset: -9 8; align: 0.5 0.0; - color: 255 255 255 255; + color_class: "/fg/normal/winlist/text/title"; offscale; text { font: FNBD; size: 10; text_class: "winlist_title"; @@ -65,7 +65,7 @@ group { name: "e/widgets/winlist/main"; rel2.offset: -9 -9; rel2.to_y: "win"; align: 0.0 0.5; - color: 160 160 160 255; + color_class: "/fg/normal/winlist/text/label"; text { font: FNBD; size: 10; text_class: "winlist_label"; align: 0.0 0.5; @@ -78,7 +78,6 @@ group { name: "e/widgets/winlist/main"; part { name: "list_clip"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 255 255 255 255; rel1.relative: 0.0 1.0; rel1.offset: 0 8; rel1.to_y: "e.swallow.icon"; @@ -100,7 +99,7 @@ group { name: "e/widgets/winlist/item"; parts { part { name: "sel_base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 40 40 40 255; + color_class: "/bg/selected/winlist/item/base"; visible: 0; } description { state: "selected" 0.0; @@ -108,14 +107,33 @@ group { name: "e/widgets/winlist/item"; visible: 1; } } + part { name: "clip_normal"; type: RECT; + description { state: "default" 0.0; + visible: 1; + } + description { state: "iconified" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "clip_iconified"; type: RECT; + description { state: "default" 0.0; + visible: 0; + } + description { state: "iconified" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "e.text.label"; type: TEXT; mouse_events: 0; + clip_to: "clip_normal"; scale: 1; description { state: "default" 0.0; rel1.offset: 8 8; rel1.relative: 1.0 0.0; rel1.to_x: "win"; rel2.offset: -9 -9; - color: 160 160 160 255; + color_class: "/fg/normal/winlist/item/text/normal"; offscale; min: 0 40; text { font: FN; size: 10; @@ -124,9 +142,27 @@ group { name: "e/widgets/winlist/item"; text_class: "winlist_item"; } } - description { state: "iconified" 0.0; + description { state: "selected" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/selected/winlist/item/text/normal"; + } + } + part { name: "label2"; type: TEXT; mouse_events: 0; + clip_to: "clip_iconified"; + scale: 1; + description { state: "default" 0.0; + rel.to: "e.text.label"; + color_class: "/fg/normal/winlist/item/text/iconified"; + text { font: FN; size: 10; + min: 0 1; + align: 0.0 0.5; + text_class: "winlist_item"; + text_source: "e.text.label"; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color_class: "/fg/selected/winlist/item/text/iconified"; } } part { name: "icon"; type: SPACER; @@ -174,26 +210,9 @@ group { name: "e/widgets/winlist/item"; rel2.relative: 0.75 0.75; } } - part { name: "label"; type: TEXT; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel.to: "e.text.label"; - color: 255 255 255 255; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.0 0.5; - text_class: "winlist_item_active"; - } - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "iconified" 0.0; inherit: "default" 0.0; @@ -205,22 +224,24 @@ group { name: "e/widgets/winlist/item"; program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "sel_base"; - target: "label"; + target: "e.text.label"; + target: "label2"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "sel_base"; - target: "label"; + target: "e.text.label"; + target: "label2"; } program { signal: "e,state,iconified"; source: "e"; action: STATE_SET "iconified" 0.0; - target: "e.swallow.icon"; - target: "e.text.label"; + target: "clip_normal"; + target: "clip_iconified"; } program { signal: "e,state,invisible"; source: "e"; action: STATE_SET "iconified" 0.0; - target: "e.swallow.icon"; - target: "e.text.label"; + target: "clip_normal"; + target: "clip_iconified"; } // program { // signal: "e,state,shaded"; source: "e"; @@ -241,12 +262,12 @@ group { name: "e/widgets/winlist/large/bg"; part { name: "bg_clip"; type: RECT; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } /* @@ -266,7 +287,7 @@ group { name: "e/widgets/winlist/large/bg"; part { name: "bg_darken"; type: RECT; clip_to: "bg_clip"; description { state: "default" 0.0; - color: 0 0 0 192; + color_class: "/dim/normal/winlist/base"; } } /* @@ -277,14 +298,14 @@ group { name: "e/widgets/winlist/large/bg"; rel2.relative: 2.0 2.0; image.normal: "screen_circular_shadow.png"; fill.smooth: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } description { state: "visible" 0.0; inherit; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } } @@ -359,7 +380,7 @@ group { name: "e/widgets/winlist/item_large"; parts { part { name: "sel_base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/winlist/large/item"; visible: 0; } description { state: "selected" 0.0; @@ -402,7 +423,7 @@ group { name: "e/widgets/winlist/item_large"; } part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "iconified" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/wizard.edc b/data/elementary/themes/edc/wizard.edc index f6fca2760b..5102c526d7 100644 --- a/data/elementary/themes/edc/wizard.edc +++ b/data/elementary/themes/edc/wizard.edc @@ -40,6 +40,7 @@ group { name: "e/wizard/main"; description { state: "default" 0.0; rel.to: "base"; WIN_SHADOW_SMALL; + color_class: "/shadow/normal/wizard"; } description { state: "clicked" 0.0; inherit; @@ -54,18 +55,18 @@ group { name: "e/wizard/main"; rel.to: "e.text.label"; rel1.offset: -4 -4; rel2.offset: 3 3; - color: 80 80 80 255; + color_class: "/bg/normal/button"; offscale; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 40 40 40 255; + color_class: "/bg/pressed/button"; } } part { name: "block"; type: RECT; description { state: "default" 0.0; rel.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "disabled" 0.0; @@ -82,7 +83,7 @@ group { name: "e/wizard/main"; rel1.offset: 16 -17; rel2.relative: 0.5 0.99; rel2.offset: -17 -17; - color: 160 160 160 255; + color_class: "/fg/normal/button"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -91,11 +92,11 @@ group { name: "e/wizard/main"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/button"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/button"; } } @@ -107,7 +108,7 @@ group { name: "e/wizard/main"; rel2.relative: 0.95 0.01; rel2.offset: -17 16; align: 0.5 0.0; - color: 255 255 255 255; + color_class: "/fg/normal/wizard/text/title"; text { font: FNBD; size: 20; min: 0 1; text_class: "init_title"; @@ -119,11 +120,11 @@ group { name: "e/wizard/main"; part { name: "blanker"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 255; + color: 0 0 0 255; // no cc } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } } @@ -196,11 +197,11 @@ group { name: "e/wizard/firstpage"; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; FIXED_SIZE(150, 150) - color: 220 220 220 255; + color_class: "/fg/selected-pressed"; } description { state: "active"; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected"; } } } @@ -226,11 +227,11 @@ group { name: "e/wizard/extra"; parts { part { name: "blanker"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 255; + color: 0 0 0 255; // no cc } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } } diff --git a/data/elementary/themes/edc/xkbswitch.edc b/data/elementary/themes/edc/xkbswitch.edc index f352dc3261..93109668db 100644 --- a/data/elementary/themes/edc/xkbswitch.edc +++ b/data/elementary/themes/edc/xkbswitch.edc @@ -3,31 +3,33 @@ group { name: "e/modules/xkbswitch/main"; max: 128 128; parts { part { name: "e.swallow.flag"; type: SWALLOW; mouse_events: 0; + scale: 1; description { state: "default" 0.0; rel1.offset: 2 2; rel2.offset: -3 -3; + offscale; } } part { name: "over"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "e.swallow.flag"; - rel2.to: "e.swallow.flag"; - color: 0 0 0 0;; + rel.to: "e.swallow.flag"; + color_class: "/dim/normal/gadgets/xkbswitch/base"; + color: 0 0 0 0; // no cc visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - color: 0 0 0 128; + color: 0 0 0 255; // no cc } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; description { state: "default" 0.0; - color: 255 255 255 0; + color_class: "/fg/selected/gadgets/xkbswitch/text"; + color: 255 255 255 0; // no cc visible: 0; - rel1.to: "e.swallow.flag"; + rel.to: "e.swallow.flag"; rel1.relative: 0.0 0.5; - rel2.to: "e.swallow.flag"; rel2.relative: 1.0 0.5; text { font: FN; size: 10; min: 0 1; @@ -37,26 +39,24 @@ group { name: "e/modules/xkbswitch/main"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } } 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: "mouse,in"; source: "event"; + program { signal: "mouse,in"; source: "event"; action: STATE_SET "visible" 0.0; transition: DECELERATE 0.25; target: "e.text.label"; target: "over"; } - program { - signal: "mouse,out"; source: "event"; + program { signal: "mouse,out"; source: "event"; action: STATE_SET "default" 0.0; transition: DECELERATE 1.0; target: "e.text.label"; @@ -69,19 +69,20 @@ group { name: "e/modules/xkbswitch/noflag"; max: 128 128; parts { part { name: "base"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; rel1.offset: 2 2; rel2.offset: -3 -3; + offscale; aspect: 1.8 1.8; aspect_preference: BOTH; - color: 32 32 32 255; + color_class: "/bg-dark/normal/gadgets/xkbswitch/text"; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; description { state: "default" 0.0; - color: 160 160 160 255;; - rel1.to: "base"; + color_class: "/fg/selected/gadgets/xkbswitch/text"; + rel.to: "base"; rel1.relative: 0.0 0.5; - rel2.to: "base"; rel2.relative: 1.0 0.5; text { font: FNBD; size: 10; min: 0 1; @@ -89,14 +90,10 @@ group { name: "e/modules/xkbswitch/noflag"; } fixed: 0 1; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } } part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } }