diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index a70a936be1..f53e159e01 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -111,6 +111,8 @@ color_classes { color: 51 153 255 255; } color_class { name: "/fg/disabled/text/hilight"; color: 25 76 128 255; } + color_class { name: "/fg/disabled/text-urgent"; + color: 255 51 51 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/button"; color: 96 96 96 255; } @@ -294,6 +296,16 @@ color_classes { color: 51 153 255 255; } color_class { name: "/fg/normal/toggle/button"; color: 51 153 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/everything/entry/cursor"; + color: 255 255 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/scroller/bar"; + color: 51 153 255 255; } + color_class { name: "/bg/disabled/scroller/bar"; + color: 96 96 96 255; } + color_class { name: "/bg/pressed/scroller/bar"; + color: 255 255 255 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/shelf/translucent"; color: 64 64 64 128; } diff --git a/data/elementary/themes/edc/evrything.edc b/data/elementary/themes/edc/evrything.edc index 69c5ace6c6..a9eeee0ac5 100644 --- a/data/elementary/themes/edc/evrything.edc +++ b/data/elementary/themes/edc/evrything.edc @@ -17,7 +17,7 @@ group { name: "e/modules/everything/main"; rel2.relative: 1.0 0.0; align: 0.5 0.0; fixed: 1 1; - color: 64 64 64 255; + color_class: "/bg/normal/everything/selector"; } } part { name: "clipper"; type: RECT; @@ -71,16 +71,14 @@ group { name: "e/modules/everything/main"; } } programs { - program { - signal: "e,state,object_selector_hide"; source: "e"; + program { signal: "e,state,object_selector_hide"; source: "e"; action: STATE_SET "default" 0.00; transition: SINUSOIDAL 0.15; target: "object_selector"; target: "subject_selector"; target: "action_selector"; } - program { - signal: "e,state,object_selector_show"; source: "e"; + program { signal: "e,state,object_selector_show"; source: "e"; action: STATE_SET "wide" 0.00; transition: SINUSOIDAL 0.2; target: "object_selector"; @@ -98,7 +96,7 @@ group { name: "e/modules/everything/selector_item"; } part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/everything/selector/item"; visible: 0; } description { state: "selected" 0.0; @@ -109,19 +107,18 @@ group { name: "e/modules/everything/selector_item"; part { name: "icon_clip"; type: RECT; clip_to: "clip"; description { state: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } description { state: "faded" 0.0; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } part { name: "e.swallow.icons"; type: SWALLOW; scale : 1; clip_to: "icon_clip"; description { state: "default" 0.0; - min: 48 48; - max: 48 48; - aspect: 1.0 1.0; aspect_preference: VERTICAL; + min: 40 40; + max: 40 40; align: 0.0 0.5; rel1.offset: 8 8; rel2.offset: 8 -9; @@ -132,9 +129,8 @@ group { name: "e/modules/everything/selector_item"; clip_to: "icon_clip"; description { state: "default" 0.0; rel.to: "e.swallow.icons"; - min: 48 48; - max: 48 48; - aspect: 1.0 1.0; aspect_preference: VERTICAL; + min: 40 40; + max: 40 40; align: 0.0 0.5; } } @@ -149,7 +145,7 @@ group { name: "e/modules/everything/selector_item"; rel2.to: "clip"; rel1.offset: 2 3; rel2.offset: -6 -7; - color: 160 160 160 255; + color_class: "/fg/normal/everything/selector/text"; text { font: FNBD; size: 10; min: 0 1; align: 0.0 1.0; @@ -159,7 +155,7 @@ group { name: "e/modules/everything/selector_item"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/selector/text"; } } part { name: "e.text.plugin"; type: TEXT; mouse_events: 0; @@ -169,7 +165,7 @@ group { name: "e/modules/everything/selector_item"; align: 1.0 0.0; rel1.offset: 6 6; rel2.offset: -7 -1; - color: 160 160 160 255; + color_class: "/fg/normal/everything/selector/text/plugin"; text { font: FN; size: 10; min: 0 1; align: 1.0 0.0; @@ -179,33 +175,30 @@ group { name: "e/modules/everything/selector_item"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/selector/text/plugin"; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } programs { - program { - signal: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "base"; target: "e.text.label"; target: "e.text.plugin"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "base"; target: "e.text.label"; target: "e.text.plugin"; } - program { - signal: "e,signal,update"; source: "e"; + program { signal: "e,signal,update"; source: "e"; action: STATE_SET "faded" 0.0; transition: DECELERATE 0.1; target: "icon_clip"; @@ -216,8 +209,7 @@ group { name: "e/modules/everything/selector_item"; transition: ACCELERATE 0.3; target: "icon_clip"; } - program { - signal: "e,action,thumb,show"; source: "e"; + program { signal: "e,action,thumb,show"; source: "e"; action: STATE_SET "faded" 0.0; target: "icon_clip"; after: "thumb_show2"; @@ -238,8 +230,8 @@ group { name: "e/modules/everything/list"; rel1.to_y: "e.text.label"; rel1.offset: 0 -8; rel2.to_y: "e.text.label"; - rel2.offset: -1 -1; - color: 64 64 64 255; + rel2.offset: -1 7; + color_class: "/bg/normal/everything/entry"; offscale; } } @@ -249,7 +241,7 @@ group { name: "e/modules/everything/list"; rel1.relative: 0.0 1.0; rel2.to_y: "bar_base"; rel2.relative: 1.0 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/everything/list/base"; } } part { name: "bar_base"; type: RECT; @@ -258,8 +250,8 @@ group { name: "e/modules/everything/list"; fixed: 0 1; rel1.relative: 0.0 1.0; align: 0.5 1.0; - min: 32 32; - color: 64 64 64 255; + min: 64 32; + color_class: "/bg/normal/everything/tabs"; } } part { name: "e.text.label"; type: TEXT; @@ -270,7 +262,7 @@ group { name: "e/modules/everything/list"; rel1.offset: 4 8; rel2.relative: 0.0 0.0; rel2.offset: 4 8; - color: 160 160 160 255; + color_class: "/fg/normal/everything/entry/text"; text { font: FN; size: 10; align: 0.0 0.5; min: 1 1; @@ -286,12 +278,11 @@ group { name: "e/modules/everything/list"; description { state: "default" 0.0; fixed: 1 1; min: 1 4; + rel.to: "e.text.label"; rel1.offset: 0 -2; rel1.relative: 1.0 0.0; - rel1.to: "e.text.label"; rel2.offset: 0 1; - rel2.to: "e.text.label"; - color: 255 255 255 255; + color_class: "/fg/normal/everything/entry/cursor"; } description { state: "faded" 0.0; inherit: "default" 0.0; @@ -300,17 +291,15 @@ group { name: "e/modules/everything/list"; } part { name: "list_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "list_base"; - rel2.to: "list_base"; + rel.to: "list_base"; } } part { name: "e.swallow.list"; type: SWALLOW; scale: 1; clip_to: "list_clip"; description { state: "default" 0.0; - min: 32 128; - rel1.to: "list_base"; - rel2.to: "list_base"; + min: 64 128; + rel.to: "list_base"; } description { state: "alternate" 0.0; inherit: "default" 0.0; @@ -323,10 +312,9 @@ group { name: "e/modules/everything/list"; clip_to: "list_clip"; description { state: "default" 0.0; min: 32 128; + rel.to: "list_base"; rel1.relative: 1.0 0.0; - rel1.to: "list_base"; rel2.relative: 2.0 1.0; - rel2.to: "list_base"; } description { state: "alternate" 0.0; inherit: "default" 0.0; @@ -336,19 +324,17 @@ group { name: "e/modules/everything/list"; } part { name: "bar_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "bar_base"; - rel2.to: "bar_base"; + rel.to: "bar_base"; } description { state: "faded" 0.0; inherit: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } part { name: "e.swallow.bar"; type: SWALLOW; clip_to: "bar_clip"; description { state: "default" 0.0; - rel1.to: "bar_clip"; - rel2.to: "bar_clip"; + rel.to: "bar_clip"; } } } @@ -381,8 +367,7 @@ group { name: "e/modules/everything/list"; // program { // signal: "e,signal,update"; source: "e"; // } - program { - signal: "e,action,slide,left"; source: "e"; + program { signal: "e,action,slide,left"; source: "e"; action: STATE_SET "default" 0.0; target: "e.swallow.list"; target: "e.swallow.list2"; @@ -390,7 +375,7 @@ group { name: "e/modules/everything/list"; } program { name: "slide_left2"; action: STATE_SET "alternate" 0.0; - transition: ACCELERATE 0.25; + transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1; target: "e.swallow.list"; target: "e.swallow.list2"; after: "left_end"; @@ -398,8 +383,7 @@ group { name: "e/modules/everything/list"; program { name: "left_end"; action: SIGNAL_EMIT "e,action,slide,left,finished" ""; } - program { - signal: "e,action,slide,right"; source: "e"; + program { signal: "e,action,slide,right"; source: "e"; action: STATE_SET "alternate" 0.0; target: "e.swallow.list"; target: "e.swallow.list2"; @@ -407,7 +391,7 @@ group { name: "e/modules/everything/list"; } program { name: "slide_right2"; action: STATE_SET "default" 0.0; - transition: ACCELERATE 0.25; + transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1; target: "e.swallow.list"; target: "e.swallow.list2"; after: "right_end"; @@ -415,8 +399,7 @@ group { name: "e/modules/everything/list"; program { name: "right_end"; action: SIGNAL_EMIT "e,action,slide,right,finished" ""; } - program { - signal: "e,action,slide,default"; source: "e"; + program { signal: "e,action,slide,default"; source: "e"; action: STATE_SET "default" 0.0; target: "e.swallow.list"; target: "e.swallow.list2"; @@ -428,10 +411,10 @@ group { name: "e/modules/everything/thumbview/main/window"; parts { part { name: "clip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "visible" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "e.swallow.list"; type: SWALLOW; @@ -451,12 +434,14 @@ group { name: "e/modules/everything/thumbview/main/window"; min: 15 15; max: 15 15; visible: 0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc + color_class: "/fg/normal/everything/thumbview/arrow/left"; } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - color: 51 153 255 255; + color: 51 153 255 255; // no cc + color_class: "/fg/normal/everything/thumbview/arrow/left"; } } part { name: "right_arrow"; mouse_events: 0; @@ -467,62 +452,57 @@ group { name: "e/modules/everything/thumbview/main/window"; min: 15 15; max: 15 15; visible: 0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc + color_class: "/fg/normal/everything/thumbview/arrow/right"; } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - color: 51 153 255 255; + color: 255 255 255 255; // no cc + color_class: "/fg/normal/everything/thumbview/arrow/right"; } } part { name: "event"; 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: "e,action,show,into"; source: "e"; + program { signal: "e,action,show,into"; source: "e"; action: STATE_SET "visible" 0.0; - transition: LINEAR 0.5; + transition: DECELERATE 0.2 USE_DURATION_FACTOR 1; target: "right_arrow"; } - program { - signal: "e,action,hide,into"; source: "e"; + program { signal: "e,action,hide,into"; source: "e"; action: STATE_SET "default" 0.0; target: "right_arrow"; - transition: LINEAR 0.5; + transition: ACCELERATE 0.4 USE_DURATION_FACTOR 1; } - program { - signal: "e,action,show,back"; source: "e"; + program { signal: "e,action,show,back"; source: "e"; action: STATE_SET "visible" 0.0; - transition: LINEAR 0.5; + transition: DECELERATE 0.2 USE_DURATION_FACTOR 1; target: "left_arrow"; } - program { - signal: "e,action,hide,back"; source: "e"; + program { signal: "e,action,hide,back"; source: "e"; action: STATE_SET "default" 0.0; target: "left_arrow"; - transition: LINEAR 0.5; + transition: ACCELERATE 0.4 USE_DURATION_FACTOR 1; } - program { - signal: "e,action,hide,list"; source: "e"; + program { signal: "e,action,hide,list"; source: "e"; action: STATE_SET "default" 0.0; target: "clip"; - transition: LINEAR 0.5; + transition: ACCELERATE 0.4 USE_DURATION_FACTOR 1; } - program { - signal: "e,action,show,list"; source: "e"; + program { signal: "e,action,show,list"; source: "e"; action: STATE_SET "visible" 0.0; target: "clip"; - transition: LINEAR 0.25; + transition: DECELERATE 0.2 USE_DURATION_FACTOR 1; } } } group { name: "e/modules/everything/thumbview/main/scrollframe"; - script { public loop_x, loop_y; @@ -590,7 +570,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; part { name: "bg"; type: RECT; description { state: "default" 0.0; rel.to: "e.swallow.content"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "clipper"; type: RECT; @@ -635,17 +615,17 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; part { name: "sb_vbar_p1"; type: RECT; clip_to: "sb_vbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.to: "sb_vbar"; - rel2.relative: 1.0 0.0; rel2.to: "e.dragable.vbar"; + rel2.relative: 1.0 0.0; fixed: 1 1; } } part { name: "sb_vbar_p2"; type: RECT; clip_to: "sb_vbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.relative: 0.0 1.0; rel1.to: "e.dragable.vbar"; rel2.to: "sb_vbar"; @@ -661,11 +641,10 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; description { state: "default" 0.0; fixed: 1 1; min: 15 15; + rel.to: "sb_vbar"; rel1.relative: 0.5 0.5; - rel1.to: "sb_vbar"; rel2.relative: 0.5 0.5; - rel2.to: "sb_vbar"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -679,10 +658,9 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; repeat_events: 1; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "sb_vbar"; + rel.to: "sb_vbar"; + color: 0 0 0 0; // no cc rel1.offset: -45 0; - rel2.to: "sb_vbar"; fixed: 1 1; offscale; } @@ -705,8 +683,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 4 2; fixed: 1 1; align: 0.0 0.0; - rel1.to: "sb_vbar"; - rel2.to: "sb_vbar"; + rel.to: "sb_vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -722,8 +699,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 4 2; fixed: 1 1; align: 0.0 0.0; - rel1.to: "e.dragable.vbar"; - rel2.to: "e.dragable.vbar"; + rel.to: "e.dragable.vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -739,8 +715,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 4 2; fixed: 1 1; align: 0.0 1.0; - rel1.to: "sb_vbar"; - rel2.to: "sb_vbar"; + rel.to: "sb_vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -756,8 +731,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 4 2; fixed: 1 1; align: 0.0 1.0; - rel1.to: "e.dragable.vbar"; - rel2.to: "e.dragable.vbar"; + rel.to: "e.dragable.vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -765,8 +739,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 0 0; } } - program { - signal: "e,action,show,vbar"; source: "e"; + program { signal: "e,action,show,vbar"; source: "e"; action: STATE_SET "default" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -777,8 +750,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; target: "y_vbar_down"; after: "check_pos_vbar"; } - program { - signal: "e,action,hide,vbar"; source: "e"; + program { signal: "e,action,hide,vbar"; source: "e"; action: STATE_SET "hidden" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -788,13 +760,11 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; } - program { - signal: "mouse,down,1*"; source: "sb_vbar_p1"; + program { signal: "mouse,down,1*"; source: "sb_vbar_p1"; action: DRAG_VAL_PAGE 0.0 -1.0; target: "e.dragable.vbar"; } - program { - signal: "mouse,down,1*"; source: "sb_vbar_p2"; + program { signal: "mouse,down,1*"; source: "sb_vbar_p2"; action: DRAG_VAL_PAGE 0.0 1.0; target: "e.dragable.vbar"; } @@ -833,7 +803,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; part { name: "sb_hbar_p1"; type: RECT; clip_to: "sb_hbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.to: "sb_hbar"; rel2.relative: 0.0 1.0; rel2.to: "e.dragable.hbar"; @@ -843,7 +813,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; part { name: "sb_hbar_p2"; type: RECT; clip_to: "sb_hbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.relative: 1.0 0.0; rel1.to: "e.dragable.hbar"; rel2.to: "sb_hbar"; @@ -859,11 +829,10 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; description { state: "default" 0.0; fixed: 1 1; min: 15 15; + rel.to: "sb_hbar"; rel1.relative: 0.5 0.5; - rel1.to: "sb_hbar"; rel2.relative: 0.5 0.5; - rel2.to: "sb_hbar"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -877,10 +846,9 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; repeat_events: 1; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "sb_hbar"; + color: 0 0 0 0; // no cc + rel.to: "sb_hbar"; rel1.offset: 0 -45; - rel2.to: "sb_hbar"; fixed: 1 1; offscale; } @@ -903,8 +871,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 2 4; fixed: 1 1; align: 0.0 1.0; - rel1.to: "sb_hbar"; - rel2.to: "sb_hbar"; + rel.to: "sb_hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -920,8 +887,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 2 4; fixed: 1 1; align: 0.0 1.0; - rel1.to: "e.dragable.hbar"; - rel2.to: "e.dragable.hbar"; + rel.to: "e.dragable.hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -937,8 +903,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 2 4; fixed: 1 1; align: 1.0 1.0; - rel1.to: "sb_hbar"; - rel2.to: "sb_hbar"; + rel.to: "sb_hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -954,8 +919,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 2 4; fixed: 1 1; align: 1.0 1.0; - rel1.to: "e.dragable.hbar"; - rel2.to: "e.dragable.hbar"; + rel.to: "e.dragable.hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -963,8 +927,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 0 0; } } - program { - signal: "e,action,show,hbar"; source: "e"; + program { signal: "e,action,show,hbar"; source: "e"; action: STATE_SET "default" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; @@ -975,8 +938,7 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; target: "x_hbar_right"; after: "check_pos_hbar"; } - program { - signal: "e,action,hide,hbar"; source: "e"; + program { signal: "e,action,hide,hbar"; source: "e"; action: STATE_SET "hidden" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; @@ -986,14 +948,12 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; target: "x_hbar_right_mapper"; target: "x_hbar_right"; } - program { - signal: "mouse,down,1*"; source: "sb_hbar_p1"; + program { signal: "mouse,down,1*"; source: "sb_hbar_p1"; action: DRAG_VAL_PAGE -1.0 0.0; target: "e.dragable.hbar"; after: "check_pos_hbar"; } - program { - signal: "mouse,down,1*"; source: "sb_hbar_p2"; + program { signal: "mouse,down,1*"; source: "sb_hbar_p2"; action: DRAG_VAL_PAGE 1.0 0.0; target: "e.dragable.hbar"; after: "check_pos_hbar"; @@ -1009,15 +969,15 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; clip_to: "sb_vbar_show"; description { state: "default" 0.0; fixed: 1 1; - color: 51 153 255 255; + color_class: "/bg/normal/scroller/bar/vertical"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 80 80 80 255; + color_class: "/bg/disabled/scroller/bar/vertical"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/pressed/scroller/bar/vertical"; } } @@ -1043,15 +1003,15 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; clip_to: "sb_hbar_show"; description { state: "default" 0.0; fixed: 1 1; - color: 51 153 255 255; + color_class: "/bg/normal/scroller/bar/horizontal"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 80 80 80 255; + color_class: "/bg/disabled/scroller/bar/horizontal"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/pressed/scroller/bar/horizontal"; } } @@ -1071,58 +1031,39 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; max: 999999 15; } } - - ////////////////////////////////////////////////////////////////////// - - part { name: "dim_effect"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - color: 0 0 0 0; - } - description { state: "effect" 0.0; - color: 32 32 32 255; - } - } } programs { - program { - signal: "mouse,down,1*"; source: "e.dragable.vbar"; + program { signal: "mouse,down,1*"; source: "e.dragable.vbar"; action: STATE_SET "clicked" 0.0; target: "e.dragable.vbar"; target: "color_vbar"; } - program { - signal: "mouse,down,*"; source: "e.dragable.vbar"; + program { signal: "mouse,down,*"; source: "e.dragable.vbar"; action: SIGNAL_EMIT "e,vbar,press" "e"; } - program { - signal: "mouse,up,1"; source: "e.dragable.vbar"; + program { signal: "mouse,up,1"; source: "e.dragable.vbar"; action: STATE_SET "default" 0.0; target: "e.dragable.vbar"; target: "color_vbar"; } - program { - signal: "mouse,up,*"; source: "e.dragable.vbar"; + program { signal: "mouse,up,*"; source: "e.dragable.vbar"; action: SIGNAL_EMIT "e,vbar,unpress" "e"; } - program { - signal: "mouse,down,1*"; source: "e.dragable.hbar"; + program { signal: "mouse,down,1*"; source: "e.dragable.hbar"; action: STATE_SET "clicked" 0.0; target: "e.dragable.hbar"; target: "color_hbar"; } - program { - signal: "mouse,down,*"; source: "e.dragable.hbar"; + program { signal: "mouse,down,*"; source: "e.dragable.hbar"; action: SIGNAL_EMIT "e,hbar,press" "e"; } - program { - signal: "mouse,up,1"; source: "e.dragable.hbar"; + program { signal: "mouse,up,1"; source: "e.dragable.hbar"; action: STATE_SET "default" 0.0; target: "e.dragable.hbar"; target: "color_hbar"; } - program { - signal: "mouse,up,*"; source: "e.dragable.hbar"; + program { signal: "mouse,up,*"; source: "e.dragable.hbar"; action: SIGNAL_EMIT "e,hbar,unpress" "e"; } } @@ -1132,7 +1073,7 @@ group { name: "e/modules/everything/thumbview/item/thumb"; parts { part { name: "sel_base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/everything/list/item"; visible: 0; } description { state: "selected" 0.0; @@ -1153,8 +1094,7 @@ group { name: "e/modules/everything/thumbview/item/thumb"; part { name: "icon"; type: SPACER; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.to: "icon0"; - rel2.to: "icon0"; + rel.to: "icon0"; } description { state: "start" 0.0; inherit: "default" 0.0; @@ -1166,14 +1106,12 @@ group { name: "e/modules/everything/thumbview/item/thumb"; } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "icon"; - rel2.to: "icon"; + rel.to: "icon"; } } part { name: "e.swallow.thumb"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "e.swallow.icon"; - rel2.to: "e.swallow.icon"; + rel.to: "e.swallow.icon"; } } part { name: "e.text.label"; type: TEXT; @@ -1182,7 +1120,7 @@ group { name: "e/modules/everything/thumbview/item/thumb"; rel1.offset: 4 -5; rel1.relative: 0.0 1.0; rel2.offset: -5 -5; - color: 160 160 160 255; + color_class: "/fg/normal/everything/list/item/text"; align: 0.5 1.0; text { font: FN; size: 10; min: 0 1; @@ -1193,14 +1131,14 @@ group { name: "e/modules/everything/thumbview/item/thumb"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/text"; } } part { name: "bg_mark"; scale: 1; description { state: "default" 0.0; visible: 0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/mark"; image.normal: "i-close"; min: 15 15; max: 15 15; @@ -1219,7 +1157,7 @@ group { name: "e/modules/everything/thumbview/item/thumb"; scale: 1; description { state: "default" 0.0; visible: 0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/arrow"; image.normal: "i-arrow-r"; min: 15 15; max: 15 15; @@ -1237,47 +1175,40 @@ group { name: "e/modules/everything/thumbview/item/thumb"; } 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: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "e.text.label"; target: "sel_base"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; target: "sel_base"; } - program { - signal: "e,state,marked"; source: "e"; + program { signal: "e,state,marked"; source: "e"; action: STATE_SET "marked" 0.0; target: "bg_mark"; transition: ACCELERATE 0.25; } - program { - signal: "e,state,unmarked"; source: "e"; + program { signal: "e,state,unmarked"; source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.2; target: "bg_mark"; } - program { - signal: "e,state,browseable"; source: "e"; + program { signal: "e,state,browseable"; source: "e"; action: STATE_SET "visible" 0.0; target: "arrow"; } - program { - signal: "e,action,thumb,show_delayed"; source: "e"; + program { signal: "e,action,thumb,show_delayed"; source: "e"; action: STATE_SET "visible" 0.0; target: "icon"; } - program { - signal: "e,action,thumb,show_delayed"; source: "e"; + program { signal: "e,action,thumb,show_delayed"; source: "e"; action: STATE_SET "start" 0.0; target: "icon"; after: "gen"; @@ -1299,7 +1230,7 @@ group { name: "e/modules/everything/thumbview/item/list"; parts { part { name: "sel_base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/everything/list/item"; visible: 0; } description { state: "selected" 0.0; @@ -1309,11 +1240,11 @@ group { name: "e/modules/everything/thumbview/item/list"; } part { name: "detail_clip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } description { state: "visible" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } } @@ -1328,7 +1259,7 @@ group { name: "e/modules/everything/thumbview/item/list"; rel2.offset: -3 -3; rel2.relative: 0.0 1.0; rel2.to_x: "arrow"; - color: 160 160 160 255; + color_class: "/fg/normal/everything/list/item/text/detail"; align: 1.0 0.5; max: 160 99999; text { font: FN; size: 8; @@ -1340,7 +1271,7 @@ group { name: "e/modules/everything/thumbview/item/list"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/text/detail"; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; @@ -1352,7 +1283,7 @@ group { name: "e/modules/everything/thumbview/item/list"; rel2.offset: -3 -3; rel2.relative: 0.0 1.0; rel2.to_x: "e.text.detail"; - color: 160 160 160 255; + color_class: "/fg/normal/everything/list/item/text"; text { font: FN; size: 10; min: 0 1; align: 0.0 0.5; @@ -1362,7 +1293,7 @@ group { name: "e/modules/everything/thumbview/item/list"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/text"; } } part { name: "icon0"; type: SPACER; @@ -1379,8 +1310,7 @@ group { name: "e/modules/everything/thumbview/item/list"; part { name: "icon"; type: SPACER; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.to: "icon0"; - rel2.to: "icon0"; + rel.to: "icon0"; } description { state: "start" 0.0; inherit: "default" 0.0; @@ -1400,7 +1330,7 @@ group { name: "e/modules/everything/thumbview/item/list"; scale: 1; description { state: "default" 0.0; visible: 0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/mark"; image.normal: "i-close"; min: 15 15; max: 15 15; @@ -1419,7 +1349,7 @@ group { name: "e/modules/everything/thumbview/item/list"; scale: 1; description { state: "default" 0.0; visible: 0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/list/item/arrow"; image.normal: "i-arrow-r"; min: 15 15; max: 15 15; @@ -1436,49 +1366,42 @@ group { name: "e/modules/everything/thumbview/item/list"; } 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: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "e.text.label"; target: "e.text.detail"; target: "sel_base"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; target: "e.text.detail"; target: "sel_base"; } - program { - signal: "e,state,marked"; source: "e"; + program { signal: "e,state,marked"; source: "e"; action: STATE_SET "marked" 0.0; target: "bg_mark"; transition: ACCELERATE 0.25; } - program { - signal: "e,state,unmarked"; source: "e"; + program { signal: "e,state,unmarked"; source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.2; target: "bg_mark"; } - program { - signal: "e,state,browseable"; source: "e"; + program { signal: "e,state,browseable"; source: "e"; action: STATE_SET "visible" 0.0; target: "arrow"; } - program { - signal: "e,action,thumb,show_delayed"; source: "e"; + program { signal: "e,action,thumb,show_delayed"; source: "e"; action: STATE_SET "visible" 0.0; target: "icon"; } - program { - signal: "e,action,thumb,show_delayed"; source: "e"; + program { signal: "e,action,thumb,show_delayed"; source: "e"; action: STATE_SET "start" 0.0; target: "icon"; after: "gen"; @@ -1488,13 +1411,11 @@ group { name: "e/modules/everything/thumbview/item/list"; transition: SPRING 0.7 2.0 4; target: "icon"; } - program { - signal: "e,state,detail,show"; source: "e"; + program { signal: "e,state,detail,show"; source: "e"; action: STATE_SET "visible" 0.0; target: "detail_clip"; } - program { - signal: "e,state,detail,hide"; source: "e"; + program { signal: "e,state,detail,hide"; source: "e"; action: STATE_SET "default" 0.0; target: "detail_clip"; } @@ -1507,12 +1428,12 @@ group { name: "e/modules/everything/thumbview/item/list"; group { name: "e/modules/everything/textblock"; styles { style { name: "everything_textblock_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=left color=#a0a0a0 wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=left color_class=/fg/normal/text wrap=word"; tag: "br" "\n"; tag: "b" "+ font="FNBD""; tag: "hilight" "+ font="FNBD" text_class=tb_light"; - tag: "urgent" "+ font="FNBD" color=#f93"; - tag: "title" "+ font="FNBD" color=#fff font_size=16 underline=on underline_color=#fff"; + tag: "urgent" "+ font="FNBD" color_class=/fg/normal/text-urgent"; + tag: "title" "+ font="FNBD" color_class=/fg/normal/text-heading font_size=16 underline=on underline_color=#fff"; } } parts { @@ -1535,7 +1456,7 @@ group { name: "e/modules/everything/tab_item"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/everything/tab/item"; visible: 0; } description { state: "selected" 0.0; @@ -1551,7 +1472,7 @@ group { name: "e/modules/everything/tab_item"; rel2.offset: -5 -5; rel2.relative: 0.5 1.0; align: 0.5 0.5; - color: 160 160 160 255; + color_class: "/fg/normal/everything/tab/item/text"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -1563,25 +1484,23 @@ group { name: "e/modules/everything/tab_item"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/tab/item/text"; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } programs { - program { - signal: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "base"; target: "e.text.label"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "base"; target: "e.text.label"; @@ -1591,7 +1510,6 @@ group { name: "e/modules/everything/tab_item"; group { name: "e/modules/everything/tab_item/back"; inherit: "e/modules/everything/tab_item"; - images.image: "big_arrow_left.png" COMP; parts { part { name: "arrow"; insert_after: "e.text.label"; @@ -1600,34 +1518,30 @@ group { name: "e/modules/everything/tab_item/back"; rel.to: "e.text.label"; rel2.relative: 0.0 1.0; align: 1.0 0.5; - image.normal: "big_arrow_left.png"; - min: 14 17; - max: 14 17; - color: 160 160 160 255; + image.normal: "i-arrow-l"; + min: 30 30; + max: 30 30; + color_class: "/fg/normal/everything/tab/item/arrow"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/everything/tab/item/arrow"; } } } programs { - program { - signal: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "arrow"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "arrow"; } - program { - signal: "mouse,down,1"; source: "event"; + program { signal: "mouse,down,1"; source: "event"; action: SIGNAL_EMIT "e,state,selected" "e"; } - program { - signal: "mouse,up,1*"; source: "event"; + program { signal: "mouse,up,1*"; source: "event"; action: SIGNAL_EMIT "e,state,unselected" "e"; } } @@ -1643,7 +1557,7 @@ group { name: "e/modules/everything/gadget"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: "every1.png"; - color: 160 160 160 255; + color_class: "/fg/normal/gadgets/everything"; } } part { name: "base2"; @@ -1651,11 +1565,11 @@ group { name: "e/modules/everything/gadget"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: "every2.png"; - color: 160 160 160 255; + color_class: "/fg/normal/gadgets/everything"; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/gadgets/everything"; } } part { name: "clip"; type: RECT; @@ -1669,28 +1583,24 @@ group { name: "e/modules/everything/gadget"; } 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,down,1"; source: "event"; + program { signal: "mouse,down,1"; source: "event"; action: STATE_SET "active" 0.0; target: "base2"; } - program { - signal: "mouse,up,1"; source: "event"; + program { signal: "mouse,up,1"; source: "event"; action: STATE_SET "default" 0.0; target: "base2"; } - program { - signal: "e,state,icon,plugin"; source: "e"; + program { signal: "e,state,icon,plugin"; source: "e"; action: STATE_SET "active" 0.0; target: "clip"; } - program { - signal: "e,state,icon,default"; source: "e"; + program { signal: "e,state,icon,default"; source: "e"; action: STATE_SET "default" 0.0; target: "clip"; }