raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=1482f3e6f481042f2a7afdcdf8d77e14a041ae2c
commit 1482f3e6f481042f2a7afdcdf8d77e14a041ae2c Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Jul 30 18:17:35 2019 +0100 TH - finish up old e widgets --- data/elementary/themes/edc/button.edc | 140 +++++++++++----------------- data/elementary/themes/edc/colors.edc | 115 +++++++---------------- data/elementary/themes/edc/colorwell.edc | 71 +++++--------- data/elementary/themes/edc/cslider.edc | 95 ++++--------------- data/elementary/themes/edc/edgebindings.edc | 129 ++++++++----------------- data/elementary/themes/edc/entry.edc | 55 +++-------- data/elementary/themes/edc/frame.edc | 115 ++++++++++------------- data/elementary/themes/edc/label.edc | 13 +-- data/elementary/themes/edc/mixer.edc | 1 - data/elementary/themes/edc/pager.edc | 14 +++ data/elementary/themes/edc/randr.edc | 126 +++++++++++-------------- data/elementary/themes/edc/spectrum.edc | 25 +++-- 12 files changed, 320 insertions(+), 579 deletions(-) diff --git a/data/elementary/themes/edc/button.edc b/data/elementary/themes/edc/button.edc index 1cd474afd8..0c6a884a6c 100644 --- a/data/elementary/themes/edc/button.edc +++ b/data/elementary/themes/edc/button.edc @@ -1,21 +1,18 @@ group { name: "e/widgets/button"; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "win_glow.png" COMP; parts { - part { name: "base"; - description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; - rel1.offset: -1 0; - rel2.offset: 0 1; - fill.smooth: 0; + rect { "base"; + scale: 1; + desc { "default"; + color: 80 80 80 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + desc { "clicked"; inherit; + color: 40 40 40 255; + } + desc { "disabled"; inherit; + color: 64 64 64 255; } } part { name: "icon_clip"; type: RECT; @@ -28,25 +25,35 @@ } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; clip_to: "icon_clip"; - description { state: "default" 0.0; + scale: 1; + desc { "default"; + fixed: 1 0; align: 0.0 0.5; - rel1.offset: 6 5; - rel1.to: "base"; + rel.to: "base"; + rel1.offset: 0 4; rel2.relative: 0.0 1.0; - rel2.offset: 6 -8; - rel2.to: "base"; + rel2.offset: -1 -5; + visible: 0; + max: 0 999999; + offscale; } - description { state: "combo" 0.0; - inherit: "default" 0.0; + desc { "combo"; inherit; + fixed: 1 0; + rel1.offset: 4 4; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; aspect: 1.0 1.0; aspect_preference: VERTICAL; + visible: 1; + min: 16 16; } description { state: "icon" 0.0; - inherit: "default" 0.0; - min: 17 17; - aspect: 1.0 1.0; aspect_preference: BOTH; + fixed: 0 0; align: 0.5 0.5; + rel1.offset: 4 4; rel2.relative: 1.0 1.0; - rel2.offset: -7 -8; + rel2.offset: -5 -5; + visible: 1; + min: 16 16; } } part { name: "label_clip"; type: RECT; @@ -58,93 +65,58 @@ } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "label_clip"; description { state: "default" 0.0; - rel1.offset: 6 5; - rel1.to_x: "base"; + fixed: 0 0; + color: 160 160 160 255; + rel1.offset: 4 4; + rel1.relative: 1.0 0.0; + rel1.to_x: "e.swallow.icon"; rel1.to_y: "base"; - rel2.offset: -7 -7; rel2.to: "base"; - color_class: "button_text"; - color3: 255 255 255 255; + rel2.offset: -5 -5; text { font: FN; size: 10; + align: 0.5 0.5; min: 1 1; ellipsis: -1; - align: 0.5 0.5; - text_class: "button"; } + offscale; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "button_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; } description { state: "combo" 0.0; inherit: "default" 0.0; - rel1.relative: 1.0 0.0; - rel1.offset: 2 5; - rel1.to_x: "e.swallow.icon"; } description { state: "icon" 0.0; inherit: "default" 0.0; visible: 0; } - } - part { name: "label2"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - rel1.to: "e.text.label"; - rel2.to: "e.text.label"; - color_class: "button_text_disabled"; - color3: 255 255 255 255; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.5 0.5; - text_class: "button"; - } - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "base2"; type: SPACER; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - } description { state: "clicked" 0.0; inherit: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + color: 255 255 255 255; } } - part { name: "glow"; mouse_events: 0; + part { name: "glow"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.to: "base2"; - rel1.offset: -2 -3; - rel2.to: "base2"; - rel2.offset: 1 0; - fill.smooth: 0; - color: 255 255 255 0; + rel.to: "base"; + rel1.relative: 0.0 1.0; + color: 51 153 255 255; + align: 0.5 1.0; visible: 0; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 255 255 255 150; + min: 0 5; visible: 1; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; + rel.to: "base"; color: 0 0 0 0; } description { state: "disabled" 0.0; @@ -158,13 +130,13 @@ signal: "mouse,down,1"; source: "event"; action: STATE_SET "clicked" 0.0; target: "base"; - target: "base2"; + target: "e.text.label"; } program { signal: "mouse,up,1"; source: "event"; action: STATE_SET "default" 0.0; target: "base"; - target: "base2"; + target: "e.text.label"; } program { signal: "mouse,clicked,1*"; source: "event"; @@ -192,17 +164,17 @@ signal: "e,state,disabled"; source: "e"; action: STATE_SET "disabled" 0.0; target: "event"; + target: "base"; target: "icon_clip"; - target: "label_clip"; - target: "label2"; + target: "e.text.label"; } program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "event"; + target: "base"; target: "icon_clip"; - target: "label_clip"; - target: "label2"; + target: "e.text.label"; } program { signal: "e,state,focused"; source: "e"; action: STATE_SET "focused" 0.0; diff --git a/data/elementary/themes/edc/colors.edc b/data/elementary/themes/edc/colors.edc index 3d22f3399c..4736de1226 100644 --- a/data/elementary/themes/edc/colors.edc +++ b/data/elementary/themes/edc/colors.edc @@ -1,53 +1,33 @@ group { name: "e/modules/conf_colors/preview/solid"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "dot_pattern.png" COMP; + images.image: "diagonal_stripes.png" COMP; parts { part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - color: 48 48 48 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + color: DARK_GREY_BG_COLOR; min: 18 18; + offscale; } } part { name: "pat"; + scale: 1; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) + rel.to: "bg"; + rel1.offset: 2 2; + rel2.offset: -3 -3; + image.normal: "diagonal_stripes.png"; + color: 255 255 255 64; + TILED_PATTERN(240, 240) + offscale; } } part { name: "e.rect"; type: RECT; mouse_events: 0; description { state: "default" 0.0; color: 255 255 255 255; color_class: "color_preview"; - rel1.to: "bg"; - rel2.to: "bg"; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "inset"; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bg"; - rel1.offset: -1 -1; - rel2.to: "bg"; - rel2.offset: 0 0; - fill.smooth: 0; + rel.to: "pat"; } } } @@ -55,16 +35,6 @@ group { name: "e/modules/conf_colors/preview/solid"; group { name: "e/modules/conf_colors/preview/text"; parts { - part { name: "shadow"; type: TEXT; mouse_events: 0; - description { state: "default" 0.0; - color: FN_COL_SHADOW; - text { font: FN; size: 10; - text: "Text"; - min: 1 1; - ellipsis: -1; - } - } - } part { name: "e.text"; type: TEXT; mouse_events: 0; effect: OUTLINE_SHADOW; description { state: "default" 0.0; @@ -81,32 +51,36 @@ group { name: "e/modules/conf_colors/preview/text"; } group { name: "e/modules/conf_colors/preview/unknown"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "dot_pattern.png" COMP; + images.image: "diagonal_stripes.png" COMP; parts { part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - color: 48 48 48 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + color: DARK_GREY_BG_COLOR; min: 18 18; + offscale; } } part { name: "pat"; + scale: 1; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) + rel.to: "bg"; + rel1.offset: 2 2; + rel2.offset: -3 -3; + image.normal: "diagonal_stripes.png"; + color: 255 255 255 64; + TILED_PATTERN(240, 240) + offscale; } } part { name: "c1"; type: RECT; mouse_events: 0; description { state: "default" 0.0; color: 255 0 0 128; color_class: "color_preview_c1"; - rel1.to: "bg"; - rel2.to: "bg"; + rel1.to: "pat"; + rel2.to: "pat"; rel2.relative: 0.333 1.0; } } @@ -116,7 +90,7 @@ group { name: "e/modules/conf_colors/preview/unknown"; color_class: "color_preview_c2"; rel1.to: "c1"; rel1.relative: 1.0 0.0; - rel2.to: "bg"; + rel2.to: "pat"; rel2.relative: 0.667 1.0; } } @@ -126,30 +100,7 @@ group { name: "e/modules/conf_colors/preview/unknown"; color_class: "color_preview_c3"; rel1.to: "c2"; rel1.relative: 1.0 0.0; - rel2.to: "bg"; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "inset"; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bg"; - rel1.offset: -1 -1; - rel2.to: "bg"; - rel2.offset: 0 0; - fill.smooth: 0; + rel2.to: "pat"; } } } diff --git a/data/elementary/themes/edc/colorwell.edc b/data/elementary/themes/edc/colorwell.edc index d129cf83ca..1bf80bead4 100644 --- a/data/elementary/themes/edc/colorwell.edc +++ b/data/elementary/themes/edc/colorwell.edc @@ -1,76 +1,55 @@ group { name: "e/widgets/color_well"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "dot_pattern.png" COMP; + images.image: "diagonal_stripes.png" COMP; parts { part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - color: 48 48 48 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + color: DARK_GREY_BG_COLOR; + min: 18 18; + offscale; } } part { name: "pat"; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) - } + scale: 1; + description + { state: "default" 0.0; + rel.to: "bg"; + rel1.offset: 2 2; + rel2.offset: -3 -3; + image.normal: + "diagonal_stripes.png"; + color: 255 255 255 64; + TILED_PATTERN(240, 240) + offscale; + } } part { name: "clipper"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; + rel.to: "pat"; } description { state: "disabled" 0.0; inherit: "default" 0.0; color: 255 255 255 64; } } - part { name: "e.swallow.content"; type: SWALLOW; + part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "inset"; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bg"; - rel1.offset: -1 -1; - rel2.to: "bg"; - rel2.offset: 0 0; - fill.smooth: 0; + rel.to: "pat"; } } } programs { - program { - signal: "mouse,clicked,1"; source: "inset"; + program { signal: "mouse,clicked,1"; source: "pat"; action: SIGNAL_EMIT "e,action,click" ""; } - program { - signal: "e,state,disabled"; source: "e"; + program { signal: "e,state,disabled"; source: "e"; action: STATE_SET "disabled" 0.0; target: "clipper"; } - program { - signal: "e,state,enabled"; source: "e"; + program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "clipper"; } diff --git a/data/elementary/themes/edc/cslider.edc b/data/elementary/themes/edc/cslider.edc index ca2777f7ec..92c2acd8c4 100644 --- a/data/elementary/themes/edc/cslider.edc +++ b/data/elementary/themes/edc/cslider.edc @@ -1,16 +1,16 @@ group { name: "e/widgets/cslider"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; images.image: "col_sel_end_bottom.png" COMP; images.image: "col_sel_end_top.png" COMP; images.image: "col_sel_end_left.png" COMP; images.image: "col_sel_end_right.png" COMP; parts { part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - color: 48 48 48 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + color: DARK_GREY_BG_COLOR; + offscale; } } part { name: "clipper"; type: RECT; @@ -25,78 +25,36 @@ group { name: "e/widgets/cslider"; } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; + scale: 1; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } } - part { name: "e.dragable.cursor"; type: RECT; - clip_to: "clipper"; + part { name: "e.dragable.cursor"; type: RECT; mouse_events: 0; dragable.confine: "e.swallow.content"; dragable.x: 1 1 0; dragable.y: -1 1 0; description { state: "default" 0.0; + fixed: 1 1; min: 1 1; max: 1 1; - fixed: 1 1; visible: 0; rel1.to: "e.swallow.content"; rel1.relative: 0.5 0.0; rel2.to: "e.swallow.content"; rel2.relative: 0.5 0.5; - color: 255 255 255 150; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "end1"; mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - image.normal: "col_sel_end_top.png"; - FIXED_SIZE(11, 8) - align: 0.5 0.0; - rel1.to: "cursor"; - rel2.to: "cursor"; - } - description { state: "vertical" 0.0; - inherit: "default" 0.0; - image.normal: "col_sel_end_left.png"; - FIXED_SIZE(8, 11) - align: 0.0 0.5; - } - } - part { name: "end2"; mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - image.normal: "col_sel_end_bottom.png"; - FIXED_SIZE(11, 8) - align: 0.5 1.0; - rel1.to: "cursor"; - rel2.to: "cursor"; - } - description { state: "vertical" 0.0; - inherit: "default" 0.0; - image.normal: "col_sel_end_right.png"; - FIXED_SIZE(8, 11) - align: 1.0 0.5; } } part { name: "cursor"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; rel1.to_x: "e.dragable.cursor"; rel1.to_y: "e.swallow.content"; rel2.to_x: "e.dragable.cursor"; rel2.to_y: "e.swallow.content"; - color: 255 255 255 150; + color: 255 255 255 192; } description { state: "vertical" 0.0; inherit: "default" 0.0; @@ -106,41 +64,22 @@ group { name: "e/widgets/cslider"; rel2.to_y: "e.dragable.cursor"; } } - part { name: "inset"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bg"; - rel1.offset: -1 -1; - rel2.to: "bg"; - rel2.offset: 0 0; - fill.smooth: 0; - } - } } programs { - program { - signal: "e,state,direction,v"; source: "e"; + program { signal: "e,state,direction,v"; source: "e"; action: STATE_SET "vertical" 0.0; target: "cursor"; - target: "end1"; - target: "end2"; } - program { - signal: "mouse,clicked,1"; source: "inset"; + program { signal: "mouse,clicked,1"; source: "inset"; action: SIGNAL_EMIT "e,action,click" ""; } - program { - signal: "e,state,disabled"; source: "e"; + program { signal: "e,state,disabled"; source: "e"; action: STATE_SET "disabled" 0.0; target: "clipper"; } - program { - signal: "e,state,enabled"; source: "e"; + program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "clipper"; } } } - diff --git a/data/elementary/themes/edc/edgebindings.edc b/data/elementary/themes/edc/edgebindings.edc index 9bcffc6beb..3422ae7dc4 100644 --- a/data/elementary/themes/edc/edgebindings.edc +++ b/data/elementary/themes/edc/edgebindings.edc @@ -13,7 +13,7 @@ group { name: "e/modules/conf_edgebindings/selection"; images.image: "mini_blue_glow_arrow_3.png" COMP; styles { style { name: "edge_binding_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=tb_light"; } @@ -21,166 +21,113 @@ group { name: "e/modules/conf_edgebindings/selection"; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; - rel2.to: "e.swallow.background"; - color: 48 48 48 255; + rel.to: "e.swallow.background"; + color: DARK_GREY_BG_COLOR; } } - part { name: "pat"; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) - } - } - part { name: "e.swallow.background"; - type: SWALLOW; + part { name: "e.swallow.background"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; - min: 160 120; + min: 320 180; align: 0 0.5; - rel1.offset: 4 4; + rel1.offset: 2 2; rel2.relative: 0.5 1.0; - rel2.offset: -2 -5; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -10 -6; - rel1.to: "e.text.selection"; - rel2.offset: 9 5; - rel2.to: "e.text.selection"; - image.normal: "darken_square.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - fixed: 1 1; + rel2.offset: -3 -3; + offscale; } } part { name: "e.text.selection"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; description { state: "default" 0.0; + rel.to: "e.swallow.background"; rel1.relative: 0.5 0.5; - rel1.to: "e.swallow.background"; rel2.relative: 0.5 0.5; - rel2.to: "e.swallow.background"; - color: FN_COL_DEFAULT; - color_class: "label_text"; + color: 255 255 255 255; fixed: 1 1; - text { font: FN; size: 10; + text { font: FNBD; size: 10; text_class: "label"; min: 1 1; ellipsis: -1; } } } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "e.edge.left"; + part { name: "e.edge.left"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; + rel.to: "e.swallow.background"; rel1.offset: 0 10; - rel2.to: "e.swallow.background"; rel2.offset: -1 -11; - image.normal: "downlight_glow_right.png"; - image.border: 3 0 0 0; - max: 24 99999; align: 0.0 0.5; + max: 5 99999; + color: 51 153 255 255; } } - part { name: "e.edge.right"; + part { name: "e.edge.right"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; + rel.to: "e.swallow.background"; rel1.offset: 0 10; - rel2.to: "e.swallow.background"; rel2.offset: -1 -11; - image.normal: "downlight_glow_left.png"; - image.border: 0 3 0 0; - max: 24 99999; align: 1.0 0.5; + max: 5 99999; + color: 51 153 255 255; } } - part { name: "e.edge.top"; + part { name: "e.edge.top"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; + rel.to: "e.swallow.background"; rel1.offset: 10 0; - rel2.to: "e.swallow.background"; rel2.offset: -11 -1; - image.normal: "downlight_glow.png"; - image.border: 0 0 3 0; - max: 99999 24; align: 0.5 0.0; + max: 99999 5; + color: 51 153 255 255; } } - part { name: "e.edge.bottom"; + part { name: "e.edge.bottom"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; + rel.to: "e.swallow.background"; rel1.offset: 10 0; - rel2.to: "e.swallow.background"; rel2.offset: -11 -1; - image.normal: "downlight_glow_up.png"; - image.border: 0 0 0 3; - max: 99999 24; align: 0.5 1.0; + max: 99999 5; + color: 51 153 255 255; } } - + part { name: "e.edge.top_left"; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; - rel2.to: "e.swallow.background"; + rel.to: "e.swallow.background"; max: 10 10; image.normal: "mini_blue_glow_arrow_2.png"; align: 0.0 0.0; + color: 51 153 255 255; } } part { name: "e.edge.top_right"; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; - rel2.to: "e.swallow.background"; + rel.to: "e.swallow.background"; max: 10 10; image.normal: "mini_blue_glow_arrow_3.png"; align: 1.0 0.0; + color: 51 153 255 255; } } part { name: "e.edge.bottom_right"; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; - rel2.to: "e.swallow.background"; + rel.to: "e.swallow.background"; max: 10 10; image.normal: "mini_blue_glow_arrow_0.png"; align: 1.0 1.0; + color: 51 153 255 255; } } part { name: "e.edge.bottom_left"; description { state: "default" 0.0; - rel1.to: "e.swallow.background"; - rel2.to: "e.swallow.background"; + rel.to: "e.swallow.background"; max: 10 10; image.normal: "mini_blue_glow_arrow_1.png"; align: 0.0 1.0; + color: 51 153 255 255; } } - part { name: "inset"; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bg"; - rel1.offset: -1 -1; - rel2.to: "bg"; - rel2.offset: 0 0; - fill.smooth: 0; - } - } + part { name: "e.box"; type: BOX; description { state: "default" 0.0; rel1 { diff --git a/data/elementary/themes/edc/entry.edc b/data/elementary/themes/edc/entry.edc index a4fd54b3ae..a2ded18e68 100644 --- a/data/elementary/themes/edc/entry.edc +++ b/data/elementary/themes/edc/entry.edc @@ -1,14 +1,8 @@ group { name: "e/widgets/entry/scrollframe"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "inset"; - rel1.offset: 1 1; - rel2.to: "inset"; - rel2.offset: -2 -2; - color: 48 48 48 255; + color: DARK_GREY_BG_COLOR; } } part { name: "clipper"; type: RECT; @@ -21,29 +15,8 @@ group { name: "e/widgets/entry/scrollframe"; mouse_events: 1; clip_to: "clipper"; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - } - } - part { name: "shadow"; mouse_events: 0; repeat_events: 1; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "inset"; mouse_events: 0; repeat_events: 1; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.offset: 0 0; - rel2.offset: -1 -1; - fill.smooth: 0; + rel1.offset: 2 2; + rel2.offset: -3 -3; } } } @@ -52,10 +25,10 @@ group { name: "e/widgets/entry/scrollframe"; group { name: "e/widgets/entry/text"; styles { style { name: "entry_textblock_style"; - base: "font="FN" font_size=10 color=#ffffffff style=shadow,bottom shadow_color=#00000080 text_class=entry color_class=entry_text"; + base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry color_class=entry_text left_margin=2 right_margin=2"; } style { name: "entry_textblock_disabled_style"; - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry color_class=entry_text_disabled"; + base: "font="FN" font_size=10 color=#707070 text_class=entry color_class=entry_text_disabled left_margin=2 right_margin=2"; } } parts { @@ -124,21 +97,16 @@ group { name: "e/widgets/entry/password"; group { name: "e/widgets/entry/cursor"; min: 1 0; - images.image: "white_bar_vert_glow.png" COMP; parts { - part { name: "cursor"; mouse_events: 0; + part { name: "cursor"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - rel1.offset: -4 -4; - rel2.offset: 3 3; - image.normal: "white_bar_vert_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; - color: 255 255 255 0; - min: 9 10; + min: 1 10; + visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + visible: 1; } } } @@ -176,7 +144,6 @@ group { name: "e/widgets/entry/cursor"; program { name: "cursor_hide"; action: STATE_SET "default" 0.0; target: "cursor"; - transition: SINUSOIDAL 0.2; after: "cursor_hide_timer"; } program { name: "cursor_show_timer"; @@ -184,7 +151,7 @@ group { name: "e/widgets/entry/cursor"; after: "cursor_hide"; } program { name: "cursor_hide_timer"; - in: 0.2 0.0; + in: 0.5 0.0; after: "cursor_show"; } } diff --git a/data/elementary/themes/edc/frame.edc b/data/elementary/themes/edc/frame.edc index 43eb6f00b0..4423ad51df 100644 --- a/data/elementary/themes/edc/frame.edc +++ b/data/elementary/themes/edc/frame.edc @@ -1,101 +1,80 @@ group { name: "e/widgets/frame"; - images.image: "shadow_square_tiny.png" COMP; - images.image: "vgrad_med_curved.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "holes_tiny_vert.png" COMP; + images.image: "win_shadow.png" COMP; parts { part { name: "shadow"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - rel1.offset: -1 0; - rel2.offset: 0 1; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - } - } - part { name: "base"; type: RECT; - description { state: "default" 0.0; - rel1.relative: 0.0 1.0; - rel1.offset: 2 0; - rel1.to_y: "top"; - rel2.offset: -3 -3; - color_class: "frame_base"; - color: 64 64 64 255; + rel.to: "base"; + WIN_SHADOW_SMALL; } - } - part { name: "top"; - description { state: "default" 0.0; - image.normal: "vgrad_med_curved.png"; - rel1.offset: 2 2; - rel2.to_y: "e.text.label"; - rel2.offset: -3 -1; - fill.smooth: 0; - TILED_HORIZ(120) - color_class: "frame_base"; + description { state: "hidden" 0.0; + inherit; + visible: 0; } } - part { name: "edge1"; + part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; - image.normal: "holes_tiny_vert.png"; - rel1.offset: 4 0; - rel1.to_y: "e.text.label"; - rel2.offset: 4 -1; - rel2.relative: 0.0 1.0; - rel2.to_y: "e.text.label"; - align: 0.0 0.5; - FIXED_SIZE(3, 11) + rel1.offset: 6 6; + rel2.offset: -7 -7; + color: 80 80 80 255; + offscale; } } - part { name: "edge2"; + part { name: "top"; type: SPACER; + scale: 1; description { state: "default" 0.0; - image.normal: "holes_tiny_vert.png"; - rel1.offset: -5 0; - rel1.to_y: "e.text.label"; - rel1.relative: 1.0 0.0; - rel2.offset: -5 -1; - rel2.relative: 1.0 1.0; + rel1.to: "base"; + rel2.to_x: "base"; rel2.to_y: "e.text.label"; - align: 1.0 0.5; - FIXED_SIZE(3, 11) + rel2.offset: -1 3; + offscale; } } part { name: "e.text.label"; type: TEXT; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - color_class: "frame"; - rel1.relative: 1.0 0.0; - rel1.offset: 1 2; - rel1.to_x: "edge1"; - rel2.relative: 0.0 0.0; - rel2.offset: -2 2; - rel2.to_x: "edge2"; + rel1.offset: 4 4; + rel1.to: "base"; + rel2.relative: 1.0 0.0; + rel2.offset: -5 4; + rel2.to: "base"; align: 0.0 0.0; - color: FN_COL_DISABLE; + color: 255 255 255 255; text { font: FNBD; size: 10; - text_class: "frame"; align: 0.0 0.0; min: 0 1; } fixed: 0 1; + offscale; } } - part { name: "e.swallow.content"; type: SWALLOW; + part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; + rel1.to_x: "base"; + rel1.to_y: "top"; rel1.relative: 0.0 1.0; - rel1.offset: 5 0; - rel1.to_y: "e.text.label"; - rel2.offset: -6 -6; + rel2.to: "base"; + color: 64 64 64 255; + } + } + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; } } - part { name: "bevel"; mouse_events: 0; + part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "clip"; + scale: 1; description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + align: 0.0 1.0; + rel1.to: "bg"; + rel1.offset: 4 4; + rel2.to: "bg"; + rel2.offset: -5 -5; + offscale; } } } diff --git a/data/elementary/themes/edc/label.edc b/data/elementary/themes/edc/label.edc index 954274f242..95b18f9c65 100644 --- a/data/elementary/themes/edc/label.edc +++ b/data/elementary/themes/edc/label.edc @@ -1,13 +1,11 @@ group { name: "e/widgets/label"; parts { part { name: "e.text.label"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: 2 2; rel2.offset: -3 -3; - color_class: "label_text"; - color3: 255 255 255 255; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -17,19 +15,16 @@ group { name: "e/widgets/label"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "label_text_disabled"; - color3: 255 255 255 255; + color: 0 0 0 16; } } } programs { - program { - signal: "e,state,disabled"; source: "e"; + program { signal: "e,state,disabled"; source: "e"; action: STATE_SET "disabled" 0.0; target: "e.text.label"; } - program { - signal: "e,state,enabled"; source: "e"; + program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; } diff --git a/data/elementary/themes/edc/mixer.edc b/data/elementary/themes/edc/mixer.edc index 363c567ed2..a1724424c8 100644 --- a/data/elementary/themes/edc/mixer.edc +++ b/data/elementary/themes/edc/mixer.edc @@ -4,7 +4,6 @@ group { name: "e/modules/mixer/main"; images.image: "speaker.png" COMP; images.image: "speaker_clip.png" COMP; images.image: "speaker_vol.png" COMP; - images.image: "led_dot_white.png" COMP; max: 160 160; min: 16 16; script { diff --git a/data/elementary/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc index c0aa0eaa11..41c8d33be5 100644 --- a/data/elementary/themes/edc/pager.edc +++ b/data/elementary/themes/edc/pager.edc @@ -938,7 +938,21 @@ group { name: "e/gadget/pager/default/desk"; group { name: "e/modules/pager/window"; alias: "e/gadget/pager/plain/window"; + images.image: "mini_box_bevel_shadow.png" COMP; parts { + part { name: "shadow"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "mini_box_bevel_shadow.png"; + image.border: 7 7 7 7; + image.middle: 0; + rel1.to: "win"; + rel1.offset: -5 -5; + rel2.to: "win"; + rel2.offset: 4 4; + fill.smooth: 0; + color: 255 255 255 128; + } + } part { name: "base"; type: SPACER; description { state: "default" 0.0; } diff --git a/data/elementary/themes/edc/randr.edc b/data/elementary/themes/edc/randr.edc index af5ab8fce3..c0823415f0 100644 --- a/data/elementary/themes/edc/randr.edc +++ b/data/elementary/themes/edc/randr.edc @@ -1,45 +1,42 @@ group { name: "e/conf/randr/main"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; + images.image: "diagonal_stripes.png" COMP; parts { part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - color: 64 64 64 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + color: DARK_GREY_BG_COLOR; + min: 18 18; + offscale; } } + part { name: "pat"; + scale: 1; + description + { state: "default" 0.0; + rel.to: "bg"; + rel1.offset: 2 2; + rel2.offset: -3 -3; + image.normal: "diagonal_stripes.png"; + color: 255 255 255 64; + TILED_PATTERN(240, 240) + offscale; + } + } part { name: "clipper"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; + rel.to: "pat"; } } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; - description { state: "default" 0.0; } - } - part { name: "shadow"; type: IMAGE; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "bg"; - rel2.to: "bg"; - fill.smooth: 0; - color: 255 255 255 128; - } - } - part { name: "inset"; type: IMAGE; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.offset: -1 -1; - rel1.to: "bg"; - rel2.offset: 0 0; - rel2.to: "bg"; - fill.smooth: 0; + scale: 1; + description { state: "default" 0.0; + rel.to: "pat"; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } } } @@ -66,8 +63,6 @@ group { name: "e/conf/randr/main/frame"; images.image: "led_tiny_orange.png" COMP; images.image: "led_tiny_green.png" COMP; images.image: "screen_bg.png" COMP; - images.image: "screen_fg.png" COMP; - images.image: "shine.png" COMP; images.image: "mini_blue_glow_arrow_0.png" COMP; images.image: "mini_blue_glow_arrow_2.png" COMP; images.image: "sym_down_light_normal.png" COMP; @@ -78,17 +73,17 @@ group { name: "e/conf/randr/main/frame"; images.image: "icon_arrow_up.png" COMP; styles { style { name: "randr_name_style"; - base: "font="FN" font_size=10 text_class=randr_monitor align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word"; + base: "font="FNBD" font_size=10 text_class=randr_monitor align=center color=#ffff wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD""; } style { name: "randr_resolution_style"; - base: "font="FN" font_size=10 text_class=randr_resolution align=center color=#3399ffff wrap=mixed style=glow glow_color=#3399ff18 align=center glow2_color=#3399ff12"; + base: "font="FN" font_size=10 text_class=randr_resolution align=center color=#ff9933ff wrap=mixed align=center"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD""; } style { name: "randr_position_style"; - base: "font="FN" font_size=10 text_class=randr_position align=center color=#3399ffff wrap=mixed style=glow glow_color=#3399ff18 align=center glow2_color=#3399ff12"; + base: "font="FN" font_size=10 text_class=randr_position align=center color=#3399ffff wrap=mixed align=center"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD""; } @@ -99,10 +94,10 @@ group { name: "e/conf/randr/main/frame"; parts { part { name: "primary"; type: IMAGE; description { state: "default" 0.0; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - rel1.offset: -4 -4; - rel2.offset: 3 3; + image.normal: "screen_bg.png"; + image.border: 4 4 4 4; + rel1.offset: -2 -2; + rel2.offset: 1 1; visible: 0; } description { state: "on" 0.0; @@ -181,12 +176,6 @@ group { name: "e/conf/randr/main/frame"; fixed: 1 1; } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "screen_fg.png"; - image.border: 4 4 4 4; - } - } part { name: "led"; mouse_events: 0; description { state: "default" 0.0; rel1.to: "hole"; @@ -257,17 +246,6 @@ group { name: "e/conf/randr/main/frame"; visible: 0; } } - part { name: "scr_shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -1; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 3; - rel2.to: "base"; - FIXED_SIZE(69, 5) - } - } part { name: "pwrhint"; mouse_events: 0; description { state: "default" 0.0; rel1.to: "hole"; @@ -276,9 +254,10 @@ group { name: "e/conf/randr/main/frame"; rel2.to: "hole"; rel2.offset: -1 3; align: 0.5 0.0; - FIXED_SIZE(10, 10) - image.normal: "icon_arrow_up.png"; + FIXED_SIZE(15, 15) + image.normal: "arrow-u-015.png"; fixed: 1 1; + color: 51 153 255 255; } } part { name: "pwrhint2"; mouse_events: 0; @@ -288,9 +267,10 @@ group { name: "e/conf/randr/main/frame"; rel1.relative: 1.0 0.0; rel2.to: "pwrhint"; align: 0.0 0.0; - FIXED_SIZE(16, 16) + FIXED_SIZE(20, 20) image.normal: "icon_system-shutdown.png"; fixed: 1 1; + color: 51 153 255 255; } } part { name: "rsz1"; mouse_events: 0; @@ -301,13 +281,14 @@ group { name: "e/conf/randr/main/frame"; rel1.to: "e.event.resize"; rel2.to: "e.event.resize"; image.normal: "mini_blue_glow_arrow_2.png"; - FIXED_SIZE(10, 10) + FIXED_SIZE(5, 5) + color: 51 153 255 255; } description { state: "pulse" 0.0; inherit: "default" 0.0; rel1.relative: -1.0 -1.0; rel2.relative: -1.0 -1.0; - color: 255 255 255 0; + color: 51 153 255 0; } } part { name: "rsz2"; mouse_events: 0; @@ -318,13 +299,14 @@ group { name: "e/conf/randr/main/frame"; rel1.to: "e.event.resize"; rel2.to: "e.event.resize"; image.normal: "mini_blue_glow_arrow_0.png"; - FIXED_SIZE(10, 10) + FIXED_SIZE(5, 5) + color: 51 153 255 255; } description { state: "pulse" 0.0; inherit: "default" 0.0; rel1.relative: 2.0 2.0; rel2.relative: 2.0 2.0; - color: 255 255 255 0; + color: 51 153 255 0; } } part { name: "rotc"; type: RECT; @@ -344,14 +326,15 @@ group { name: "e/conf/randr/main/frame"; rel1.to: "e.event.rotate"; rel2.to: "e.event.rotate"; image.normal: "mini_blue_glow_arrow_2.png"; - FIXED_SIZE(10, 10) + FIXED_SIZE(5, 5) map.on: 1; map.smooth: 1; map.rotation.center: "rotc"; + color: 51 153 255 255; } description { state: "pulse" 0.0; inherit: "default" 0.0; - color: 255 255 255 0; + color: 51 153 255 0; map.rotation.z: -60; } } @@ -363,14 +346,15 @@ group { name: "e/conf/randr/main/frame"; rel1.to: "e.event.rotate"; rel2.to: "e.event.rotate"; image.normal: "mini_blue_glow_arrow_0.png"; - FIXED_SIZE(10, 10) + FIXED_SIZE(5, 5) map.on: 1; map.smooth: 1; map.rotation.center: "rotc"; + color: 51 153 255 255; } description { state: "pulse" 0.0; inherit: "default" 0.0; - color: 255 255 255 0; + color: 51 153 255 0; map.rotation.z: 60; } } @@ -428,8 +412,9 @@ group { name: "e/conf/randr/main/frame"; description { state: "default" 0.0; rel1.to: "e.event.arrow.show"; rel2.to: "e.event.arrow.show"; - image.normal: "sym_down_light_normal.png"; + image.normal: "arrow-d-015.png"; FIXED_SIZE(15, 15) + color: 51 153 255 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -441,8 +426,9 @@ group { name: "e/conf/randr/main/frame"; description { state: "default" 0.0; rel1.to: "e.event.arrow.show"; rel2.to: "e.event.arrow.show"; - image.normal: "sym_up_light_normal.png"; + image.normal: "arrow-u-015.png"; FIXED_SIZE(15, 15) + color: 51 153 255 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -529,7 +515,7 @@ group { name: "e/conf/randr/main/frame"; } program { name: "refresh_show"; action: STATE_SET "expanded" 0.0; - transition: BOUNCE 1.0 0.5 4; + transition: DECELERATE 0.5; target: "e.swallow.refresh"; } program { name: "refresh_hide"; diff --git a/data/elementary/themes/edc/spectrum.edc b/data/elementary/themes/edc/spectrum.edc index dc151f58e5..9ca81a8d17 100644 --- a/data/elementary/themes/edc/spectrum.edc +++ b/data/elementary/themes/edc/spectrum.edc @@ -1,9 +1,25 @@ group { name: "e/widgets/spectrum"; + images.image: "diagonal_stripes.png" COMP; parts { part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel.to: "e.swallow.content"; - color: DARK_GREY_BG_COLOR;; + rel1.offset: 2 2; + rel2.offset: -3 -3; + color: DARK_GREY_BG_COLOR; + offscale; + } + } + part { name: "pat"; + scale: 1; + description { state: "default" 0.0; + rel.to: "bg"; + rel1.offset: 2 2; + rel2.offset: -3 -3; + image.normal: "diagonal_stripes.png"; + color: 255 255 255 64; + TILED_PATTERN(240, 240) + offscale; } } part { name: "clipper"; type: RECT; @@ -17,11 +33,8 @@ group { name: "e/widgets/spectrum"; } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; - scale: 1; description { state: "default" 0.0; - rel1.offset: 4 4; - rel2.offset: -5 -5; - offscale; + rel.to: "pat"; } } part { name: "e.dragable.cursor"; type: RECT; --
