diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-01-16 01:20:10 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-01-16 01:46:04 +0900 |
| commit | a14f79a2907eb7f318f09f47b78521b6f2b999a8 (patch) | |
| tree | eb927727b1a78342923d0ea0204365cb449d0e7e | |
| parent | f7849d07278c063ba4bd49cb298eba2ec1f2a337 (diff) | |
| download | efl-a14f79a2907eb7f318f09f47b78521b6f2b999a8.tar.gz | |
TH
172 files changed, 5486 insertions, 7129 deletions
diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 74ba32fa63..408a6ec9d9 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -78,7 +78,6 @@ elementary/themes/edc/slider.edc \ elementary/themes/edc/spectrum.edc \ elementary/themes/edc/start.edc \ elementary/themes/edc/syscon.edc \ -elementary/themes/edc/sys.edc \ elementary/themes/edc/systray.edc \ elementary/themes/edc/tasks.edc \ elementary/themes/edc/temperature.edc \ diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc index 0b43454863..fd9c76ba5a 100644 --- a/data/elementary/themes/default.edc +++ b/data/elementary/themes/default.edc @@ -21,7 +21,6 @@ collections { #include "edc/elm/label.edc" #include "edc/elm/separator.edc" #include "edc/elm/check.edc" -#include "edc/elm/slider.edc" #include "edc/elm/radio.edc" #include "edc/elm/bubble.edc" #include "edc/elm/panes.edc" @@ -74,6 +73,7 @@ collections { #include "edc/elm/code.edc" #include "edc/elm/ews.edc" #include "edc/elm/textpath.edc" +#include "edc/elm/slider.edc" // desktop in general @@ -91,7 +91,6 @@ collections { #include "edc/gadman.edc" #include "edc/syscon.edc" #include "edc/pointer.edc" -#include "edc/sys.edc" #include "edc/winlist.edc" #include "edc/desklock.edc" #include "edc/deskmirror.edc" diff --git a/data/elementary/themes/edc/about-e.edc b/data/elementary/themes/edc/about-e.edc index 376fef65b8..24fb7b89cf 100644 --- a/data/elementary/themes/edc/about-e.edc +++ b/data/elementary/themes/edc/about-e.edc @@ -1,56 +1,47 @@ group { name: "e/widgets/about/main"; // data.item: "borderless" "1"; // data.item: "shaped" "1"; - images.image: "bg_radgrad.png" COMP; - images.image: "dot_pattern.png" COMP; - images.image: "bevel_dark_out.png" COMP; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "shadow_square_tiny.png" COMP; - images.image: "screen_circular_shadow.png" COMP; - images.image: "logo_blue_bottom.png" COMP; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; + images.image: "snow.jpg" LOSSY 90; + images.image: "grad-v-light.png" COMP; + set { name: "logo_mono"; + image { image: "logo.png" COMP; size: 601 601 99999 99999; } + image { image: "logo2.png" COMP; size: 301 301 600 600; } + image { image: "logo3.png" COMP; size: 151 151 300 300; } + image { image: "logo4.png" COMP; size: 76 76 150 150; } + image { image: "logo5.png" COMP; size: 0 0 75 75; } + } styles { style { name: "about_style"; - base: "font="FN" font_size=10 align=center text_class=tb_plain color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word"; - tag: "hilight" "+ font="FNBD" text_class=tb_light style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12"; + base: "font="FN" font_size=10 align=center text_class=tb_plain color=#fff wrap=word"; + tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff align=center"; tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big"; tag: "/title" "- \n \n"; tag: "br" "\n"; } style { name: "authors_style"; - base: "font="FNBD" font_size=16 align=left text_class=tb_plain color=#00000044 wrap=none"; - tag: "hilight" "+ font="FNBD" text_class=tb_light color=#3399ff44"; - tag: "title" "+ font_size=24 font="FNBD" text_class=tb_big"; + base: "font="FNBD" font_size=10 align=left text_class=tb_plain color=#0004 wrap=none"; + tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff"; + tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big"; tag: "/title" "- \n \n"; tag: "br" "\n"; } } - min: 220 260; - max: 800 600; + min: 320 360; parts { part { name: "sizer"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 220 260; - } - } - part { name: "bg"; - description { state: "default" 0.0; - image.normal: "bg_radgrad.png"; - image.scale_hint: STATIC; - fill.smooth: 0; - ASPECT_FILL((1024/653)) + min: 320 360; } } - part { name: "pat"; + part { name: "image"; description { state: "default" 0.0; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) + fixed: 1 1; + image.normal: "snow.jpg"; + aspect: 1.0 1.0; aspect_preference: NONE; } } + //////////////////////////////////////////////////////////////// part { name: "e.textblock.authors"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; @@ -58,9 +49,9 @@ group { name: "e/widgets/about/main"; max: 20000 20000; min: 160 0; rel1.relative: 0.0 1.0; - rel1.offset: 4 4; + rel1.offset: 13 13; rel2.relative: 1.0 1.0; - rel2.offset: -5 4; + rel2.offset: -14 13; align: 0.5 0.0; text { style: "authors_style"; min: 0 1; @@ -70,12 +61,25 @@ group { name: "e/widgets/about/main"; description { state: "up" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.0; - rel1.offset: 4 -5; + rel1.offset: 13 -14; rel2.relative: 1.0 0.0; - rel2.offset: -5 -5; + rel2.offset: -14 -14; align: 0.5 1.0; } } + program { name: "show1"; + signal: "show"; source: ""; + action: STATE_SET "up" 0.0; + transition: LINEAR 60.0; + target: "e.textblock.authors"; + after: "show2"; + } + program { name: "show2"; + action: STATE_SET "default" 0.0; + target: "e.textblock.authors"; + after: "show1"; + } + //////////////////////////////////////////////////////////////// part { name: "e.textblock.about"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; @@ -83,9 +87,9 @@ group { name: "e/widgets/about/main"; max: 20000 20000; min: 160 0; rel1.relative: 0.0 1.0; - rel1.offset: 4 4; + rel1.offset: 13 13; rel2.relative: 1.0 1.0; - rel2.offset: -5 4; + rel2.offset: -14 13; align: 0.5 0.0; text { style: "about_style"; min: 0 1; @@ -95,177 +99,124 @@ group { name: "e/widgets/about/main"; description { state: "up" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.0; - rel1.offset: 4 -5; + rel1.offset: 13 -14; rel2.relative: 1.0 0.0; - rel2.offset: -5 -5; + rel2.offset: -14 -14; align: 0.5 1.0; } } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - image.normal: "screen_circular_shadow.png"; - fill.smooth: 0; - } + program { name: "show3"; + signal: "show"; source: ""; + action: STATE_SET "up" 0.0; + transition: LINEAR 25.0; + target: "e.textblock.about"; + after: "show4"; } - part { name: "bevel"; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } + program { name: "show4"; + action: STATE_SET "default" 0.0; + target: "e.textblock.about"; + after: "show3"; } - part { name: "top_shadow"; mouse_events: 0; + //////////////////////////////////////////////////////////////// + part { name: "shad"; + scale: 1; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel1.to: "top_base"; - rel2.offset: 3 4; - rel2.to: "top_base"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; + image.normal: "grad-v-light.png"; + min: 0 256; + align: 0.5 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + fill.size.relative: 0.0 1.0; + fill.size.offset: 64 0; fill.smooth: 0; } } + //////////////////////////////////////////////////////////////// part { name: "logo"; + scale: 1; description { state: "default" 0.0; - image.normal: "logo_blue_bottom.png"; - image.scale_hint: STATIC; - FIXED_SIZE(263,100); - rel1.to: "top_base"; - rel2.to: "top_base"; - align: 0.5 0.25; - } - } - part { name: "top_base"; - description { state: "default" 0.0; - image.normal: "vgrad_med_lighter.png"; - rel2.to_y: "e.text.title"; - rel2.offset: -1 3; - fill.smooth: 0; - TILED_HORIZ(120) - } - } - part { name: "top_bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "top_base"; - rel2.to: "top_base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + image.normal: "logo_mono"; + align: 0.5 0.0; + rel1.offset: 0 13; + rel2.offset: -1 13; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + FIXED_SIZE(75, 75) } } + //////////////////////////////////////////////////////////////// part { name: "e.text.title"; type: TEXT; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - align: 0.0 0.0; - rel1.offset: 3 3; - rel2.relative: 0.0 0.0; - rel2.offset: 3 3; - text { font: FN; size: 10; + align: 0.5 0.0; + rel1.offset: 0 13; + rel2.offset: -1 13; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + rel1.to: "logo"; + rel2.to: "logo"; + color: 255 255 255 255; + text { font: FNBD; size: 16; min: 1 1; ellipsis: -1; - align: 0.0 0.0; text_class: "about_title"; } - fixed: 1 1; } } + //////////////////////////////////////////////////////////////// part { name: "e.text.version"; type: TEXT; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - align: 1.0 0.0; - rel1.relative: 0.0 0.0; - rel1.offset: -4 3; - rel2.relative: 1.0 0.0; - rel2.offset: -4 3; + align: 0.5 0.0; + rel1.offset: 0 13; + rel2.offset: -1 13; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + rel1.to: "e.text.title"; + rel2.to: "e.text.title"; + color: 255 255 255 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; - align: 1.0 0.0; text_class: "about_version"; } - fixed: 1 1; } } - part { name: "base"; + //////////////////////////////////////////////////////////////// + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; rel1.offset: -6 -6; rel1.to: "e.text.label"; rel2.offset: 5 5; rel2.to: "e.text.label"; - fill.smooth: 0; - } + color: 48 48 48 255; + } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + color: 32 32 32 255; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.offset: 0 -14; + rel1.offset: 0 -19; rel1.relative: 0.5 1.0; - rel2.offset: -1 -14; + rel2.offset: -1 -19; rel2.relative: 0.5 1.0; - color: FN_COL_DEFAULT; - color_class: "button_text"; + color: 160 160 160 255; align: 0.5 1.0; + min: 80 10; text { font: FN; size: 10; min: 1 1; ellipsis: -1; - align: 0.5 0.5; text_class: "button"; } - fixed: 1 1; } - } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "top_base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "top_base"; - FIXED_SIZE(69, 5) + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } - } - programs { - program { name: "show1"; - signal: "show"; source: ""; - action: STATE_SET "up" 0.0; - transition: LINEAR 45.0; - target: "e.textblock.about"; - after: "show2"; - } - program { name: "show2"; - action: STATE_SET "default" 0.0; - target: "e.textblock.about"; - after: "show1"; - } - program { name: "show3"; - signal: "show"; source: ""; - action: STATE_SET "up" 0.0; - transition: LINEAR 120.0; - target: "e.textblock.authors"; - after: "show4"; - } - program { name: "show4"; - action: STATE_SET "default" 0.0; - target: "e.textblock.authors"; - after: "show3"; - } program { signal: "mouse,down,1*"; source: "base"; action: STATE_SET "clicked" 0.0; diff --git a/data/elementary/themes/edc/about-theme.edc b/data/elementary/themes/edc/about-theme.edc index d27d2001c1..e6868eb30c 100644 --- a/data/elementary/themes/edc/about-theme.edc +++ b/data/elementary/themes/edc/about-theme.edc @@ -1,37 +1,53 @@ group { name: "e/theme/about"; // data.item: "borderless" "1"; // data.item: "shaped" "1"; - images.image: "bevel_dark_out.png" COMP; - images.image: "screen_circular_shadow.png" COMP; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - min: 220 220; - max: 220 220; +// images.image: "check_fill.png" COMP; + images.image: "clouds.jpg" LOSSY 99; + min: 220 320; parts { part { name: "sizer"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 220 220; + min: 220 320; } } - part { name: "bg"; +/* + part { name: "bg"; type: RECT; description { state: "default" 0.0; - image.normal: "bg_radgrad.png"; - image.scale_hint: STATIC; - fill.smooth: 0; - ASPECT_FILL((1024/653)) + color: 64 64 64 255; + } + } + part { name: "check"; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + color: 56 56 56 255; + image.normal: "check_fill.png"; + min: 5120 5120; + align: 0.0 0.0; + fill { + size.relative: 0.05 0.05; + smooth: 0; + } + } + } + */ + part { name: "image"; + description { state: "default" 0.0; + fixed: 1 1; + image.normal: "clouds.jpg"; + aspect: 1.0 1.0; aspect_preference: NONE; } } part { name: "name"; type: TEXT; mouse_events: 0; - effect: GLOW; scale: 1; description { state: "default" 0.0; fixed: 1 1; - color: FN_COL_HIGHLIGHT; + color: 255 255 255 255; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - text { font: FNBD; size: 64; - text: "Dark"; + text { font: FNBD; size: 48; + text: "FLAT"; min: 1 1; ellipsis: -1; align: 0.5 0.5; @@ -39,67 +55,47 @@ group { name: "e/theme/about"; } } part { name: "name2"; type: TEXT; mouse_events: 0; - effect: GLOW; scale: 1; description { state: "default" 0.0; fixed: 1 1; - color: FN_COL_HIGHLIGHT; - rel1.relative: 0.5 0.9; + color: 255 255 255 192; + rel1.relative: 0.0 1.0; rel1.to: "name"; - rel2.relative: 0.5 0.9; + rel1.offset: 0 16; + rel2.relative: 1.0 1.0; rel2.to: "name"; - align: 0.5 1.0; + rel2.offset: -1 16; + align: 0.5 0.0; text { font: FN; size: 10; text: "The default theme for Enlightenment"; min: 1 1; ellipsis: -1; - align: 0.5 1.0; + align: 0.5 0.0; } } } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - image.normal: "screen_circular_shadow.png"; - fill.smooth: 0; - } - } - part { name: "bevel"; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "base"; + //////////////////////////////////////////////////////////////// + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; rel1.offset: -6 -6; rel1.to: "e.text.label"; rel2.offset: 5 5; rel2.to: "e.text.label"; - fill.smooth: 0; - } + color: 48 48 48 255; + } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + color: 32 32 32 255; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: -14 -14; rel1.relative: 1.0 1.0; rel2.offset: -14 -14; rel2.relative: 1.0 1.0; - color: FN_COL_DEFAULT; - color_class: "button_text"; + color: 160 160 160 255; align: 1.0 1.0; min: 85 0; text { font: FN; size: 10; @@ -110,34 +106,49 @@ group { name: "e/theme/about"; } fixed: 1 1; } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + program { + signal: "mouse,down,1*"; source: "base"; + action: STATE_SET "clicked" 0.0; + target: "base"; + target: "e.text.label"; + } + program { + signal: "mouse,up,1"; source: "base"; + action: STATE_SET "default" 0.0; + target: "base"; + target: "e.text.label"; } - part { name: "base2"; + program { + signal: "mouse,clicked,1*"; source: "base"; + action: SIGNAL_EMIT "e,action,close" ""; + } + //////////////////////////////////////////////////////////////// + part { name: "base2"; type: RECT; description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; rel1.offset: -6 -6; rel1.to: "e.text.theme"; rel2.offset: 5 5; rel2.to: "e.text.theme"; - fill.smooth: 0; - } + color: 48 48 48 255; + } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + color: 32 32 32 255; } } part { name: "e.text.theme"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: 13 -14; rel1.relative: 0.0 1.0; rel2.offset: 13 -14; rel2.relative: 0.0 1.0; - color: FN_COL_DEFAULT; - color_class: "button_text"; + color: 160 160 160 255; align: 0.0 1.0; min: 85 0; text { font: FN; size: 10; @@ -148,24 +159,10 @@ group { name: "e/theme/about"; } fixed: 1 1; } - } - } - programs { - program { - signal: "mouse,down,1*"; source: "base"; - action: STATE_SET "clicked" 0.0; - target: "base"; - target: "e.text.label"; - } - program { - signal: "mouse,up,1"; source: "base"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "e.text.label"; - } - program { - signal: "mouse,clicked,1*"; source: "base"; - action: SIGNAL_EMIT "e,action,close" ""; + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } } program { signal: "mouse,down,1*"; source: "base2"; diff --git a/data/elementary/themes/edc/appmenu.edc b/data/elementary/themes/edc/appmenu.edc index 7b3134695d..e22d990e23 100644 --- a/data/elementary/themes/edc/appmenu.edc +++ b/data/elementary/themes/edc/appmenu.edc @@ -1,72 +1,47 @@ group { name: "e/modules/appmenu/item"; - images.image: "vgrad_med_dark.png" COMP; data.item: "padding_horizontal" "5"; - data.item: "padding_vertical" "5"; + data.item: "padding_vertical" "5"; parts { - part { - name: "event_area"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - part { - name: "background"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - TILED_HORIZ(120) + part { name: "background"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + color: 32 32 32 255; visible: 0; } - description { - state: "selected" 0.0; + description { state: "selected" 0.0; inherit: "default" 0.0; visible: 1; } } - part { - name: "text"; - type: TEXT; - mouse_events: 0; - effect: SHADOW BOTTOM; + part { name: "text"; type: TEXT; mouse_events: 0; scale: 1; - description { - state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - color: FN_COL_DEFAULT; - text { - font: FN; - size: 10; + description { state: "default" 0.0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + color: 160 160 160 255; + text { font: FN; size: 10; min: 1 1; ellipsis: -1; - align: 0.5 0.5; text_class: "label"; } } - description { - state: "selected" 0.0; + description { state: "selected" 0.0; inherit: "default" 0.0; - color: FN_COL_HIGHLIGHT; + color: 255 255 255 255; + } + } + part { name: "event_area"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; } } } programs { - program { - signal: "mouse,in"; - source: "event_area"; + program { signal: "mouse,in"; source: "event_area"; action: STATE_SET "selected" 0.0; target: "background"; target: "text"; } - program { - signal: "mouse,out"; - source: "event_area"; + program { signal: "mouse,out"; source: "event_area"; action: STATE_SET "default" 0.0; target: "background"; target: "text"; diff --git a/data/elementary/themes/edc/backlight.edc b/data/elementary/themes/edc/backlight.edc index a9b0626e50..c364c0f0f7 100644 --- a/data/elementary/themes/edc/backlight.edc +++ b/data/elementary/themes/edc/backlight.edc @@ -1,9 +1,8 @@ group { name: "e/modules/backlight/main"; alias: "e/gadget/backlight/main"; alias: "e/gadget/backlight/main_vert"; - images.image: "bulb_glow.png" COMP; - images.image: "bulb_off.png" COMP; - images.image: "bulb_on.png" COMP; + alias: "e/modules/backlight/main_vert"; + images.image: "bulb_middle.png" COMP; images.image: "bulb_over.png" COMP; min: 16 16; max: 160 160; @@ -13,46 +12,30 @@ group { name: "e/modules/backlight/main"; new Float:val; val = getfarg(2); set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0); - set_tween_state(PART:"glow2", val, "default", 0.0, "full", 0.0); } } } parts { - part { name: "glow"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.relative: (76/152) (69/152); - rel2.to: "base"; - rel2.relative: (76/152) (69/152); - image.normal: "bulb_glow.png"; - color: 255 255 255 0; - max: 138 138; - } - description { state: "full" 0.0; - inherit: "default" 0.0; - rel1.relative: (7/152) (0/152); - rel2.relative: (145/152) (138/152); - color: 255 255 255 255; - } - } part { name: "base"; description { state: "default" 0.0; - rel1.relative: (4/160) (4/160); - rel2.relative: (156/160) (156/160); aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "bulb_off.png"; - max: 152 152; + image.normal: "bulb_middle.png"; + color: 32 32 32 255; } } - part { name: "glow2"; + part { name: "glow"; description { state: "default" 0.0; rel1.to: "base"; + rel1.relative: 0.5 0.5; rel2.to: "base"; - image.normal: "bulb_on.png"; + rel2.relative: 0.5 0.5; + image.normal: "bulb_middle.png"; color: 255 255 255 0; } description { state: "full" 0.0; inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; color: 255 255 255 255; } } diff --git a/data/elementary/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc index 0c2536c62d..7cf3cf537f 100644 --- a/data/elementary/themes/edc/battery.edc +++ b/data/elementary/themes/edc/battery.edc @@ -1,210 +1,77 @@ group { name: "e/modules/battery/main"; - images.image: "bat_shadow.png" COMP; images.image: "bat_base.png" COMP; - images.image: "bat_shine.png" COMP; - images.image: "bat_bottom0.png" COMP; - images.image: "bat_bottom1.png" COMP; - images.image: "bat_top0.png" COMP; - images.image: "bat_top1.png" COMP; - images.image: "glow_med_white.png" COMP; + min: 16 16; + max: 160 160; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT) && (id == 1)) { - new Float:val; - new r = 51, g = 153, b = 255; - new lr = 255, lg = 0, lb = 0; - - val = getfarg(2); - if (val < 0.35) { - new Float:val1, Float:val2; - - val1 = (val - 0.10) / 0.25; - val2 = 1.0 - val1; - r = round((r * val1) + (lr * val2), ROUND); - g = round((g * val1) + (lg * val2), ROUND); - b = round((b * val1) + (lb * val2), ROUND); - } - custom_state(PART:"fill", "default", 0.0); - set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255); - set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255); - set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255); - set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val); - set_state(PART:"fill", "custom", 0.0); + new Float:val = getfarg(2); + val = 0.05 + (0.9 * (1.0 - val)); + custom_state(PART:"fill_clip", "default", 0.0); + set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val); + set_state(PART:"fill_clip", "custom", 0.0); } } } parts { - part { name: "fade_clip"; type: RECT; + part { name: "pulse_clip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 255; + rel1.to: "bg"; + rel2.to: "bg"; } description { state: "faded" 0.0; - color: 128 128 128 255; + inherit: "default" 0.0; + color: 255 255 255 128; } } - part { name: "info_clip"; type: RECT; - clip_to: "fade_clip"; + part { name: "fill_clip_dim"; type: RECT; + clip_to: "pulse_clip"; description { state: "default" 0.0; - color: 255 255 255 0; + rel1.to: "bg"; + rel2.to: "bg"; } description { state: "visible" 0.0; - color: 255 255 255 255; - } - } - part { name: "pulse_clip"; type: RECT; - clip_to: "fade_clip"; - description { state: "default" 0.0; - color: 255 255 255 255; - } - description { state: "faded" 1.0; - color: 255 255 255 255; - } - description { state: "faded" 0.0; - color: 255 255 255 64; + inherit: "default" 0.0; + color: 128 128 128 255; } } - part { name: "fill_region"; type: SPACER; + part { name: "fill_clip"; type: RECT; + clip_to: "fill_clip_dim"; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; } } - part { name: "pwr"; type: SPACER; + part { name: "info_clip"; type: RECT; description { state: "default" 0.0; rel1.to: "bg"; - rel1.relative: 0.40 0.40; rel2.to: "bg"; - rel2.relative: 0.60 0.60; - aspect: 1.0 1.0; aspect_preference: BOTH; - step: 5 5; - } - } - part { name: "base"; type: SPACER; - description { state: "default" 0.0; - aspect: 1.0 1.0; aspect_preference: BOTH; + color: 255 255 255 0; } - } - part { name: "shadow"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "top"; - rel1.offset: -4 0; - rel2.to: "bottom"; - rel2.offset: 3 3; - image.normal: "bat_shadow.png"; + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } part { name: "bg"; clip_to: "pulse_clip"; description { state: "default" 0.0; - rel1.to: "top"; - rel1.relative: 0.0 1.0; - rel2.to: "bottom"; - rel2.relative: 1.0 0.0; + aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: "bat_base.png"; - fill.smooth: 0; - } - } - part { name: "top"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 6 4; - rel2.to: "base"; - rel2.offset: -7 4; - rel2.relative: 1.0 0.0; - aspect: (112/24) (112/24); aspect_preference: HORIZONTAL; - align: 0.5 0.0; - image.normal: "bat_top0.png"; - } - } - part { name: "bottom"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 6 -5; - rel2.to: "base"; - rel2.offset: -7 -5; - aspect: (112/12) (112/12); aspect_preference: HORIZONTAL; - align: 0.5 1.0; - image.normal: "bat_bottom0.png"; - } - } - part { name: "fill"; mouse_events: 0; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "fill_region"; - rel1.offset: -5 -5; - rel2.to: "fill_region"; - rel2.offset: 4 4; - image.normal: "glow_med_white.png"; - image.border: 10 10 10 10; - color: 51 153 255 255; - } - } - part { name: "top-shine"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "top"; - rel2.to: "top"; - image.normal: "bat_top1.png"; - } - } - part { name: "bottom-shine"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "bottom"; - rel2.to: "bottom"; - image.normal: "bat_bottom1.png"; + color: 0 0 0 64; } } - part { name: "shine"; - clip_to: "pulse_clip"; + part { name: "fill"; + clip_to: "fill_clip"; description { state: "default" 0.0; rel1.to: "bg"; - rel1.offset: 0 -6; rel2.to: "bg"; - rel2.offset: -1 5; - image.normal: "bat_shine.png"; - image.border: 0 0 7 7; - } - } - part { name: "pwr1"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "pwr"; - rel1.relative: (2/5) 0.0; - rel1.offset: -5 -5; - rel2.to: "pwr"; - rel2.relative: (3/5) 1.0; - rel2.offset: 4 4; - image.normal: "glow_med_white.png"; - image.border: 5 5 5 5; - fill.smooth: 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "pwr2"; - clip_to: "pulse_clip"; - description { state: "default" 0.0; - rel1.to: "pwr"; - rel1.relative: 0.0 (2/5); - rel1.offset: -5 -5; - rel2.to: "pwr"; - rel2.relative: 1.0 (3/5); - rel2.offset: 4 4; - image.normal: "glow_med_white.png"; - image.border: 5 5 5 5; - fill.smooth: 0; - visible: 0; + image.normal: "bat_base.png"; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "charging" 0.0; inherit: "default" 0.0; - visible: 1; + color: 51 153 255 255; } } part { name: "e.text.reading"; type: TEXT; mouse_events: 0; @@ -213,14 +80,12 @@ group { name: "e/modules/battery/main"; description { state: "default" 0.0; align: 0.5 0.0; rel1.to: "bg"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.to_x: "bg"; - rel2.to_y: "pwr"; - rel2.offset: -1 2; - color_class: "module_label_plain"; - color3: 255 255 255 255; - text { font: "Sans"; + rel2.to: "bg"; + rel1.relative: 0.2 0.15; + rel2.relative: 0.8 0.53; + color: 255 255 255 255; + text { font: "Sans"; size: 8; + min: 0 1; fit: 1 1; ellipsis: -1; align: 0.5 0.5; @@ -233,15 +98,13 @@ group { name: "e/modules/battery/main"; clip_to: "info_clip"; description { state: "default" 0.0; align: 0.5 1.0; - rel1.relative: 0.0 1.0; - rel1.offset: 0 -2; - rel1.to_x: "bg"; - rel1.to_y: "pwr"; - rel2.offset: -1 1; + rel1.to: "bg"; rel2.to: "bg"; - color_class: "module_label_plain"; - color3: 255 255 255 255; - text { font: "Sans"; + rel1.relative: 0.2 0.47; + rel2.relative: 0.8 0.85; + color: 255 255 255 255; + text { font: "Sans"; size: 8; + min: 0 1; fit: 1 1; ellipsis: -1; align: 0.5 0.5; @@ -257,33 +120,14 @@ group { name: "e/modules/battery/main"; } programs { program { - signal: "mouse,in"; source: "over"; - action: STATE_SET "visible" 0.0; - transition: LINEAR 0.3; - target: "info_clip"; - } - program { - signal: "mouse,out"; source: "over"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.3; - target: "info_clip"; - } - program { signal: "e,state,charging"; source: "e"; - action: STATE_SET "visible" 0.0; - target: "pwr1"; - target: "pwr2"; + action: STATE_SET "charging" 0.0; + target: "fill"; } program { signal: "e,state,discharging"; source: "e"; action: STATE_SET "default" 0.0; - target: "pwr1"; - target: "pwr2"; - } - program { - signal: "e,state,unknown"; source: "e"; - action: STATE_SET "faded" 0.0; - target: "fade_clip"; + target: "fill"; } program { name: "pulse"; signal: "e,action,pulse,start"; source: "e"; @@ -293,36 +137,58 @@ group { name: "e/modules/battery/main"; target: "pulse_clip"; } program { name: "pulse2"; - action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.1; target: "pulse_clip"; + after: "pulse"; } program { signal: "e,action,pulse,stop"; source: "e"; + action: ACTION_STOP; + target: "pulse"; + target: "pulse2"; + after: "pulse3"; + } + program { name: "pulse3"; + signal: "e,action,pulse,stop"; source: "e"; action: STATE_SET "default" 0.0; target: "pulse_clip"; } + program { + signal: "mouse,in"; source: "over"; + action: STATE_SET "visible" 0.0; + transition: SINUSOIDAL 0.3; + target: "info_clip"; + target: "fill_clip_dim"; + } + program { + signal: "mouse,out"; source: "over"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.3; + target: "info_clip"; + target: "fill_clip_dim"; + } } } group { name: "e/modules/battery/popup"; - min: 240 60; + min: 320 60; parts { part { name: "e.swallow.battery"; type: SWALLOW; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: VERTICAL; min: 1 1; - max: 160 160; + max: 240 160; align: 0.0 0.5; } } part { name: "e.text.title"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.relative: 1.0 0.0; rel1.to_x: "e.swallow.battery"; rel2.relative: 1.0 0.5; - color: FN_COL_DEFAULT; + color: 160 160 160 255; text { font: "Sans:style=Bold"; size: 10; text: "Your battery is low!"; min: 1 1; @@ -332,12 +198,11 @@ group { name: "e/modules/battery/popup"; } } part { name: "e.text.label"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.relative: 1.0 0.5; rel1.to_x: "e.swallow.battery"; - color: FN_COL_DEFAULT; + color: 160 160 160 255; text { font: "Sans"; size: 10; text: "AC power is recommended."; min: 1 1; diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc index 4dfd6c5012..4f389f334b 100644 --- a/data/elementary/themes/edc/border.edc +++ b/data/elementary/themes/edc/border.edc @@ -1,56 +1,73 @@ group { name: "e/widgets/border/volume"; + images.image: "shadow_circle_vert.png" COMP; parts { - part { name: "base"; - type: RECT; + part { name: "base"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 0 0 0 0; } } - part { name: "clip"; - type: RECT; + part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.volume"; - rel1.relative: -1.0 0.0; - rel2.to: "e.swallow.volume"; - rel2.relative: 0.0 1.0; + fixed: 1 1; + rel.to: "e.swallow.volume"; + rel2.to_x: "clip"; + color: 64 64 64 255; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 32 32 32 255; + } + } + part { name: "clip"; type: RECT; + scale: 1; + description { state: "default" 0.0; + rel.to: "e.swallow.volume"; + align: 0.0 0.5; + max: 0 999999; color: 255 255 255 255; } description { state: "show" 0.0; - rel1.to: "e.swallow.volume"; - rel1.relative: 0.0 0.0; - rel2.to: "e.swallow.volume"; - rel2.relative: 1.0 1.0; + rel.to: "e.swallow.volume"; + max: 999999 999999; + rel2.offset: 3 -1; + offscale; } } - part { name: "e.swallow.volume_icon"; - type: SWALLOW; + part { name: "e.swallow.volume_icon"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "base"; + rel.to: "base"; rel1.relative: 0.15 0.15; - rel2.to: "base"; rel2.relative: 0.85 0.85; } } - part { name: "e.swallow.volume"; - type: SWALLOW; + part { name: "e.swallow.volume"; type: SWALLOW; clip_to: "clip"; description { state: "default" 0.0; fixed: 1 0; + rel1.to_x: "e.swallow.volume_icon"; rel1.relative: 1.0 0.0; rel1.offset: 1 0; - rel1.to_x: "e.swallow.volume_icon"; - rel2.relative: 1.0 1.0; - rel2.offset: 1 -1; - rel2.to: "e.swallow.volume_icon"; + rel2.to_x: "e.swallow.volume_icon"; align: 0.0 0.5; } } - part { name: "event"; - type: RECT; - repeat_events: 1; + part { name: "sh_right"; mouse_events: 0; + scale: 1; + clip_to: "clip"; + description { state: "default" 0.0; + fixed: 1 1; + color: 255 255 255 128; + rel.to: "bg"; + rel1.relative: 1.0 0.0; + rel1.offset: -16 0; + rel2.offset: 15 -1; + image.normal: "shadow_circle_vert.png"; + offscale; + } + } + part { name: "event"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; color: 255 255 255 0; } description { state: "large" 0.0; @@ -60,45 +77,44 @@ group { name: "e/widgets/border/volume"; } } programs { - program { - signal: "mouse,in"; - source: "event"; + program { signal: "e,state,focused"; source: "e"; + action: STATE_SET "focused" 0.0; + target: "bg"; + } + program { signal: "e,state,unfocused"; source: "e"; + action: STATE_SET "default" 0.0; + target: "bg"; + } + program { signal: "mouse,in"; source: "event"; action: ACTION_STOP; target: "hide_volume1"; target: "hide_volume2"; after: "show_volume1"; } - program { - name: "show_volume1"; + program { name: "show_volume1"; action: STATE_SET "large" 0.0; target: "event"; after: "show_volume2"; } - program { - name: "show_volume2"; + program { name: "show_volume2"; action: STATE_SET "show" 0.0; - transition: SIN 0.25; + transition: SINUSOIDAL 0.3; target: "clip"; } - program { - name: "hide_volume"; - signal: "mouse,out"; - source: "event"; + program { signal: "mouse,out"; source: "event"; action: ACTION_STOP; target: "show_volume1"; target: "show_volume2"; after: "hide_volume1"; } - program { - name: "hide_volume1"; + program { name: "hide_volume1"; action: STATE_SET "default" 0.0; - transition: SIN 0.25; + transition: SINUSOIDAL 0.5; target: "clip"; after: "hide_volume2"; } - program { - name: "hide_volume2"; + program { name: "hide_volume2"; action: STATE_SET "default" 0.0; target: "event"; } @@ -110,26 +126,14 @@ group { name: "e/widgets/border/volume"; group { name: "e/widgets/border/default/border"; alias: "e/widgets/border/shaped/border"; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "bevel_dark_out.png" COMP; - images.image: "sym_close_dark_normal.png" COMP; - images.image: "sym_close_dark_selected.png" COMP; - images.image: "sym_close_light_normal.png" COMP; - images.image: "sym_close_light_selected.png" COMP; - images.image: "sym_down_dark_normal.png" COMP; - images.image: "sym_down_dark_selected.png" COMP; - images.image: "sym_down_light_normal.png" COMP; - images.image: "sym_down_light_selected.png" COMP; - images.image: "sym_up_dark_normal.png" COMP; - images.image: "sym_up_dark_selected.png" COMP; - images.image: "sym_up_light_normal.png" COMP; - images.image: "sym_up_light_selected.png" COMP; - images.image: "glow_round_corners_small.png" COMP; - images.image: "knob_round_small_busy.png" COMP; - images.image: "screen_circular_shadow.png" COMP; + images.image: "border_close.png" COMP; + images.image: "border_maximize.png" COMP; + images.image: "border_minimize.png" COMP; + + IMAGE_RING("ringa", 160) + IMAGE_RING("ringb", 160) + IMAGE_RING("ringc", 160) + images.image: "win_shadow.png" COMP; data.item: "shadow" "1"; parts { @@ -182,35 +186,19 @@ group { name: "e/widgets/border/default/border"; rel2.offset: -1 -1; } } - part { name: "top"; mouse_events: 0; + part { name: "top"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "vgrad_med_lighter.png"; - rel2.to_y: "title2"; - rel2.offset: -1 0; - fill.smooth: 0; - TILED_HORIZ(120) - color_class: "border_frame"; + rel2.to_y: "e.text.title"; + rel2.offset: -1 3; + color: 64 64 64 255; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "vgrad_med_dark.png"; - color_class: "border_frame_active"; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "top"; - rel2.to: "top"; - fill.smooth: 0; + color: 32 32 32 255; } } - part { name: "e.text.title"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; rel1.relative: 1.0 0.0; rel1.offset: 1 3; @@ -219,8 +207,7 @@ group { name: "e/widgets/border/default/border"; rel2.offset: -2 3; rel2.to_x: "e.event.minimize"; align: 0.5 0.0; - color_class: "border_title"; - color3: 255 255 255 255; + color: 160 160 160 255; text { font: FNBD; size: 10; text_class: "title_bar"; align: 0.5 0.0; @@ -230,34 +217,7 @@ group { name: "e/widgets/border/default/border"; } description { state: "focused" 0.0; inherit: "default" 0.0; - visible: 0; - } - } - part { name: "title2"; type: TEXT; mouse_events: 0; - scale: 1; - effect: SOFT_SHADOW BOTTOM; - description { state: "default" 0.0; - rel1.relative: 1.0 0.0; - rel1.offset: 1 2; - rel1.to_x: "e.swallow.volume"; - rel2.relative: 0.0 0.0; - rel2.offset: -1 2; - rel2.to_x: "e.event.minimize"; - align: 0.5 0.0; - color_class: "border_title_active"; - color3: 255 255 255 255; - text { font: FNBD; size: 10; - text_source: "e.text.title"; - text_class: "title_bar"; - align: 0.5 0.0; - min: 0 1; - } - fixed: 0 1; - visible: 0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } part { name: "icon"; type: SPACER; @@ -285,50 +245,18 @@ group { name: "e/widgets/border/default/border"; rel2.offset: 0 0; } } - part { name: "busy_clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "hung" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } - part { name: "knob"; mouse_events: 0; - clip_to: "busy_clip"; + part { name: "busy_area"; type: SPACER; description { state: "default" 0.0; - fixed: 1 1; - image.normal: "knob_round_small_busy.png"; aspect: 1.0 1.0; aspect_preference: VERTICAL; - max: 20 20; - rel1.relative: 1.0 0.0; - rel1.offset: 2 -0; + max: 160 160; + rel1.relative: -0.2 -0.2; rel1.to: "e.event.icon"; - rel2.relative: 1.0 1.0; - rel2.offset: 2 -1; + rel2.relative: 1.2 1.2; rel2.to: "e.event.icon"; - align: 0.0 0.5; fixed: 1 1; } } - part { name: "knob_spinner"; mouse_events: 0; - clip_to: "busy_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "knob"; - rel2.to: "knob"; - image.normal: "glow_round_corners_small.png"; - map.on: 1; - map.smooth: 1; - map.rotation.center: "knob"; - } - description { state: "spin" 0.0; - inherit: "default" 0.0; - map.rotation.z: 360; - } - } + BUSY("busy_area", "e,state,hung", "e", "e,state,unhung", "e") part { name: "clip1"; type: RECT; mouse_events: 0; description { state: "default" 0.0; rel1.to: "top"; @@ -351,94 +279,99 @@ group { name: "e/widgets/border/default/border"; } } part { name: "close1"; mouse_events: 0; - clip_to: "clip1"; description { state: "default" 0.0; - image.normal: "sym_close_dark_normal.png"; + image.normal: "border_close.png"; rel1.to: "e.event.close"; rel2.to: "e.event.close"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_close_dark_selected.png"; + color: 255 255 255 255; } } part { name: "max1"; mouse_events: 0; clip_to: "clip1"; description { state: "default" 0.0; - image.normal: "sym_up_dark_normal.png"; + image.normal: "border_maximize.png"; rel1.to: "e.event.maximize"; rel2.to: "e.event.maximize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_up_dark_selected.png"; + color: 255 255 255 255; } } part { name: "min1"; mouse_events: 0; clip_to: "clip1"; description { state: "default" 0.0; - image.normal: "sym_down_dark_normal.png"; + image.normal: "border_minimize.png"; rel1.to: "e.event.minimize"; rel2.to: "e.event.minimize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_down_dark_selected.png"; + color: 255 255 255 255; } } part { name: "close2"; mouse_events: 0; clip_to: "clip2"; description { state: "default" 0.0; - image.normal: "sym_close_light_normal.png"; + image.normal: "border_close.png"; rel1.to: "e.event.close"; rel2.to: "e.event.close"; min: 15 15; max: 15 15; fixed: 1 1; + color: 255 255 255 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_close_light_selected.png"; + color: 220 220 220 255; } } part { name: "max2"; mouse_events: 0; clip_to: "clip2"; description { state: "default" 0.0; - image.normal: "sym_up_light_normal.png"; + image.normal: "border_maximize.png"; rel1.to: "e.event.maximize"; rel2.to: "e.event.maximize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 255 255 255 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_up_light_selected.png"; + color: 220 220 220 255; } } part { name: "min2"; mouse_events: 0; clip_to: "clip2"; description { state: "default" 0.0; - image.normal: "sym_down_light_normal.png"; + image.normal: "border_minimize.png"; rel1.to: "e.event.minimize"; rel2.to: "e.event.minimize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 255 255 255 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_down_light_selected.png"; - } + color: 220 220 220 255; + } } part { name: "e.event.titlebar"; type: RECT; description { rel.to: "top"; @@ -545,24 +478,6 @@ group { name: "e/widgets/border/default/border"; visible: 0; } } - part { name: "bevel2"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bottom"; - rel2.to: "bottom"; - fill.smooth: 0; - } - description { state: "shaded" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "max" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } part { name: "e.event.resize.bl"; type: RECT; description { state: "default" 0.0; rel1.relative: 0.0 1.0; @@ -630,17 +545,6 @@ group { name: "e/widgets/border/default/border"; visible: 0; } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "top"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "top"; - FIXED_SIZE(69, 5) - } - } part { name: "e.swallow.volume"; type: SWALLOW; source: "e/widgets/border/volume"; @@ -655,7 +559,6 @@ group { name: "e/widgets/border/default/border"; aspect: 1.0 1.0; aspect_preference: VERTICAL; } } - } programs { program { @@ -685,7 +588,6 @@ group { name: "e/widgets/border/default/border"; action: STATE_SET "focused" 0.0; target: "top"; target: "e.text.title"; - target: "title2"; target: "clip1"; target: "clip2"; } @@ -694,7 +596,6 @@ group { name: "e/widgets/border/default/border"; action: STATE_SET "default" 0.0; target: "top"; target: "e.text.title"; - target: "title2"; target: "clip1"; target: "clip2"; } @@ -721,41 +622,6 @@ group { name: "e/widgets/border/default/border"; action: STATE_SET "default" 0.0; target: "icon"; } - program { name: "spin"; - signal: "e,state,hung"; source: "e"; - action: STATE_SET "spin" 0.0; - transition: LINEAR 1.0; - target: "knob_spinner"; - after: "spin2"; - } - program { name: "spin2"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - after: "spin"; - } - program { - signal: "e,state,hung"; source: "e"; - action: STATE_SET "hung" 0.0; - transition: SINUSOIDAL 0.25; - target: "busy_clip"; - } - program { - signal: "e,state,unhung"; source: "e"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - after: "spin3"; - } - program { name: "spin3"; - action: ACTION_STOP; - target: "spin"; - target: "spin2"; - after: "spin4"; - } - program { name: "spin4"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - } program { signal: "e,state,shaded"; source: "e"; action: STATE_SET "shaded" 0.0; @@ -767,7 +633,6 @@ group { name: "e/widgets/border/default/border"; action: STATE_SET "shaded" 0.0; target: "e.swallow.client"; target: "bottom"; - target: "bevel2"; target: "e.event.resize.bl"; target: "e.event.resize.b"; target: "e.event.resize.br"; @@ -776,7 +641,6 @@ group { name: "e/widgets/border/default/border"; signal: "e,state,unshaded"; source: "e"; action: STATE_SET "default" 0.0; target: "bottom"; - target: "bevel2"; target: "e.event.resize.bl"; target: "e.event.resize.b"; target: "e.event.resize.br"; @@ -807,7 +671,6 @@ group { name: "e/widgets/border/default/border"; action: STATE_SET "max" 0.0; target: "e.swallow.client"; target: "bottom"; - target: "bevel2"; target: "e.event.resize.bl"; target: "e.event.resize.b"; target: "e.event.resize.br"; @@ -817,7 +680,6 @@ group { name: "e/widgets/border/default/border"; action: STATE_SET "default" 0.0; target: "e.swallow.client"; target: "bottom"; - target: "bevel2"; target: "e.event.resize.bl"; target: "e.event.resize.b"; target: "e.event.resize.br"; @@ -861,193 +723,6 @@ group { name: "e/widgets/border/default/border"; } } -group { name: "e/widgets/border/sparkle/border"; - inherit: "e/widgets/border/default/border"; - images.image: "vgrad_med_lighter_sparkle.png" COMP; - images.image: "vgrad_med_dark_sparkle.png" COMP; - script { - public in_x, in_y, locked = 0; - } - parts { - part { name: "top"; - description { state: "default" 0.0; - image.normal: "vgrad_med_lighter_sparkle.png"; - visible: 0; - } - description { state: "focused" 0.0; - image.normal: "vgrad_med_dark_sparkle.png"; - visible: 0; - } - } - part { name: "proxy"; type: PROXY; mouse_events: 0; - insert_after: "top"; - description { state: "default"; - source: "top"; - proxy.source_clip: 0; - proxy.source_visible: 0; - rel1.to: "top"; - rel2.to: "top"; - fill.smooth: 0; - TILED_HORIZ(120) - } - } - part { name: "bevel"; - description { state: "default" 0.0; - rel1.to: "proxy"; - rel2.to: "proxy"; - } - } - part { name: "e.text.title"; - effect: GLOW; - description { state: "default" 0.0; - color3: 255 255 255 222; - } - } - part { name: "title2"; - effect: OUTLINE_SHADOW; - description { state: "focused" 0.0; - color3: 0 0 0 255; - } - } - part { "clip1"; - desc { "default"; - rel1.to: ""; - rel1.offset: -9999 -9999; - rel2.to: ""; - rel2.offset: 9999 9999; - } - } - part { "clip2"; - desc { "default"; - rel1.to: ""; - rel1.offset: -9999 -9999; - rel2.to: ""; - rel2.offset: 9999 9999; - } - desc { "focused"; - rel1.to: ""; - rel1.offset: -9999 -9999; - rel2.to: ""; - rel2.offset: 9999 9999; - } - } - part { name: "e.event.icon"; - description { state: "default" 0.0; - rel1.to: "proxy"; - } - } - part { name: "e.event.close"; - description { state: "default" 0.0; - rel2.to: "proxy"; - } - } - part { name: "shine"; - description { state: "default" 0.0; - visible: 0; - } - } - part { name: "events"; type: RECT; repeat_events: 1; - description { state: "default"; - color: 0 0 0 0; - } - } - } - programs { - program { name: "in"; - signal: "mouse,in"; source: "events"; - - script { - new mx, my; - - get_mouse(mx, my); - set_int(in_x, mx); - set_int(in_y, my); - } - } - program { name: "out"; - signal: "mouse,out"; source: "events"; - action: STATE_SET "default" 0.0; - target: "proxy"; - transition: LINEAR 0.2; - } - program { name: "anim"; - signal: "mouse,move"; source: "events"; - script { - new mx, my; - - if (get_int(locked) != 1) { - get_mouse(mx, my); - custom_state(PART:"proxy", "default", 0.0); - set_state_val(PART:"proxy", STATE_REL1_OFFSET, get_int(in_x) - mx, 0); - set_state_val(PART:"proxy", STATE_REL2_OFFSET, get_int(in_x) - mx, 0); - set_state(PART:"proxy", "custom", 0.0); - } - } - } - program { name: "lock"; - after: "out"; - script { - set_int(locked, 1); - set_int(in_x, 0); - set_int(in_y, 0); - } - } - program { name: "unlock"; - script { - set_int(locked, 0); - } - } - program { - signal: "mouse,down,1"; source: "e.event.resize.tr"; - after: "lock"; - } - program { - signal: "mouse,down,1"; source: "e.event.resize.t"; - after: "lock"; - } - program { - signal: "mouse,down,1"; source: "e.event.resize.tl"; - after: "lock"; - } - program { - signal: "mouse,down,1"; source: "e.event.resize.br"; - after: "lock"; - } - program { - signal: "mouse,down,1"; source: "e.event.resize.b"; - after: "lock"; - } - program { - signal: "mouse,down,1"; source: "e.event.resize.bl"; - after: "lock"; - } - program { - signal: "mouse,up,1"; source: "e.event.resize.tr"; - after: "unlock"; - } - program { - signal: "mouse,up,1"; source: "e.event.resize.t"; - after: "unlock"; - } - program { - signal: "mouse,up,1"; source: "e.event.resize.tl"; - after: "unlock"; - } - program { - signal: "mouse,up,1"; source: "e.event.resize.br"; - after: "unlock"; - } - program { - signal: "mouse,up,1"; source: "e.event.resize.b"; - after: "unlock"; - } - program { - signal: "mouse,up,1"; source: "e.event.resize.bl"; - after: "unlock"; - } - } -} - group { name: "e/widgets/border/dialog/border"; alias: "e/widgets/border/modal/border"; inherit: "e/widgets/border/default/border"; @@ -1142,11 +817,6 @@ group { name: "e/widgets/border/noresize/border"; visible: 0; } } - part { name: "bevel2"; - description { state: "default" 0.0; - visible: 0; - } - } part { name: "e.event.resize.bl"; description { state: "default" 0.0; min: 0 0; @@ -1186,11 +856,6 @@ group { name: "e/widgets/border/noresize_dialog/border"; visible: 0; } } - part { name: "bevel2"; - description { state: "default" 0.0; - visible: 0; - } - } part { name: "e.event.resize.bl"; description { state: "default" 0.0; min: 0 0; @@ -1353,24 +1018,11 @@ group { name: "e/widgets/border/pixel/border"; } group { name: "e/widgets/border/default/move"; - images.image: "vgrad_tall.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; images.image: "ic_win_move.png" COMP; parts { - part { name: "bg"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "vgrad_tall.png"; - fill.smooth: 0; - TILED_HORIZ(40) - } - } - part { name: "bevel"; mouse_events: 0; + part { name: "bg"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 64 64 64 255; } } part { name: "icon"; @@ -1400,15 +1052,6 @@ group { name: "e/widgets/border/default/move"; } } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - FIXED_SIZE(69, 5) - } - } } } diff --git a/data/elementary/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc index 4025882c9a..81a8b7f168 100644 --- a/data/elementary/themes/edc/clock.edc +++ b/data/elementary/themes/edc/clock.edc @@ -1,21 +1,19 @@ group { name: "e/modules/clock/digital"; min: 64 16; max: 512 128; - images.image: "O/digit_na.png" COMP; - images.image: "O/digit_nm.png" COMP; - images.image: "O/digit_0.png" COMP; - images.image: "O/digit_1.png" COMP; - images.image: "O/digit_2.png" COMP; - images.image: "O/digit_3.png" COMP; - images.image: "O/digit_4.png" COMP; - images.image: "O/digit_5.png" COMP; - images.image: "O/digit_6.png" COMP; - images.image: "O/digit_7.png" COMP; - images.image: "O/digit_8.png" COMP; - images.image: "O/digit_9.png" COMP; - images.image: "O/digit_am.png" COMP; - images.image: "O/digit_pm.png" COMP; - images.image: "hole_tiny.png" COMP; + images.image: "digit_0.png" COMP; + images.image: "digit_1.png" COMP; + images.image: "digit_2.png" COMP; + images.image: "digit_3.png" COMP; + images.image: "digit_4.png" COMP; + images.image: "digit_5.png" COMP; + images.image: "digit_6.png" COMP; + images.image: "digit_7.png" COMP; + images.image: "digit_8.png" COMP; + images.image: "digit_9.png" COMP; + images.image: "digit_am.png" COMP; + images.image: "digit_pm.png" COMP; + images.image: "digit_sep.png" COMP; script { public do_seconds, do_24h, do_date, tick_timer; @@ -186,8 +184,8 @@ group { name: "e/modules/clock/digital"; } part { name: "hours1"; type: RECT; description { state: "default" 0.0; - rel1.relative: (0/16) 0.0; - rel2.relative: (2/16) 1.0; + rel1.relative: (0/30) 0.0; + rel2.relative: (4/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -195,8 +193,8 @@ group { name: "e/modules/clock/digital"; } part { name: "hours2"; type: RECT; description { state: "default" 0.0; - rel1.relative: (2/16) 0.0; - rel2.relative: (4/16) 1.0; + rel1.relative: (4/30) 0.0; + rel2.relative: (8/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -204,8 +202,8 @@ group { name: "e/modules/clock/digital"; } part { name: "mins1"; type: RECT; description { state: "default" 0.0; - rel1.relative: (5/16) 0.0; - rel2.relative: (7/16) 1.0; + rel1.relative: (9/30) 0.0; + rel2.relative: (13/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -213,8 +211,8 @@ group { name: "e/modules/clock/digital"; } part { name: "mins2"; type: RECT; description { state: "default" 0.0; - rel1.relative: (7/16) 0.0; - rel2.relative: (9/16) 1.0; + rel1.relative: (13/30) 0.0; + rel2.relative: (17/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -222,8 +220,8 @@ group { name: "e/modules/clock/digital"; } part { name: "secs1"; type: RECT; description { state: "default" 0.0; - rel1.relative: (10/16) 0.0; - rel2.relative: (12/16) 1.0; + rel1.relative: (18/30) 0.0; + rel2.relative: (22/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -231,8 +229,8 @@ group { name: "e/modules/clock/digital"; } part { name: "secs2"; type: RECT; description { state: "default" 0.0; - rel1.relative: (12/16) 0.0; - rel2.relative: (14/16) 1.0; + rel1.relative: (22/30) 0.0; + rel2.relative: (26/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -240,8 +238,8 @@ group { name: "e/modules/clock/digital"; } part { name: "ampm"; type: RECT; description { state: "default" 0.0; - rel1.relative: (14/16) 0.0; - rel2.relative: (16/16) 1.0; + rel1.relative: (26/30) 0.0; + rel2.relative: (30/30) 1.0; rel1.to: "timearea"; rel2.to: "timearea"; visible: 0; @@ -250,55 +248,47 @@ group { name: "e/modules/clock/digital"; part { name: "c00"; description { state: "default" 0.0; rel1.to: "hours2"; - rel1.relative: 1.0 0.5; - rel1.offset: 0 -2; + rel1.relative: 1.0 0.39; rel2.to: "mins1"; - rel2.relative: 0.0 0.5; - rel2.offset: 0 -2; - align: 0.5 1.0; - FIXED_SIZE(4, 4) - image.normal: "hole_tiny.png"; + rel2.relative: 0.0 0.45; + image.normal: "digit_sep.png"; + color: 160 160 160 255; + aspect: 1.0 1.0; aspect_preference: BOTH; } } part { name: "c01"; description { state: "default" 0.0; rel1.to: "hours2"; - rel1.relative: 1.0 0.5; - rel1.offset: 0 1; + rel1.relative: 1.0 0.55; rel2.to: "mins1"; - rel2.relative: 0.0 0.5; - rel2.offset: 0 1; - align: 0.5 0.0; - FIXED_SIZE(4, 4) - image.normal: "hole_tiny.png"; + rel2.relative: 0.0 0.61; + image.normal: "digit_sep.png"; + color: 160 160 160 255; + aspect: 1.0 1.0; aspect_preference: BOTH; } } part { name: "c10"; clip_to: "secclip"; description { state: "default" 0.0; rel1.to: "mins2"; - rel1.relative: 1.0 0.5; - rel1.offset: 0 -2; + rel1.relative: 1.0 0.39; rel2.to: "secs1"; - rel2.relative: 0.0 0.5; - rel2.offset: 0 -2; - align: 0.5 1.0; - FIXED_SIZE(4, 4) - image.normal: "hole_tiny.png"; + rel2.relative: 0.0 0.45; + image.normal: "digit_sep.png"; + color: 160 160 160 255; + aspect: 1.0 1.0; aspect_preference: BOTH; } } part { name: "c11"; clip_to: "secclip"; description { state: "default" 0.0; rel1.to: "mins2"; - rel1.relative: 1.0 0.5; - rel1.offset: 0 1; + rel1.relative: 1.0 0.55; rel2.to: "secs1"; - rel2.relative: 0.0 0.5; - rel2.offset: 0 1; - align: 0.5 0.0; - FIXED_SIZE(4, 4) - image.normal: "hole_tiny.png"; + rel2.relative: 0.0 0.61; + image.normal: "digit_sep.png"; + color: 160 160 160 255; + aspect: 1.0 1.0; aspect_preference: BOTH; } } #define ELEM(_NAME, _TO, _DIGIT) \ @@ -306,14 +296,14 @@ group { name: "e/modules/clock/digital"; description { state: "default" 0.0; \ rel1.to: _TO; rel2.to: _TO; \ aspect: (52/72) (52/72); aspect_preference: BOTH; \ - image.normal: "O/digit_"_DIGIT".png"; \ + image.normal: "digit_"_DIGIT".png"; \ visible: 0; \ - color: 255 255 255 0; \ + color: 160 160 160 0; \ } \ description { state: "active" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ - color: 255 255 255 255; \ + color: 160 160 160 255; \ } \ } #define DIGIT(_NAME, _TO) \ @@ -333,14 +323,14 @@ group { name: "e/modules/clock/digital"; description { state: "default" 0.0; \ rel1.to: _TO; rel2.to: _TO; \ aspect: (52/72) (52/72); aspect_preference: BOTH; \ - image.normal: "O/digit_"_DIGIT".png"; \ + image.normal: "digit_"_DIGIT".png"; \ visible: 0; \ - color: 255 255 255 0; \ + color: 160 160 160 0; \ } \ description { state: "active" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ - color: 255 255 255 255; \ + color: 160 160 160 255; \ } \ } #define DIGITC(_NAME, _TO, _CLIP) \ @@ -361,42 +351,14 @@ group { name: "e/modules/clock/digital"; description { state: "default" 0.0; \ rel1.to: _TO; rel2.to: _TO; \ aspect: (48/31) (48/31); aspect_preference: BOTH; \ - image.normal: "O/digit_am.png"; \ + image.normal: "digit_am.png"; \ + color: 160 160 160 255; \ } \ description { state: "active" 0.0; \ inherit: "default" 0.0; \ - image.normal: "O/digit_pm.png"; \ - } \ - } -#define BASE(_NAME, _BASE, _IMG) \ - part { name: _NAME; \ - description { state: "default" 0.0; \ - rel1.to: _BASE; \ - rel2.to: _BASE; \ - image.normal: _IMG; \ - color: 255 255 255 128; \ + image.normal: "digit_pm.png"; \ } \ } -#define BASEC(_NAME, _CLIP, _BASE, _IMG) \ - part { name: _NAME; \ - clip_to: _CLIP; \ - description { state: "default" 0.0; \ - rel1.to: _BASE; \ - rel2.to: _BASE; \ - image.normal: _IMG; \ - color: 255 255 255 128; \ - } \ - } - - BASE ("ha", "h0-0", "O/digit_na.png") - BASE ("hb", "h1-0", "O/digit_na.png") - BASE ("ma", "m0-0", "O/digit_na.png") - BASE ("mb", "m1-0", "O/digit_na.png") - - BASEC("sa", "secclip", "s0-0", "O/digit_na.png") - BASEC("sb", "secclip", "s1-0", "O/digit_na.png") - BASEC("aa", "ampmclip", "ap", "O/digit_nm.png") - DIGIT ("h0", "hours1") DIGIT ("h1", "hours2") DIGIT ("m0", "mins1") @@ -408,20 +370,17 @@ group { name: "e/modules/clock/digital"; #undef TAG #undef ELEM #undef ELEMC -#undef BASE -#undef BASEC #undef DIGIT #undef DIGITC part { name: "e.text.today"; type: TEXT; - effect: GLOW; scale: 1; description { state: "default" 0.0; rel1.relative: 0.0 1.0; rel1.offset: 0 1; - rel2.offset: -1 1; + rel2.offset: -1 -1; align: 0.5 1.0; - color: FN_COL_HIGHLIGHT; + color: FN_COL_DEFAULT_BASIC; text { font: FN; size: 8; text_class: "module_small"; align: 0.5 0.5; @@ -506,13 +465,12 @@ group { name: "e/modules/clock/digital"; program { \ signal: "show,"_NAME; source: "c"; \ action: STATE_SET "active" 0.0; \ - transition: BOUNCE 0.3 0.5 2; \ target: _NAME; \ } \ program { \ signal: "hide,"_NAME; source: "c"; \ action: STATE_SET "default" 0.0; \ - transition: DECELERATE 0.3; \ + transition: DECELERATE 0.1; \ target: _NAME; \ } #define DIGPRGS(_NAME) \ @@ -540,106 +498,60 @@ group { name: "e/modules/clock/digital"; group { name: "e/modules/clock/main"; images.image: "clock_base.png" COMP; - images.image: "inset_round_hilight.png" COMP; - images.image: "inset_round_shadow.png" COMP; - images.image: "inset_round_shading.png" COMP; set { name: "tacho_hand_big"; image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; } image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; } image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; } image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; } } - images.image: "tacho_hand_big_shadow.png" COMP; set { name: "tacho_hand_small_min"; image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; } image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; } image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; } image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; } } - set { name: "knob"; - image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; } - image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; } - image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; } - image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; } - image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; } - image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; } - image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; } - image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; } - image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; } - image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } - image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } + set { name: "tacho_hand_small_sec"; + image { image: "tacho_hand_small_sec.png" COMP; size: 73 73 99999 99999; } + image { image: "tacho_hand_small_sec2.png" COMP; size: 37 37 72 72; } + image { image: "tacho_hand_small_sec3.png" COMP; size: 19 19 36 36; } + image { image: "tacho_hand_small_sec4.png" COMP; size: 0 0 18 18; } } min: 16 16; max: 160 160; script { public do_seconds, tick_timer; - + public clock_cb(val) { new year, month, day, yearday, weekday, hour, minute; new Float:second; new v, dosec, tim; - + date(year, month, day, yearday, weekday, hour, minute, second); dosec = get_int(do_seconds); if (dosec) { v = round(second, FLOOR); tim = timer(1.0 - (second - v), "clock_cb", 1); - + custom_state(PART:"seconds", "default", 0.0); set_state_val(PART:"seconds", STATE_MAP_ROT_Z, (v * 360.0) / 60.0); set_state(PART:"seconds", "custom", 0.0); - - custom_state(PART:"seconds-sh", "default", 0.0); - set_state_val(PART:"seconds-sh", STATE_MAP_ROT_Z, (v * 360.0) / 60.0); - set_state(PART:"seconds-sh", "custom", 0.0); } else { tim = timer(60.0 - (second), "clock_cb", 1); } set_int(tick_timer, tim); - + custom_state(PART:"minutes", "default", 0.0); set_state_val(PART:"minutes", STATE_MAP_ROT_Z, (float(minute) * 360.0) / 60.0); set_state(PART:"minutes", "custom", 0.0); - - custom_state(PART:"minutes-sh", "default", 0.0); - set_state_val(PART:"minutes-sh", STATE_MAP_ROT_Z, (float(minute) * 360.0) / 60.0); - set_state(PART:"minutes-sh", "custom", 0.0); - + custom_state(PART:"hours", "default", 0.0); set_state_val(PART:"hours", STATE_MAP_ROT_Z, ((float(hour) + (float(minute) / 60.0)) * 360.0) / 12.0); set_state(PART:"hours", "custom", 0.0); - - custom_state(PART:"hours-sh", "default", 0.0); - set_state_val(PART:"hours-sh", STATE_MAP_ROT_Z, ((float(hour) + (float(minute) / 60.0)) * 360.0) / 12.0); - set_state(PART:"hours-sh", "custom", 0.0); } } - parts { - part { name: "event"; type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "base-sh"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 0 -1; - rel2.to: "base"; - rel2.offset: -1 -2; - image.normal: "inset_round_shadow.png"; - } - } - part { name: "base-hi"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 0 1; - rel2.to: "base"; - rel2.offset: -1 0; - image.normal: "inset_round_hilight.png"; - } - } - part { name: "base"; + parts { + part { name: "base"; mouse_events: 0; description { state: "default" 0.0; rel1.relative: (25/380) (25/380); rel2.relative: (365/380) (365/380); @@ -647,24 +559,9 @@ group { name: "e/modules/clock/main"; image.normal: "clock_base.png"; } } - part { name: "seconds-sh"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "tacho_hand_big_shadow.png"; - rel1.to: "hours-sh"; - rel2.to: "hours-sh"; - map { - on: 1; - rotation.center: "seconds-sh"; - } - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } part { name: "seconds"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "tacho_hand_big"; + image.normal: "tacho_hand_small_sec"; color: 255 0 0 255; rel1.to: "base"; rel2.to: "base"; @@ -678,17 +575,6 @@ group { name: "e/modules/clock/main"; visible: 0; } } - part { name: "minutes-sh"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "tacho_hand_big_shadow.png"; - rel1.to: "hours-sh"; - rel2.to: "hours-sh"; - map { - on: 1; - rotation.center: "minutes-sh"; - } - } - } part { name: "minutes"; mouse_events: 0; description { state: "default" 0.0000; color: 255 255 255 255; @@ -701,21 +587,6 @@ group { name: "e/modules/clock/main"; } } } - part { name: "hours-sh"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "tacho_hand_small_shadow.png"; - rel1.to: "hours"; - rel1.relative: 0.0 (15/380); - rel1.offset: 0 1; - rel2.to: "hours"; - rel2.relative: 1.0 (395/380); - rel2.offset: -1 0; - map { - on: 1; - rotation.center: "hours-sh"; - } - } - } part { name: "hours"; mouse_events: 0; description { state: "default" 0.0; image.normal: "tacho_hand_small_min"; @@ -728,33 +599,9 @@ group { name: "e/modules/clock/main"; } } } - part { name: "over"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "inset_round_shading.png"; - } - } - part { name: "knob"; type: SPACER; - description { state: "default" 0.0; - rel1.relative: (140/340) (140/340); - rel1.to: "base"; - rel2.relative: (205/340) (205/340); - rel2.to: "base"; - min: 4 4; - step: 2 2; - max: 24 24; - } - } - part { name: "knob2"; + part { name: "event"; type: RECT; description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.to: "knob"; - rel2.offset: 3 3; - rel2.to: "knob"; - min: 12 12; - max: 32 32; - image.normal: "knob"; + color: 0 0 0 0; } } } @@ -769,13 +616,12 @@ group { name: "e/modules/clock/main"; signal: "e,state,seconds,on"; source: "e"; action: STATE_SET "default" 0.0; target: "seconds"; - target: "seconds-sh"; after: "sec2"; } program { name: "sec2"; script { new tim; - + set_int(do_seconds, 1); tim = get_int(tick_timer); if (tim) { @@ -789,13 +635,12 @@ group { name: "e/modules/clock/main"; signal: "e,state,seconds,off"; source: "e"; action: STATE_SET "hidden" 0.0; target: "seconds"; - target: "seconds-sh"; after: "sec3"; } program { name: "sec3"; script { new tim; - + set_int(do_seconds, 0); tim = get_int(tick_timer); if (tim) { @@ -811,10 +656,9 @@ group { name: "e/modules/clock/main"; group { name: "e/modules/clock/calendar/dayname"; parts { part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - color: FN_COL_DISABLE; + color: 160 160 160 255; text { font: FN; size: 8; text: "WWe"; min: 1 1; @@ -825,7 +669,7 @@ group { name: "e/modules/clock/calendar/dayname"; } description { state: "weekend" 0.0; inherit: "default" 0.0; - color: 48 48 48 255; + color: 51 153 255 255; } } } @@ -848,35 +692,50 @@ group { name: "e/modules/clock/calendar/day"; public day_state = 0; evalstate() { new vv = get_int(day_state); - + if (vv & 2) { set_state(PART:"e.text.label", "today", 0.0); set_state(PART:"label2", "today", 0.0); + set_state(PART:"base", "today", 0.0); } else if (vv & 4) { set_state(PART:"e.text.label", "hidden", 0.0); set_state(PART:"label2", "default", 0.0); + set_state(PART:"base", "default", 0.0); } else if (vv & 1) { set_state(PART:"e.text.label", "weekend", 0.0); - set_state(PART:"label2", "default", 0.0); - } + set_state(PART:"label2", "default", 0.0); + set_state(PART:"base", "default", 0.0); + } else { set_state(PART:"e.text.label", "default", 0.0); set_state(PART:"label2", "default", 0.0); + set_state(PART:"base", "default", 0.0); } } } parts { + part { name: "base"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + color: 0 0 0 64; + visible: 0; + } + description { state: "today" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - color: FN_COL_DEFAULT; + color: 160 160 160 255; + rel1.offset: 3 3; + rel2.offset: -4 -4; text { font: FN; size: 10; text: "00"; min: 1 1; @@ -890,22 +749,19 @@ group { name: "e/modules/clock/calendar/day"; } description { state: "weekend" 0.0; inherit: "default" 0.0; - color: FN_COL_MID_GREY; + color: 51 153 255 255; } description { state: "hidden" 0.0; inherit: "default" 0.0; - color: FN_COL_DISABLE; + color: 40 40 40 255; } } part { name: "label2"; type: TEXT; mouse_events: 0; - effect: GLOW; scale: 1; description { state: "default" 0.0; - rel1.offset: -3 -3; + color: 255 255 255 255; rel1.to: "e.text.label"; - rel2.offset: 2 1; rel2.to: "e.text.label"; - color: FN_COL_HIGHLIGHT; text { font: FN; size: 10; text_source: "e.text.label"; min: 1 1; @@ -937,7 +793,7 @@ group { name: "e/modules/clock/calendar/day"; evalstate(); } } - + program { signal: "e,state,today"; source: "e"; script { @@ -954,7 +810,7 @@ group { name: "e/modules/clock/calendar/day"; evalstate(); } } - + program { signal: "e,state,hidden"; source: "e"; script { @@ -975,14 +831,10 @@ group { name: "e/modules/clock/calendar/day"; } group { name: "e/modules/clock/calendar"; - images.image: "separator_horiz.png" COMP; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; + images.image: "calendar_prev.png" COMP; + images.image: "calendar_next.png" COMP; parts { part { name: "e.text.month"; type: TEXT; - effect: SHADOW BOTTOM; mouse_events: 1; scale: 1; description { state: "default" 0.0; @@ -990,8 +842,9 @@ group { name: "e/modules/clock/calendar"; align: 0.0 0.0; rel1.to_x: "prev"; rel1.relative: 1.0 0.0; + rel1.offset: 4 0; rel2.relative: 1.0 0.0; - color: FN_COL_DEFAULT; + color: 160 160 160 255; text { font: FNBD; size: 10; text: "000000000000"; align: 0.0 0.5; @@ -1001,15 +854,15 @@ group { name: "e/modules/clock/calendar"; } } part { name: "e.text.year"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; fixed: 0 1; align: 1.0 0.0; rel1.relative: 0.0 0.0; rel2.to_x: "next"; + rel2.offset: -5 -1; rel2.relative: 0.0 0.0; - color: FN_COL_DEFAULT; + color: 160 160 160 255; text { font: FNBD; size: 10; text: "0000"; align: 1.0 0.5; @@ -1024,11 +877,12 @@ group { name: "e/modules/clock/calendar"; max: 15 15; rel1.to: "prev"; rel2.to: "prev"; - image.normal: "sym_left_light_normal.png"; + image.normal: "calendar_prev.png"; + color: 160 160 160 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "sym_left_glow_normal.png"; + color: 255 255 255 255; } } part { name: "prev"; type: RECT; @@ -1062,11 +916,12 @@ group { name: "e/modules/clock/calendar"; max: 15 15; rel1.to: "next"; rel2.to: "next"; - image.normal: "sym_right_light_normal.png"; + image.normal: "calendar_next.png"; + color: 160 160 160 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "sym_right_glow_normal.png"; + color: 255 255 255 255; } } part { name: "next"; type: RECT; @@ -1094,29 +949,30 @@ group { name: "e/modules/clock/calendar"; action: SIGNAL_EMIT "e,action,next" ""; } } - part { name: "sel"; + part { name: "sep"; type: RECT; description { state: "default" 0.0; - image.normal: "separator_horiz.png"; + color: 80 80 80 255; rel1.relative: 0.0 1.0; - rel1.offset: 0 0; + rel1.offset: 8 0; rel1.to: "e.table.daynames"; - rel2.offset: -1 1; - rel2.to: "e.table.daynames"; - min: 0 2; - fill.smooth: 0; + rel2.relative: 1.0 0.0; + rel2.offset: -9 -1; + rel2.to_y: "e.table.days"; + min: 0 1; + max: 99999 1; } } - + part { name: "e.table.daynames"; type: TABLE; description { state: "default" 0.0; fixed: 0 1; align: 0.5 0.0; rel1.to_y: "e.text.month"; rel1.relative: 0.0 1.0; - rel1.offset: 2 2; + rel1.offset: 8 2; rel2.to_y: "e.text.month"; rel2.relative: 1.0 1.0; - rel2.offset: -3 2; + rel2.offset: -9 2; step: 7 1; table { homogeneous: TABLE; padding: 1 1; @@ -1143,8 +999,8 @@ item { \ description { state: "default" 0.0; rel1.to_y: "e.table.daynames"; rel1.relative: 0.0 1.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 8 16; + rel2.offset: -9 -9; step: 7 5; table { homogeneous: TABLE; padding: 1 1; diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc index 1d277aa118..02e62f02e3 100644 --- a/data/elementary/themes/edc/conf.edc +++ b/data/elementary/themes/edc/conf.edc @@ -1,5 +1,4 @@ group { name: "e/widgets/configure/main"; - images.image: "bevel_dark_out.png" COMP; images.image: "separator_horiz.png" COMP; parts { part { name: "base"; type: RECT; @@ -8,14 +7,6 @@ group { name: "e/widgets/configure/main"; color: 64 64 64 255; } } - part { name: "bevel"; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } part { name: "separator"; mouse_events: 0; description { state: "default" 0.0; min: 16 2; diff --git a/data/elementary/themes/edc/connman.edc b/data/elementary/themes/edc/connman.edc index b1a90050f7..db4be1b4c9 100644 --- a/data/elementary/themes/edc/connman.edc +++ b/data/elementary/themes/edc/connman.edc @@ -1,119 +1,122 @@ group { name: "e/modules/connman/main"; - images.image: "slot_horiz_top.png" COMP; - images.image: "slot_horiz_bottom.png" COMP; - images.image: "wifi_base.png" COMP; - images.image: "wifi_sig_1.png" COMP; - images.image: "wifi_sig_2.png" COMP; - images.image: "wifi_sig_3.png" COMP; - images.image: "eth.png" COMP; - images.image: "exlclam.png" COMP; - images.image: "hole_tiny.png" COMP; - images.image: "led_tiny_orange.png" COMP; - images.image: "led_tiny_green.png" COMP; + images.image: "cloud-conn.png" COMP; + + images.image: "eth-top.png" COMP; + images.image: "eth-base.png" COMP; + + images.image: "wifi-1.png" COMP; + images.image: "wifi-2.png" COMP; + images.image: "wifi-3.png" COMP; + images.image: "wifi-4.png" COMP; + images.image: "wifi-5.png" COMP; + images.image: "bt_base.png" COMP; images.image: "bt_sig_1.png" COMP; images.image: "bt_sig_2.png" COMP; + images.image: "cell_base.png" COMP; images.image: "cell_sig_1.png" COMP; images.image: "cell_sig_2.png" COMP; images.image: "cell_sig_3.png" COMP; images.image: "cell_sig_4.png" COMP; parts { - part { name: "slot_bottom"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "slot"; - rel2.relative: 1.0 0.5; - rel2.to: "slot"; - min: 0 3; - image.normal: "slot_horiz_bottom.png"; - fixed: 0 1; - } - } -/////////////////////// part { name: "exclam_base"; mouse_events: 0; + scale: 1; clip_to: "clip_exclam"; description { state: "default" 0.0; - aspect: (71/144) (71/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "exlclam.png"; + min: 11 10; + rel1.relative: (20/160) (50/160); + rel2.relative: (135/160) (150/160); + aspect: (115/105) (115/105); aspect_preference: BOTH; + image.normal: "cloud-conn.png"; } } /////////////////////// - part { name: "eth_base"; mouse_events: 0; + part { name: "eth-base"; mouse_events: 0; + scale: 1; clip_to: "clip_eth"; description { state: "default" 0.0; - aspect: (60/144) (60/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "eth.png"; + min: 6 13; + aspect: (60/130) (60/130); aspect_preference: BOTH; + rel1.relative: (50/160) (15/160); + rel2.relative: (110/160) (145/160); + image.normal: "eth-base.png"; + color: 160 160 160 128; } - } -/////////////////////// - part { name: "wifi_base"; mouse_events: 0; - clip_to: "clip_wifi"; - description { state: "default" 0.0; - aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "wifi_base.png"; + description { state: "connected" 0.0; + inherit: "default" 0.0; + color: 160 160 160 255; + } + description { state: "online" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; } } - part { name: "wifi_1"; mouse_events: 0; - clip_to: "clip_wifi"; + part { name: "eth"; mouse_events: 0; + scale: 1; + clip_to: "clip_eth"; description { state: "default" 0.0; - rel1.to: "wifi_base"; - rel2.to: "wifi_base"; - image.normal: "wifi_sig_1.png"; - visible: 0; + rel1.to: "eth-base"; + rel2.to: "eth-base"; + image.normal: "eth-top.png"; + color: 160 160 160 128; } - description { state: "partly" 0.0; + description { state: "connected" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; - visible: 1; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "online" 0.0; inherit: "default" 0.0; - visible: 1; + color: 160 160 160 255; } } - part { name: "wifi_2"; mouse_events: 0; +/////////////////////// + part { name: "wifi-base"; mouse_events: 0; clip_to: "clip_wifi"; description { state: "default" 0.0; - rel1.to: "wifi_base"; - rel2.to: "wifi_base"; - image.normal: "wifi_sig_2.png"; - visible: 0; + min: 14 10; + aspect: (140/100) (140/100); aspect_preference: BOTH; + rel1.relative: (10/160) (30/160); + rel2.relative: (150/160) (130/160); + image.normal: "wifi-1.png"; + color: 160 160 160 255; } - description { state: "partly" 0.0; + description { state: "connected" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; - visible: 1; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "online" 0.0; inherit: "default" 0.0; - visible: 1; + color: 51 153 255 255; } } - part { name: "wifi_3"; mouse_events: 0; + part { name: "wifi"; mouse_events: 0; clip_to: "clip_wifi"; description { state: "default" 0.0; - rel1.to: "wifi_base"; - rel2.to: "wifi_base"; - image.normal: "wifi_sig_3.png"; - visible: 0; + rel1.to: "wifi-base"; + rel2.to: "wifi-base"; + image.normal: "wifi-1.png"; + color: 0 0 0 0; } - description { state: "partly" 0.0; + description { state: "default" 0.25; inherit: "default" 0.0; - color: 255 255 255 128; - visible: 1; + image.normal: "wifi-2.png"; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "default" 0.5; inherit: "default" 0.0; - visible: 1; + image.normal: "wifi-3.png"; + color: 160 160 160 255; + } + description { state: "default" 0.75; + inherit: "default" 0.0; + image.normal: "wifi-4.png"; + color: 160 160 160 255; + } + description { state: "default" 1.0; + inherit: "default" 0.0; + image.normal: "wifi-5.png"; + color: 160 160 160 255; } } /////////////////////// @@ -121,9 +124,6 @@ group { name: "e/modules/connman/main"; clip_to: "clip_bt"; description { state: "default" 0.0; aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; image.normal: "bt_base.png"; } } @@ -168,9 +168,6 @@ group { name: "e/modules/connman/main"; clip_to: "clip_cell"; description { state: "default" 0.0; aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; image.normal: "cell_base.png"; } } @@ -247,30 +244,6 @@ group { name: "e/modules/connman/main"; } } /////////////////////// - part { name: "slot"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 0 -1; - rel1.relative: (21/160) 1.0; - rel2.offset: -1 -1; - rel2.relative: (140/160) 1.0; - align: 0.5 1.0; - min: 0 6; - image.normal: "slot_horiz_top.png"; - fixed: 0 1; - } - } - part { name: "hole"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.relative: 1.0 1.0; - rel2.offset: -4 -4; - align: 1.0 1.0; - min: 4 4; - max: 4 4; - image.normal: "hole_tiny.png"; - fixed: 1 1; - } - } part { name: "clip_exclam"; type: RECT; description { state: "default" 0.0; visible: 1; @@ -356,27 +329,6 @@ group { name: "e/modules/connman/main"; visible: 1; } } - part { name: "led"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "hole"; - rel2.to: "hole"; - min: 10 10; - max: 10 10; - image.normal: "led_tiny_orange.png"; - fixed: 1 1; - visible: 0; - } - description { state: "connected" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_orange.png"; - visible: 1; - } - description { state: "online" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_green.png"; - visible: 1; - } - } part { name: "event"; type: RECT; description { state: "default" 0.0; color: 0 0 0 0; @@ -389,41 +341,7 @@ script { \ public message(Msg_Type:type, id, ...) { \ if ((type == MSG_INT_SET) && (id == 1)) { \ new state = getarg(2), signl = getarg(3); \ -if (signl <= 14) { \ -set_state(PART:"wifi_1", "default", 0.0); \ -set_state(PART:"wifi_2", "default", 0.0); \ -set_state(PART:"wifi_3", "default", 0.0); \ -} \ -else if (signl <= 28) { \ -set_state(PART:"wifi_1", "partly", 0.0); \ -set_state(PART:"wifi_2", "default", 0.0); \ -set_state(PART:"wifi_3", "default", 0.0); \ -} \ -else if (signl <= 42) { \ -set_state(PART:"wifi_1", "visible", 0.0); \ -set_state(PART:"wifi_2", "default", 0.0); \ -set_state(PART:"wifi_3", "default", 0.0); \ -} \ -else if (signl <= 57) { \ -set_state(PART:"wifi_1", "visible", 0.0); \ -set_state(PART:"wifi_2", "partly", 0.0); \ -set_state(PART:"wifi_3", "default", 0.0); \ -} \ -else if (signl <= 71) { \ -set_state(PART:"wifi_1", "visible", 0.0); \ -set_state(PART:"wifi_2", "visible", 0.0); \ -set_state(PART:"wifi_3", "default", 0.0); \ -} \ -else if (signl <= 85) { \ -set_state(PART:"wifi_1", "visible", 0.0); \ -set_state(PART:"wifi_2", "visible", 0.0); \ -set_state(PART:"wifi_3", "partly", 0.0); \ -} \ -else { \ -set_state(PART:"wifi_1", "visible", 0.0); \ -set_state(PART:"wifi_2", "visible", 0.0); \ -set_state(PART:"wifi_3", "visible", 0.0); \ -} \ +set_state(PART:"wifi", "default", float(signl) / 100.0); \ if (signl <= 20) { \ set_state(PART:"bt_1", "default", 0.0); \ set_state(PART:"bt_2", "default", 0.0); \ @@ -499,17 +417,31 @@ set_state(PART:"cell_3", "visible", 0.0); \ set_state(PART:"cell_4", "visible", 0.0); \ } \ if ((state == 2)) { \ -set_state(PART:"led", "default", 0.0); \ -run_program(PROGRAM:"connecting"); \ + set_state(PART:"wifi-base", "default", 0.0); \ + set_state(PART:"eth-base", "default", 0.0); \ + set_state(PART:"eth", "default", 0.0); \ +/*run_program(PROGRAM:"connecting");*/ \ return; } \ else if ((state == 3)) { return; } \ -else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); } \ -else if ((state == 5)) { set_state(PART:"led", "online", 0.0); } \ -else { set_state(PART:"led", "default", 0.0); \ +else if ((state == 4)) { \ + set_state(PART:"wifi-base", "connected", 0.0); \ + set_state(PART:"eth-base", "connected", 0.0); \ + set_state(PART:"eth", "connected", 0.0); \ +} \ +else if ((state == 5)) { \ + set_state(PART:"wifi-base", "online", 0.0); \ + set_state(PART:"eth-base", "online", 0.0); \ + set_state(PART:"eth", "online", 0.0); \ +} \ +else { \ + set_state(PART:"wifi-base", "default", 0.0); \ + set_state(PART:"eth-base", "default", 0.0); \ + set_state(PART:"eth", "default", 0.0); \ } } } } SCRIPT_MESSAGE() programs { +/* program { name: "connecting"; action: STATE_SET "connected" 0.0; target: "led"; @@ -522,6 +454,7 @@ else { set_state(PART:"led", "default", 0.0); \ in: 0.3 0.0; after: "connecting"; } + */ // program { // signal: "e,available"; source: "e"; // } @@ -589,8 +522,7 @@ group { name: "e/modules/connman/icon/wifi"; inherit: "e/modules/connman/main"; SCRIPT_MESSAGE() programs { - program { - signal: "load"; source: ""; + program { signal: "load"; source: ""; action: STATE_SET "wifi" 0.0; target: "clip_exclam"; target: "clip_wifi"; @@ -605,8 +537,7 @@ group { name: "e/modules/connman/icon/ethernet"; inherit: "e/modules/connman/main"; SCRIPT_MESSAGE() programs { - program { - signal: "load"; source: ""; + program { signal: "load"; source: ""; action: STATE_SET "eth" 0.0; target: "clip_exclam"; target: "clip_wifi"; @@ -621,8 +552,7 @@ group { name: "e/modules/connman/icon/bluetooth"; inherit: "e/modules/connman/main"; SCRIPT_MESSAGE() programs { - program { - signal: "load"; source: ""; + program { signal: "load"; source: ""; action: STATE_SET "bt" 0.0; target: "clip_exclam"; target: "clip_wifi"; @@ -637,8 +567,7 @@ group { name: "e/modules/connman/icon/cellular"; inherit: "e/modules/connman/main"; SCRIPT_MESSAGE() programs { - program { - signal: "load"; source: ""; + program { signal: "load"; source: ""; action: STATE_SET "cell" 0.0; target: "clip_exclam"; target: "clip_wifi"; diff --git a/data/elementary/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc index fac534d78c..40cfcc03f7 100644 --- a/data/elementary/themes/edc/cpufreq.edc +++ b/data/elementary/themes/edc/cpufreq.edc @@ -1,64 +1,45 @@ group { name: "e/modules/cpufreq/main"; alias: "e/gadget/cpuclock/main"; alias: "e/gadget/cpuclock/main_vert"; - images.image: "tacho_base.png" COMP; - images.image: "inset_round_hilight.png" COMP; - images.image: "inset_round_shadow.png" COMP; - images.image: "inset_round_shading.png" COMP; - set { name: "tacho_hand_big"; - image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; } - image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; } - image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; } - image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; } - } - images.image: "tacho_hand_big_shadow.png" COMP; - set { name: "tacho_hand_small_min"; - image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; } - image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; } - image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; } - image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; } - } - images.image: "tacho_hand_small_shadow.png" COMP; - set { name: "knob"; - image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; } - image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; } - image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; } - image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; } - image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; } - image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; } - image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; } - image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; } - image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; } - image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } - image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } + alias: "e/modules/cpuclock/main"; + alias: "e/modules/cpuclock/main_vert"; + images.image: "cpu_base.png" COMP; + images.image: "cpu_clip1.png" COMP; + images.image: "cpu_clip2.png" COMP; + images.image: "cpu_clip3.png" COMP; + set { name: "marker"; + image { image: "cpu_marker.png" COMP; size: 72 72 99999 99999; } + image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; } + image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; } + image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; } } script { public available_frequencies; public available_governors; - + public cur_freq_old; public cur_freq_new; public cur_freq_now; public cur_freq_anim; - + public min_freq_old; public min_freq_new; public min_freq_now; - + public max_freq_old; public max_freq_new; public max_freq_now; - + public slide_cur_freq(val, Float:v) { new Float:freq, Float:min_freq, Float:max_freq, Float:tf; new f, f0, f1; - + v = (1.0 - cos(v * 3.141592654)) / 2.0; - + min_freq = fetch_int(available_frequencies, 0); max_freq = fetch_int(available_frequencies, count(available_frequencies) - 1); - + f0 = get_int(cur_freq_old); f1 = get_int(cur_freq_new); f = f1 - f0; @@ -66,16 +47,13 @@ group { name: "e/modules/cpufreq/main"; f = round(freq); f = f + f0; set_int(cur_freq_now, f); - + freq = (float(f) - min_freq) / (max_freq - min_freq); tf = (freq * 225.0) - 135.0; custom_state(PART:"meter", "default", 0.0); set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf); set_state(PART:"meter", "custom", 0.0); - custom_state(PART:"meter_sh", "default", 0.0); - set_state_val(PART:"meter_sh", STATE_MAP_ROT_Z, tf); - set_state(PART:"meter_sh", "custom", 0.0); - + f0 = get_int(min_freq_old); f1 = get_int(min_freq_new); f = f1 - f0; @@ -83,16 +61,13 @@ group { name: "e/modules/cpufreq/main"; f = round(freq); f = f + f0; set_int(min_freq_now, f); - + freq = (float(f) - min_freq) / (max_freq - min_freq); tf = (freq * 225.0) - 135.0; custom_state(PART:"meter_min", "default", 0.0); set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf); set_state(PART:"meter_min", "custom", 0.0); - custom_state(PART:"meter_min_sh", "default", 0.0); - set_state_val(PART:"meter_min_sh", STATE_MAP_ROT_Z, tf); - set_state(PART:"meter_min_sh", "custom", 0.0); - + f0 = get_int(max_freq_old); f1 = get_int(max_freq_new); f = f1 - f0; @@ -100,23 +75,20 @@ group { name: "e/modules/cpufreq/main"; f = round(freq); f = f + f0; set_int(max_freq_now, f); - + freq = (float(f) - min_freq) / (max_freq - min_freq); tf = (freq * 225.0) - 135.0; custom_state(PART:"meter_max", "default", 0.0); set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf); set_state(PART:"meter_max", "custom", 0.0); - custom_state(PART:"meter_max_sh", "default", 0.0); - set_state_val(PART:"meter_max_sh", STATE_MAP_ROT_Z, tf); - set_state(PART:"meter_max_sh", "custom", 0.0); - + if (v >= 1.0) { set_int(cur_freq_anim, 0); return 0; } return 1; } - + public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq while (count(available_frequencies) > 0) { @@ -125,7 +97,7 @@ group { name: "e/modules/cpufreq/main"; for (new i = 2; i < numargs(); i++) { append_int(available_frequencies, getarg(i)); } - } + } else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor new text[100]; while (count(available_governors) > 0) { @@ -139,8 +111,8 @@ group { name: "e/modules/cpufreq/main"; new f; new ani, curf, minf, maxf; new text[100]; - - f = getarg(2); + + f = getarg(2); if (f < 1000000) { f += 500; snprintf(text, 100, "%i", f / 1000); @@ -150,22 +122,22 @@ group { name: "e/modules/cpufreq/main"; (f % 1000000) / 100000); } set_text(PART:"readout", text); - + ani = get_int(cur_freq_anim); if (ani > 0) cancel_anim(ani); ani = anim(0.25, "slide_cur_freq", 0); set_int(cur_freq_anim, ani); - + f = getarg(2); curf = get_int(cur_freq_now); set_int(cur_freq_old, curf); set_int(cur_freq_new, f); - + f = getarg(4); minf = get_int(min_freq_now); set_int(min_freq_old, minf); set_int(min_freq_new, f); - + f = getarg(5); maxf = get_int(max_freq_now); set_int(max_freq_old, maxf); @@ -185,22 +157,28 @@ group { name: "e/modules/cpufreq/main"; color: 255 255 255 128; } } - part { name: "base-sh"; + part { name: "clip1"; + clip_to: "fade_clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "cpu_clip1.png"; + } + } + part { name: "clip2"; + clip_to: "fade_clip"; description { state: "default" 0.0; rel1.to: "base"; - rel1.offset: 0 -1; rel2.to: "base"; - rel2.offset: -1 -2; - image.normal: "inset_round_shadow.png"; + image.normal: "cpu_clip2.png"; } } - part { name: "base-hi"; + part { name: "clip3"; + clip_to: "fade_clip"; description { state: "default" 0.0; rel1.to: "base"; - rel1.offset: 0 1; rel2.to: "base"; - rel2.offset: -1 0; - image.normal: "inset_round_hilight.png"; + image.normal: "cpu_clip3.png"; } } part { name: "base"; @@ -208,43 +186,27 @@ group { name: "e/modules/cpufreq/main"; rel1.relative: (25/380) (25/380); rel2.relative: (365/380) (365/380); aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "tacho_base.png"; + image.normal: "cpu_base.png"; } } part { name: "readout"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "knob2"; - rel1.relative: 1.0 1.0; - rel1.offset: -2 -2; - rel2.relative: 0.75 0.75; - color_class: "module_label"; - color3: 255 255 255 255; - text { font: FNBOLD; size: 6; - align: 0.5 0.5; + rel1.relative: (56/144) (56/144); + rel2.relative: (88/144) (88/144); + color: 255 255 255 255; + text { font: FN; size: 6; + min: 1 1; ellipsis: -1; text_class: "module_small"; } } } - part { name: "meter_min_sh"; mouse_events: 0; - clip_to: "fade_clip"; - description { state: "default" 0.0; - image.normal: "tacho_hand_small_shadow.png"; - rel1.to: "meter_sh"; - rel2.to: "meter_sh"; - map { - on: 1; - rotation.center: "meter_min_sh"; - } - } - } part { name: "meter_min"; mouse_events: 0; - clip_to: "fade_clip"; + clip_to: "clip3"; description { state: "default" 0.0; - image.normal: "tacho_hand_small_min"; + image.normal: "marker"; color: 51 153 255 255; rel1.to: "base"; rel2.to: "base"; @@ -254,23 +216,11 @@ group { name: "e/modules/cpufreq/main"; } } } - part { name: "meter_max_sh"; mouse_events: 0; - clip_to: "fade_clip"; - description { state: "default" 0.0; - image.normal: "tacho_hand_small_shadow.png"; - rel1.to: "meter_sh"; - rel2.to: "meter_sh"; - map { - on: 1; - rotation.center: "meter_max_sh"; - } - } - } part { name: "meter_max"; mouse_events: 0; - clip_to: "fade_clip"; + clip_to: "clip1"; description { state: "default" 0.0; - image.normal: "tacho_hand_small_min"; - color: 255 153 51 255; + image.normal: "marker"; + color: 255 0 0 255; rel1.to: "base"; rel2.to: "base"; map { @@ -279,27 +229,11 @@ group { name: "e/modules/cpufreq/main"; } } } - part { name: "meter_sh"; mouse_events: 0; - clip_to: "fade_clip"; - description { state: "default" 0.0; - image.normal: "tacho_hand_big_shadow.png"; - rel1.to: "meter"; - rel1.relative: 0.0 (15/380); - rel1.offset: 0 1; - rel2.to: "meter"; - rel2.relative: 1.0 (395/380); - rel2.offset: -1 0; - map { - on: 1; - rotation.center: "meter_sh"; - } - } - } part { name: "meter"; mouse_events: 0; - clip_to: "fade_clip"; + clip_to: "clip2"; description { state: "default" 0.0000; - color: 255 0 0 255; - image.normal: "tacho_hand_big"; + color: 255 153 51 255; + image.normal: "marker"; rel1.to: "base"; rel2.to: "base"; map { @@ -308,35 +242,6 @@ group { name: "e/modules/cpufreq/main"; } } } - part { name: "over"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "inset_round_shading.png"; - } - } - part { name: "knob"; type: SPACER; - description { state: "default" 0.0; - rel1.relative: (140/340) (140/340); - rel1.to: "base"; - rel2.relative: (205/340) (205/340); - rel2.to: "base"; - min: 4 4; - step: 2 2; - max: 24 24; - } - } - part { name: "knob2"; - description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.to: "knob"; - rel2.offset: 3 3; - rel2.to: "knob"; - min: 12 12; - max: 32 32; - image.normal: "knob"; - } - } } programs { program { diff --git a/data/elementary/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc index 4817848608..30061aa077 100644 --- a/data/elementary/themes/edc/desklock.edc +++ b/data/elementary/themes/edc/desklock.edc @@ -1,22 +1,37 @@ group { name: "e/desklock/background"; - images.image: "bg_radgrad.png" COMP; - images.image: "dot_pattern.png" COMP; + data.item: "hide_signal" "1"; parts { - part { name: "bg"; + part { name: "clip"; type: RECT; description { state: "default" 0.0; - image.normal: "bg_radgrad.png"; - image.scale_hint: STATIC; - fill.smooth: 0; - ASPECT_FILL((1024/653)) + color: 255 255 255 0; + visible: 0; + } + description { state: "visible" 0.0; + color: 255 255 255 255; + visible: 1; } } - part { name: "pat"; + part { name: "bg"; type: RECT; + clip_to: "clip"; description { state: "default" 0.0; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) + color: 48 48 48 255; + } + } + program { signal: "show"; source: ""; + action: STATE_SET "visible" 0.0; + transition: SINUSOIDAL 0.5; + target: "clip"; + } + program { signal: "e,action,hide"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.5; + target: "clip"; + sequence { + action: SIGNAL_EMIT "e,action,hide,done" "e"; } } part { name: "e.swallow.login_box"; type: SWALLOW; + clip_to: "clip"; description { state: "default" 0.0; } } @@ -24,13 +39,16 @@ group { name: "e/desklock/background"; } group { name: "e/desklock/login_box"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "white_bar_vert_glow.png" COMP; - images.image: "logo_blue_small.png" COMP; - images.image: "logo_blue_small_glow.png" COMP; - images.image: "knob_round_busy.png" COMP; - images.image: "glow_round_corners.png" COMP; + set { name: "logo_mono"; + image { image: "logo.png" COMP; size: 601 601 99999 99999; } + image { image: "logo2.png" COMP; size: 301 301 600 600; } + image { image: "logo3.png" COMP; size: 151 151 300 300; } + image { image: "logo4.png" COMP; size: 76 76 150 150; } + image { image: "logo5.png" COMP; size: 0 0 75 75; } + } + IMAGE_RING("ringa", 160) + IMAGE_RING("ringb", 160) + IMAGE_RING("ringc", 160) parts { part { name: "logo_clip"; type: RECT; description { state: "default"; @@ -41,43 +59,28 @@ group { name: "e/desklock/login_box"; visible: 0; } } - part { name: "logo"; clip_to: "logo_clip"; - description { state: "default" 0.0; - image.normal: "logo_blue_small.png"; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - FIXED_SIZE(100, 127) - } - } - part { name: "logo_glow"; clip_to: "logo_clip"; - description { state: "default" 0.0; - image.normal: "logo_blue_small_glow.png"; - rel1.to: "logo"; - rel2.to: "logo"; - color: 255 255 255 128; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { name: "bg"; type: RECT; + part { name: "clipper"; 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; + rel1.to_x: "logo"; + rel1.to_y: "e.text.password"; + rel1.relative: 0.3 0.0; + rel1.offset: -100 -4; + rel2.to_x: "logo"; + rel2.to_y: "e.text.password"; + rel2.relative: 0.7 1.0; + rel2.offset: 99 196; } } - part { name: "clipper"; type: RECT; + part { name: "logo"; clip_to: "logo_clip"; + scale: 1; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + image.normal: "logo_mono"; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; + FIXED_SIZE(150, 150) } } part { name: "e.text.title"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.relative: 0.0 1.0; @@ -98,7 +101,6 @@ group { name: "e/desklock/login_box"; } } part { name: "e.text.hint"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.relative: 0.0 1.0; @@ -107,7 +109,7 @@ group { name: "e/desklock/login_box"; rel2.relative: 1.0 1.0; rel2.offset: -4 3; rel2.to_y: "e.text.password"; - color: FN_COL_DEFAULT; + color: 160 160 160 255; align: 0.5 0.0; text { font: FNBD; size: 10; min: 1 1; @@ -131,20 +133,18 @@ group { name: "e/desklock/login_box"; } } part { name: "e.text.password"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; rel1.relative: 0.0 1.0; rel1.offset: 3 10; - rel1.to_x: "inset"; + rel1.to_x: "clipper"; rel1.to_y: "e.text.title"; rel2.relative: 0.0 1.0; rel2.offset: 3 10; - rel2.to_x: "inset"; + rel2.to_x: "clipper"; rel2.to_y: "e.text.title"; - color: FN_COL_DEFAULT; - color_class: "desklock_passwd"; + color: 255 255 255 255; align: 0.0 0.0; text { font: FN; size: 10; min: 1 1; @@ -155,113 +155,40 @@ group { name: "e/desklock/login_box"; fixed: 1 1; } } - part { name: "cursor"; mouse_events: 0; + part { name: "cursor"; type: RECT; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; rel1.to: "e.text.password"; rel1.relative: 1.0 0.0; - rel1.offset: -4 -4; + rel1.offset: 0 -4; rel2.to: "e.text.password"; - 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; + rel2.offset: -1 3; + color: 255 255 255 255; + min: 1 10; fixed: 1 1; + visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; - } - } - 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; - rel1.relative: 0.5 0.0; - rel1.offset: -100 -4; - rel1.to_x: "logo"; - rel1.to_y: "e.text.password"; - rel2.relative: 0.5 1.0; - rel2.offset: 99 3; - rel2.to_x: "logo"; - rel2.to_y: "e.text.password"; - align: 0.5 0.5; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "busy_clip"; type: RECT; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - } - description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; } } - part { name: "knob"; mouse_events: 0; - clip_to: "busy_clip"; + part { name: "busy_area"; type: SPACER; description { state: "default" 0.0; - fixed: 1 1; - image.normal: "knob_round_busy.png"; - min: 40 40; - max: 40 40; - rel1.relative: 0.5 1.0; - rel1.offset: 0 3; - rel1.to_y: "inset"; - rel2.relative: 0.5 1.0; - rel2.offset: -1 3; - rel2.to_y: "inset"; + min: 20 20; + max: 160 160; + rel1.to: "clipper"; + rel1.relative: 0.0 0.5; + rel2.to: "clipper"; align: 0.5 0.0; - fixed: 1 1; } } - part { name: "knob_spinner"; mouse_events: 0; - clip_to: "busy_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "knob"; - rel2.to: "knob"; - image.normal: "glow_round_corners.png"; - map.on: 1; - map.smooth: 1; - map.rotation.center: "knob"; - } - description { state: "spin" 0.0; - inherit: "default" 0.0; - map.rotation.z: 360; - } + program { signal: "e,action,hide"; source: "e"; + action: SIGNAL_EMIT "e,state,invalid" "e"; } + BUSY("busy_area", "e,state,checking", "e", "e,state,invalid", "e") } programs { - program { name: "logo_pulse"; - signal: "show"; source: ""; - in: 3.0 5.0; - action: STATE_SET "active" 0.0; - target: "logo_glow"; - transition: BOUNCE 0.8 0.5 6; - after: "logo_pulse2"; - } - program { name: "logo_pulse2"; - action: STATE_SET "default" 0.0; - target: "logo_glow"; - transition: SINUSOIDAL 2.4; - after: "logo_pulse"; - } program { name: "cursor_show"; signal: "show"; source: ""; action: STATE_SET "visible" 0.0; @@ -271,52 +198,16 @@ group { name: "e/desklock/login_box"; 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"; - in: 0.5 0.0; + in: 0.4 0.0; after: "cursor_hide"; } program { name: "cursor_hide_timer"; - in: 0.2 0.0; + in: 0.4 0.0; after: "cursor_show"; } - program { name: "spin"; - signal: "e,state,checking"; source: "e"; - action: STATE_SET "spin" 0.0; - transition: LINEAR 1.0; - target: "knob_spinner"; - after: "spin2"; - } - program { name: "spin2"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - after: "spin"; - } - program { - signal: "e,state,checking"; source: "e"; - action: STATE_SET "active" 0.0; - transition: SINUSOIDAL 0.25; - target: "busy_clip"; - } - program { - signal: "e,state,invalid"; source: "e"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - after: "spin3"; - } - program { name: "spin3"; - action: ACTION_STOP; - target: "spin"; - target: "spin2"; - after: "spin4"; - } - program { name: "spin4"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - } program { signal: "e,state,selected"; source: "e"; action: STATE_SET "active" 0.0; @@ -341,14 +232,13 @@ group { name: "e/desklock/login_box"; group { name: "e/desklock/pin_box"; parts { part { name: "e.text.title"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: 3 3; rel1.relative: 0.0 1.0; rel1.to_y: "e.swallow.buttons"; rel2.offset: -4 -3; - color: FN_COL_DEFAULT; + color: 160 160 160 255; align: 0.5 0.0; text { font: "Sans:style=Bold"; size: 10; min: 0 1; @@ -372,15 +262,13 @@ group { name: "e/desklock/pin_box"; } } part { name: "e.text.password"; type: TEXT; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.relative: 0.5 0.0; rel1.offset: 3 2; rel2.relative: 0.5 0.0; rel2.offset: 3 -2; - color: FN_COL_DEFAULT; - color_class: "desklock_passwd"; + color: 255 255 255 255; text { font: "Sans"; size: 10; min: 1 1; ellipsis: -1; @@ -390,18 +278,15 @@ group { name: "e/desklock/pin_box"; fixed: 1 1; } } - part { name: "cursor"; mouse_events: 0; + part { name: "cursor"; type: RECT; mouse_events: 0; description { state: "default" 0.0; rel1.to: "e.text.password"; rel1.relative: 1.0 0.0; - rel1.offset: -4 -4; + rel1.offset: 0 0; rel2.to: "e.text.password"; - rel2.offset: 3 3; - image.normal: "white_bar_vert_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; + rel2.offset: 1 -1; color: 255 255 255 0; - min: 9 10; + min: 1 3; fixed: 1 1; } description { state: "visible" 0.0; diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc index 90ba72d8ce..0898c622af 100644 --- a/data/elementary/themes/edc/deskmirror.edc +++ b/data/elementary/themes/edc/deskmirror.edc @@ -3,23 +3,14 @@ group { name: "e/deskmirror/frame/default"; alias: "e/deskmirror/frame/urgent"; alias: "e/deskmirror/frame/sparkle"; images.image: "mini_box_bevel_shadow.png" COMP; - images.image: "shine.png" COMP; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "bevel_dark_out.png" COMP; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT) && (id == 0)) { new Float:sc = getfarg(2); - + custom_state(PART:"top_spacer", "default", 0.0); set_state_val(PART:"top_spacer", STATE_REL2, 1.0, sc); set_state(PART:"top_spacer", "custom", 0.0); - - custom_state(PART:"bottom_spacer", "default", 0.0); - set_state_val(PART:"bottom_spacer", STATE_REL1, 0.0, 1.0 - sc); - set_state(PART:"bottom_spacer", "custom", 0.0); } } } @@ -28,6 +19,7 @@ group { name: "e/deskmirror/frame/default"; description { state: "default"; } description { state: "iconic"; + inherit: "default" 0.0; rel1.relative: 0.0 1.0; rel2.relative: 0.0 1.0; } @@ -36,27 +28,25 @@ group { name: "e/deskmirror/frame/default"; description { state: "default" 0.0; rel1.to: "spacer"; rel2.to_x: "spacer"; - rel2.to_y: "title2"; + rel2.to_y: "e.text.title"; rel2.offset: -1 -4; align: 0.5 0.0; } } - part { name: "bottom_spacer"; type: SPACER; - description { state: "default" 0.0; - rel1.to: "bottom_size"; - rel2.to: "bottom_size"; - align: 0.5 1.0; - } - } part { name: "bottom_size"; type: SPACER; description { state: "default" 0.0; rel1.to_x: "spacer"; rel1.relative: 0.0 1.0; - rel1.offset: 0 -3; + rel1.offset: 0 -1; rel2.to: "spacer"; min: 0 1; fixed: 0 1; } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + } } part { name: "shadow"; mouse_events: 0; @@ -69,14 +59,14 @@ group { name: "e/deskmirror/frame/default"; rel2.to: "bottom"; rel2.offset: 4 4; fill.smooth: 0; + color: 255 255 255 128; } description { state: "off"; inherit: "default" 0.0; visible: 0; } } - - + part { name: "client_clip"; type: RECT; description { state: "default" 0.0; rel1.to_y: "top"; @@ -94,42 +84,31 @@ group { name: "e/deskmirror/frame/default"; rel2.relative: 1.0 0.0; } } - - part { name: "e.text.title"; type: TEXT; mouse_events: 0; - scale: 1; - effect: SHADOW BOTTOM; + + part { name: "top"; type: RECT; description { state: "default" 0.0; - color_class: "border_title"; - rel1.offset: 1 3; - rel1.to: "spacer"; - rel2.relative: 1.0 0.0; - rel2.offset: -2 3; - rel2.to: "spacer"; - align: 0.5 0.0; - color: FN_COL_DISABLE; - text { font: FNBD; size: 10; - text_class: "title_bar"; - align: 0.5 0.0; - min: 0 1; - } - visible: 0; - fixed: 0 1; + rel1.to: "top_spacer"; + rel2.to: "top_spacer"; + color: 64 64 64 255; + min: 0 1; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 32 32 32 255; } } - part { name: "title2"; type: TEXT; mouse_events: 0; + + part { name: "e.text.title"; type: TEXT; mouse_events: 0; scale: 1; - effect: SOFT_SHADOW BOTTOM; description { state: "default" 0.0; - color_class: "border_title_active"; - rel1.offset: 1 2; + rel1.offset: 1 3; rel1.to: "spacer"; rel2.relative: 1.0 0.0; - rel2.offset: -1 2; + rel2.offset: -2 3; rel2.to: "spacer"; align: 0.5 0.0; - color: FN_COL_DEFAULT_SOFT_SHADOW; + color: 160 160 160 255; text { font: FNBD; size: 10; - text_source: "e.text.title"; text_class: "title_bar"; align: 0.5 0.0; min: 0 1; @@ -137,49 +116,25 @@ group { name: "e/deskmirror/frame/default"; visible: 0; fixed: 0 1; } - } - - part { name: "top"; - description { state: "default" 0.0; - color_class: "border_top"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - TILED_HORIZ(120) - rel1.to: "top_spacer"; - rel2.to: "top_spacer"; - min: 0 1; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "top"; - rel2.to: "top"; - fill.smooth: 0; + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } part { name: "bottom"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color_class: "border_bottom"; - rel1.to: "bottom_spacer"; - rel2.to: "bottom_spacer"; + rel1.to: "bottom_size"; + rel2.to: "bottom_size"; color: 64 64 64 255; } - } - part { name: "bevel2"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "bottom"; - rel2.to: "bottom"; - fill.smooth: 0; + description { state: "hidden" 0.0; + inherit: "default" 0.0; + max: 0 0; + visible: 0; } } - + part { name: "clone"; type: PROXY; mouse_events: 0; description { state: "default"; source: "e.swallow.client"; @@ -204,18 +159,6 @@ group { name: "e/deskmirror/frame/default"; proxy.source_clip: 0; } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - fixed: 0 1; - image.normal: "shine.png"; - rel1.offset: 0 -1; - rel1.to: "top"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 1; - rel2.to: "top"; - max: 69 3; - } - } } programs { program { name: "urgent"; @@ -261,44 +204,27 @@ group { name: "e/deskmirror/frame/default"; program { name: "focus"; signal: "e,state,focused"; source: "e"; - script { - custom_state(PART:"top", "default", 0.0); - set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_dark.png")); - set_state(PART:"top", "custom", 0.0); - } + action: STATE_SET "focused" 0.0; + target: "e.text.title"; + target: "top"; } program { name: "unfocus"; signal: "e,state,unfocused"; source: "e"; - script { - custom_state(PART:"top", "default", 0.0); - set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_lighter.png")); - set_state(PART:"top", "custom", 0.0); - } + action: STATE_SET "default" 0.0; + target: "e.text.title"; + target: "top"; } program { name: "shade"; signal: "e,state,shaded"; source: "e"; - script { - custom_state(PART:"bottom", "default", 0.0); - set_state_val(PART:"bottom", STATE_VISIBLE, 0); - set_state(PART:"bottom", "custom", 0.0); - custom_state(PART:"bevel2", "default", 0.0); - set_state_val(PART:"bevel2", STATE_VISIBLE, 0); - set_state(PART:"bevel2", "custom", 0.0); - } + action: STATE_SET "hidden" 0.0; + target: "bottom"; } program { signal: "e,state,maximize*"; source: "e"; - script { - custom_state(PART:"bottom", "default", 0.0); - set_state_val(PART:"bottom", STATE_VISIBLE, 0); - set_state_val(PART:"bottom", STATE_MAX, 0, 0); - set_state(PART:"bottom", "custom", 0.0); - custom_state(PART:"bevel2", "default", 0.0); - set_state_val(PART:"bevel2", STATE_VISIBLE, 0); - set_state(PART:"bevel2", "custom", 0.0); - } + action: STATE_SET "hidden" 0.0; + target: "bottom"; } program { signal: "e,state,unmaximize*"; source: "e"; @@ -311,15 +237,8 @@ group { name: "e/deskmirror/frame/default"; program { name: "unshade"; signal: "e,state,unshading"; source: "e"; - script { - custom_state(PART:"bottom", "default", 0.0); - set_state_val(PART:"bottom", STATE_VISIBLE, 1); - set_state_val(PART:"bottom", STATE_MAX, 99999, 99999); - set_state(PART:"bottom", "custom", 0.0); - custom_state(PART:"bevel2", "default", 0.0); - set_state_val(PART:"bevel2", STATE_VISIBLE, 1); - set_state(PART:"bevel2", "custom", 0.0); - } + action: STATE_SET "default" 0.0; + target: "bottom"; } program { name: "iconify"; action: STATE_SET "iconic" 0.0; @@ -366,11 +285,6 @@ group { name: "e/deskmirror/frame/noresize"; visible: 0; } } - part { name: "bevel2"; - description { state: "default" 0.0; - visible: 0; - } - } } } @@ -394,11 +308,6 @@ group { name: "e/deskmirror/frame/noresize_dialog"; visible: 0; } } - part { name: "bevel2"; - description { state: "default" 0.0; - visible: 0; - } - } } } @@ -417,7 +326,7 @@ group { name: "e/deskmirror/frame/pixel"; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 64 64 64 255; } } part { name: "e.swallow.client"; type: SWALLOW; diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc index 728c905399..899ecaab64 100644 --- a/data/elementary/themes/edc/efl/text.edc +++ b/data/elementary/themes/edc/efl/text.edc @@ -2,6 +2,11 @@ group { "efl/text/scroller"; inherit: "elm/scroller/base/default"; image: "bg_glow_in.png" COMP; parts { + part { name: "bg"; + description { state: "default" 0.0; + color: DARK_GREY_BG_COLOR; + } + } part { name: "elm.swallow.background"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; @@ -9,10 +14,8 @@ group { "efl/text/scroller"; rel2.offset: -2 -2; } } - part { name: "validation_glow"; - type: RECT; - insert_before: "bg"; - mouse_events: 0; + part { name: "validation_glow"; type: RECT; mouse_events: 0; + insert_after: "elm.swallow.background"; description { state: "default" 0.0; color: 0 0 0 0; } @@ -23,11 +26,55 @@ group { "efl/text/scroller"; color: 255 0 0 90; } } - part { name: "bg"; + program { name: "validation_fail"; + signal: "validation,default,fail"; + source: "elm"; + action: STATE_SET "fail" 0.0; + target: "validation_glow"; + } + program { name: "validation_pass"; + signal: "validation,default,pass"; + source: "elm"; + action: STATE_SET "pass" 0.0; + target: "validation_glow"; + } + program { name: "validation_off"; + signal: "validation,default"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "validation_glow"; + } + part { name: "glow"; type: RECT; mouse_events: 0; + insert_before: "elm.swallow.content"; + scale: 1; description { state: "default" 0.0; - color: DARK_GREY_BG_COLOR; + rel1.to: "bg"; + rel1.relative: 0.0 1.0; + rel2.to: "bg"; + rel1.offset: 0 0; + color: 51 153 255 0; + visible: 0; + offscale; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + rel1.offset: 0 -3; + color: 51 153 255 255; + visible: 1; } } + program { + signal: "elm,action,focus_highlight,show"; source: "elm"; + action: STATE_SET "focused" 0.0; + transition: DECELERATE 0.3; + target: "glow"; + } + program { + signal: "elm,action,focus_highlight,hide"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "glow"; + } part { name: "elm.swallow.content"; description { state: "default" 0.0; rel1.to: "elm.swallow.icon"; @@ -94,64 +141,6 @@ group { "efl/text/scroller"; action: STATE_SET "default" 0.0; target: "elm.swallow.end"; } - part { name: "glow"; - insert_after: "shadow"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "bg_glow_in.png"; - image.border: 7 7 7 7; - image.middle: 0; - fill.smooth: 0; - color: 255 255 255 0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - description { state: "focused2" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - } - programs { - program { - signal: "elm,action,focus_highlight,show"; source: "elm"; - action: STATE_SET "focused" 0.0; - target: "glow"; - after: "focus_in2"; - } - program { name: "focus_in2"; - action: STATE_SET "focused2" 0.0; - transition: DECELERATE 0.5; - target: "glow"; - } - program { - signal: "elm,action,focus_highlight,hide"; source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "glow"; - } - program { name: "validation_fail"; - signal: "validation,default,fail"; - source: "elm"; - action: STATE_SET "fail" 0.0; - target: "validation_glow"; - } - program { name: "validation_pass"; - signal: "validation,default,pass"; - source: "elm"; - action: STATE_SET "pass" 0.0; - target: "validation_glow"; - } - program { name: "validation_off"; - signal: "validation,default"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "validation_glow"; - } } } diff --git a/data/elementary/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc index 48bdfcdedc..b9c7f99956 100644 --- a/data/elementary/themes/edc/elm/bg.edc +++ b/data/elementary/themes/edc/elm/bg.edc @@ -8,7 +8,6 @@ group { name: "elm/bg/base/default"; data.item: "version" "119"; - images.image: "bevel_dark_out.png" COMP; parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; @@ -30,14 +29,6 @@ group { name: "elm/bg/base/default"; fixed: 1 1; } } - part { name: "bevel"; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; } diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc index b788e73115..fe0e1bf6ec 100644 --- a/data/elementary/themes/edc/elm/border.edc +++ b/data/elementary/themes/edc/elm/border.edc @@ -8,26 +8,13 @@ */ group { name: "elm/border/base/default"; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "bevel_dark_out.png" COMP; - images.image: "sym_close_dark_normal.png" COMP; - images.image: "sym_close_dark_selected.png" COMP; - images.image: "sym_close_light_normal.png" COMP; - images.image: "sym_close_light_selected.png" COMP; - images.image: "sym_down_dark_normal.png" COMP; - images.image: "sym_down_dark_selected.png" COMP; - images.image: "sym_down_light_normal.png" COMP; - images.image: "sym_down_light_selected.png" COMP; - images.image: "sym_up_dark_normal.png" COMP; - images.image: "sym_up_dark_selected.png" COMP; - images.image: "sym_up_light_normal.png" COMP; - images.image: "sym_up_light_selected.png" COMP; + images.image: "border_close.png" COMP; + images.image: "border_maximize.png" COMP; + images.image: "border_minimize.png" COMP; + images.image: "glow_round_corners_small.png" COMP; images.image: "knob_round_small_busy.png" COMP; - images.image: "screen_circular_shadow.png" COMP; + images.image: "win_shadow.png" COMP; data.item: "shadow" "1"; data.item: "version" "119"; @@ -94,22 +81,6 @@ group { name: "elm/border/base/default"; required; // @since 1.19 clip: "client_clip"; } - image { "background_bevel"; - desc { "default"; - image { - normal: "bevel_dark_out.png"; - border: 1 1 1 1; - middle: 0; - } - fill.smooth: 0; - rel.to: "elm.spacer.content"; - visible: 0; - } - desc { "visible"; - inherit: "default"; - visible: 1; - } - } spacer { "indicator_spacer"; desc { "default"; rel.to: "elm.swallow.indicator"; @@ -133,8 +104,7 @@ group { name: "elm/border/base/default"; swallow { "elm.swallow.menu"; required: 1; // since 1.19 desc { "default"; - rel.to: "indicator_spacer"; - rel1.relative: 0.0 1.0; + rel.to: "top_clip"; visible: 0; align: 0.5 0.0; fixed: 1 1; @@ -192,16 +162,19 @@ group { name: "elm/border/base/default"; rect { "top_clip"; //nomouse; desc { "default"; rel1.to: "shadow_spacer"; - rel2.to_y: "title2"; + rel2.to_y: "elm.text.title"; rel2.to_x: "shadow_spacer"; + rel2.offset: -1 3; vis; } desc { "hidden"; inherit: "default"; + rel1.to: ""; + rel2.to: ""; rel1.relative: 0.0 0.0; rel2.to: "shadow_spacer"; rel2.relative: 1.0 0.0; - rel2.offset: -1 -1; + rel2.offset: -1 0; max: -1 0; min: 0 0; fixed: 0 1; @@ -209,87 +182,41 @@ group { name: "elm/border/base/default"; } } /* top title bar */ - image { "top"; nomouse; + part { name: "top"; type: RECT; mouse_events: 0; clip: "top_clip"; - desc { "default"; - image.normal: "vgrad_med_lighter.png"; + description { state: "default" 0.0; rel.to: "top_clip"; - fill.smooth: 0; - TILED_HORIZ(120) - color_class: "border_frame"; + color: 64 64 64 255; } - desc { "focused"; - inherit: "default"; - image.normal: "vgrad_med_dark.png"; - color_class: "border_frame_active"; - } - } - image { "bevel"; nomouse; - clip: "top_clip"; - desc { "default"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel.to: "top_clip"; - fill.smooth: 0; + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 32 32 32 255; } } - text { "elm.text.title"; nomouse; + part { name: "elm.text.title"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; clip: "top_clip"; - desc { "default"; + description { state: "default" 0.0; rel1.relative: 1.0 0.0; rel1.offset: 1 3; - rel1.to_x: "elm.event.icon"; + rel1.to_x: "icon"; rel1.to_y: "shadow_spacer"; rel2.relative: 0.0 0.0; rel2.offset: -2 3; rel2.to_x: "elm.event.minimize"; rel2.to_y: "shadow_spacer"; align: 0.5 0.0; - color_class: "border_title"; - color3: 255 255 255 255; - text { font: FNBD; size: 10; - text_class: "title_bar"; - align: 0.5 0.0; - min: 0 1; - } - fixed: 0 1; - } - desc { "focused"; - inherit: "default"; - visible: 0; - } - } - text { "title2"; nomouse; - scale: 1; - effect: SOFT_SHADOW BOTTOM; - clip: "top_clip"; - desc { "default"; - rel1.relative: 1.0 0.0; - rel1.offset: 1 2; - rel1.to_x: "elm.event.icon"; - rel1.to_y: "shadow_spacer"; - rel2.relative: 0.0 0.0; - rel2.offset: -1 2; - rel2.to_x: "elm.event.minimize"; - rel2.to_y: "shadow_spacer"; - align: 0.5 0.0; - color_class: "border_title_active"; - color3: 255 255 255 255; + color: 160 160 160 255; text { font: FNBD; size: 10; - text_source: "elm.text.title"; text_class: "title_bar"; align: 0.5 0.0; min: 0 1; } fixed: 0 1; - visible: 0; } - desc { "focused"; - inherit: "default"; - visible: 1; + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } spacer { "icon"; @@ -386,91 +313,97 @@ group { name: "elm/border/base/default"; image { "close1"; nomouse; clip: "clip1"; desc { "default"; - image.normal: "sym_close_dark_normal.png"; + image.normal: "border_close.png"; rel1.to: "elm.event.close"; rel2.to: "elm.event.close"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } desc { "selected"; inherit: "default"; - image.normal: "sym_close_dark_selected.png"; + color: 255 255 255 255; } } image { "max1"; nomouse; clip: "clip1"; desc { "default"; - image.normal: "sym_up_dark_normal.png"; + image.normal: "border_maximize.png"; rel1.to: "elm.event.maximize"; rel2.to: "elm.event.maximize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } desc { "selected"; inherit: "default"; - image.normal: "sym_up_dark_selected.png"; + color: 255 255 255 255; } } image { "min1"; nomouse; clip: "clip1"; desc { "default"; - image.normal: "sym_down_dark_normal.png"; + image.normal: "border_minimize.png"; rel1.to: "elm.event.minimize"; rel2.to: "elm.event.minimize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } desc { "selected"; inherit: "default"; - image.normal: "sym_down_dark_selected.png"; + color: 255 255 255 255; } } - image { "close2"; nomouse; + image { "close2"; nomouse; clip: "clip2"; desc { "default"; - image.normal: "sym_close_light_normal.png"; + image.normal: "border_close.png"; rel1.to: "elm.event.close"; rel2.to: "elm.event.close"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } desc { "selected"; inherit: "default"; - image.normal: "sym_close_light_selected.png"; + color: 255 255 255 255; } } image { "max2"; nomouse; clip: "clip2"; desc { "default"; - image.normal: "sym_up_light_normal.png"; + image.normal: "border_maximize.png"; rel1.to: "elm.event.maximize"; rel2.to: "elm.event.maximize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } desc { "selected"; inherit: "default"; - image.normal: "sym_up_light_selected.png"; + color: 255 255 255 255; } } image { "min2"; nomouse; clip: "clip2"; desc { "default"; - image.normal: "sym_down_light_normal.png"; + image.normal: "border_minimize.png"; rel1.to: "elm.event.minimize"; rel2.to: "elm.event.minimize"; min: 15 15; max: 15 15; fixed: 1 1; + color: 160 160 160 255; } desc { "selected"; inherit: "default"; - image.normal: "sym_down_light_selected.png"; + color: 255 255 255 255; } } rect { "elm.event.icon"; @@ -608,22 +541,11 @@ group { name: "elm/border/base/default"; hid; } } - rect { "bottom"; - nomouse; - desc { "default"; - color_class: "border_bottom"; - color: 64 64 64 255; /* FIXME */ - rel.to: "bottom_clip"; - } - } - image { "bevel2"; nomouse; + part { name: "bottom"; type: RECT; mouse_events: 0; clip: "bottom_clip"; - desc { "default"; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; + description { state: "default" 0.0; + color: 64 64 64 255; rel.to: "bottom_clip"; - fill.smooth: 0; } } rect { "elm.event.resize.bl"; @@ -671,18 +593,6 @@ group { name: "elm/border/base/default"; } desc { "hidden"; inherit: "default"; hid; } } - /* top title bar decoration */ - image { "shine"; nomouse; - clip: "top_clip"; - desc { "default"; - image.normal: "shine.png"; - rel.to: "top_clip"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - FIXED_SIZE(69, 5) - } - } rect { "indicator_bg"; clip: "bg_clip"; desc { "default"; @@ -781,22 +691,21 @@ group { name: "elm/border/base/default"; action: STATE_SET "default"; target: "elm.rect.background"; } - program { - signal: "elm,state,background,standard,on"; source: "elm"; - action: STATE_SET "visible"; - target: "background_bevel"; - } - program { - signal: "elm,state,background,standard,off"; source: "elm"; - action: STATE_SET "default"; - target: "background_bevel"; - } +// program { +// signal: "elm,state,background,standard,on"; source: "elm"; +// action: STATE_SET "visible"; +// target: "background_bevel"; +// } +// program { +// signal: "elm,state,background,standard,off"; source: "elm"; +// action: STATE_SET "default"; +// target: "background_bevel"; +// } program { signal: "elm,action,focus"; source: "elm"; action: STATE_SET "focused"; target: "top"; target: "elm.text.title"; - target: "title2"; target: "clip1"; target: "clip2"; } @@ -805,7 +714,6 @@ group { name: "elm/border/base/default"; action: STATE_SET "default"; target: "top"; target: "elm.text.title"; - target: "title2"; target: "clip1"; target: "clip2"; } diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc index c5c48d3a21..e7d75f0829 100644 --- a/data/elementary/themes/edc/elm/button.edc +++ b/data/elementary/themes/edc/elm/button.edc @@ -1,141 +1,34 @@ group { name: "elm/button/base/default"; alias: "elm/button/base/naviframe/back_btn/default"; alias: "elm/button/base/naviframe/back_btn/pager"; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 -#define PRESSED 8 -#define BACKGROUND 16 script { - public btmode; - public eval_mode(m) { - new m1 = m & MASK; - new d = m & DISABLE; - new p = m & PRESSED; - new bg = m & BACKGROUND; - if (bg) { - set_state(PART:"base", "hidden", 0.0); - set_state(PART:"elm.swallow.background", "visible", 0.0); - } else { - set_state(PART:"elm.swallow.background", "default", 0.0); - if (!d) { - if (!p) - { - set_state(PART:"base", "default", 0.0); - set_state(PART:"base", "default", 0.0); - } - else { - set_state(PART:"base", "pressed", 0.0); - } - } else { - set_state(PART:"base", "disabled", 0.0); - } - } - if (m1 == (ICON | LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"event", "default", 0.0); - if (!p) { - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"icon_clip", "default", 0.0); - } else { - set_state(PART:"elm.text", "pressed_visible", 0.0); - set_state(PART:"icon_clip", "pressed", 0.0); - } - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (ICON)) { - if (!d) { - set_state(PART:"elm.swallow.content", "icononly", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - if (!p) - set_state(PART:"icon_clip", "default", 0.0); - else - set_state(PART:"icon_clip", "pressed", 0.0); - } else { - set_state(PART:"elm.swallow.content", "icononly", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"icon_clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - if (!p) - set_state(PART:"elm.text", "textonly", 0.0); - else - set_state(PART:"elm.text", "pressed_textonly", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_textonly", 0.0); - set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"icon_clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } - } + BUTTONMODE_SCRIPT } parts { - image { "base"; + rect { "base"; + scale: 1; desc { "default"; - 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; - color_class: "button_bg"; + color: 80 80 80 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } - desc { "pressed"; - inherit: "default"; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; - color_class: "button_bg_pressed"; + desc { "pressed"; inherit; + color: 40 40 40 255; } - desc { "disabled"; - inherit: "default"; - color_class: "button_bg_disabled"; + desc { "disabled"; inherit; + color: 64 64 64 255; } - desc { "hidden"; - inherit: "default"; + desc { "hidden"; inherit; visible: 0; } } swallow { "elm.swallow.background"; nomouse; desc { "default"; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; visible: 0; } - desc { "visible"; - inherit: "default"; + desc { "visible"; inherit; visible: 1; } } @@ -143,66 +36,58 @@ group { name: "elm/button/base/default"; desc { "default"; color_class: "button_icon"; } - desc { "pressed"; - inherit: "default"; + desc { "pressed"; inherit; color_class: "button_icon_pressed"; } - desc { "disabled"; - inherit: "default"; + desc { "disabled"; inherit; color_class: "button_icon_disabled"; } } swallow { "elm.swallow.content"; nomouse; clip_to: "icon_clip"; + scale: 1; desc { "default"; fixed: 1 0; align: 0.0 0.5; - rel1.offset: 6 5; - rel1.to: "base"; + rel.to: "base"; + rel1.offset: 4 4; rel2.relative: 0.0 1.0; - rel2.offset: 6 -8; - rel2.to: "base"; + rel2.offset: 4 -5; visible: 0; + offscale; } - desc { "visible"; - inherit: "default"; + desc { "visible"; inherit; fixed: 1 0; aspect: 1.0 1.0; visible: 1; } - desc { "icononly"; - inherit: "default"; + desc { "icononly"; inherit; fixed: 0 0; align: 0.5 0.5; rel2.relative: 1.0 1.0; - rel2.offset: -7 -8; + rel2.offset: -5 -5; visible: 1; } } text { "sizer.content"; nomouse; scale: 1; desc { "default"; -// fixed: 1 1; visible: 0; text { font: FN; size: 10; min: 0 0; text_class: "button_text"; } } - desc { "visible"; - inherit: "default"; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "visible"; inherit; + rel.to: "elm.swallow.content"; text { min: 1 1; ellipsis: -1; text: "M"; } } - desc { "icononly"; - inherit: "default"; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "icononly"; inherit; + rel.to: "elm.swallow.content"; text { min: 1 1; ellipsis: -1; @@ -211,83 +96,73 @@ group { name: "elm/button/base/default"; } } text { "elm.text"; nomouse; - effect: SHADOW BOTTOM; scale: 1; desc { "default"; - rel1.offset: 0 5; + fixed: 1 1; + color: 160 160 160 255; + rel1.offset: 0 4; rel1.relative: 1.0 0.0; rel1.to_x: "elm.swallow.content"; rel1.to_y: "base"; - rel2.offset: -8 -8; 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: 0 0; - text_class: "button"; } visible: 0; - fixed: 1 1; + offscale; } - desc { "visible"; - inherit: "default"; - rel1.offset: 2 5; + desc { "visible"; inherit; + fixed: 0 0; + rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; visible: 1; - fixed: 0 0; } - desc { "pressed_visible"; - inherit: "default"; - rel1.offset: 2 5; + desc { "pressed_visible"; inherit; + fixed: 0 0; + color: 255 255 255 255; + rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; visible: 1; - fixed: 0 0; - color_class: "button_text_pressed"; } - desc { "textonly"; - inherit: "default"; + desc { "textonly"; inherit; + fixed: 0 0; text.min: 1 1; text.ellipsis: -1; visible: 1; - fixed: 0 0; } - desc { "pressed_textonly"; - inherit: "default"; + desc { "pressed_textonly"; inherit; + fixed: 0 0; + color: 255 255 255 255; text.min: 1 1; text.ellipsis: -1; visible: 1; - fixed: 0 0; - color_class: "button_text_pressed"; } - desc { "disabled_visible"; - inherit: "default"; - rel1.offset: 2 5; - color_class: "button_text_disabled"; - color3: 255 255 255 255; + desc { "disabled_visible"; inherit; + fixed: 0 0; + color: 96 96 96 255; + rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; visible: 1; - fixed: 0 0; } - desc { "disabled_textonly"; - inherit: "default"; - color_class: "button_text_disabled"; - color3: 255 255 255 255; + desc { "disabled_textonly"; inherit; + fixed: 0 0; + color: 96 96 96 255; text.min: 1 1; text.ellipsis: -1; visible: 1; - fixed: 0 0; } } rect { "event"; + ignore_flags: ON_HOLD; desc { "default"; color: 0 0 0 0; } - desc { "disabled"; - inherit: "default"; + desc { "disabled"; inherit; visible: 0; } } @@ -299,11 +174,7 @@ group { name: "elm/button/base/default"; after: "button_click_anim"; } program { name: "button_click_anim"; - script { - new m = get_int(btmode); - m |= PRESSED; set_int(btmode, m); - eval_mode(m); - } + script { flag_set(PRESSED); } } program { name: "button_unclick"; signal: "mouse,up,1"; source: "event"; @@ -311,11 +182,7 @@ group { name: "elm/button/base/default"; after: "button_unclick_anim"; } program { name: "button_unclick_anim"; - script { - new m = get_int(btmode); - m &= ~PRESSED; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(PRESSED); } } program { name: "buttonactivate"; signal: "elm,anim,activate"; source: "elm"; @@ -324,8 +191,8 @@ group { name: "elm/button/base/default"; after: "button_unpressed_anim"; } program { name: "button_unpressed_anim"; - action: STATE_SET "default" 0.0; in: 0.5 0.0; + action: STATE_SET "default" 0.0; target: "base"; } program { @@ -334,102 +201,72 @@ group { name: "elm/button/base/default"; } program { name: "button_text_visible"; signal: "elm,state,text,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= LABEL; set_int(btmode, m); - eval_mode(m); - } + script { flag_set(LABEL); } } program { name: "button_text_hidden"; signal: "elm,state,text,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~LABEL; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(LABEL); } } program { name: "button_icon_visible"; signal: "elm,state,icon,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= ICON; set_int(btmode, m); - eval_mode(m); - } + script { flag_set(ICON); } } program { name: "button_icon_hidden"; signal: "elm,state,icon,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~ICON; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(ICON); } } program { name: "button_background_visible"; signal: "elm,state,background,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= BACKGROUND; set_int(btmode, m); - eval_mode(m); - } + script { flag_set(BACKGROUND); } } program { name: "button_background_hidden"; signal: "elm,state,background,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~BACKGROUND; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(BACKGROUND); } } program { name: "button_state_disabled"; signal: "elm,state,disabled"; source: "elm"; - script { - new m = get_int(btmode); - m |= DISABLE; set_int(btmode, m); - eval_mode(m); - } + script { flag_set(DISABLE); } } program { name: "button_state_enabled"; signal: "elm,state,enabled"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~DISABLE; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(DISABLE); } } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE -#undef PRESSED -#undef BACKGROUND } group { name: "elm/button/base/anchor"; - images.image: "horizontal_separated_bar_small_glow.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 script { public btmode; public eval_mode(m) { new m1 = m & MASK; new d = m & DISABLE; + new p = m & PRESSED; + if (!d) { + if (!p) { + set_state(PART:"bar", "default", 0.0); + } + else { + set_state(PART:"bar", "pressed", 0.0); + } + } else { + set_state(PART:"bar", "disabled", 0.0); + } if (m1 == (ICON | LABEL)) { if (!d) { set_state(PART:"elm.swallow.content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + if (!p) { + set_state(PART:"elm.text", "visible", 0.0); + } else { + set_state(PART:"elm.text", "pressed_visible", 0.0); + } set_state(PART:"icon_clip", "default", 0.0); - set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { set_state(PART:"elm.swallow.content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); set_state(PART:"elm.text", "disabled_visible", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (ICON)) { @@ -438,30 +275,30 @@ group { name: "elm/button/base/anchor"; set_state(PART:"sizer.content", "icononly", 0.0); set_state(PART:"elm.text", "default", 0.0); set_state(PART:"icon_clip", "default", 0.0); - set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { set_state(PART:"elm.swallow.content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); set_state(PART:"elm.text", "default", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (LABEL)) { if (!d) { set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "textonly", 0.0); + if (!p) { + set_state(PART:"elm.text", "textonly", 0.0); + } else { + set_state(PART:"elm.text", "pressed_textonly", 0.0); + } set_state(PART:"icon_clip", "default", 0.0); - set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"elm.text", "disabled_textonly", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else { @@ -469,13 +306,11 @@ group { name: "elm/button/base/anchor"; set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "default", 0.0); - set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); - set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } @@ -511,10 +346,10 @@ group { name: "elm/button/base/anchor"; desc { "default"; fixed: 1 0; align: 0.0 0.5; - rel1.offset: 0 4; + rel1.offset: 4 4; rel1.to: "base"; rel2.relative: 0.0 1.0; - rel2.offset: 0 -5; + rel2.offset: 4 -5; rel2.to: "base"; visible: 0; } @@ -529,7 +364,7 @@ group { name: "elm/button/base/anchor"; fixed: 0 0; align: 0.5 0.5; rel2.relative: 1.0 1.0; - rel2.offset: -1 -5; + rel2.offset: -5 -5; visible: 1; } } @@ -564,106 +399,83 @@ group { name: "elm/button/base/anchor"; } } text { "elm.text"; nomouse; - effect: GLOW; scale: 1; desc { "default"; - rel1.offset: -2 0; + rel1.offset: 0 4; rel1.relative: 1.0 0.0; rel1.to_x: "elm.swallow.content"; rel1.to_y: "base"; - rel2.offset: -1 -1; + rel2.offset: -5 -5; rel2.to: "base"; - color_class: "button_text_anchor"; - color2: 255 255 255 255; - color3: 255 255 255 255; + color: 51 153 255 255; text { font: FN; size: 10; align: 0.5 0.5; min: 0 0; - text_class: "button_anchor"; } visible: 0; } desc { "visible"; inherit: "default"; - rel1.offset: 0 0; + rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; visible: 1; } - desc { "textonly"; + desc { "pressed_visible"; inherit: "default"; + color: 255 255 255 255; + rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; visible: 1; + fixed: 0 0; } - desc { "disabled_visible"; + desc { "textonly"; inherit: "default"; - rel1.offset: 0 0; - color_class: "button_text_anchor_disabled"; + rel1.offset: 0 4; text.min: 1 1; text.ellipsis: -1; visible: 1; } - desc { "disabled_textonly"; + desc { "pressed_textonly"; inherit: "default"; - color_class: "button_text_anchor_disabled"; + color: 255 255 255 255; text.min: 1 1; text.ellipsis: -1; visible: 1; + fixed: 0 0; } - } - text { "text2"; nomouse; - effect: GLOW; - scale: 1; - desc { "default"; - fixed: 1 1; - rel1.to: "elm.text"; - rel2.to: "elm.text"; - color_class: "button_text_anchor"; - color2: 255 255 255 255; - color3: 255 255 255 255; - text { font: FN; size: 10; - text_source: "elm.text"; - min: 1 1; - ellipsis: -1; - text_class: "button_anchor"; - } - visible: 0; + desc { "disabled_visible"; + inherit: "default"; + rel1.offset: 0 0; + color: 96 96 96 255; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - desc { "clicked"; + desc { "disabled_textonly"; inherit: "default"; + rel1.offset: 0 4; + color: 96 96 96 255; + text.min: 1 1; + text.ellipsis: -1; visible: 1; } } - image { "bar"; nomouse; + rect { "bar"; nomouse; desc { "default"; - image.normal: "horizontal_separated_bar_small_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; - fixed: 0 1; + color: 51 153 255 255; rel1.relative: 0.0 1.0; - rel1.offset: -3 -6; - rel2.offset: 2 3; + rel1.offset: 2 -3; + rel2.offset: -3 -3; } - desc { "disabled"; + desc { "pressed"; inherit: "default"; - color: 255 255 255 64; - } - } - image { "bar2"; nomouse; - desc { "default"; - image.normal: "horizontal_separated_bar_small_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; - rel1.to: "bar"; - rel2.to: "bar"; - color: 255 255 255 0; - visible: 0; + color: 255 255 255 255; } - desc { "clicked"; + desc { "disabled"; inherit: "default"; - color: 255 255 255 255; - visible: 1; + color: 96 96 96 255; } } rect { "event"; @@ -683,32 +495,34 @@ group { name: "elm/button/base/anchor"; after: "button_click_anim"; } program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "bar2"; - target: "text2"; + script { + new m = get_int(btmode); + m |= PRESSED; set_int(btmode, m); + eval_mode(m); + } } - program { + program { name: "button_unclick"; signal: "mouse,up,1"; source: "event"; action: SIGNAL_EMIT "elm,action,unpress" "elm"; after: "button_unclick_anim"; } program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "bar2"; - target: "text2"; + script { + new m = get_int(btmode); + m &= ~PRESSED; set_int(btmode, m); + eval_mode(m); + } } - program { + program { name: "buttonactivate"; signal: "elm,anim,activate"; source: "elm"; - action: STATE_SET "clicked" 0.0; - target: "bar2"; - target: "text2"; + action: STATE_SET "pressed" 0.0; + target: "base"; after: "button_unpressed_anim"; } program { name: "button_unpressed_anim"; action: STATE_SET "default" 0.0; in: 0.5 0.0; - target: "bar2"; - target: "text2"; + target: "base"; } program { signal: "mouse,clicked,1"; source: "event"; @@ -773,10 +587,6 @@ group { name: "elm/button/base/anchor"; } } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } group { name: "elm/button/base/colorselector/left/default"; @@ -928,75 +738,70 @@ group { name: "elm/button/base/hoversel_vertical/default"; alias: "elm/button/base/hoversel_horizontal/default"; alias: "elm/button/base/hoversel_horizontal/entry"; - images.image: "vertical_separated_bar_glow.png" COMP; - parts { text { "elm.text"; desc { "default"; - rel1.offset: 0 5; - rel1.relative: 1.0 0.0; - rel1.to_x: "elm.swallow.content"; - rel1.to_y: "base"; rel2.to_y: "base"; rel2.to_x: "select_line"; - rel2.offset: -3 -8; + rel2.offset: -5 -5; rel2.relative: 0.0 1.0; - text.text_class: "hoversel"; - text.ellipsis: -1; - color3: 255 255 255 255; - fixed: 1 1; } desc { "visible"; - inherit: "default"; - rel1.offset: 5 5; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; - fixed: 0 0; + rel2.to_y: "base"; + rel2.to_x: "select_line"; + rel2.offset: -5 -5; + rel2.relative: 0.0 1.0; + } + desc { "pressed_visible"; + rel2.to_y: "base"; + rel2.to_x: "select_line"; + rel2.offset: -5 -5; + rel2.relative: 0.0 1.0; } desc { "textonly"; - inherit: "default"; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; - fixed: 0 0; + rel2.to_y: "base"; + rel2.to_x: "select_line"; + rel2.offset: -5 -5; + rel2.relative: 0.0 1.0; + } + desc { "pressed_textonly"; + rel2.to_y: "base"; + rel2.to_x: "select_line"; + rel2.offset: -5 -5; + rel2.relative: 0.0 1.0; } desc { "disabled_visible"; - inherit: "default"; - rel1.offset: 5 5; - color_class: "hoversel_text_disabled"; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; - fixed: 0 0; + rel2.to_y: "base"; + rel2.to_x: "select_line"; + rel2.offset: -5 -5; + rel2.relative: 0.0 1.0; } desc { "disabled_textonly"; - inherit: "default"; - color_class: "hoversel_text_disabled"; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; - fixed: 0 0; + rel2.to_y: "base"; + rel2.to_x: "select_line"; + rel2.offset: -5 -5; + rel2.relative: 0.0 1.0; } } - image { "select_line"; nomouse; + rect { "select_line"; nomouse; desc { "default"; fixed: 1 1; align: 1.0 0.5; - min: 15 10; + min: 5 5; rel1.to: "base"; rel1.relative: 1.0 0.0; - rel1.offset: 1 -3; + rel1.offset: -1 0; rel2.to: "base"; - rel2.offset: 1 0; - image.normal: "vertical_separated_bar_glow.png"; - image.border: 7 7 7 7; - fill.smooth : 0; + rel2.offset: -1 -1; + color: 51 153 255 255; } desc { "pressed"; inherit: "default"; - rel1.offset: 0 -2; - rel2.offset: 0 -1; + color: 255 255 255 255; + } + desc { "disabled"; + inherit: "default"; + color: 96 96 96 255; } } } @@ -1017,6 +822,16 @@ group { name: "elm/button/base/hoversel_vertical/default"; program { name: "button_unpressed_anim"; target: "select_line"; } + program { + signal: "elm,state,disabled"; source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "select_line"; + } + program { + signal: "elm,state,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "select_line"; + } } } @@ -1026,10 +841,6 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; images.image: "bevel_horiz_out.png" COMP; images.image: "shadow_rounded_horiz.png" COMP; images.image: "shine.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 script { public btmode; public is_selected; @@ -1447,10 +1258,6 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; } } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } group { name: "elm/button/base/hoversel_horizontal_entry/default"; diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc index 1a1cfd436c..47371959d3 100644 --- a/data/elementary/themes/edc/elm/check.edc +++ b/data/elementary/themes/edc/elm/check.edc @@ -1,204 +1,76 @@ group { name: "elm/check/base/default"; - images.image: "inset_shadow_tiny.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "sym_check_alum.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 + images.image: "check.png" COMP; script { - public btmode; - public eval_mode(m) { - new m1 = m & MASK; - new d = m & DISABLE; - if (m1 == (ICON | LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (ICON)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } - } + BUTTONMODE_SCRIPT } parts { - part { name: "base"; type: RECT; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel1.to: "inset"; - rel2.offset: -2 -2; - rel2.to: "inset"; - color: 24 24 24 255; + swallow { "elm.swallow.background"; nomouse; + desc { "default"; + visible: 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 64 64 64 255; + desc { "visible"; inherit; + visible: 1; } } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow_tiny.png"; - image.border: 4 4 4 4; - rel1.to: "base"; - rel2.to: "base"; + rect { "icon_clip"; + desc { "default"; + color_class: "button_icon"; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; + desc { "pressed"; inherit; + color_class: "button_icon_pressed"; + } + desc { "disabled"; inherit; + color_class: "button_icon_disabled"; } } - part { name: "inset"; mouse_events: 0; + swallow { "elm.swallow.content"; nomouse; + clip_to: "icon_clip"; scale: 1; - description { state: "default" 0.0; + desc { "default"; fixed: 1 0; - rel1.offset: 2 2; - rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; align: 0.0 0.5; - min: 13 13; - max: 13 13; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "indicator"; mouse_events: 0; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "sym_check_alum.png"; - min: 11 11; - max: 11 11; + rel1.to_x: "base"; + rel2.to_x: "base"; + rel1.offset: 4 4; + rel1.relative: 1.0 0.0; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; visible: 0; + offscale; } - description { state: "selected" 0.0; - inherit: "default" 0.0; + desc { "visible"; inherit; + fixed: 1 0; + aspect: 1.0 1.0; visible: 1; } - } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - part { name: "elm.swallow.content"; type: SWALLOW; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - fixed: 1 0; - visible: 0; - align: 0.0 0.5; - max: 0 0; - rel1.to_x: "inset"; - rel1.relative: 1.0 0.0; - rel1.offset: 1 1; - rel2.to_x: "inset"; - rel2.offset: 1 -2; + desc { "icononly"; inherit; + fixed: 0 0; + align: 0.5 0.5; rel2.relative: 1.0 1.0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; + rel2.offset: -5 -5; + rel2.to_x: ""; visible: 1; - aspect: 1.0 1.0; - min: 16 16; } } - part { name: "sizer.content"; type: TEXT; mouse_events: 0; + text { "sizer.content"; nomouse; scale: 1; - description { state: "default" 0.0; - fixed: 1 1; + desc { "default"; visible: 0; text { font: FN; size: 10; min: 0 0; - text_class: "check_text"; + text_class: "button_text"; } } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "visible"; inherit; + rel.to: "elm.swallow.content"; text { min: 1 1; ellipsis: -1; text: "M"; } } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "icononly"; inherit; + rel.to: "elm.swallow.content"; text { min: 1 1; ellipsis: -1; @@ -206,49 +78,123 @@ group { name: "elm/check/base/default"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; + part { name: "base"; type: RECT; scale: 1; + description { state: "default"; + fixed: 1 0; + color: 0 0 0 64; + align: 0.0 0.5; + min: 13 13; + max: 13 13; + rel1.offset: 4 4; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + aspect: 1.0 1.0; aspect_preference: VERTICAL; + offscale; + } + desc { "pressed"; inherit; + color: 0 0 0 128; + } + desc { "disabled"; inherit; + color: 0 0 0 16; + } + } + part { name: "ck_check"; + clip_to: "ck_selected"; description { state: "default" 0.0; - rel1.offset: 2 2; - rel1.to_x: "elm.swallow.content"; + fixed: 0 0; + rel.to: "base"; + image.normal: "check.png"; + min: 13 13; + max: 13 13; + visible: 0; + color: 160 160 160 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + visible: 1; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "ck_selected"; type: RECT; + description { state: "default" 0.0; + rel.to: "base"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 153 153 153 255; + } + } + text { "elm.text"; nomouse; + scale: 1; + desc { "default"; + fixed: 1 1; + color: 160 160 160 255; + rel1.offset: 0 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - color: FN_COL_DEFAULT; - color_class: "check_text"; + rel1.to_x: "elm.swallow.content"; + rel2.offset: -5 -5; text { font: FN; size: 10; - min: 0 0; - align: 0.0 0.5; - text_class: "check"; + align: 0.5 0.5; + min: 0 0; } + visible: 0; + offscale; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "visible"; inherit; + fixed: 0 0; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + desc { "pressed_visible"; inherit; + fixed: 0 0; + color: 255 255 255 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "textonly"; inherit; + fixed: 0 0; text.min: 1 1; text.ellipsis: -1; + visible: 1; } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "pressed_textonly"; inherit; + fixed: 0 0; + color: 255 255 255 255; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "disabled_visible"; inherit; + fixed: 0 0; + color: 96 96 96 255; + rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; + visible: 1; + } + desc { "disabled_textonly"; inherit; + fixed: 0 0; + color: 96 96 96 255; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } } - part { name: "event"; type: RECT; + rect { "event"; ignore_flags: ON_HOLD; - description { state: "default" 0.0; + desc { "default"; color: 0 0 0 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + desc { "disabled"; inherit; visible: 0; } } @@ -261,250 +207,231 @@ group { name: "elm/check/base/default"; program { signal: "elm,state,check,on"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "indicator"; + target: "ck_check"; } program { signal: "elm,state,check,off"; source: "elm"; action: STATE_SET "default" 0.0; - target: "indicator"; + target: "ck_check"; } program { - signal: "elm,state,text,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= LABEL; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,down,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,press" "elm"; + after: "button_click_anim"; } program { - signal: "elm,state,text,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~LABEL; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,down,1"; source: "event"; + action: STATE_SET "pressed" 0.0; + target: "ck_check"; + } + program { name: "button_click_anim"; + script { flag_set(PRESSED); } + } + program { name: "button_unclick"; + signal: "mouse,up,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + after: "button_unclick_anim"; } program { - signal: "elm,state,icon,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= ICON; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,up,1"; source: "event"; + action: STATE_SET "default" 0.0; + target: "ck_check"; + } + program { name: "button_unclick_anim"; + script { flag_unset(PRESSED); } + } + program { name: "buttonactivate"; + signal: "elm,anim,activate"; source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "ck_check"; + after: "button_unpressed_anim"; + } + program { name: "button_unpressed_anim"; + in: 0.5 0.0; + action: STATE_SET "default" 0.0; + target: "ck_check"; } program { + signal: "mouse,clicked,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { name: "button_text_visible"; + signal: "elm,state,text,visible"; source: "elm"; + script { flag_set(LABEL); } + } + program { name: "button_text_hidden"; + signal: "elm,state,text,hidden"; source: "elm"; + script { flag_unset(LABEL); } + } + program { name: "button_icon_visible"; + signal: "elm,state,icon,visible"; source: "elm"; + script { flag_set(ICON); } + } + program { name: "button_icon_hidden"; signal: "elm,state,icon,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~ICON; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(ICON); } + } + program { name: "button_background_visible"; + signal: "elm,state,background,visible"; source: "elm"; + script { flag_set(BACKGROUND); } + } + program { name: "button_background_hidden"; + signal: "elm,state,background,hidden"; source: "elm"; + script { flag_unset(BACKGROUND); } + } + program { name: "button_state_disabled"; + signal: "elm,state,disabled"; source: "elm"; + script { flag_set(DISABLE); } + } + program { name: "button_state_enabled"; + signal: "elm,state,enabled"; source: "elm"; + script { flag_unset(DISABLE); } } program { signal: "elm,state,disabled"; source: "elm"; - script { - new m = get_int(btmode); - m |= DISABLE; set_int(btmode, m); - eval_mode(m); - } + action: STATE_SET "disabled" 0.0; + target: "ck_selected"; } program { signal: "elm,state,enabled"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~DISABLE; set_int(btmode, m); - eval_mode(m); - } + action: STATE_SET "default" 0.0; + target: "ck_selected"; } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } group { name: "elm/check/base/toggle"; - images.image: "inset_shadow_tiny.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "shadow_square_tiny.png" COMP; - images.image: "glow_small.png" COMP; - -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 + images.image: "check.png" COMP; script { - public is_rtl; public is_drag; public was_drag; - - public btmode; - public eval_mode(m) { - new m1 = m & MASK; - new d = m & DISABLE; - if (m1 == (ICON | LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"elm.ontext", "default", 0.0); - set_state(PART:"elm.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"elm.ontext", "disabled", 0.0); - set_state(PART:"elm.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); - } - } else if (m1 == (ICON)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"elm.ontext", "default", 0.0); - set_state(PART:"elm.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"elm.ontext", "disabled", 0.0); - set_state(PART:"elm.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); + public is_rtl; + + BUTTONMODE_SCRIPT + } + parts { + swallow { "elm.swallow.background"; nomouse; + desc { "default"; + visible: 0; + } + desc { "visible"; inherit; + visible: 1; + } + } + rect { "icon_clip"; + desc { "default"; + color_class: "button_icon"; + } + desc { "pressed"; inherit; + color_class: "button_icon_pressed"; + } + desc { "disabled"; inherit; + color_class: "button_icon_disabled"; + } + } + swallow { "elm.swallow.content"; nomouse; + clip_to: "icon_clip"; + scale: 1; + desc { "default"; + fixed: 1 0; + align: 0.0 0.5; + rel1.offset: 4 4; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + visible: 0; + offscale; + } + desc { "visible"; inherit; + fixed: 1 0; + aspect: 1.0 1.0; + visible: 1; + } + desc { "icononly"; inherit; + fixed: 0 0; + align: 0.5 0.5; + rel2.relative: 1.0 1.0; + rel2.offset: -5 -5; + rel2.to_x: "tog"; + rel2.relative: 0.0 1.0; + visible: 1; + } + } + text { "sizer.content"; nomouse; + scale: 1; + desc { "default"; + visible: 0; + text { font: FN; size: 10; + min: 0 0; + text_class: "button_text"; } - } else if (m1 == (LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"elm.ontext", "default", 0.0); - set_state(PART:"elm.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"elm.ontext", "disabled", 0.0); - set_state(PART:"elm.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); + } + desc { "visible"; inherit; + rel.to: "elm.swallow.content"; + text { + min: 1 1; + ellipsis: -1; + text: "M"; } - } else { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"elm.ontext", "default", 0.0); - set_state(PART:"elm.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"elm.ontext", "disabled", 0.0); - set_state(PART:"elm.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); + } + desc { "icononly"; inherit; + rel.to: "elm.swallow.content"; + text { + min: 1 1; + ellipsis: -1; + text: "M"; } } } - } - parts { - part { name: "tog"; type: SPACER; - scale: 1; + spacer { name: "tog"; scale: 1; description { state: "default" 0.0; - fixed: 1 0; + fixed: 1 1; rel1.relative: 1.0 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: -5 4; + rel2.offset: -5 -5; align: 1.0 0.5; min: 88 15; max: 88 15; + offscale; } } - part { name: "onrect"; type: RECT; mouse_events: 0; - scale: 1; - clip_to: "tog_clip"; + rect { name: "base"; + description { state: "default"; + fixed: 1 1; + color: 0 0 0 64; + rel.to: "tog"; + } + desc { "pressed"; inherit; + color: 0 0 0 128; + } + desc { "disabled"; inherit; + color: 0 0 0 16; + } + } + spacer { name: "onrect"; description { state: "default" 0.0; - rel1.to: "button"; + rel.to: "button"; rel1.relative: -5.0 0.0; - rel2.to: "button"; rel2.relative: 0.5 1.0; - color: 24 24 24 255; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 64 64 64 255; } } - part { name: "offrect"; type: RECT; mouse_events: 0; - scale: 1; - clip_to: "tog_clip"; + spacer { name: "offrect"; description { state: "default" 0.0; - rel1.to: "button"; + rel.to: "button"; rel1.relative: 0.5 0.0; - rel2.to: "button"; rel2.relative: 6.0 1.0; - color: 24 24 24 255; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 64 64 64 255; } } - part { name: "elm.offtext"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; + text { name: "elm.offtext"; nomouse; scale: 1; clip_to: "tog_clip"; description { state: "default" 0.0; fixed: 1 1; rel1.to: "button"; rel1.relative: 1.0 0.0; + rel1.offset: 4 0; rel2.to: "offrect"; - color: FN_COL_DEFAULT; - color_class: "check_off_text"; + rel2.offset: -5 -1; + offscale; + color: 160 160 160 255; text { font: FN; size: 10; min: 0 1; align: 0.5 0.5; @@ -514,24 +441,24 @@ group { name: "elm/check/base/toggle"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "check_off_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } - part { name: "elm.ontext"; type: TEXT; mouse_events: 0; - effect: GLOW; - scale: 1; + text { name: "elm.ontext"; nomouse; scale: 1; clip_to: "tog_clip"; description { state: "default" 0.0; fixed: 1 1; rel1.to: "onrect"; - rel1.offset: 2 -1; + rel1.offset: 4 0; rel2.to: "button"; rel2.relative: 0.0 1.0; - rel2.offset: -1 -2; - color_class: "check_on_text"; - color2: 255 255 255 255; - color3: 255 255 255 255; + rel2.offset: -5 -1; + offscale; + color: 51 153 255 255; text { font: FN; size: 10; min: 0 1; align: 0.5 0.5; @@ -541,44 +468,19 @@ group { name: "elm/check/base/toggle"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "check_on_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow_tiny.png"; - image.border: 4 4 4 4; - rel1.to: "tog"; - rel2.to: "tog"; - } - description { state: "disabled" 0.0; + description { state: "clicked" 0.0; inherit: "default" 0.0; - visible: 0; - } - } - part { name: "inset"; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "tog"; - rel1.offset: -1 -1; - rel2.to: "tog"; - rel2.offset: 0 0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 255 255 255 255; } } part { name: "tog_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "tog"; - rel2.to: "tog"; + rel.to: "tog"; } } - part { name: "button"; type: RECT; - scale: 1; + part { name: "button"; type: RECT; scale: 1; clip_to: "tog_clip"; dragable { x: 1 1 0; @@ -587,222 +489,131 @@ group { name: "elm/check/base/toggle"; } description { state: "default" 0.0; fixed: 1 1; - rel1.to: "tog"; - rel2.to: "tog"; + rel.to: "tog"; min: 15 15; max: 15 99999; color: 0 0 0 0; } } - part { name: "shadow_but"; mouse_events: 0; + rect { name: "base_but"; nomouse; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel1.to: "base_but"; - rel2.offset: 2 4; - rel2.to: "base_but"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; + rel.to: "button"; + color: 51 153 255 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - rel1.offset: -2 -2; - rel2.offset: 1 1; - color: 255 255 255 128; - } - } - part { name: "glow_but"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -3 -3; - rel1.to: "base_but"; - rel2.offset: 2 2; - rel2.to: "base_but"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - visible: 0; + color: 255 255 255 255; } - description { state: "clicked" 0.0; + description { state: "disabled" 0.0; inherit: "default" 0.0; - visible: 1; - } - } - part { name: "base_but"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button"; - rel2.to: "button"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - TILED_HORIZ(120) - } - } - part { name: "bevel_but"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base_but"; - rel2.to: "base_but"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 64 64 64 255; } } - part { name: "button_events"; type: RECT; + rect { name: "button_events"; dragable.events: "button"; description { state: "default" 0.0; color: 0 0 0 0; } } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - part { name: "elm.swallow.content"; type: SWALLOW; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - fixed: 1 0; - visible: 0; - align: 0.0 0.5; - max: 0 0; - rel1.offset: 1 1; - rel2.offset: 1 -2; - rel2.relative: 0.0 1.0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - fixed: 0 0; - visible: 1; - min: 16 16; - } - } - part { name: "sizer.content"; type: TEXT; mouse_events: 0; + text { "elm.text"; nomouse; scale: 1; - description { state: "default" 0.0; + desc { "default"; fixed: 1 1; - visible: 0; - text { font: FN; size: 10; - min: 0 0; - text_class: "check_text"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; - text { - min: 1 1; - ellipsis: -1; - text: "M"; - } - } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; - text { - min: 1 1; - ellipsis: -1; - text: "M"; - } - } - } - part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - rel1.to_x: "elm.swallow.content"; + color: 160 160 160 255; + rel1.offset: 0 4; rel1.relative: 1.0 0.0; - rel1.offset: 2 2; - rel2.to_x: "tog"; + rel1.to_x: "elm.swallow.content"; + rel2.offset: -5 -5; rel2.relative: 0.0 1.0; - rel2.offset: -5 -3; - color: FN_COL_DEFAULT; - color_class: "check_text"; + rel2.to_x: "tog"; text { font: FN; size: 10; - min: 0 0; - align: 0.0 0.5; - text_class: "check"; + align: 0.5 0.5; + min: 0 0; } + visible: 0; + offscale; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "visible"; inherit; + fixed: 0 0; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + desc { "pressed_visible"; inherit; + fixed: 0 0; + color: 255 255 255 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; + } + desc { "textonly"; inherit; + fixed: 0 0; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "pressed_textonly"; inherit; + fixed: 0 0; + color: 255 255 255 255; text.min: 1 1; text.ellipsis: -1; + visible: 1; } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "disabled_visible"; inherit; + fixed: 0 0; + color: 96 96 96 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "disabled_textonly"; inherit; + fixed: 0 0; + color: 96 96 96 255; text.min: 1 1; text.ellipsis: -1; + visible: 1; } } - part { name: "event"; type: RECT; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; + rect { "event2"; + desc { "default"; color: 0 0 0 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.text"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; visible: 0; } + desc { "disabled"; inherit; + visible: 1; + } } - part { name: "event2"; type: RECT; + rect { "event"; repeat; ignore_flags: ON_HOLD; - description { state: "default" 0.0; + desc { "default"; color: 0 0 0 0; - visible: 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "disabled"; inherit; + visible: 0; } } } programs { - program { - signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,check,toggle" "elm"; - } - program { - signal: "elm,state,check,on"; source: "elm"; + program { signal: "elm,state,check,on"; source: "elm"; script { new Float:drag; - if (get_int(is_rtl) == 0) { - drag = 100.0; - } else { - drag = 0.0; - } + if (get_int(is_rtl) == 0) { drag = 100.0; } + else { drag = 0.0; } set_drag(PART:"button", drag, 0.0); } } - program { - signal: "elm,state,check,off"; source: "elm"; + program { signal: "elm,state,check,off"; source: "elm"; script { new Float:drag; - if (get_int(is_rtl) == 0) { - drag = 0.0; - } else { - drag = 100.0; - } + if (get_int(is_rtl) == 0) { drag = 0.0; } + else { drag = 100.0; } set_drag(PART:"button", drag, 0.0); } } - program { - signal: "mouse,clicked,1"; source: "button"; + program { signal: "mouse,clicked,1"; source: "button"; script { new Float:dx, Float:dy; get_drag(PART:"button", dx, dy); @@ -821,21 +632,18 @@ group { name: "elm/check/base/toggle"; } } } - program { - signal: "drag"; source: "button"; + program { signal: "drag"; source: "button"; script { set_int(is_drag, 1); } } - program { - signal: "mouse,down,1"; source: "button"; + program { signal: "mouse,down,1"; source: "button"; script { set_int(was_drag, 0); set_int(is_drag, 0); } } - program { name: "drag_end"; - signal: "mouse,up,1"; source: "button"; + program { signal: "mouse,up,1"; source: "button"; script { new Float:dx, Float:dy; get_drag(PART:"button", dx, dy); @@ -856,81 +664,116 @@ group { name: "elm/check/base/toggle"; } } } - program { - signal: "mouse,down,1"; source: "button"; + program { signal: "mouse,down,1"; source: "button"; action: STATE_SET "clicked" 0.0; - target: "shadow_but"; - target: "glow_but"; + target: "base_but"; + target: "elm.ontext"; + target: "elm.offtext"; } - program { - signal: "mouse,up,1"; source: "button"; + program { signal: "mouse,up,1"; source: "button"; action: STATE_SET "default" 0.0; - target: "shadow_but"; - target: "glow_but"; + target: "base_but"; + target: "elm.ontext"; + target: "elm.offtext"; } program { - signal: "elm,state,text,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= LABEL; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,clicked,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,check,toggle" "elm"; } program { - signal: "elm,state,text,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~LABEL; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,down,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,press" "elm"; + after: "button_click_anim"; + } + program { name: "button_click_anim"; + script { flag_set(PRESSED); } + } + program { name: "button_unclick"; + signal: "mouse,up,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + after: "button_unclick_anim"; + } + program { name: "button_unclick_anim"; + script { flag_unset(PRESSED); } } program { - signal: "elm,state,icon,visible"; source: "elm"; + signal: "elm,anim,activate"; source: "elm"; script { - new m = get_int(btmode); - m |= ICON; set_int(btmode, m); - eval_mode(m); + new Float:drag; + if (get_int(is_rtl) == 0) { drag = 100.0; } + else { drag = 0.0; } + set_drag(PART:"button", drag, 0.0); } + after: "button_unpressed_anim"; } - program { - signal: "elm,state,icon,hidden"; source: "elm"; + program { name: "button_unpressed_anim"; + in: 0.5 0.0; script { - new m = get_int(btmode); - m &= ~ICON; set_int(btmode, m); - eval_mode(m); + new Float:drag; + if (get_int(is_rtl) == 0) { drag = 0.0; } + else { drag = 100.0; } + set_drag(PART:"button", drag, 0.0); } } program { + signal: "mouse,clicked,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { name: "button_text_visible"; + signal: "elm,state,text,visible"; source: "elm"; + script { flag_set(LABEL); } + } + program { name: "button_text_hidden"; + signal: "elm,state,text,hidden"; source: "elm"; + script { flag_unset(LABEL); } + } + program { name: "button_icon_visible"; + signal: "elm,state,icon,visible"; source: "elm"; + script { flag_set(ICON); } + } + program { name: "button_icon_hidden"; + signal: "elm,state,icon,hidden"; source: "elm"; + script { flag_unset(ICON); } + } + program { name: "button_background_visible"; + signal: "elm,state,background,visible"; source: "elm"; + script { flag_set(BACKGROUND); } + } + program { name: "button_background_hidden"; + signal: "elm,state,background,hidden"; source: "elm"; + script { flag_unset(BACKGROUND); } + } + program { name: "button_state_disabled"; signal: "elm,state,disabled"; source: "elm"; - script { - new m = get_int(btmode); - m |= DISABLE; set_int(btmode, m); - eval_mode(m); - } + script { flag_set(DISABLE); } } - program { + program { name: "button_state_enabled"; signal: "elm,state,enabled"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~DISABLE; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(DISABLE); } } - program { - signal: "edje,state,rtl"; source: "edje"; - script { - set_int(is_rtl, 1); - } + program { signal: "elm,state,disabled"; source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "base_but"; + target: "event2"; + target: "elm.offtext"; + target: "elm.ontext"; } - program { - signal: "edje,state,ltr"; source: "edje"; + program { signal: "elm,state,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "base_but"; + target: "event2"; + target: "elm.offtext"; + target: "elm.ontext"; + } + program { signal: "edje,state,rtl"; source: "edje"; + script { + set_int(is_rtl, 1); + } + } + program { signal: "edje,state,ltr"; source: "edje"; script { set_int(is_rtl, 0); } } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc index 189bf968d7..38083efbf3 100644 --- a/data/elementary/themes/edc/elm/entry.edc +++ b/data/elementary/themes/edc/elm/entry.edc @@ -1,18 +1,13 @@ group { name: "elm/scroller/entry/default"; inherit: "elm/scroller/base/default"; - image: "bg_glow_in.png" COMP; parts { - part { name: "elm.swallow.background"; type: SWALLOW; - clip_to: "clipper"; + part { name: "bg"; description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + color: DARK_GREY_BG_COLOR; } } - part { name: "validation_glow"; - type: RECT; - insert_before: "bg"; - mouse_events: 0; + part { name: "validation_glow"; type: RECT; mouse_events: 0; + insert_after: "elm.swallow.background"; description { state: "default" 0.0; color: 0 0 0 0; } @@ -23,11 +18,55 @@ group { name: "elm/scroller/entry/default"; color: 255 0 0 90; } } - part { name: "bg"; + program { name: "validation_fail"; + signal: "validation,default,fail"; + source: "elm"; + action: STATE_SET "fail" 0.0; + target: "validation_glow"; + } + program { name: "validation_pass"; + signal: "validation,default,pass"; + source: "elm"; + action: STATE_SET "pass" 0.0; + target: "validation_glow"; + } + program { name: "validation_off"; + signal: "validation,default"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "validation_glow"; + } + part { name: "glow"; type: RECT; mouse_events: 0; + insert_before: "elm.swallow.content"; + scale: 1; description { state: "default" 0.0; - color: DARK_GREY_BG_COLOR; + rel1.to: "bg"; + rel1.relative: 0.0 1.0; + rel2.to: "bg"; + rel1.offset: 0 0; + color: 51 153 255 0; + visible: 0; + offscale; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + rel1.offset: 0 -3; + color: 51 153 255 255; + visible: 1; } } + program { + signal: "elm,action,focus_highlight,show"; source: "elm"; + action: STATE_SET "focused" 0.0; + transition: DECELERATE 0.3; + target: "glow"; + } + program { + signal: "elm,action,focus_highlight,hide"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "glow"; + } part { name: "elm.swallow.content"; description { state: "default" 0.0; rel1.to: "elm.swallow.icon"; @@ -40,20 +79,26 @@ group { name: "elm/scroller/entry/default"; } part { name: "elm.swallow.icon"; type: SWALLOW; clip_to: "clipper"; + scale: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "clipper"; - rel1.offset: 1 1; - rel2.to: "clipper"; - rel2.offset: 1 -2; + rel1.to: "bg"; + rel1.offset: 0 2; + rel2.to: "bg"; + rel2.offset: 0 -3; rel2.relative: 0.0 1.0; visible: 0; - align: 1.0 0.0; + align: 0.0 0.5; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - align: 0.0 0.0; + rel1.offset: 2 2; + rel2.offset: 2 -3; + min: 16 16; + aspect_preference: VERTICAL; + aspect: 1.0 1.0; } } program { @@ -68,20 +113,26 @@ group { name: "elm/scroller/entry/default"; } part { name: "elm.swallow.end"; type: SWALLOW; clip_to: "clipper"; + scale: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "clipper"; - rel1.offset: -2 1; + rel1.to: "bg"; + rel1.offset: 0 2; rel1.relative: 1.0 0.0; - rel2.to: "clipper"; - rel2.offset: -2 -2; + rel2.to: "bg"; + rel2.offset: 0 -3; visible: 0; - align: 0.0 0.0; + align: 1.0 0.5; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - align: 1.0 0.0; + rel1.offset: -3 2; + rel2.offset: -3 -3; + min: 16 16; + aspect_preference: VERTICAL; + aspect: 1.0 1.0; } } program { @@ -94,87 +145,17 @@ group { name: "elm/scroller/entry/default"; action: STATE_SET "default" 0.0; target: "elm.swallow.end"; } - part { name: "glow"; - insert_after: "shadow"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "bg_glow_in.png"; - image.border: 7 7 7 7; - image.middle: 0; - fill.smooth: 0; - color: 255 255 255 0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - description { state: "focused2" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - } - programs { - program { - signal: "elm,action,focus_highlight,show"; source: "elm"; - action: STATE_SET "focused" 0.0; - target: "glow"; - after: "focus_in2"; - } - program { name: "focus_in2"; - action: STATE_SET "focused2" 0.0; - transition: DECELERATE 0.5; - target: "glow"; - } - program { - signal: "elm,action,focus_highlight,hide"; source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "glow"; - } - program { name: "validation_fail"; - signal: "validation,default,fail"; - source: "elm"; - action: STATE_SET "fail" 0.0; - target: "validation_glow"; - } - program { name: "validation_pass"; - signal: "validation,default,pass"; - source: "elm"; - action: STATE_SET "pass" 0.0; - target: "validation_glow"; - } - program { name: "validation_off"; - signal: "validation,default"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "validation_glow"; - } } } group { name: "elm/scroller/entry_single/default"; - images.image: "bevel_in.png" COMP; - images.image: "inset_shadow.png" COMP; - image: "bg_glow_in.png" COMP; - + images.image: "shadow_circle_horiz.png" COMP; + images.image: "shadow_circle_vert.png" COMP; + data.item: "focus_highlight" "on"; - parts { - part { name: "validation_glow"; - type: RECT; - insert_before: "bg"; - mouse_events: 0; + part { name: "clipper"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; - } - description { state: "pass" 0.0; - color: 0 255 0 90; - } - description { state: "fail" 0.0; - color: 255 0 0 90; } } part { name: "sb_vbar_base"; type: RECT; @@ -216,6 +197,7 @@ group { name: "elm/scroller/entry_single/default"; rel2.to: "sb_hbar_base"; visible: 0; } + } part { name: "bg"; type: RECT; description { state: "default" 0.0; @@ -225,42 +207,85 @@ group { name: "elm/scroller/entry_single/default"; color_class: "scroller_bg"; } } - part { name: "clipper"; type: RECT; + part { name: "elm.swallow.background"; type: SWALLOW; + clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.background"; - rel2.to: "elm.swallow.background"; } } - part { name: "elm.swallow.background"; type: SWALLOW; - clip_to: "clipper"; + part { name: "validation_glow"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "pass" 0.0; + color: 0 255 0 90; + } + description { state: "fail" 0.0; + color: 255 0 0 90; + } + } + part { name: "glow"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + rel1.to: "bg"; + rel1.relative: 0.0 1.0; + rel2.to: "bg"; + rel1.offset: 0 0; + color: 51 153 255 0; + visible: 0; + offscale; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + rel1.offset: 0 -3; + color: 51 153 255 255; + visible: 1; } } + program { + signal: "elm,action,focus_highlight,show"; source: "elm"; + action: STATE_SET "focused" 0.0; + transition: DECELERATE 0.2; + target: "glow"; + } + program { + signal: "elm,action,focus_highlight,hide"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.2; + target: "glow"; + } + part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.icon"; rel1.relative: 1.0 0.0; - rel2.to: "elm.swallow.end"; + rel1.offset: 2 2; + rel2.to_x: "elm.swallow.end"; rel2.relative: 0.0 1.0; + rel2.offset: -3 -3; + offscale; } } part { name: "elm.swallow.icon"; type: SWALLOW; + scale: 1; clip_to: "clipper"; description { state: "default" 0.0; - fixed: 1 1; - rel1.offset: 1 1; - rel2.offset: 1 -2; rel2.relative: 0.0 1.0; + rel1.offset: -1 2; + rel2.offset: -1 -3; visible: 0; - align: 1.0 0.5; + align: 0.0 0.5; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; + rel1.offset: 2 2; + rel2.offset: 2 -3; visible: 1; - align: 0.0 0.5; + min: 16 16; + aspect_preference: VERTICAL; + aspect: 1.0 1.0; } } program { @@ -273,20 +298,26 @@ group { name: "elm/scroller/entry_single/default"; action: STATE_SET "default" 0.0; target: "elm.swallow.icon"; } + part { name: "elm.swallow.end"; type: SWALLOW; + scale: 1; clip_to: "clipper"; description { state: "default" 0.0; - fixed: 1 1; - rel1.offset: -2 1; rel1.relative: 1.0 0.0; - rel2.offset: -2 -2; + rel1.offset: 0 2; + rel2.offset: 0 -3; visible: 0; - align: 0.0 0.5; + align: 1.0 0.5; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; + rel1.offset: -3 2; + rel2.offset: -3 -3; visible: 1; - align: 1.0 0.5; + min: 16 16; + aspect_preference: VERTICAL; + aspect: 1.0 1.0; } } program { @@ -299,75 +330,85 @@ group { name: "elm/scroller/entry_single/default"; action: STATE_SET "default" 0.0; target: "elm.swallow.end"; } - part { name: "inset"; mouse_events: 0; + + part { name: "elm.swallow.overlay"; type: SWALLOW; + clip_to: "clipper"; 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; + rel1.to: "elm.swallow.icon"; + rel2.to: "elm.swallow.end"; } } - part { name: "shadow"; mouse_events: 0; + + part { name: "sh_left"; mouse_events: 0; + scale: 1; + clip_to: "sh_clip"; 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 0; + rel.to: "bg"; + rel1.offset: -1 0; + rel2.offset: -1 -1; + rel2.relative: 0.0 1.0; + image.normal: "shadow_circle_vert.png"; + visible: 0; + offscale; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; color: 255 255 255 128; + rel1.offset: -16 0; + rel2.offset: 15 -1; + visible: 1; } } - part { name: "elm.swallow.overlay"; type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - } + program { signal: "elm,action,show,left"; source: "elm"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "sh_left"; + } + program { signal: "elm,action,hide,left"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "sh_left"; } - part { name: "glow"; - mouse_events: 0; + part { name: "sh_right"; mouse_events: 0; + scale: 1; + clip_to: "sh_clip"; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "bg_glow_in.png"; - image.border: 7 7 7 7; - image.middle: 0; - fill.smooth: 0; color: 255 255 255 0; + rel.to: "bg"; + rel1.relative: 1.0 0.0; + rel1.offset: 0 0; + rel2.offset: 0 -1; + image.normal: "shadow_circle_vert.png"; + visible: 0; + offscale; } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - description { state: "focused2" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 255 255 255 128; + rel1.offset: -16 0; + rel2.offset: 15 -1; + visible: 1; } } - } - programs { - program { - signal: "elm,action,focus_highlight,show"; source: "elm"; - action: STATE_SET "focused" 0.0; - target: "glow"; - after: "focus_in2"; + program { signal: "elm,action,show,right"; source: "elm"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "sh_right"; } - program { name: "focus_in2"; - action: STATE_SET "focused2" 0.0; - transition: DECELERATE 0.5; - target: "glow"; + program { signal: "elm,action,hide,right"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "sh_right"; } - program { - signal: "elm,action,focus_highlight,hide"; source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "glow"; + + part { name: "sh_clip"; type: RECT; + description { state: "default" 0.0; + rel.to: "elm.swallow.background"; + } } + } + programs { program { name: "validation_fail"; signal: "validation,default,fail"; source: "elm"; @@ -391,23 +432,17 @@ group { name: "elm/scroller/entry_single/default"; group { name: "elm/entry/cursor/default"; 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; clip_to: "clipper"; 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; - color_class: "entry_cursor"; - min: 9 10; + min: 1 10; + visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + visible: 1; } } part { name: "clipper"; type: RECT; @@ -477,7 +512,6 @@ group { name: "elm/entry/cursor/default"; 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"; @@ -485,7 +519,7 @@ group { name: "elm/entry/cursor/default"; after: "cursor_hide"; } program { name: "cursor_hide_timer"; - in: 0.2 0.0; + in: 0.3 0.0; after: "cursor_show"; } } @@ -495,7 +529,7 @@ group { name: "elm/entry/selection/default"; parts { part { name: "base"; type: RECT; description { state: "default" 0.0; - color: 51 153 255 255; + color: 51 153 255 128; } } } @@ -504,21 +538,22 @@ group { name: "elm/entry/selection/default"; group { name: "elm/entry/anchor/default"; images.image: "horizontal_separated_bar_small_glow.png" COMP; parts { - part { name: "bar"; + part { name: "bar"; type: RECT; + scale: 1; description { state: "default" 0.0; - image.normal: "horizontal_separated_bar_small_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; + color: 51 135 255 255; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.offset: -3 -5; - rel2.offset: 2 4; + rel1.offset: -1 -1; + rel2.offset: 0 -1; + offscale; } } } } group { name: "elm/entry/base/default"; +/* sounds { sample { name: "key-tap1" LOSSY 64; source: "kbd-tap.wav"; @@ -536,26 +571,26 @@ group { name: "elm/entry/base/default"; source: "kbd-tap5.wav"; } } - + */ styles { style { name: "entry_style"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_nowrap_style"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style"; - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_nowrap_disabled_style"; - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style"; - base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -563,15 +598,12 @@ group { name: "elm/entry/base/default"; parts { part { name: "elm.swallow.background"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; } } part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; + rel.to: "elm.text"; text { style: "entry_guide_style"; min: 0 1; align: 0.0 0.0; @@ -604,12 +636,11 @@ group { name: "elm/entry/base/default"; min: 0 1; align: 0.0 0.0; } + offscale; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_disabled_style"; - min: 0 1; - } + text.style: "entry_disabled_style"; } } } @@ -639,6 +670,7 @@ group { name: "elm/entry/base/default"; action: STATE_SET "default" 0.0; target: "elm.guide"; } +/* program { name: "key-down"; signal: "entry,keydown"; source: "elm.text"; script { @@ -662,6 +694,7 @@ group { name: "elm/entry/base/default"; program { name: "key-down5"; action: PLAY_SAMPLE "key-tap5" 1.0 INPUT; } + */ } } @@ -669,28 +702,22 @@ group { name: "elm/entry/base-mixedwrap/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_style_mixedwrap"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style_mixedwrap"; - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style_mixedwrap"; - base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } parts { part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; - scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; - text { style: "entry_guide_style_mixedwrap"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_guide_style_mixedwrap"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -700,10 +727,7 @@ group { name: "elm/entry/base-mixedwrap/default"; part { name: "elm.text"; description { state: "default" 0.0; fixed: 1 0; - text { style: "entry_style_mixedwrap"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_style_mixedwrap"; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -719,15 +743,15 @@ group { name: "elm/entry/base-charwrap/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_style_charwrap"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style_charwrap"; - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style_charwrap"; - base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -735,12 +759,7 @@ group { name: "elm/entry/base-charwrap/default"; part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; - text { style: "entry_guide_style_charwrap"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_guide_style_charwrap"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -750,10 +769,7 @@ group { name: "elm/entry/base-charwrap/default"; part { name: "elm.text"; description { state: "default" 0.0; fixed: 1 1; - text { style: "entry_style_charwrap"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_style_charwrap"; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -771,12 +787,7 @@ group { name: "elm/entry/base-nowrap/default"; part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; - text { style: "entry_guide_style"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_guide_style"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -788,7 +799,6 @@ group { name: "elm/entry/base-nowrap/default"; text { style: "entry_nowrap_style"; min: 1 1; ellipsis: -1; - align: 0.0 0.0; } } description { state: "disabled" 0.0; @@ -805,15 +815,15 @@ group { name: "elm/entry/base-single/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_single_style"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_single_disabled_style"; - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_single_guide_style"; - base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -821,10 +831,7 @@ group { name: "elm/entry/base-single/default"; part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; text { style: "entry_single_guide_style"; - min: 0 1; align: 0.0 0.5; } } @@ -845,8 +852,7 @@ group { name: "elm/entry/base-single/default"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_single_disabled_style"; - } + text.style: "entry_single_disabled_style"; } } } @@ -859,7 +865,7 @@ group { name: "elm/entry/base-single/spinner/default"; inherit: "elm/entry/base-single/default"; styles { style { name: "entry_single_spinner_style"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 align=center wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } } @@ -891,8 +897,7 @@ group { name: "elm/entry/base-single-noedit/default"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_single_disabled_style"; - } + text.style: "entry_single_disabled_style"; } } } @@ -908,15 +913,10 @@ group { name: "elm/entry/base-noedit/default"; source6: "elm/entry/anchor/default"; // anchor over description { state: "default" 0.0; fixed: 1 0; - text { style: "entry_style"; - min: 0 1; - align: 0.0 0.0; - } } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_disabled_style"; - } + text.style: "entry_disabled_style"; } } } @@ -932,15 +932,11 @@ group { name: "elm/entry/base-noedit-mixedwrap/default"; source6: "elm/entry/anchor/default"; // anchor over description { state: "default" 0.0; fixed: 1 0; - text { style: "entry_style_mixedwrap"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_style_mixedwrap"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_disabled_style_mixedwrap"; - } + text.style: "entry_disabled_style_mixedwrap"; } } } @@ -956,15 +952,11 @@ group { name: "elm/entry/base-noedit-charwrap/default"; source6: "elm/entry/anchor/default"; // anchor under description { state: "default" 0.0; fixed: 1 0; - text { style: "entry_style_charwrap"; - min: 0 1; - align: 0.0 0.0; - } + text.style: "entry_style_charwrap"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_disabled_style_charwrap"; - } + text.style: "entry_disabled_style_charwrap"; } } } @@ -1000,12 +992,7 @@ group { name: "elm/entry/base-password/default"; part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; - text { style: "entry_single_guide_style"; - min: 0 1; - align: 0.0 0.5; - } + text.style: "entry_single_guide_style"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -1029,8 +1016,7 @@ group { name: "elm/entry/base-password/default"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text { style: "entry_single_disabled_style"; - } + text.style: "entry_single_disabled_style"; } } } @@ -1041,10 +1027,9 @@ group { name: "elm/entry/magnifier/default"; parts { part { name: "bg"; type: RECT; mouse_events: 0; description { state: "default" 0.0; + rel.to: "over"; rel1.offset: 10 10; - rel1.to: "over"; rel2.offset: -11 -11; - rel2.to: "over"; color: 48 48 48 255; } description { state: "hidden" 0.0; @@ -1054,10 +1039,9 @@ group { name: "elm/entry/magnifier/default"; } part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; + rel.to: "over"; rel1.offset: 10 10; - rel1.to: "over"; rel2.offset: -11 -11; - rel2.to: "over"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -1118,9 +1102,8 @@ group { name: "elm/entry/handler/start/default"; part { name: "event"; type: RECT; scale: 1; description { state: "default" 0.0; + rel.to: "base"; color: 0 0 0 0; - rel1.to: "base"; - rel2.to: "base"; min: 32 32; visible: 0; } @@ -1166,9 +1149,8 @@ group { name: "elm/entry/handler/end/default"; part { name: "event"; type: RECT; scale: 1; description { state: "default" 0.0; + rel.to: "base"; color: 0 0 0 0; - rel1.to: "base"; - rel2.to: "base"; min: 32 32; visible: 0; } @@ -1194,6 +1176,114 @@ group { name: "elm/entry/handler/end/default"; } } +group { name: "elm/efl_ui_text/base/default"; +/* + sounds { + sample { name: "key-tap1" LOSSY 64; + source: "kbd-tap.wav"; + } + sample { name: "key-tap2" LOSSY 64; + source: "kbd-tap2.wav"; + } + sample { name: "key-tap3" LOSSY 64; + source: "kbd-tap3.wav"; + } + sample { name: "key-tap4" LOSSY 64; + source: "kbd-tap4.wav"; + } + sample { name: "key-tap5" LOSSY 64; + source: "kbd-tap5.wav"; + } + } + */ +// data.item: "context_menu_orientation" "horizontal"; + parts { + part { name: "elm.swallow.background"; type: SWALLOW; + description { state: "default" 0.0; + rel1.offset: 2 2; + rel2.offset: -3 -3; + } + } + part { name: "elm.text"; type: SWALLOW; + scale: 1; + entry_mode: EDITABLE; + select_mode: DEFAULT; +// select_mode: EXPLICIT; + cursor_mode: BEFORE; + multiline: 1; + source: "elm/entry/selection/default"; // selection under +// source2: "X"; // selection over +// source3: "X"; // cursor under + source4: "elm/entry/cursor/default"; // cursorover +// source5: "elm/entry/anchor/default"; // anchor under + source6: "elm/entry/anchor/default"; // anchor over + description { state: "default" 0.0; + /* we gotta use 0 0 here, because of scrolled entries */ + fixed: 0 0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + offscale; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + } + } + programs { + program { + signal: "load"; source: ""; + action: FOCUS_SET; + target: "elm.text"; + } + program { + signal: "elm,state,disabled"; source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text"; + } + program { + signal: "elm,state,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } +#if 0 + program { + signal: "elm,guide,disabled"; source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { + signal: "elm,guide,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } +#endif +/* + program { name: "key-down"; + signal: "entry,keydown"; source: "elm.text"; + script { + new buf[32]; + snprintf(buf, 31, "key-down%i", (rand() % 5) + 1); + run_program(get_program_id(buf)); + } + } + program { name: "key-down1"; + action: PLAY_SAMPLE "key-tap1" 1.0 INPUT; + } + program { name: "key-down2"; + action: PLAY_SAMPLE "key-tap2" 1.0 INPUT; + } + program { name: "key-down3"; + action: PLAY_SAMPLE "key-tap3" 1.0 INPUT; + } + program { name: "key-down4"; + action: PLAY_SAMPLE "key-tap4" 1.0 INPUT; + } + program { name: "key-down5"; + action: PLAY_SAMPLE "key-tap5" 1.0 INPUT; + } + */ + } +} /////////////////////////////////////////////////////////////////////////////// // emoticon images from: // Tanya - Latvia diff --git a/data/elementary/themes/edc/elm/frame.edc b/data/elementary/themes/edc/elm/frame.edc index e6ce022acf..5bed9cd55b 100644 --- a/data/elementary/themes/edc/elm/frame.edc +++ b/data/elementary/themes/edc/elm/frame.edc @@ -1,113 +1,89 @@ group { name: "elm/frame/base/default"; - 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: 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: "elm.text"; - rel2.offset: -3 -1; - fill.smooth: 0; - TILED_HORIZ(120) + 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: "elm.text"; - rel2.offset: 4 -1; - rel2.relative: 0.0 1.0; - rel2.to_y: "elm.text"; - 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: "elm.text"; - 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: "elm.text"; - align: 1.0 0.5; - FIXED_SIZE(3, 11) + rel2.offset: -1 3; + offscale; } } part { name: "elm.text"; 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: -3 1; - 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: "clip"; type: RECT; + 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: "elm.text"; - rel2.offset: -7 -7; + rel1.offset: 0 0; + rel2.to: "base"; + rel2.offset: -1 -1; + color: 64 64 64 255; + offscale; + } + } + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; } } part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "clip"; + scale: 1; description { state: "default" 0.0; align: 0.0 1.0; - rel1.relative: 0.0 1.0; - rel1.offset: 5 0; - rel1.to_y: "elm.text"; - rel2.offset: -7 -7; + rel1.to: "bg"; + rel1.offset: 4 4; + rel2.to: "bg"; + rel2.offset: -5 -5; + offscale; } description { state: "collapsed" 0.0; inherit: "default" 0.0; minmul: 1.0 0.0; - } - } - part { name: "bevel"; mouse_events: 0; - 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; + rel1.offset: 4 0; + rel2.offset: -5 -1; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; @@ -245,18 +221,19 @@ group { name: "elm/frame/base/outdent_top"; parts { part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; + rel1.to_y: "base"; + rel1.relative: 0.0 1.0; + rel1.offset: 4 4; + rel2.offset: -5 -5; } } - part { name: "base"; + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "separator_horiz.png"; - rel1.offset: 0 2; - rel2.offset: -1 3; + fixed: 0 1; + rel1.offset: 4 2; + rel2.offset: -5 2; rel2.relative: 1.0 0.0; - min: 0 2; - fill.smooth: 0; + min: 0 1; } } } @@ -267,18 +244,19 @@ group { name: "elm/frame/base/outdent_bottom"; parts { part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; + rel1.offset: 4 4; + rel2.to_y: "base"; + rel2.relative: 1.0 0.0; + rel2.offset: -5 -5; } } - part { name: "base"; + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "separator_horiz.png"; - rel1.offset: 0 -4; + fixed: 0 1; + rel1.offset: 4 -3; rel1.relative: 0.0 1.0; - rel2.offset: -1 -3; - min: 0 2; - fill.smooth: 0; + rel2.offset: -5 -3; + min: 0 1; } } } diff --git a/data/elementary/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc index 99227d8067..61096c3394 100644 --- a/data/elementary/themes/edc/elm/label.edc +++ b/data/elementary/themes/edc/elm/label.edc @@ -1,7 +1,7 @@ group { name: "elm/label/base/default"; styles { style { name: "label_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0"; tag: "br" "\n"; tag: "b" "+ font="FNBD" text_class=tb_light"; ENABLED_TEXTBLOCK_TAGS @@ -53,7 +53,7 @@ group { name: "elm/label/base/default/left"; inherit: "elm/label/base/default"; styles { style { name: "label_style_left"; - base: "font="FN" font_size=10 text_class=tb_plain align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FN" font_size=10 text_class=tb_plain align=left color=#a0a0a0"; tag: "br" "\n"; tag: "b" "+ font="FNBD" text_class=tb_light"; ENABLED_TEXTBLOCK_TAGS @@ -70,7 +70,7 @@ group { name: "elm/label/base/default/right"; inherit: "elm/label/base/default"; styles { style { name: "label_style_right"; - base: "font="FN" font_size=10 text_class=tb_plain align=right color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FN" font_size=10 text_class=tb_plain align=right color=#a0a0a0"; tag: "br" "\n"; tag: "b" "+ font="FNBD" text_class=tb_light"; ENABLED_TEXTBLOCK_TAGS @@ -87,7 +87,7 @@ group { name: "elm/label/base/marker"; inherit: "elm/label/base/default"; styles { style { name: "label_style2"; - base: "font="FNBD" font_size=10 text_class=tb_plain align=center color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FNBD" font_size=10 text_class=tb_plain align=center color=#a0a0a0"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light"; tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light"; @@ -110,7 +110,7 @@ group { "elm/label/base/marker/left"; inherit: "elm/label/base/default"; styles { style { name: "label_style3"; - base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#a0a0a0"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light"; tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light"; @@ -133,7 +133,7 @@ group { "elm/label/base/marker/right"; inherit: "elm/label/base/default"; styles { style { name: "label_style4"; - base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#ffffffff style=shadow,bottom shadow_color=#00000080"; + base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#a0a0a0"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light"; tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light"; diff --git a/data/elementary/themes/edc/elm/pointer.edc b/data/elementary/themes/edc/elm/pointer.edc index d1a95b2769..26336b1440 100644 --- a/data/elementary/themes/edc/elm/pointer.edc +++ b/data/elementary/themes/edc/elm/pointer.edc @@ -1,7 +1,6 @@ group { name: "elm/pointer/base/default"; images { image: "pointer.png" COMP; - image: "pointer_glow.png" COMP; } parts { part { @@ -23,20 +22,6 @@ group { name: "elm/pointer/base/default"; } } } - part { name: "glow"; - description { state: "default" 0.0; - image.normal: "pointer_glow.png"; - color: 255 255 255 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - description { state: "faded" 0.0; - inherit: "default" 0.0; - color: 255 255 255 128; - } - } part { name: "elm.swallow.hotspot"; /* this is a "fake" swallow part @@ -64,42 +49,6 @@ group { name: "elm/pointer/base/default"; } } programs { - program { - signal: "elm,action,mouse,down"; source: "elm"; - action: STATE_SET "visible" 0.0; - target: "glow"; - after: "fade"; - } - program { name: "fade"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 0.5; - target: "glow"; - } - program { name: "pulse"; - signal: "e,state,mouse,idle"; source: "e"; - in: 10.0 0.0; - action: STATE_SET "faded" 0.0; - transition: SINUSOIDAL 0.25; - target: "glow"; - after: "pulse2"; - } - program { name: "pulse2"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 0.5; - target: "glow"; - after: "pulse"; - } - program { - signal: "elm,action,mouse,move"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "glow"; - after: "stop2"; - } - program { name: "stop2"; - action: ACTION_STOP; - target: "pulse"; - target: "pulse2"; - } } } @@ -108,7 +57,7 @@ group { name: "elm/pointer/base/bottom_right_corner"; images.image: "mini_box_glow.png" COMP; parts { part { name: "box"; - insert_after: "glow"; + insert_after: "base"; description { state: "default" 0.0; image.normal: "mini_box_glow.png"; image.border: 7 7 7 7; @@ -256,7 +205,7 @@ group { name: "elm/pointer/base/hand1"; images.image: "mini_box_glow.png" COMP; parts { part { name: "box"; - insert_after: "glow"; + insert_after: "base"; description { state: "default" 0.0; image.normal: "mini_box_glow.png"; image.border: 7 7 7 7; @@ -323,19 +272,6 @@ group { name: "elm/pointer/base/hand1"; group { name: "elm/pointer/base/move"; inherit: "elm/pointer/base/hand1"; programs { - program { name: "move1"; - signal: "load"; source: ""; - action: STATE_SET "faded" 0.0; - transition: SINUSOIDAL 0.5; - target: "glow"; - after: "move2"; - } - program { name: "move2"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 0.5; - target: "glow"; - after: "move1"; - } } } @@ -344,7 +280,7 @@ group { name: "elm/pointer/base/rotate"; images.image: "mini_box_glow.png" COMP; parts { part { name: "box"; - insert_after: "glow"; + insert_after: "base"; description { state: "default" 0.0; image.normal: "mini_box_glow.png"; image.border: 7 7 7 7; @@ -389,12 +325,12 @@ group { name: "elm/pointer/base/rotate"; group { name: "elm/pointer/base/plus"; inherit: "elm/pointer/base/default"; - images.image: "add_glow_small.png" COMP; + images.image: "therm_base.png" COMP; parts { part { name: "add"; - insert_after: "glow"; + insert_after: "base"; description { state: "default" 0.0; - image.normal: "add_glow_small.png"; + image.normal: "therm_base.png"; aspect: 1.0 1.0; aspect_preference: BOTH; rel1.relative: 0.3 0.3; rel2.relative: 1.0 1.0; @@ -425,15 +361,15 @@ group { name: "elm/pointer/base/plus"; } group { name: "elm/pointer/base/xterm"; - images.image: "pointer_entry_bar.png" COMP; + images.image: "therm_base.png" COMP; images.image: "led_dot_white.png" COMP; parts { part { name: "base"; description { state: "default" 0.0; - image.normal: "pointer_entry_bar.png"; + image.normal: "therm_base.png"; max: 15 99999; min: 15 20; - image.normal: "pointer_entry_bar.png"; + image.normal: "therm_base.png"; image.border: 0 0 10 10; rel1.offset: 0 2; rel2.offset: -1 -3; diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc index e820f32896..bf387f4872 100644 --- a/data/elementary/themes/edc/elm/radio.edc +++ b/data/elementary/themes/edc/elm/radio.edc @@ -1,171 +1,76 @@ group { name: "elm/radio/base/default"; - images.image: "inset_shadow_circle_tiny.png" COMP; - images.image: "inset_circle_tiny.png" COMP; - images.image: "sym_radio_alum.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 + images.image: "radio.png" COMP; script { - public btmode; - public eval_mode(m) { - new m1 = m & MASK; - new d = m & DISABLE; - if (m1 == (ICON | LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"inset", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"inset", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (ICON)) { - if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"inset", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); - set_state(PART:"inset", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (LABEL)) { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"inset", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); - set_state(PART:"inset", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else { - if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"inset", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"inset", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } - } + BUTTONMODE_SCRIPT } parts { - part { name: "inset"; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; - image.normal: "inset_shadow_circle_tiny.png"; - align: 0.0 0.5; - min: 13 13; - max: 13 13; - fixed: 1 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "inset_circle_tiny.png"; - } - } - part { name: "indicator"; mouse_events: 0; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "inset"; - rel2.to: "inset"; - image.normal: "sym_radio_alum.png"; - min: 11 11; - max: 11 11; + swallow { "elm.swallow.background"; nomouse; + desc { "default"; visible: 0; } - description { state: "selected" 0.0; - inherit: "default" 0.0; + desc { "visible"; inherit; visible: 1; } } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; + rect { "icon_clip"; + desc { "default"; + color_class: "button_icon"; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; + desc { "pressed"; inherit; + color_class: "button_icon_pressed"; + } + desc { "disabled"; inherit; + color_class: "button_icon_disabled"; } } - part { name: "elm.swallow.content"; type: SWALLOW; + swallow { "elm.swallow.content"; nomouse; + clip_to: "icon_clip"; scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; + desc { "default"; fixed: 1 0; - visible: 0; align: 0.0 0.5; - max: 0 0; - rel1.to_x: "inset"; + rel1.to_x: "base"; + rel2.to_x: "base"; + rel1.offset: 4 4; rel1.relative: 1.0 0.0; - rel1.offset: 1 1; - rel2.to_x: "inset"; - rel2.offset: 1 -2; - rel2.relative: 1.0 1.0; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + visible: 0; + offscale; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "visible"; inherit; + fixed: 1 0; aspect: 1.0 1.0; - min: 16 16; + visible: 1; + } + desc { "icononly"; inherit; + fixed: 0 0; + align: 0.5 0.5; + rel2.relative: 1.0 1.0; + rel2.offset: -5 -5; + rel2.to_x: ""; + visible: 1; } } - part { name: "sizer.content"; type: TEXT; mouse_events: 0; + text { "sizer.content"; nomouse; scale: 1; - description { state: "default" 0.0; - fixed: 1 1; + desc { "default"; visible: 0; text { font: FN; size: 10; min: 0 0; - text_class: "radio_text"; + text_class: "button_text"; } } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "visible"; inherit; + rel.to: "elm.swallow.content"; text { min: 1 1; ellipsis: -1; text: "M"; } } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "icononly"; inherit; + rel.to: "elm.swallow.content"; text { min: 1 1; ellipsis: -1; @@ -173,48 +78,111 @@ group { name: "elm/radio/base/default"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; + part { name: "base"; type: RECT; + description { state: "default"; + fixed: 1 0; + align: 0.0 0.5; + min: 13 13; + max: 13 13; + rel1.offset: 4 4; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + aspect: 1.0 1.0; aspect_preference: VERTICAL; + offscale; + visible: 0; + } + desc { "pressed"; inherit; + } + desc { "disabled"; inherit; + } + } + part { name: "ck_check"; description { state: "default" 0.0; - rel1.offset: 2 2; - rel1.to_x: "elm.swallow.content"; + fixed: 0 0; + rel.to: "base"; + image.normal: "radio.png"; + min: 13 13; + max: 13 13; + color: 0 0 0 64; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 160 160 160 255; + } + desc { "disabled"; inherit; + color: 0 0 0 16; + } + } + text { "elm.text"; nomouse; + scale: 1; + desc { "default"; + fixed: 1 1; + color: 160 160 160 255; + rel1.offset: 0 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - color: FN_COL_DEFAULT; - color_class: "radio_text"; + rel1.to_x: "elm.swallow.content"; + rel2.offset: -5 -5; text { font: FN; size: 10; - min: 0 0; - align: 0.0 0.5; - text_class: "radio"; + align: 0.5 0.5; + min: 0 0; } + visible: 0; + offscale; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "radio_text_disabled"; - color3: 255 255 255 255; + desc { "visible"; inherit; + fixed: 0 0; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + desc { "pressed_visible"; inherit; + fixed: 0 0; + color: 255 255 255 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "textonly"; inherit; + fixed: 0 0; text.min: 1 1; text.ellipsis: -1; + visible: 1; } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color_class: "radio_text_disabled"; - color3: 255 255 255 255; + desc { "pressed_textonly"; inherit; + fixed: 0 0; + color: 255 255 255 255; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; + } + desc { "disabled_visible"; inherit; + fixed: 0 0; + color: 96 96 96 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "disabled_textonly"; inherit; + fixed: 0 0; + color: 96 96 96 255; text.min: 1 1; text.ellipsis: -1; + visible: 1; } } - part { name: "event"; type: RECT; - description { state: "default" 0.0; + rect { "event"; + ignore_flags: ON_HOLD; + desc { "default"; color: 0 0 0 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + desc { "disabled"; inherit; visible: 0; } } @@ -227,64 +195,95 @@ group { name: "elm/radio/base/default"; program { signal: "elm,state,radio,on"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "indicator"; + target: "ck_check"; } program { signal: "elm,state,radio,off"; source: "elm"; action: STATE_SET "default" 0.0; - target: "indicator"; + target: "ck_check"; } program { - signal: "elm,state,text,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= LABEL; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,down,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,press" "elm"; + after: "button_click_anim"; } program { - signal: "elm,state,text,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~LABEL; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,down,1"; source: "event"; + action: STATE_SET "pressed" 0.0; + target: "ck_check"; + } + program { name: "button_click_anim"; + script { flag_set(PRESSED); } + } + program { name: "button_unclick"; + signal: "mouse,up,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + after: "button_unclick_anim"; } program { - signal: "elm,state,icon,visible"; source: "elm"; - script { - new m = get_int(btmode); - m |= ICON; set_int(btmode, m); - eval_mode(m); - } + signal: "mouse,up,1"; source: "event"; + action: STATE_SET "default" 0.0; + target: "ck_check"; + } + program { name: "button_unclick_anim"; + script { flag_unset(PRESSED); } + } + program { name: "buttonactivate"; + signal: "elm,anim,activate"; source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "ck_check"; + after: "button_unpressed_anim"; + } + program { name: "button_unpressed_anim"; + in: 0.5 0.0; + action: STATE_SET "default" 0.0; + target: "ck_check"; } program { + signal: "mouse,clicked,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { name: "button_text_visible"; + signal: "elm,state,text,visible"; source: "elm"; + script { flag_set(LABEL); } + } + program { name: "button_text_hidden"; + signal: "elm,state,text,hidden"; source: "elm"; + script { flag_unset(LABEL); } + } + program { name: "button_icon_visible"; + signal: "elm,state,icon,visible"; source: "elm"; + script { flag_set(ICON); } + } + program { name: "button_icon_hidden"; signal: "elm,state,icon,hidden"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~ICON; set_int(btmode, m); - eval_mode(m); - } + script { flag_unset(ICON); } + } + program { name: "button_background_visible"; + signal: "elm,state,background,visible"; source: "elm"; + script { flag_set(BACKGROUND); } + } + program { name: "button_background_hidden"; + signal: "elm,state,background,hidden"; source: "elm"; + script { flag_unset(BACKGROUND); } + } + program { name: "button_state_disabled"; + signal: "elm,state,disabled"; source: "elm"; + script { flag_set(DISABLE); } + } + program { name: "button_state_enabled"; + signal: "elm,state,enabled"; source: "elm"; + script { flag_unset(DISABLE); } } program { signal: "elm,state,disabled"; source: "elm"; - script { - new m = get_int(btmode); - m |= DISABLE; set_int(btmode, m); - eval_mode(m); - } + action: STATE_SET "disabled" 0.0; + target: "ck_check"; } program { signal: "elm,state,enabled"; source: "elm"; - script { - new m = get_int(btmode); - m &= ~DISABLE; set_int(btmode, m); - eval_mode(m); - } + action: STATE_SET "default" 0.0; + target: "ck_check"; } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc index 091cfb1b23..671c5160de 100644 --- a/data/elementary/themes/edc/elm/scroller.edc +++ b/data/elementary/themes/edc/elm/scroller.edc @@ -7,70 +7,40 @@ group { name: "elm/scroller/base/default"; alias: "elm/scroller/base/popup/default"; alias: "elm/scroller/base/popup/transparent"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "runner_horiz.png" COMP; - images.image: "runner_vert.png" COMP; - images.image: "runner_glow_horiz.png" COMP; - images.image: "runner_glow_vert.png" COMP; - images.image: "holes_tiny_horiz.png" COMP; - images.image: "holes_tiny_vert.png" COMP; - images.image: "holes_tiny_glow_horiz.png" COMP; - images.image: "holes_tiny_glow_vert.png" COMP; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "shadow_square_tiny.png" COMP; - images.image: "glow_small.png" COMP; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_up_light_normal.png" COMP; - images.image: "sym_down_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "sym_up_glow_normal.png" COMP; - images.image: "sym_down_glow_normal.png" COMP; - images.image: "sym_up_dark_normal.png" COMP; - images.image: "sym_down_dark_normal.png" COMP; - images.image: "sym_left_dark_normal.png" COMP; - images.image: "sym_right_dark_normal.png" COMP; - + images.image: "shadow_circle_horiz.png" COMP; + images.image: "shadow_circle_vert.png" COMP; data.item: "focus_highlight" "on"; script { public loop_x, loop_y; + public action_on_pos_vbar(val) { new x, y , w, h, x1, y1 , w1, h1; - get_geometry(PART:"y_vbar_up", x,y,w, h); - get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1); + get_geometry(PART:"y_vbar_up", x, y, w, h); + get_geometry(PART:"y_vbar_up_mapper", x1, y1, w1, h1); - if(((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y))) - { - set_state(PART:"arrow1_vbar", "hidden", 0.0); - set_state(PART:"sb_vbar_a1", "hidden", 0.0); - } - else - { - set_state(PART:"arrow1_vbar", "default", 0.0); - set_state(PART:"sb_vbar_a1", "default", 0.0); + if (((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y))) { +// set_state(PART:"arrow1_vbar", "hidden", 0.0); +// set_state(PART:"sb_vbar_a1", "hidden", 0.0); + } else { +// set_state(PART:"arrow1_vbar", "default", 0.0); +// set_state(PART:"sb_vbar_a1", "default", 0.0); } get_geometry(PART:"y_vbar_down", x,y,w, h); get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1); - if(((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y))) - { - set_state(PART:"arrow2_vbar", "hidden", 0.0); - set_state(PART:"sb_vbar_a2", "hidden", 0.0); - } - else - { - set_state(PART:"arrow2_vbar", "default", 0.0); - set_state(PART:"sb_vbar_a2", "default", 0.0); + if (((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y))) { +// set_state(PART:"arrow2_vbar", "hidden", 0.0); +// set_state(PART:"sb_vbar_a2", "hidden", 0.0); + } else { +// set_state(PART:"arrow2_vbar", "default", 0.0); +// set_state(PART:"sb_vbar_a2", "default", 0.0); } - if(val < 10) + if (val < 10) timer(0.1,"action_on_pos_vbar", val+1); } @@ -80,45 +50,210 @@ group { name: "elm/scroller/base/default"; get_geometry(PART:"x_hbar_left", x,y,w, h); get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1); - if(((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x))) - { - set_state(PART:"arrow1_hbar", "hidden", 0.0); - set_state(PART:"sb_hbar_a1", "hidden", 0.0); - } - else - { - set_state(PART:"arrow1_hbar", "default", 0.0); - set_state(PART:"sb_hbar_a1", "default", 0.0); + if (((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x))) { +// set_state(PART:"arrow1_hbar", "hidden", 0.0); +// set_state(PART:"sb_hbar_a1", "hidden", 0.0); + } else { +// set_state(PART:"arrow1_hbar", "default", 0.0); +// set_state(PART:"sb_hbar_a1", "default", 0.0); } get_geometry(PART:"x_hbar_right", x,y,w, h); get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1); - if(((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x))) - { - set_state(PART:"arrow2_hbar", "hidden", 0.0); - set_state(PART:"sb_hbar_a2", "hidden", 0.0); - } - else - { - set_state(PART:"arrow2_hbar", "default", 0.0); - set_state(PART:"sb_hbar_a2", "default", 0.0); + if (((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x))) { +// set_state(PART:"arrow2_hbar", "hidden", 0.0); +// set_state(PART:"sb_hbar_a2", "hidden", 0.0); + } else { +// set_state(PART:"arrow2_hbar", "default", 0.0); +// set_state(PART:"sb_hbar_a2", "default", 0.0); } - if(val < 10) + if (val < 10) timer(0.1,"action_on_pos_hbar", val+1); } } parts { - program { - signal: "load"; source: ""; + program { signal: "load"; source: ""; script { emit("reload", "elm"); action_on_pos_vbar(0); action_on_pos_hbar(0); } } + + ////////////////////////////////////////////////////////////////////// + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + rel.to: "elm.swallow.background"; +// color: 64 64 64 200; + color: 0 0 0 0; + color_class: "scroller_bg"; + } + } + part { name: "clipper"; type: RECT; + description { state: "default" 0.0; + rel.to: "elm.swallow.background"; + } + } + part { name: "elm.swallow.background"; type: SWALLOW; +// scale: 1; + clip_to: "clipper"; + description { state: "default" 0.0; +// rel1.offset: 2 2; +// rel2.offset: -3 -3; +// offscale; + } + } + part { name: "elm.swallow.content"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel.to: "elm.swallow.background"; + } + } + part { name: "elm.swallow.overlay"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel.to: "elm.swallow.content"; + } + } + + part { name: "sh_top"; mouse_events: 0; + scale: 1; + clip_to: "sh_clip"; + description { state: "default" 0.0; + color: 255 255 255 0; + rel.to: "elm.swallow.content"; + rel1.offset: 0 -1; + rel2.offset: -1 -1; + rel2.relative: 1.0 0.0; + image.normal: "shadow_circle_horiz.png"; + visible: 0; + offscale; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: 0 -16; + rel2.offset: -1 15; + visible: 1; + } + } + program { signal: "elm,action,show,up"; source: "elm"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "sh_top"; + } + program { signal: "elm,action,hide,up"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "sh_top"; + } + + part { name: "sh_bottom"; mouse_events: 0; + scale: 1; + clip_to: "sh_clip"; + description { state: "default" 0.0; + color: 255 255 255 0; + rel.to: "elm.swallow.content"; + rel1.relative: 0.0 1.0; + rel1.offset: 0 0; + rel2.offset: -1 0; + image.normal: "shadow_circle_horiz.png"; + visible: 0; + offscale; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: 0 -16; + rel2.offset: -1 15; + visible: 1; + } + } + program { signal: "elm,action,show,down"; source: "elm"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "sh_bottom"; + } + program { signal: "elm,action,hide,down"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "sh_bottom"; + } + + part { name: "sh_left"; mouse_events: 0; + scale: 1; + clip_to: "sh_clip"; + description { state: "default" 0.0; + color: 255 255 255 0; + rel.to: "elm.swallow.content"; + rel1.offset: -1 0; + rel2.offset: -1 -1; + rel2.relative: 0.0 1.0; + image.normal: "shadow_circle_vert.png"; + visible: 0; + offscale; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: -16 0; + rel2.offset: 15 -1; + visible: 1; + } + } + program { signal: "elm,action,show,left"; source: "elm"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "sh_left"; + } + program { signal: "elm,action,hide,left"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "sh_left"; + } + + part { name: "sh_right"; mouse_events: 0; + scale: 1; + clip_to: "sh_clip"; + description { state: "default" 0.0; + color: 255 255 255 0; + rel.to: "elm.swallow.content"; + rel1.relative: 1.0 0.0; + rel1.offset: 0 0; + rel2.offset: 0 -1; + image.normal: "shadow_circle_vert.png"; + visible: 0; + offscale; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: -16 0; + rel2.offset: 15 -1; + visible: 1; + } + } + program { signal: "elm,action,show,right"; source: "elm"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "sh_right"; + } + program { signal: "elm,action,hide,right"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "sh_right"; + } + + part { name: "sh_clip"; type: RECT; + description { state: "default" 0.0; + rel.to: "elm.swallow.background"; + } + } + ////////////////////////////////////////////////////////////////////// + // vert bar //////////////////////////////////////////////////////////////// part { name: "sb_vbar_show"; type: RECT; description { state: "default" 0.0; @@ -142,26 +277,14 @@ group { name: "elm/scroller/base/default"; description { state: "hidden" 0.0; inherit: "default" 0.0; min: 0 0; - max: 0 99999; - } - } - part { name: "sb_vbar_base"; type: RECT; - clip_to: "sb_vbar"; - description { state: "default" 0.0; - color: 0 0 0 0; - rel1.relative: 0.0 1.0; - rel1.to: "sb_vbar_a1"; - rel2.relative: 1.0 0.0; - rel2.to: "sb_vbar_a2"; - fixed: 1 1; + max: 0 999999; } } part { name: "sb_vbar_p1"; type: RECT; clip_to: "sb_vbar"; description { state: "default" 0.0; color: 0 0 0 0; - rel1.relative: 0.0 1.0; - rel1.to: "sb_vbar_a1"; + rel1.to: "sb_vbar"; rel2.relative: 1.0 0.0; rel2.to: "elm.dragable.vbar"; fixed: 1 1; @@ -173,8 +296,7 @@ group { name: "elm/scroller/base/default"; color: 0 0 0 0; rel1.relative: 0.0 1.0; rel1.to: "elm.dragable.vbar"; - rel2.relative: 1.0 0.0; - rel2.to: "sb_vbar_a2"; + rel2.to: "sb_vbar"; fixed: 1 1; } } @@ -183,14 +305,14 @@ group { name: "elm/scroller/base/default"; scale: 1; dragable.x: 0 0 0; dragable.y: 1 1 0; - dragable.confine: "sb_vbar_base"; + dragable.confine: "sb_vbar"; description { state: "default" 0.0; fixed: 1 1; - min: 15 13; + min: 15 15; rel1.relative: 0.5 0.5; - rel1.to: "sb_vbar_base"; + rel1.to: "sb_vbar"; rel2.relative: 0.5 0.5; - rel2.to: "sb_vbar_base"; + rel2.to: "sb_vbar"; color: 0 0 0 0; } description { state: "hidden" 0.0; @@ -201,6 +323,28 @@ group { name: "elm/scroller/base/default"; inherit: "default" 0.0; } } + part { name: "sb_vbar_over"; type: RECT; + repeat_events: 1; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.to: "sb_vbar"; + rel1.offset: -45 0; + rel2.to: "sb_vbar"; + fixed: 1 1; + offscale; + } + } + program { signal: "mouse,in"; source: "sb_vbar_over"; + action: STATE_SET "over" 0.0; + transition: DECELERATE 0.2; + target: "base_vbar"; + } + program { signal: "mouse,out"; source: "sb_vbar_over"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.2; + target: "base_vbar"; + } part { name: "y_vbar_up_mapper"; type: SPACER; scale: 1; repeat_events: 1; @@ -209,8 +353,8 @@ group { name: "elm/scroller/base/default"; max: 4 2; fixed: 1 1; align: 0.0 0.0; - rel1.to: "sb_vbar_base"; - rel2.to: "sb_vbar_base"; + rel1.to: "sb_vbar"; + rel2.to: "sb_vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -243,8 +387,8 @@ group { name: "elm/scroller/base/default"; max: 4 2; fixed: 1 1; align: 0.0 1.0; - rel1.to: "sb_vbar_base"; - rel2.to: "sb_vbar_base"; + rel1.to: "sb_vbar"; + rel2.to: "sb_vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -269,58 +413,16 @@ group { name: "elm/scroller/base/default"; max: 0 0; } } - part { name: "sb_vbar_a1"; type: RECT; - clip_to: "sb_vbar"; - description { state: "default" 0.0; - fixed: 1 1; - min: 15 15; - align: 0.5 0.0; - aspect: 1.0 1.0; aspect_preference: HORIZONTAL; - color: 0 0 0 0; - rel1.to: "sb_vbar"; - rel2.to: "sb_vbar"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 0; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - min: 0 0; - visible: 0; - } - } - part { name: "sb_vbar_a2"; type: RECT; - clip_to: "sb_vbar"; - description { state: "default" 0.0; - fixed: 1 1; - min: 15 15; - align: 0.5 1.0; - aspect: 1.0 1.0; aspect_preference: HORIZONTAL; - color: 0 0 0 0; - rel1.to: "sb_vbar"; - rel1.offset: 0 -1; - rel1.relative: 0.0 1.0; - rel2.to: "sb_vbar"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - min: 0 0; - visible: 0; - } - } program { signal: "elm,action,show,vbar"; source: "elm"; action: STATE_SET "default" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; target: "elm.dragable.vbar"; - target: "sb_vbar_a1"; - target: "sb_vbar_a2"; target: "y_vbar_up_mapper"; target: "y_vbar_up"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; - target: "arrow1_vbar_indent"; - target: "arrow2_vbar_indent"; after: "check_pos_vbar"; } program { @@ -329,46 +431,10 @@ group { name: "elm/scroller/base/default"; target: "sb_vbar"; target: "sb_vbar_show"; target: "elm.dragable.vbar"; - target: "sb_vbar_a1"; - target: "sb_vbar_a2"; target: "y_vbar_up_mapper"; target: "y_vbar_up"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; - target: "arrow1_vbar_indent"; - target: "arrow2_vbar_indent"; - } - program { - signal: "mouse,down,1*"; source: "sb_vbar_a1";//ok - action: STATE_SET "clicked" 0.0; - target: "arrow1_vbar"; - after: "anim1_up"; - } - program { name: "anim1_up"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.1; - target: "arrow1_vbar"; - after: "drag_up"; - } - program { name: "drag_up"; - action: DRAG_VAL_STEP 0.0 -1.0; - target: "elm.dragable.vbar"; - } - program { - signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok - action: STATE_SET "clicked" 0.0; - target: "arrow2_vbar"; - after: "anim1_down"; - } - program { name: "anim1_down"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.1; - target: "arrow2_vbar"; - after: "drag_down"; - } - program { name: "drag_down"; - action: DRAG_VAL_STEP 0.0 1.0; - target: "elm.dragable.vbar"; } program { signal: "mouse,down,1*"; source: "sb_vbar_p1"; @@ -429,26 +495,14 @@ group { name: "elm/scroller/base/default"; description { state: "hidden" 0.0; inherit: "default" 0.0; min: 0 0; - max: 99999 0; - } - } - part { name: "sb_hbar_base"; type: RECT; - clip_to: "sb_hbar"; - description { state: "default" 0.0; - color: 0 0 0 0; - rel1.relative: 1.0 0.0; - rel1.to: "sb_hbar_a1"; - rel2.relative: 0.0 1.0; - rel2.to: "sb_hbar_a2"; - fixed: 1 1; + max: 999999 0; } } part { name: "sb_hbar_p1"; type: RECT; clip_to: "sb_hbar"; description { state: "default" 0.0; color: 0 0 0 0; - rel1.relative: 1.0 0.0; - rel1.to: "sb_hbar_a1"; + rel1.to: "sb_hbar"; rel2.relative: 0.0 1.0; rel2.to: "elm.dragable.hbar"; fixed: 1 1; @@ -460,24 +514,23 @@ group { name: "elm/scroller/base/default"; color: 0 0 0 0; rel1.relative: 1.0 0.0; rel1.to: "elm.dragable.hbar"; - rel2.relative: 0.0 1.0; - rel2.to: "sb_hbar_a2"; + rel2.to: "sb_hbar"; fixed: 1 1; } } part { name: "elm.dragable.hbar"; type: RECT; - clip_to: "sb_hbar"; scale: 1; + clip_to: "sb_hbar"; dragable.x: 1 1 0; dragable.y: 0 0 0; - dragable.confine: "sb_hbar_base"; + dragable.confine: "sb_hbar"; description { state: "default" 0.0; fixed: 1 1; - min: 13 15; + min: 15 15; rel1.relative: 0.5 0.5; - rel1.to: "sb_hbar_base"; + rel1.to: "sb_hbar"; rel2.relative: 0.5 0.5; - rel2.to: "sb_hbar_base"; + rel2.to: "sb_hbar"; color: 0 0 0 0; } description { state: "hidden" 0.0; @@ -488,6 +541,28 @@ group { name: "elm/scroller/base/default"; inherit: "default" 0.0; } } + part { name: "sb_hbar_over"; type: RECT; + repeat_events: 1; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.to: "sb_hbar"; + rel1.offset: 0 -45; + rel2.to: "sb_hbar"; + fixed: 1 1; + offscale; + } + } + program { signal: "mouse,in"; source: "sb_hbar_over"; + action: STATE_SET "over" 0.0; + transition: DECELERATE 0.2; + target: "base_hbar"; + } + program { signal: "mouse,out"; source: "sb_hbar_over"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.2; + target: "base_hbar"; + } part { name: "x_hbar_left_mapper"; type: SPACER; scale: 1; repeat_events: 1; @@ -496,8 +571,8 @@ group { name: "elm/scroller/base/default"; max: 2 4; fixed: 1 1; align: 0.0 1.0; - rel1.to: "sb_hbar_base"; - rel2.to: "sb_hbar_base"; + rel1.to: "sb_hbar"; + rel2.to: "sb_hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -530,8 +605,8 @@ group { name: "elm/scroller/base/default"; max: 2 4; fixed: 1 1; align: 1.0 1.0; - rel1.to: "sb_hbar_base"; - rel2.to: "sb_hbar_base"; + rel1.to: "sb_hbar"; + rel2.to: "sb_hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -556,58 +631,16 @@ group { name: "elm/scroller/base/default"; max: 0 0; } } - part { name: "sb_hbar_a1"; type: RECT; - clip_to: "sb_hbar"; - description { state: "default" 0.0; - fixed: 1 1; - min: 15 15; - align: 0.0 0.5; - aspect: 1.0 1.0; aspect_preference: VERTICAL; - color: 0 0 0 0; - rel1.to: "sb_hbar"; - rel2.to: "sb_hbar"; - rel2.relative: 0.0 1.0; - rel2.offset: 0 -1; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - min: 0 0; - visible: 0; - } - } - part { name: "sb_hbar_a2"; type: RECT; - clip_to: "sb_hbar"; - description { state: "default" 0.0; - fixed: 1 1; - min: 15 15; - align: 1.0 0.5; - aspect: 1.0 1.0; aspect_preference: VERTICAL; - color: 0 0 0 0; - rel1.to: "sb_hbar"; - rel1.offset: -1 0; - rel1.relative: 1.0 0.0; - rel2.to: "sb_hbar"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - min: 0 0; - visible: 0; - } - } program { signal: "elm,action,show,hbar"; source: "elm"; action: STATE_SET "default" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; target: "elm.dragable.hbar"; - target: "sb_hbar_a1"; - target: "sb_hbar_a2"; target: "x_hbar_left_mapper"; target: "x_hbar_left"; target: "x_hbar_right_mapper"; target: "x_hbar_right"; - target: "arrow1_hbar_indent"; - target: "arrow2_hbar_indent"; after: "check_pos_hbar"; } program { @@ -616,46 +649,10 @@ group { name: "elm/scroller/base/default"; target: "sb_hbar"; target: "sb_hbar_show"; target: "elm.dragable.hbar"; - target: "sb_hbar_a1"; - target: "sb_hbar_a2"; target: "x_hbar_left_mapper"; target: "x_hbar_left"; target: "x_hbar_right_mapper"; target: "x_hbar_right"; - target: "arrow1_hbar_indent"; - target: "arrow2_hbar_indent"; - } - program { - signal: "mouse,down,1*"; source: "sb_hbar_a1"; - action: STATE_SET "clicked" 0.0; - target: "arrow1_hbar"; - after: "anim1_left"; - } - program { name: "anim1_left"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.1; - target: "arrow1_hbar"; - after: "drag_left"; - } - program { name: "drag_left"; - action: DRAG_VAL_STEP -1.0 0.0; - target: "elm.dragable.hbar"; - } - program { - signal: "mouse,down,1*"; source: "sb_hbar_a2"; - action: STATE_SET "clicked" 0.0; - target: "arrow2_hbar"; - after: "anim2_left"; - } - program { name: "anim2_left"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.1; - target: "arrow2_hbar"; - after: "drag_right"; - } - program { name: "drag_right"; - action: DRAG_VAL_STEP 1.0 0.0; - target: "elm.dragable.hbar"; } program { signal: "mouse,down,1*"; source: "sb_hbar_p1"; @@ -694,459 +691,104 @@ group { name: "elm/scroller/base/default"; action_on_pos_hbar(10); } } - part { name: "bg"; type: RECT; - description { state: "default" 0.0; - rel1.to: "elm.swallow.background"; - rel2.to: "elm.swallow.background"; -// color: 64 64 64 200; - color: 0 0 0 0; - color_class: "scroller_bg"; - } - } - part { name: "clipper"; type: RECT; - description { state: "default" 0.0; - rel1.to: "elm.swallow.background"; - rel2.to: "elm.swallow.background"; - } - } - part { name: "elm.swallow.background"; type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.relative: 0.0 0.0; - rel2.offset: -2 -2; - rel2.to_x: "sb_vbar"; - rel2.to_y: "sb_hbar"; - } - } - part { name: "elm.swallow.content"; type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.relative: 0.0 0.0; - rel2.offset: -2 -2; - rel2.to_x: "sb_vbar"; - rel2.to_y: "sb_hbar"; - } - } - 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; - } - } - 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: "elm.swallow.overlay"; type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; - } - } - part { name: "runner_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - image.normal: "runner_vert.png"; - image.border: 0 0 2 2; - rel1.to: "sb_vbar_base"; - rel2.to: "sb_vbar_base"; - fill.smooth: 0; - min: 3 4; - max: 3 99999; - fixed: 1 1; - } - } - part { name: "runner_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - image.normal: "runner_horiz.png"; - image.border: 2 2 0 0; - rel1.to: "sb_hbar_base"; - rel2.to: "sb_hbar_base"; - fill.smooth: 0; - min: 4 3; - max: 99999 3; - fixed: 1 1; - } - } - part { name: "runner_vbar_clip"; type: RECT; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - min: 1 1; - max: 1 99999; - rel1.to: "runner_vbar"; - rel1.offset: 0 1; - rel2.to: "runner_vbar"; - rel2.offset: -1 -2; - fixed: 1 1; - } - } - part { name: "runner_hbar_clip"; type: RECT; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - min: 1 1; - max: 99999 1; - rel1.to: "runner_hbar"; - rel1.offset: 1 0; - rel2.to: "runner_hbar"; - rel2.offset: -2 -1; - fixed: 1 1; - } - } - part { name: "arrow1_vbar_indent"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "sb_vbar_a1"; - rel2.to: "sb_vbar_a1"; - image.normal: "sym_up_dark_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "arrow1_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - rel1.to: "sb_vbar_a1"; - rel2.to: "sb_vbar_a1"; - image.normal: "sym_up_light_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "sym_up_glow_normal.png"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "arrow2_vbar_indent"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "sb_vbar_a2"; - rel2.to: "sb_vbar_a2"; - image.normal: "sym_down_dark_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "arrow2_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - rel1.to: "sb_vbar_a2"; - rel2.to: "sb_vbar_a2"; - image.normal: "sym_down_light_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "sym_down_glow_normal.png"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "shadow_vbar"; mouse_events: 0; + + ////////////////////////////////////////////////////////////////////// + part { name: "color_vbar"; type: RECT; mouse_events: 0; clip_to: "sb_vbar_show"; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel1.to: "base_vbar"; - rel2.offset: 2 4; - rel2.to: "base_vbar"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; fixed: 1 1; + color: 51 153 255 255; } - description { state: "clicked" 0.0; + description { state: "disabled" 0.0; inherit: "default" 0.0; - rel1.offset: -2 -2; - rel2.offset: 1 1; - color: 255 255 255 128; - } - } - part { name: "glow_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - rel1.offset: -3 -3; - rel1.to: "base_vbar"; - rel2.offset: 2 2; - rel2.to: "base_vbar"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - visible: 0; - fixed: 1 1; + color: 80 80 80 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } - part { name: "runner_glow_vbar"; mouse_events: 0; - clip_to: "runner_vbar_clip"; - description { state: "default" 0.0; - rel1.offset: 0 -30; - rel1.to_x: "runner_vbar_clip"; - rel1.to_y: "base_vbar"; - rel2.offset: -1 29; - rel2.to_x: "runner_vbar_clip"; - rel2.to_y: "base_vbar"; - image.normal: "runner_glow_vert.png"; - image.border: 0 0 33 33; - fixed: 1 1; - } - } - part { name: "base_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.offset: 2 0; - rel1.to: "elm.dragable.vbar"; - rel2.offset: -3 -1; - rel2.to: "elm.dragable.vbar"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - min: 3 13; - TILED_HORIZ(120) - fixed: 1 1; - color_class: "scroller_bar"; - } - } - part { name: "bevel_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; + + part { name: "base_vbar"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "color_vbar"; description { state: "default" 0.0; - rel1.to: "base_vbar"; - rel2.to: "base_vbar"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - min: 3 3; fixed: 1 1; + rel.to: "elm.dragable.vbar"; + min: 5 15; + max: 5 999999; + align: 1.0 0.5; } - } - part { name: "center_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - rel1.to: "base_vbar"; - rel2.to: "base_vbar"; - image.normal: "holes_tiny_vert.png"; - FIXED_SIZE(3, 11) - } - } - part { name: "center_glow_vbar"; mouse_events: 0; - clip_to: "sb_vbar_show"; - description { state: "default" 0.0; - rel1.to: "center_vbar"; - rel2.to: "center_vbar"; - image.normal: "holes_tiny_glow_vert.png"; - FIXED_SIZE(11, 17) - visible: 0; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "arrow1_hbar_indent"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "sb_hbar_a1"; - rel2.to: "sb_hbar_a1"; - image.normal: "sym_left_dark_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "arrow1_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - rel1.to: "sb_hbar_a1"; - rel2.to: "sb_hbar_a1"; - image.normal: "sym_left_light_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_glow_normal.png"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "arrow2_hbar_indent"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "sb_hbar_a2"; - rel2.to: "sb_hbar_a2"; - image.normal: "sym_right_dark_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "arrow2_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - rel1.to: "sb_hbar_a2"; - rel2.to: "sb_hbar_a2"; - image.normal: "sym_right_light_normal.png"; - FIXED_SIZE(15, 15) - } - description { state: "clicked" 0.0; + description { state: "over" 0.0; inherit: "default" 0.0; - image.normal: "sym_right_glow_normal.png"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; + min: 15 15; + max: 15 999999; } } - part { name: "shadow_hbar"; mouse_events: 0; + + ////////////////////////////////////////////////////////////////////// + part { name: "color_hbar"; type: RECT; mouse_events: 0; clip_to: "sb_hbar_show"; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel1.to: "base_hbar"; - rel2.offset: 2 4; - rel2.to: "base_hbar"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; fixed: 1 1; + color: 51 153 255 255; } - description { state: "clicked" 0.0; + description { state: "disabled" 0.0; inherit: "default" 0.0; - rel1.offset: -2 -2; - rel2.offset: 1 1; - color: 255 255 255 128; - } - } - part { name: "glow_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - rel1.offset: -3 -3; - rel1.to: "base_hbar"; - rel2.offset: 2 2; - rel2.to: "base_hbar"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - visible: 0; - fixed: 1 1; + color: 80 80 80 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - visible: 1; - } - } - part { name: "runner_glow_hbar"; mouse_events: 0; - clip_to: "runner_hbar_clip"; - description { state: "default" 0.0; - rel1.offset: -30 0; - rel1.to_x: "base_hbar"; - rel1.to_y: "runner_hbar_clip"; - rel2.offset: 29 -1; - rel2.to_x: "base_hbar"; - rel2.to_y: "runner_hbar_clip"; - image.normal: "runner_glow_horiz.png"; - image.border: 33 33 0 0; - fixed: 1 1; + color: 255 255 255 255; } } - part { name: "base_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.offset: 0 2; - rel1.to: "elm.dragable.hbar"; - rel2.offset: -1 -3; - rel2.to: "elm.dragable.hbar"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - min: 13 3; - TILED_HORIZ(120) - } - } - part { name: "bevel_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - rel1.to: "base_hbar"; - rel2.to: "base_hbar"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - min: 3 3; - fixed: 1 1; - } - } - part { name: "center_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; + + part { name: "base_hbar"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "color_hbar"; description { state: "default" 0.0; - rel1.to: "base_hbar"; - rel2.to: "base_hbar"; - image.normal: "holes_tiny_horiz.png"; - FIXED_SIZE(11, 3) fixed: 1 1; + rel.to: "elm.dragable.hbar"; + min: 15 5; + max: 999999 5; + align: 0.5 1.0; } - } - part { name: "center_glow_hbar"; mouse_events: 0; - clip_to: "sb_hbar_show"; - description { state: "default" 0.0; - rel1.to: "center_hbar"; - rel2.to: "center_hbar"; - image.normal: "holes_tiny_glow_horiz.png"; - FIXED_SIZE(17, 11) - visible: 0; - } - description { state: "clicked" 0.0; + description { state: "over" 0.0; inherit: "default" 0.0; - visible: 1; + min: 15 15; + 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: 50 50 50 255; + color: 32 32 32 255; } } } programs { program { + signal: "elm,state,disabled"; source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "color_hbar"; + target: "color_vbar"; + } + program { + signal: "elm,state,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "color_hbar"; + target: "color_vbar"; + } + program { signal: "mouse,down,1*"; source: "elm.dragable.vbar"; action: STATE_SET "clicked" 0.0; target: "elm.dragable.vbar"; - target: "shadow_vbar"; - target: "glow_vbar"; - target: "center_glow_vbar"; + target: "color_vbar"; } program { signal: "mouse,down,*"; source: "elm.dragable.vbar"; @@ -1156,21 +798,18 @@ group { name: "elm/scroller/base/default"; signal: "mouse,up,1"; source: "elm.dragable.vbar"; action: STATE_SET "default" 0.0; target: "elm.dragable.vbar"; - target: "shadow_vbar"; - target: "glow_vbar"; - target: "center_glow_vbar"; + target: "color_vbar"; } program { signal: "mouse,up,*"; source: "elm.dragable.vbar"; action: SIGNAL_EMIT "elm,vbar,unpress" "elm"; } + program { signal: "mouse,down,1*"; source: "elm.dragable.hbar"; action: STATE_SET "clicked" 0.0; target: "elm.dragable.hbar"; - target: "shadow_hbar"; - target: "glow_hbar"; - target: "center_glow_hbar"; + target: "color_hbar"; } program { signal: "mouse,down,*"; source: "elm.dragable.hbar"; @@ -1180,9 +819,7 @@ group { name: "elm/scroller/base/default"; signal: "mouse,up,1"; source: "elm.dragable.hbar"; action: STATE_SET "default" 0.0; target: "elm.dragable.hbar"; - target: "shadow_hbar"; - target: "glow_hbar"; - target: "center_glow_hbar"; + target: "color_hbar"; } program { signal: "mouse,up,*"; source: "elm.dragable.hbar"; @@ -1276,12 +913,7 @@ group { name: "elm/scroller/base/noclip"; rel2.offset: -1 -1; } } - part { name: "inset"; - description { state: "default" 0.0; - visible: 0; - } - } - part { name: "shadow"; + part { name: "sh_clip"; type: RECT; description { state: "default" 0.0; visible: 0; } @@ -1291,8 +923,7 @@ group { name: "elm/scroller/base/noclip"; group { name: "elm/scroller/contents/default"; parts { - part { name: "elm.swallow.content"; - type: SWALLOW; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; } } @@ -1352,15 +983,5 @@ group { name: "elm/scroller/base/popup/no_inset_shadow"; rel2.offset: 0 0; } } - part { name: "inset"; - description { state: "default" 0.0; - visible: 0; - } - } - part { name: "shadow"; - description { state: "default" 0.0; - visible: 0; - } - } } } diff --git a/data/elementary/themes/edc/elm/separator.edc b/data/elementary/themes/edc/elm/separator.edc index a61d9785e1..c6cbc97c4f 100644 --- a/data/elementary/themes/edc/elm/separator.edc +++ b/data/elementary/themes/edc/elm/separator.edc @@ -1,15 +1,12 @@ group { name: "elm/separator/horizontal/default"; - images.image: "bevel_dark_in.png" COMP; parts { - part { name: "base"; + rect { name: "base"; description { state: "default" 0.0; - min: 2 2; - max: 99999 2; + min: 1 1; + max: 99999 1; rel1.offset: 4 4; rel2.offset: -5 -5; - image.normal: "bevel_dark_in.png"; - image.border: 2 2 2 2; - fill.smooth: 0; + color: 72 72 72 255; } } } @@ -19,9 +16,9 @@ group { name: "elm/separator/vertical/default"; parts { part { name: "base"; description { state: "default" 0.0; - max: 2 99999; + max: 1 99999; } } } } - + diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc index 2ea9293f5b..e31f108011 100644 --- a/data/elementary/themes/edc/elm/toolbar.edc +++ b/data/elementary/themes/edc/elm/toolbar.edc @@ -1,9 +1,5 @@ // === toolbar default base with scrolling arrows etc. group { name: "elm/toolbar/base/default"; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "shadow_square_tiny.png" COMP; images.image: "sym_left_light_normal.png" COMP; images.image: "sym_left_glow_normal.png" COMP; images.image: "sym_right_light_normal.png" COMP; @@ -13,22 +9,9 @@ group { name: "elm/toolbar/base/default"; images.image: "sym_down_light_normal.png" COMP; images.image: "sym_down_glow_normal.png" COMP; parts { - part { name: "shadow"; mouse_events: 0; + part { name: "base"; type: RECT; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel2.offset: 2 3; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - } - } - part { name: "base"; - description { state: "default" 0.0; - image.normal: "vgrad_med_lighter.png"; - rel1.offset: 0 0; - rel2.offset: -1 -1; - fill.smooth: 0; - TILED_HORIZ(120) + color: 64 64 64 255; } } part { name: "clipper"; type: RECT; @@ -40,21 +23,8 @@ group { name: "elm/toolbar/base/default"; part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; - rel1.offset: 0 0; - rel2.offset: -1 -1; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; } } - part { name: "arrow_clipper_l"; type: RECT; description { state: "default" 0.0; visible: 0; @@ -122,17 +92,6 @@ group { name: "elm/toolbar/base/default"; FIXED_SIZE(23, 23) } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "base"; - FIXED_SIZE(69, 5) - } - } part { name: "arrow_clipper_u"; type: RECT; description { state: "default" 0.0; @@ -373,10 +332,6 @@ group { name: "elm/toolbar/item/default"; images.image: "shadow_angled_in_sides.png" COMP; images.image: "horizontal_separated_bar_small_glow.png" COMP; images.image: "bevel_dark_in.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 script { public btmode; public eval_mode(m) { @@ -593,7 +548,6 @@ group { name: "elm/toolbar/item/default"; } } part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "text_clip1"; description { state: "default" 0.0; @@ -601,8 +555,7 @@ group { name: "elm/toolbar/item/default"; rel1.relative: 0.0 1.0; rel2.offset: -5 -3; align: 0.5 1.0; - color: FN_COL_DEFAULT; - color_class: "toolbar_item"; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -614,13 +567,11 @@ group { name: "elm/toolbar/item/default"; description { state: "selected" 0.0; inherit: "default" 0.0; visible: 0; - color_class: "toolbar_item_selected"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; - } + color: 80 80 80 255; + } description { state: "noicon" 0.0; inherit: "default" 0.0; rel1.offset: 4 2; @@ -628,8 +579,7 @@ group { name: "elm/toolbar/item/default"; } description { state: "noicon_disabled" 0.0; inherit: "noicon" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "icononly" 0.0; inherit: "default" 0.0; @@ -647,8 +597,7 @@ group { name: "elm/toolbar/item/default"; rel1.to: "elm.text"; rel2.offset: 2 1; rel2.to: "elm.text"; - color: FN_COL_HIGHLIGHT; - color_class: "toolbar_item_active"; + color: 255 255 255 255; text { font: FN; size: 10; text_source: "elm.text"; align: 0.5 0.5; @@ -685,7 +634,6 @@ group { name: "elm/toolbar/item/default"; } } part { name: "elm.text_new"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "text_clip2"; description { state: "default" 0.0; @@ -693,9 +641,8 @@ group { name: "elm/toolbar/item/default"; rel1.relative: 0.0 1.0; rel2.offset: -5 -3; align: 0.5 1.0; - color: FN_COL_DEFAULT; - color_class: "toolbar_item"; - text { font: FN; size: 10; + color: 160 160 160 255; + text { font: FN; size: 10; min: 1 1; ellipsis: -1; align: 0.5 0.5; @@ -706,12 +653,10 @@ group { name: "elm/toolbar/item/default"; description { state: "selected" 0.0; inherit: "default" 0.0; visible: 0; - color_class: "toolbar_item_selected"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "noicon" 0.0; inherit: "default" 0.0; @@ -720,8 +665,7 @@ group { name: "elm/toolbar/item/default"; } description { state: "noicon_disabled" 0.0; inherit: "noicon" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "icononly" 0.0; inherit: "default" 0.0; @@ -739,8 +683,7 @@ group { name: "elm/toolbar/item/default"; rel1.to: "elm.text"; rel2.offset: 2 1; rel2.to: "elm.text"; - color: FN_COL_HIGHLIGHT; - color_class: "toolbar_item_active"; + color: 255 255 255 255; text { font: FN; size: 10; text_source: "elm.text"; align: 0.5 0.5; @@ -985,10 +928,6 @@ group { name: "elm/toolbar/item/default"; target: "text_clip2"; } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } // === item: style assumed to exist @@ -1000,10 +939,6 @@ group { name: "elm/toolbar/item/item_horizontal"; images.image: "shadow_angled_in_sides.png" COMP; images.image: "horizontal_separated_bar_small_glow.png" COMP; images.image: "bevel_dark_in.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 script { public btmode; public eval_mode(m) { @@ -1222,7 +1157,6 @@ group { name: "elm/toolbar/item/item_horizontal"; } } part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "text_clip1"; description { state: "default" 0.0; @@ -1231,8 +1165,7 @@ group { name: "elm/toolbar/item/item_horizontal"; rel1.to_x: "elm.swallow.icon"; rel2.offset: -5 -3; align: 0.0 0.5; - color: FN_COL_DEFAULT; - color_class: "toolbar_item"; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -1243,13 +1176,12 @@ group { name: "elm/toolbar/item/item_horizontal"; } description { state: "selected" 0.0; inherit: "default" 0.0; + color: 255 255 255 255; visible: 0; - color_class: "toolbar_item_selected"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "noicon" 0.0; inherit: "default" 0.0; @@ -1261,8 +1193,7 @@ group { name: "elm/toolbar/item/item_horizontal"; } description { state: "noicon_disabled" 0.0; inherit: "noicon" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "icononly" 0.0; inherit: "default" 0.0; @@ -1280,8 +1211,7 @@ group { name: "elm/toolbar/item/item_horizontal"; rel1.to: "elm.text"; rel2.offset: 2 1; rel2.to: "elm.text"; - color: FN_COL_HIGHLIGHT; - color_class: "toolbar_item_active"; + color: 255 255 255 255; align: 0.0 0.5; text { font: FN; size: 10; text_source: "elm.text"; @@ -1319,7 +1249,6 @@ group { name: "elm/toolbar/item/item_horizontal"; } } part { name: "elm.text_new"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "text_clip2"; description { state: "default" 0.0; @@ -1328,8 +1257,7 @@ group { name: "elm/toolbar/item/item_horizontal"; rel1.to_x: "elm.swallow.icon"; rel2.offset: -5 -3; align: 0.0 0.5; - color: FN_COL_DEFAULT; - color_class: "toolbar_item"; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -1341,12 +1269,11 @@ group { name: "elm/toolbar/item/item_horizontal"; description { state: "selected" 0.0; inherit: "default" 0.0; visible: 0; - color_class: "toolbar_item_selected"; + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "noicon" 0.0; inherit: "default" 0.0; @@ -1356,8 +1283,7 @@ group { name: "elm/toolbar/item/item_horizontal"; } description { state: "noicon_disabled" 0.0; inherit: "noicon" 0.0; - color: FN_COL_DISABLE; - color_class: "toolbar_item_disabled"; + color: 80 80 80 255; } description { state: "icononly" 0.0; inherit: "default" 0.0; @@ -1376,8 +1302,7 @@ group { name: "elm/toolbar/item/item_horizontal"; rel1.to: "elm.text"; rel2.offset: 2 1; rel2.to: "elm.text"; - color: FN_COL_HIGHLIGHT; - color_class: "toolbar_item_active"; + color: 255 255 255 255; text { font: FN; size: 10; text_source: "elm.text"; align: 0.0 0.5; @@ -1622,10 +1547,6 @@ group { name: "elm/toolbar/item/item_horizontal"; target: "text_clip2"; } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } // === separator diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc index 3dd3ac0305..66a6c7f2d1 100644 --- a/data/elementary/themes/edc/fileman.edc +++ b/data/elementary/themes/edc/fileman.edc @@ -434,90 +434,24 @@ group { name: "e/fileman/desktop/list/fixed"; group { name: "e/fileman/default/icon/fixed"; alias: "e/fileman/default/icon/variable"; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "glow_small.png" COMP; - images.image: "shadow_square_tiny.png" COMP; images.image: "sym_icon_op_ask.png" COMP; images.image: "sym_icon_op_copy.png" COMP; images.image: "sym_icon_op_move.png" COMP; styles { style { name: "fileman_icon_name"; - base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#ffffffff wrap=mixed style=shadow,bottom shadow_color=#00000080 align=center ellipsis=1.0"; + base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#a0a0a0ff wrap=mixed ellipsis=1.0"; } style { name: "fileman_icon_name_selected"; - base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#3399ffff wrap=mixed style=glow glow_color=#3399ff18 align=center glow2_color=#3399ff12 ellipsis=1.0"; + base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#ffffffff wrap=mixed ellipsis=1.0"; } } script { public longpressed; } parts { - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - rel1.offset: -3 -2; - rel1.to: "sel_base"; - rel2.offset: 2 3; - rel2.to: "sel_base"; - fill.smooth: 0; - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "sel_glow"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "sel_base"; - rel2.to: "sel_base"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - color: 255 255 255 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.offset: -4 -4; - rel2.offset: 3 3; - color: 255 255 255 128; - visible: 1; - } - description { state: "hilighted" 0.0; - inherit: "default" 0.0; - rel1.offset: -4 -4; - rel2.offset: 3 3; - color: 255 255 255 255; - visible: 1; - } - } - part { name: "sel_base"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - TILED_HORIZ(120) - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "sel_bevel"; mouse_events: 0; + part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "sel_base"; - rel2.to: "sel_base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 51 153 255 255; visible: 0; } description { state: "selected" 0.0; @@ -528,14 +462,12 @@ group { name: "e/fileman/default/icon/fixed"; ////////////////////////////// part { name: "label0"; type: SPACER; scale: 1; - clip_to: "textmaster"; description { state: "default" 0.0; align: 0.5 1.0; rel1.offset: 4 -5; - rel2.relative: 1.0 1.0; rel2.offset: -5 -5; - min: 0 20; - max: 99999 26; + min: 0 10; + max: 99999 28; fixed: 0 1; } } @@ -546,8 +478,6 @@ group { name: "e/fileman/default/icon/fixed"; align: 0.5 0.0; rel1.to: "label0"; rel2.to: "label0"; - rel2.offset: -1 6; - color_class: "fileman_icon"; text { style: "fileman_icon_name"; align: 0.5 0.0; @@ -557,35 +487,11 @@ group { name: "e/fileman/default/icon/fixed"; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 0; - } - } - part { name: "label2"; type: TEXTBLOCK; mouse_events: 0; - scale: 1; - clip_to: "textmaster"; - description { state: "default" 0.0; - align: 0.5 0.0; - rel1.to: "e.text.label"; - rel2.to: "e.text.label"; - color_class: "fileman_icon_selected"; - text { - text_source: "e.text.label"; - style: "fileman_icon_name_selected"; - align: 0.5 0.0; - text_class: "fileman_icon_selected"; - } - fixed: 1 1; - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + text.style: "fileman_icon_name_selected"; } } part { name: "textmaster"; type: RECT; description { state: "default" 0.0; - rel1.offset: -20 -20; - rel2.offset: 19 19; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -700,23 +606,6 @@ group { name: "e/fileman/default/icon/fixed"; } } ////////////////////////////// - part { name: "sel_shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "sel_base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "sel_base"; - FIXED_SIZE(69, 5) - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } -////////////////////////////// part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; @@ -760,34 +649,13 @@ group { name: "e/fileman/default/icon/fixed"; signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "e.text.label"; - target: "label2"; - target: "shadow"; - target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; - } - program { - signal: "e,state,selected"; source: "e"; - action: STATE_SET "hilighted" 0.0; - transition: DECELERATE 0.2; - target: "sel_glow"; - after: "sel2"; - } - program { name: "sel2"; - action: STATE_SET "visible" 0.0; - transition: SINUSOIDAL 0.3; - target: "sel_glow"; + target: "base"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; - target: "label2"; - target: "shadow"; - target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; - target: "sel_glow"; + target: "base"; } program { signal: "mouse,down,1"; source: "label_event"; @@ -868,59 +736,48 @@ group { name: "e/fileman/default/icon/fixed"; group { name: "e/fileman/desktop/icon/fixed"; inherit: "e/fileman/default/icon/fixed"; alias: "e/fileman/desktop/icon/variable"; - images.image: "darken_square.png" COMP; - styles { - style { name: "fileman_icon_full"; - base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#ff00ffff wrap=mixed style=shadow,bottom shadow_color=#00000080 align=center"; - } - } parts { - part { name: "label1"; type: TEXTBLOCK; mouse_events: 0; - insert_after: "e.text.label"; - scale: 1; - description { state: "default" 0.0; - align: 0.5 0.0; - rel1.to: "e.text.label"; - rel2.to: "e.text.label"; - color_class: "fileman_icon"; - text { - text: "xxxxx"; - text_source: "e.text.label"; - style: "fileman_icon_full"; - align: 0.5 0.0; - text_class: "fileman_icon"; - max: 0 1; - } - fixed: 1 1; + part { name: "base"; type: RECT; mouse_events: 0; + description { state: "selected" 0.0; visible: 0; } } - part { name: "label_min"; type: SPACER; - scale: 1; + part { name: "back"; type: RECT; mouse_events: 0; + insert_before: "e.text.label"; + clip_to: "textmaster"; description { state: "default" 0.0; - align: 0.5 0.0; - rel1.to: "label1"; - rel2.to: "label1"; - max: 99999 26; + rel1.offset: -3 -3; + rel1.to: "labelmin"; + rel2.offset: 2 2; + rel2.to: "labelmin"; + color: 0 0 0 128; fixed: 1 1; } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 0 0 0 192; + } } - part { name: "bevel"; mouse_events: 0; - insert_before: "e.text.label"; - clip_to: "textmaster"; + part { name: "labelmin"; type: TEXTBLOCK; mouse_events: 0; + insert_after: "event"; + scale: 1; description { state: "default" 0.0; - rel1.offset: -8 -7; - rel1.to: "e.text.label"; - rel2.offset: 7 7; - rel2.to: "label_min"; - image.normal: "darken_square.png"; - image.border: 6 6 6 6; - fill.smooth: 0; + align: 0.5 0.0; + rel1.to: "label0"; + rel2.to: "label0"; + text { + style: "fileman_icon_name"; + align: 0.5 0.0; + text_class: "fileman_icon"; + text_source: "e.text.label"; + max: 0 1; + } fixed: 1 1; + visible: 1; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 0; + text.style: "fileman_icon_name_selected"; } } } @@ -928,12 +785,14 @@ group { name: "e/fileman/desktop/icon/fixed"; program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; - target: "bevel"; + target: "back"; + target: "labelmin"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; - target: "bevel"; + target: "back"; + target: "labelmin"; } } } @@ -962,7 +821,7 @@ group { name: "e/fileman/default/scrollframe"; } } part { name: "e.box.operations"; type: BOX; - insert_after: "inset"; + insert_after: "e.swallow.overlay"; description { state: "default" 0.0; rel1.offset: 3 3; rel1.to: "bg"; @@ -980,11 +839,9 @@ group { name: "e/fileman/default/scrollframe"; } group { name: "e/fileman/default/window/main"; - images.image: "bevel_dark_out.png" COMP; parts { part { name: "base"; type: RECT; description { state: "default" 0.0; - color_class: "fwin_base"; color: 64 64 64 255; } } @@ -992,31 +849,23 @@ group { name: "e/fileman/default/window/main"; description { state: "default" 0.0; } } - part { name: "bevel"; - description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } part { name: "e.swallow.favorites"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 1.0; - rel1.offset: 4 4; - rel1.to: "region"; - rel2.offset: 4 -5; + rel1.offset: 0 0; + rel1.to: "region"; + rel2.offset: -1 -1; rel2.relative: 0.0 1.0; - rel2.to: "region"; + rel2.to: "region"; fixed: 1 0; } } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 4 4; - rel1.to: "region"; - rel2.offset: -5 -5; - rel2.to: "region"; + rel1.offset: 0 0; + rel1.to: "region"; + rel2.offset: -1 -1; + rel2.to: "region"; align: 1.0 1.0; } description { state: "fav" 0.0; @@ -1030,18 +879,18 @@ group { name: "e/fileman/default/window/main"; } description { state: "tb_top" 0.0; align: 0.5 0.0; - rel1.offset: 4 4; - // XXX: this is a bug workaround. should be -4 4; - rel2.offset: -9 4; + rel1.offset: 0 0; + // XXX: this is a bug workaround. should be -1 0; + rel2.offset: -1 0; rel2.relative: 1.0 0.0; fixed: 0 1; } description { state: "tb_bottom" 0.0; align: 0.5 1.0; - rel1.offset: 4 -5; + rel1.offset: 0 -1; + // XXX: this is a bug workaround. should be -1 -1; + rel2.offset: -1 -1; rel1.relative: 0.0 1.0; - // XXX: this is a bug workaround. should be -4 -5; - rel2.offset: -9 -5; fixed: 0 1; } } @@ -1051,22 +900,22 @@ group { name: "e/fileman/default/window/main"; description { state: "tb_top" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 1.0; - rel1.to_y: "e.swallow.toolbar"; + rel1.to_y: "e.swallow.toolbar"; } description { state: "tb_bottom" 0.0; inherit: "default" 0.0; rel2.relative: 1.0 0.0; - rel2.to_y: "e.swallow.toolbar"; + rel2.to_y: "e.swallow.toolbar"; } description { state: "tb_left" 0.0; inherit: "default" 0.0; rel1.relative: 1.0 0.0; - rel1.to_x: "e.swallow.toolbar"; + rel1.to_x: "e.swallow.toolbar"; } description { state: "tb_right" 0.0; inherit: "default" 0.0; rel2.relative: 0.0 1.0; - rel2.to_x: "e.swallow.toolbar"; + rel2.to_x: "e.swallow.toolbar"; } } } @@ -1115,27 +964,10 @@ group { name: "e/fileman/default/window/main"; } group { name: "e/fileman/toolbar/default/base"; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "shadow_square_tiny.png" COMP; parts { - part { name: "shadow"; mouse_events: 0; - 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"; + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "vgrad_med_lighter.png"; - rel1.offset: 2 2; - rel2.offset: -3 -3; - fill.smooth: 0; - TILED_HORIZ(120) + color: 64 64 64 255; } } part { name: "e.swallow.event"; type: SWALLOW; @@ -1146,29 +978,8 @@ group { name: "e/fileman/toolbar/default/base"; } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "base"; - FIXED_SIZE(69, 5) + rel1.offset: 4 4; + rel2.offset: -5 -5; } } } @@ -1189,26 +1000,15 @@ group { name: "e/fileman/toolbar/default/base"; } group { name: "e/fileman/popup/default"; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - parts { + parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; color: 64 64 64 255; } } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 4 0; + rel1.offset: 4 4; rel1.relative: 0.0 1.0; rel1.to_y: "e.text.title"; rel2.offset: -5 -5; @@ -1216,15 +1016,13 @@ group { name: "e/fileman/popup/default"; } part { name: "e.text.title"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - color_class: "fileman_popup_title"; rel1.relative: 0.0 0.0; - rel1.offset: 1 3; + rel1.offset: 4 4; rel2.relative: 1.0 0.0; - rel2.offset: -2 3; + rel2.offset: -5 4; align: 0.5 0.0; - color: FN_COL_DEFAULT; + color: 160 160 160 255; text { font: FNBD; size: 10; text_class: "fileman_popup_title"; align: 0.5 0.0; @@ -1233,17 +1031,6 @@ group { name: "e/fileman/popup/default"; fixed: 0 1; } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "base"; - FIXED_SIZE(69, 5) - } - } } } @@ -1261,16 +1048,6 @@ group { name: "e/fileman/desktop/scrollframe"; rel2.offset: -1 -1; } } - part { name: "shadow"; - description { state: "default" 0.0; - visible: 0; - } - } - part { name: "inset"; - description { state: "default" 0.0; - visible: 0; - } - } } } @@ -2215,16 +1992,13 @@ group { name: "modules/efm_navigation/main"; } group { name: "modules/efm_navigation/pathbar_button"; - images.image: "horizontal_separated_bar_small_glow.png" COMP; parts { part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: 6 6; - rel2.offset: -7 -6; - color: FN_COL_DEFAULT; - color_class: "button_text"; + rel2.offset: -7 -7; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -2234,39 +2008,15 @@ group { name: "modules/efm_navigation/pathbar_button"; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 0; - } - } - part { name: "sel_label"; type: TEXT; mouse_events: 0; - effect: GLOW; - scale: 1; - description { state: "default" 0.0; - rel1.offset: -3 -3; - rel1.to: "e.text.label"; - rel2.offset: 3 1; - rel2.to: "e.text.label"; - color: FN_COL_HIGHLIGHT; - color_class: "button_selected"; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.5 0.5; - text_class: "button_text"; - } - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } - part { name: "bar"; mouse_events: 0; + part { name: "bar"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "horizontal_separated_bar_small_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; + align: 0.5 1.0; + min: 1 5; rel1.relative: 0.0 1.0; - rel1.offset: -3 -6; - rel2.offset: 2 3; + color: 51 153 255 255; visible: 0; } description { state: "selected" 0.0; @@ -2289,14 +2039,12 @@ group { name: "modules/efm_navigation/pathbar_button"; signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "e.text.label"; - target: "sel_label"; target: "bar"; } program { signal: "e,state,default"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; - target: "sel_label"; target: "bar"; } } @@ -2307,7 +2055,6 @@ group { name: "modules/efm_navigation/pathbar_scrollframe"; images.image: "sym_right_light_normal.png" COMP; images.image: "sym_left_glow_normal.png" COMP; images.image: "sym_right_glow_normal.png" COMP; - images.image: "horiz_bar_inset.png" COMP; parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; @@ -2326,18 +2073,6 @@ group { name: "modules/efm_navigation/pathbar_scrollframe"; rel2.to_x: "arrow2_ev"; } } - part { name: "inset"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -1 -4; - rel1.to_x: "clipper"; - rel2.offset: 0 2; - rel2.to_x: "clipper"; - image.normal: "horiz_bar_inset.png"; - image.border: 7 7 1 1; - image.middle: 0; - fill.smooth: 0; - } - } part { name: "e.dragable.hbar"; mouse_events: 0; dragable.x: 1 1 0; dragable.y: 0 0 0; diff --git a/data/elementary/themes/edc/gadman.edc b/data/elementary/themes/edc/gadman.edc index 6593f5a396..b5dc4ce1d8 100644 --- a/data/elementary/themes/edc/gadman.edc +++ b/data/elementary/themes/edc/gadman.edc @@ -1,27 +1,14 @@ group { name: "e/gadman/popup"; - images.image: "vgrad_tall.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; parts { - part { name: "bg"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "vgrad_tall.png"; - fill.smooth: 0; - TILED_HORIZ(40) - } - } - part { name: "bevel"; mouse_events: 0; + part { name: "bg"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 64 64 64 255; } } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clip"; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; + rel1.offset: 4 4; + rel2.offset: -5 -5; } } part { name: "clip"; type: RECT; @@ -30,22 +17,6 @@ group { name: "e/gadman/popup"; rel2.to: "e.swallow.content"; } } - rect { "shine_clip"; - desc { - rel1.to_x: "e.swallow.content"; - rel2.to_x: "e.swallow.content"; - rel1.offset: 0 -10; - } - } - part { name: "shine"; mouse_events: 0; clip: "shine_clip"; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - FIXED_SIZE(69, 5) - } - } } } diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc index 3d34f3c5e4..1ae1c2f1c5 100644 --- a/data/elementary/themes/edc/ibar-ibox.edc +++ b/data/elementary/themes/edc/ibar-ibox.edc @@ -1,15 +1,12 @@ group { name: "e/modules/ibar/separator/default"; - images.image: "bevel_dark_in.png" COMP; parts { - part { name: "base"; + part { name: "base"; type: RECT; description { state: "default" 0.0; - min: 2 2; - max: 2 99999; + min: 1 1; + max: 1 99999; rel1.offset: 4 4; rel2.offset: -5 -5; - image.normal: "bevel_dark_in.png"; - image.border: 2 2 2 2; - fill.smooth: 0; + color: 80 80 80 255; } } } @@ -20,7 +17,7 @@ group { name: "e/modules/ibar/separator/horizontal"; parts { part { name: "base"; description { state: "default" 0.0; - max: 99999 2; + max: 99999 1; } } } @@ -29,9 +26,8 @@ group { name: "e/modules/ibar/separator/horizontal"; group { name: "e/modules/ibox/icon"; alias: "e/modules/ibar/icon"; // 1 or 0 if u want an icon holder to raise when the mouse (or keyboard) hilights it - data.item: "raise_on_hilight" "0"; + data.item: "raise_on_hilight" "1"; // data.item: "item_list" "item item2 item3"; - images.image: "led_tiny_blue.png" COMP; parts { part { name: "item_clip"; type: RECT; description { state: "default" 0.0; @@ -44,9 +40,20 @@ group { name: "e/modules/ibox/icon"; color: 255 255 255 64; } } + part { name: "content"; type: SPACER; + description { state: "default" 0.0; + } + description { state: "starting" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.1 0.1; + rel2.relative: 0.9 0.9; + } + } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "item_clip"; description { state: "default" 0.0; + rel1.to: "content"; + rel2.to: "content"; rel1.offset: 3 3; rel2.offset: -4 -4; } @@ -61,21 +68,91 @@ group { name: "e/modules/ibox/icon"; rel2.relative: 1.0 0.85; } } - part { name: "indicator"; + part { name: "clip"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + } + } + part { name: "clip1"; type: RECT; mouse_events: 0; + clip_to: "clip"; + description { state: "default" 0.0; + visible: 1; + } + description { state: "left" 0.0; + visible: 0; + } + description { state: "right" 0.0; + visible: 0; + } + } + part { name: "clip2"; type: RECT; mouse_events: 0; + clip_to: "clip"; + description { state: "default" 0.0; + visible: 0; + } + description { state: "left" 0.0; + visible: 1; + } + description { state: "right" 0.0; + visible: 0; + } + } + part { name: "clip3"; type: RECT; mouse_events: 0; + clip_to: "clip"; + description { state: "default" 0.0; + visible: 0; + } + description { state: "left" 0.0; + visible: 0; + } + description { state: "right" 0.0; + visible: 1; + } + } + part { name: "indicator1"; type: RECT; + scale: 1; + clip_to: "clip1"; description { state: "default"; - min: 10 10; - max: 10 10; - rel1.relative: 1.0 1.0; - rel1.offset: -5 -5; - rel2.relative: 1.0 1.0; - rel2.offset: -4 -4; - image.normal: "led_tiny_blue.png"; - color: 255 255 255 0; + color: 51 153 255 255; visible: 0; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + max: 99999 5; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + rel1.relative: 0.0 0.5; + visible: 1; + } + } + part { name: "indicator2"; type: RECT; + scale: 1; + clip_to: "clip2"; + description { state: "default"; + color: 51 153 255 255; + visible: 0; + rel2.relative: 0.0 1.0; + align: 0.0 0.5; + max: 5 99999; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel2.relative: 0.5 1.0; + visible: 1; + } + } + part { name: "indicator3"; type: RECT; + scale: 1; + clip_to: "clip3"; + description { state: "default"; + color: 51 153 255 255; + visible: 0; + rel1.relative: 1.0 0.0; + align: 1.0 0.5; + max: 5 99999; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.5 0.0; visible: 1; } } @@ -86,6 +163,28 @@ group { name: "e/modules/ibox/icon"; } } programs { + program { + signal: "e,origin,center"; source: "e"; + action: STATE_SET "default" 0.0; + target: "clip1"; + target: "clip2"; + target: "clip3"; + } + program { + signal: "e,origin,left"; source: "e"; + action: STATE_SET "left" 0.0; + target: "clip1"; + target: "clip2"; + target: "clip3"; + } + program { + signal: "e,origin,right"; source: "e"; + action: STATE_SET "right" 0.0; + target: "clip1"; + target: "clip2"; + target: "clip3"; + } + ///////////////////////////////////////////////////////////// // program { // signal: "e,action,exec"; source: "e"; // } @@ -106,38 +205,34 @@ group { name: "e/modules/ibox/icon"; // } program { signal: "e,state,starting"; source: "e"; - action: STATE_SET "disabled" 0.0; - target: "item_clip"; + action: STATE_SET "starting" 0.0; + transition: DECELERATE 0.2; + target: "content"; } program { signal: "e,state,started"; source: "e"; action: STATE_SET "default" 0.0; - target: "item_clip"; - } - program { name: "ion"; - signal: "e,state,on"; source: "e"; - action: STATE_SET "visible" 0.0; - target: "indicator"; - transition: ACCELERATE 0.1; - } - program { name: "ioff"; - signal: "e,state,off"; source: "e"; - action: STATE_SET "default" 0.0; - target: "indicator"; - transition: DECELERATE 0.1; + transition: ACCELERATE 0.2; + target: "content"; } + ///////////////////////////////////////////////////////////// program { signal: "e,state,on"; source: "e"; action: STATE_SET "visible" 0.0; - target: "indicator"; + target: "indicator1"; + target: "indicator2"; + target: "indicator3"; transition: ACCELERATE 0.2; } program { signal: "e,state,off"; source: "e"; action: STATE_SET "default" 0.0; - target: "indicator"; - transition: DECELERATE 0.8; + target: "indicator1"; + target: "indicator2"; + target: "indicator3"; + transition: DECELERATE 0.2; } + ///////////////////////////////////////////////////////////// program { signal: "e,state,urgent"; source: "e"; action: STATE_SET "bounce1" 0.0; @@ -164,270 +259,11 @@ group { name: "e/modules/ibox/icon"; } } -group { name: "e/modules/ibar/menu"; - images.image: "darken_square.png" COMP; - parts { - part { name: "sizer"; type: SPACER; - description { state: "default"; } - description { state: "hidden"; - fixed: 1 1; - rel1.relative: 0.5 1.0; - rel2.relative: 0.5 1.0; - minmul: 0 0; - } - } - part { name: "clip"; type: RECT; - description { state: "default"; - rel1.offset: -9999 -9999; - rel2.offset: 9999 9999; - } - description { state: "hidden"; - inherit: "default"; - color: 0 0 0 0; - } - } - part { name: "base"; mouse_events: 0; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "sizer"; - rel2.to: "sizer"; - image.normal: "darken_square.png"; - image.border: 6 6 6 6; - } - } - part { name: "e.box"; type: BOX; - clip_to: "clip"; - description { state: "default"; - rel1.to: "sizer"; - rel1.offset: 12 12; - rel2.to: "sizer"; - rel2.offset: -13 -13; - box { layout: "vertical"; - padding: 0 0; - align: 0.5 0.5; - min: 1 1; - } - } - } - } - programs { - program { signal: "e,state,hidden"; source: "e"; - action: STATE_SET "hidden" 0.0; - target: "sizer"; - target: "clip"; - } - - program { signal: "e,action,show"; source: "e"; - action: STATE_SET "default" 0.0; - target: "sizer"; - target: "clip"; - transition: SINUSOIDAL 0.2; - after: "show2"; - } - program { name: "show2"; - action: SIGNAL_EMIT "e,action,show,done" ""; - } - - program { signal: "e,action,hide"; source: "e"; - action: STATE_SET "hidden" 0.0; - target: "sizer"; - target: "clip"; - transition: SINUSOIDAL 0.2; - after: "hide2"; - } - program { name: "hide2"; - action: SIGNAL_EMIT "e,action,hide,done" ""; - } - } -} - -group { name: "e/modules/ibar/menu/item"; - images.image: "glow_small.png" COMP; - images.image: "win_shadow.png" COMP; - images.image: "mini_box_glow.png" COMP; - parts { - part { name: "base"; - description { state: "default"; - rel1.offset: -6 -6; - rel2.offset: 5 5; - image.normal: "mini_box_glow.png"; - image.border: 7 7 7 7; - color: 255 255 255 80; - visible: 0; - link.base: "e,state,unfocused" "e"; - link.transition: ACCEL 0.1; - } - description { state: "focused"; - inherit: "default" 0.0; - visible: 1; - link.base: "e,state,focused" "e"; - link.transition: ACCEL 0.1; - } - } - part { name: "clip"; type: RECT; - description { state: "default"; - link.base: "e,state,other,none" "e"; - link.transition: ACCEL 0.1; - } - description { state: "otherdesk"; - inherit: "default" 0.0; - color: 255 255 255 160; - link.base: "e,state,other,desk" "e"; - link.transition: ACCEL 0.1; - } - description { state: "otherscreen"; - inherit: "default" 0.0; - color: 255 255 255 80; - link.base: "e,state,other,screen" "e"; - link.transition: ACCEL 0.1; - } - } - part { name: "icon"; type: SPACER; - description { state: "default"; - rel1.offset: 2 2; - rel2.offset: 2 -3; - align: 0.0 0.5; - aspect: 1.0 1.0; aspect_preference: BOTH; - min: 48 48; - max: 48 48; - } - } - part { name: "shadow"; mouse_events: 0; - clip_to: "clip"; - description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; - rel1.to: "e.swallow.icon"; - rel1.offset: -7 -3; - rel2.to: "e.swallow.icon"; - rel2.offset: 6 11; - fill.smooth: 0; - } - } - part { name: "glow"; mouse_events: 0; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "e.swallow.icon"; - rel2.to: "e.swallow.icon"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - color: 255 255 255 0; - visible: 0; - } - description { state: "focus" 0.0; - inherit: "default" 0.0; - rel1.offset: -4 -4; - rel2.offset: 3 3; - color: 255 255 255 255; - visible: 1; - } - } - part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; - clip_to: "icon_clip"; - description { state: "default"; - rel1.to: "icon"; - rel2.to: "icon"; - } - } - part { name: "e.text.title"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to_x: "icon"; - rel1.relative: 1.0 0.0; - rel1.offset: 3 0; - rel2.offset: -3 -3; - align: 0.0 0.0; - color_class: "menu_item"; - min: 128 0; - text { font: FNBD; size: 10; - text: "window name thingy"; - min: 0 1; - align: 0.0 0.5; - text_class: "menu_item"; - } - } - description { state: "focus"; - inherit: "default"; - visible: 0; - } - } - part { name: "title2"; type: TEXT; mouse_events: 0; - effect: GLOW; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.offset: -2 -3; - rel1.to: "e.text.title"; - rel2.offset: 2 1; - rel2.to: "e.text.title"; - color_class: "menu_item_active"; - color: 255 255 255 0; - color2: 255 255 255 0; - color3: 255 255 255 0; - min: 128 0; - text { font: FNBD; size: 10; - text_source: "e.text.title"; - min: 0 1; - align: 0.0 0.5; - text_class: "menu_item"; - } - visible: 0; - } - description { state: "focus" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - color2: 255 255 255 255; - color3: 255 255 255 255; - visible: 1; - } - } - part { name: "icon_clip"; type: RECT; - clip_to: "clip"; - description { state: "default"; - color: 255 255 255 200; - rel1.offset: -9999 -9999; - rel2.offset: 9999 9999; - } - description { state: "focus"; - inherit: "default"; - color: 255 255 255 255; - } - } - part { name: "event"; type: RECT; - description { state: "default"; - color: 0 0 0 0; - } - } - } - programs { - program { - signal: "mouse,in"; source: "event"; - action: STATE_SET "focus" 0.0; - target: "e.text.title"; - target: "title2"; - target: "icon_clip"; - target: "glow"; - transition: ACCELERATE 0.2; - } - program { - signal: "mouse,out"; source: "event"; - action: STATE_SET "default" 0.0; - target: "e.text.title"; - target: "title2"; - target: "icon_clip"; - target: "glow"; - transition: DECELERATE 0.2; - } - } -} - group { name: "e/modules/ibox/icon_overlay"; alias: "e/modules/ibar/icon_overlay"; - images.image: "darken_square.png" COMP; + IMAGE_RING("ringa", 160) + IMAGE_RING("ringb", 160) + IMAGE_RING("ringc", 160) script_recursion: 1; script { public urgent; @@ -488,6 +324,24 @@ group { name: "e/modules/ibox/icon_overlay"; color: 255 255 255 0; } } + part { name: "content"; type: SPACER; + description { state: "default" 0.0; + } + description { state: "starting" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.1 0.1; + rel2.relative: 0.9 0.9; + } + } + BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e") + part { name: "busy_area"; type: SPACER; + description { state: "default" 0.0; + rel1.to: "content"; + rel2.to: "content"; + rel1.relative: -0.5 -0.5; + rel2.relative: 1.5 1.5; + } + } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "background"; description { @@ -496,29 +350,9 @@ group { name: "e/modules/ibox/icon_overlay"; rel2.to: "background"; } } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -9 -5; - rel1.to: "e.text.label"; - rel2.offset: 8 4; - rel2.to: "e.text.label"; - image.normal: "darken_square.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - fixed: 1 1; - color: 255 255 255 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } - text { name: "spacer"; - effect: SHADOW BOTTOM; - scale: 1; - desc { color: 0 0 0 0; + text { name: "spacer"; scale: 1; + desc { + color: 0 0 0 0; rel1.relative: 1 0; rel2.relative: 0 1; text { @@ -539,29 +373,44 @@ group { name: "e/modules/ibox/icon_overlay"; link.transition: SINUSOIDAL 0.1 CURRENT; } } + part { name: "bg"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + rel1.offset: -5 -5; + rel1.to: "e.text.label"; + rel2.offset: 4 4; + rel2.to: "e.text.label"; + fixed: 1 1; + color: 0 0 0 0; + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 0 0 0 192; + visible: 1; + } + } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; fixed: 0 1; rel1.to_x: "spacer"; rel2.to_x: "spacer"; rel1.relative: 0 1; - color_class: "module_label_invisible"; - color3: 255 255 255 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; align: 0.5 0.5; text_class: "module_normal"; } + color: 255 255 255 0; + visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.5; rel2.relative: 1.0 0.5; - color_class: "module_label"; - color3: 255 255 255 255; + color: 255 255 255 255; + visible: 1; } } } @@ -573,6 +422,19 @@ group { name: "e/modules/ibox/icon_overlay"; // signal: "e,action,start"; source: "e"; // } program { + signal: "e,state,starting"; source: "e"; + action: STATE_SET "starting" 0.0; + transition: DECELERATE 0.2; + target: "content"; + } + program { + signal: "e,state,started"; source: "e"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.2; + target: "content"; + } + /////////////////////////////////////////////////////////// + program { signal: "load"; source: ""; script { set_int(urgent, 0); @@ -610,24 +472,24 @@ group { name: "e/modules/ibox/icon_overlay"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 0.5; target: "e.text.label"; - target: "bevel"; + target: "bg"; } program { signal: "e,action,hide,label"; source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0; target: "e.text.label"; - target: "bevel"; + target: "bg"; } - program { name: "show_bevel"; + program { action: STATE_SET visible 0.0; transition: SINUSOIDAL 1.0; - target: "bevel"; + target: "bg"; } - program { name: "hide_bevel"; + program { action: STATE_SET default 0.0; transition: SINUSOIDAL 1.0; - target: "bevel"; + target: "bg"; } program { name: "go_passive2"; action: STATE_SET "default" 0.0; @@ -844,3 +706,176 @@ group { name: "e/modules/ibox/drop_overlay"; } } } + +group { name: "e/modules/ibar/menu"; + parts { + part { name: "sizer"; type: SPACER; + description { state: "default"; } + description { state: "hidden"; + fixed: 1 1; + rel1.relative: 0.5 1.0; + rel2.relative: 0.5 1.0; + minmul: 0 0; + } + } + part { name: "clip"; type: RECT; + description { state: "default"; + rel1.to: "sizer"; + rel2.to: "sizer"; + } + description { state: "hidden"; + inherit: "default"; + color: 0 0 0 0; + } + } + part { name: "base"; type: RECT; mouse_events: 0; + clip_to: "clip"; + description { state: "default" 0.0; + rel1.to: "sizer"; + rel2.to: "sizer"; + color: 0 0 0 192; + } + } + part { name: "e.box"; type: BOX; + clip_to: "clip"; + description { state: "default"; + rel1.to: "sizer"; + rel1.offset: 4 4; + rel2.to: "sizer"; + rel2.offset: -5 -5; + box { layout: "vertical"; + padding: 0 0; + align: 0.5 0.5; + min: 1 1; + } + } + } + } + programs { + program { signal: "e,state,hidden"; source: "e"; + action: STATE_SET "hidden" 0.0; + target: "sizer"; + target: "clip"; + } + + program { signal: "e,action,show"; source: "e"; + action: STATE_SET "default" 0.0; + target: "sizer"; + target: "clip"; + transition: SINUSOIDAL 0.2; + after: "show2"; + } + program { name: "show2"; + action: SIGNAL_EMIT "e,action,show,done" ""; + } + + program { signal: "e,action,hide"; source: "e"; + action: STATE_SET "hidden" 0.0; + target: "sizer"; + target: "clip"; + transition: SINUSOIDAL 0.2; + after: "hide2"; + } + program { name: "hide2"; + action: SIGNAL_EMIT "e,action,hide,done" ""; + } + } +} + +group { name: "e/modules/ibar/menu/item"; + parts { + part { name: "base"; type: RECT; + description { state: "default"; + rel1.offset: -5 0; + rel2.offset: 4 -1; + color: 64 64 64 255; + visible: 0; + link.base: "e,state,unfocused" "e"; + link.transition: ACCEL 0.1; + } + description { state: "focused"; + inherit: "default" 0.0; + visible: 1; + link.base: "e,state,focused" "e"; + link.transition: ACCEL 0.1; + } + } +/* + part { name: "clip"; type: RECT; + description { state: "default"; + link.base: "e,state,other,none" "e"; + link.transition: ACCEL 0.1; + } + description { state: "otherdesk"; + inherit: "default" 0.0; + color: 32 32 32 255; + link.base: "e,state,other,desk" "e"; + link.transition: ACCEL 0.1; + } + description { state: "otherscreen"; + inherit: "default" 0.0; + color: 32 32 32 255; + link.base: "e,state,other,screen" "e"; + link.transition: ACCEL 0.1; + } + } + */ + part { name: "icon"; scale: 1; type: SPACER; + description { state: "default"; + rel1.offset: 2 2; + rel2.offset: 2 -3; + align: 0.0 0.5; + aspect: 1.0 1.0; aspect_preference: BOTH; + min: 48 48; + max: 48 48; + } + } + part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; + description { state: "default"; + rel1.to: "icon"; + rel2.to: "icon"; + } + } + part { name: "e.text.title"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to_x: "icon"; + rel1.relative: 1.0 0.0; + rel1.offset: 3 0; + rel2.offset: -3 -3; + align: 0.0 0.0; + min: 128 0; + color: 160 160 160 255; + text { font: FNBD; size: 10; + text: "window name thingy"; + min: 0 1; + align: 0.0 0.5; + text_class: "menu_item"; + } + } + description { state: "focus"; + inherit: "default"; + color: 255 255 255 255; + } + } + part { name: "event"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } + } + programs { + program { + signal: "mouse,in"; source: "event"; + action: STATE_SET "focus" 0.0; + target: "e.text.title"; + transition: ACCELERATE 0.2; + } + program { + signal: "mouse,out"; source: "event"; + action: STATE_SET "default" 0.0; + target: "e.text.title"; + transition: DECELERATE 0.2; + } + } +} diff --git a/data/elementary/themes/edc/init.edc b/data/elementary/themes/edc/init.edc index 630b714a51..3b0be7f709 100644 --- a/data/elementary/themes/edc/init.edc +++ b/data/elementary/themes/edc/init.edc @@ -1,51 +1,29 @@ group { name: "e/init/splash"; - images.image: "screen_circular_shadow.png" COMP; - images.image: "bg_radgrad.png" COMP; - images.image: "dot_pattern.png" COMP; - images.image: "logo_blue_small.png" COMP; - images.image: "logo_blue_small_glow.png" COMP; - images.image: "led_square_base.png" COMP; - images.image: "led_square_glow.png" COMP; - images.image: "led_square_shading.png" COMP; - images.image: "led_square_shadow.png" COMP; - images.image: "led_square_shine.png" COMP; + set { name: "logo_mono"; + image { image: "logo.png" COMP; size: 601 601 99999 99999; } + image { image: "logo2.png" COMP; size: 301 301 600 600; } + image { image: "logo3.png" COMP; size: 151 151 300 300; } + image { image: "logo4.png" COMP; size: 76 76 150 150; } + image { image: "logo5.png" COMP; size: 0 0 75 75; } + } script { public is_ready; public do_end; } parts { - part { name: "clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - } - } - part { name: "bg"; + part { name: "bg"; type: RECT; description { state: "default" 0.0; - image.normal: "bg_radgrad.png"; - image.scale_hint: STATIC; - fill.smooth: 0; - ASPECT_FILL((1024/653)) - } - } - part { name: "pat"; - description { state: "default" 0.0; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) + color: 32 32 32 255; } } part { name: "logo"; + scale: 1; description { state: "default" 0.0; - image.normal: "logo_blue_small.png"; + image.normal: "logo_mono"; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - FIXED_SIZE(100, 127) - } - } - part { name: "logo_glow"; - description { state: "default" 0.0; - image.normal: "logo_blue_small_glow.png"; - rel1.to: "logo"; - rel2.to: "logo"; - color: 255 255 255 128; + color: 255 255 255 192; + FIXED_SIZE(150, 150) } description { state: "active" 0.0; inherit: "default" 0.0; @@ -53,18 +31,18 @@ group { name: "e/init/splash"; } } part { name: "e.text.title"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; align: 0.5 1.0; rel1.relative: 0.05 0.0; - rel1.offset: 4 -1; + rel1.offset: 4 -16; rel1.to_y: "e.text.status"; rel2.relative: 0.95 0.0; - rel2.offset: -5 -1; + rel2.offset: -5 -16; rel2.to_y: "e.text.status"; - color: FN_COL_DEFAULT; + color: 160 160 160 255; text { font: FNBD; size: 20; + text: "Title here"; min: 0 1; text_class: "init_title"; } @@ -72,18 +50,18 @@ group { name: "e/init/splash"; } } part { name: "e.text.status"; type: TEXT; - effect: GLOW; scale: 1; description { state: "default" 0.0; align: 0.5 1.0; rel1.relative: 0.05 0.0; rel1.to_y: "logo"; - rel1.offset: 4 -1; + rel1.offset: 4 -16; rel2.relative: 0.95 0.0; - rel2.offset: -5 -1; + rel2.offset: -5 -16; rel2.to_y: "logo"; - color: FN_COL_HIGHLIGHT; + color: 160 160 160 255; text { font: FN; size: 10; + text: "Status here"; min: 0 1; text_class: "init_status"; } @@ -91,16 +69,16 @@ group { name: "e/init/splash"; } } part { name: "e.text.version"; type: TEXT; - effect: GLOW; + scale: 1; description { state: "default" 0.0; align: 1.0 1.0; rel1.relative: 1.0 1.0; - rel1.offset: -4 -4; + rel1.offset: -16 -16; rel2.relative: 1.0 1.0; - rel2.offset: -4 -4; - color: FN_COL_HIGHLIGHT; + rel2.offset: -16 -16; + color: 80 80 80 255; text { font: FN; size: 8; - text: "0.19"; + text: "0.22.0"; min: 1 1; ellipsis: -1; align: 1.0 1.0; @@ -109,450 +87,76 @@ group { name: "e/init/splash"; fixed: 1 1; } } - - part { name: "shadow"; mouse_events: 0; - clip_to: "clip"; + part { name: "blanker"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - color: 255 255 255 255; - image.normal: "screen_circular_shadow.png"; - fill.smooth: 0; + color: 0 0 0 255; + visible: 1; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.relative: -1.0 -1.0; - rel2.relative: 2.0 2.0; - color: 255 255 255 255; - } - } - -#define LED(_NAME, _TO, _SHINE, _C00, _C01, _C10, _C11, _C20, _C21, _C30, _C31, _C40, _C41, _C50, _C51, _C60, _C61) \ - part { name: _NAME"_shadow"; \ - description { state: "default" 0.0; \ - rel1.to: _TO; \ - rel2.to: _TO; \ - FIXED_SIZE(20, 20) \ - image.normal: "led_square_shadow.png"; \ - } \ - } \ - part { name: _NAME"_base"; \ - description { state: "default" 0.0; \ - rel1.to: _NAME"_shadow"; \ - rel2.to: _NAME"_shadow"; \ - image.normal: "led_square_base.png"; \ - color: _C00; \ - } \ - description { state: "col1" 0.0; \ - inherit: "default" 0.0; \ - color: _C10; \ - } \ - description { state: "col2" 0.0; \ - inherit: "default" 0.0; \ - color: _C20; \ - } \ - description { state: "col3" 0.0; \ - inherit: "default" 0.0; \ - color: _C30; \ - } \ - description { state: "col4" 0.0; \ - inherit: "default" 0.0; \ - color: _C40; \ - } \ - description { state: "col5" 0.0; \ - inherit: "default" 0.0; \ - color: _C50; \ - } \ - description { state: "col6" 0.0; \ - inherit: "default" 0.0; \ - color: _C60; \ - } \ - } \ - part { name: _NAME"_glow"; \ - description { state: "default" 0.0; \ - rel1.to: _NAME"_shadow"; \ - rel2.to: _NAME"_shadow"; \ - image.normal: "led_square_glow.png"; \ - color: _C01; \ - } \ - description { state: "col1" 0.0; \ - inherit: "default" 0.0; \ - color: _C11; \ - } \ - description { state: "col2" 0.0; \ - inherit: "default" 0.0; \ - color: _C21; \ - } \ - description { state: "col3" 0.0; \ - inherit: "default" 0.0; \ - color: _C31; \ - } \ - description { state: "col4" 0.0; \ - inherit: "default" 0.0; \ - color: _C41; \ - } \ - description { state: "col5" 0.0; \ - inherit: "default" 0.0; \ - color: _C51; \ - } \ - description { state: "col6" 0.0; \ - inherit: "default" 0.0; \ - color: _C61; \ - } \ - } \ - part { name: _NAME"_shading"; \ - description { state: "default" 0.0; \ - rel1.to: _NAME"_shadow"; \ - rel2.to: _NAME"_shadow"; \ - image.normal: "led_square_shading.png"; \ - } \ - } \ - part { name: _NAME"_shine"; \ - description { state: "default" 0.0; \ - rel1.to: _NAME"_shadow"; \ - rel2.to: _NAME"_shadow"; \ - image.normal: "led_square_shine.png"; \ - color: 255 255 255 _SHINE; \ - } \ - } - -#define WHITE 255 255 255 255 -#define RED 255 40 20 255 -#define GREEN 80 255 20 255 -#define BLUE 51 153 255 255 -#define ORANGE 255 128 32 255 -#define YELLOW 255 220 64 255 -#define PURPLE 200 60 255 255 -#define CYAN 40 220 255 255 - - LED("l0", "led0", 255, - BLUE, WHITE, - RED, ORANGE, - GREEN, YELLOW, - ORANGE, YELLOW, - PURPLE, YELLOW, - CYAN, WHITE, - YELLOW, WHITE - ) - - LED("l-1", "led-1", 128, - RED, ORANGE, - BLUE, WHITE, - ORANGE, YELLOW, - GREEN, YELLOW, - CYAN, WHITE, - YELLOW, WHITE, - PURPLE, YELLOW - ) - LED("l-2", "led-2", 64, - CYAN, WHITE, - GREEN, YELLOW, - BLUE, WHITE, - YELLOW, WHITE, - ORANGE, YELLOW, - PURPLE, YELLOW, - RED, ORANGE - ) - LED("l-3", "led-3", 0, - GREEN, YELLOW, - PURPLE, YELLOW, - YELLOW, WHITE, - RED, ORANGE, - CYAN, WHITE, - ORANGE, YELLOW, - BLUE, WHITE - ) - - LED("l+1", "led+1", 128, - YELLOW, WHITE, - ORANGE, YELLOW, - RED, ORANGE, - PURPLE, YELLOW, - BLUE, WHITE, - GREEN, YELLOW, - CYAN, WHITE - ) - LED("l+2", "led+2", 64, - PURPLE, YELLOW, - BLUE, WHITE, - RED, ORANGE, - YELLOW, WHITE, - ORANGE, YELLOW, - CYAN, WHITE, - GREEN, YELLOW - ) - LED("l+3", "led+3", 0, - ORANGE, YELLOW, - RED, ORANGE, - PURPLE, YELLOW, - GREEN, YELLOW, - BLUE, WHITE, - YELLOW, WHITE, - CYAN, WHITE - ) -#undef LED - - part { name: "led0"; type: RECT; - description { state: "default" 0.0; - rel1.relative: 0.5 1.0; - rel1.to: "logo"; - rel2.relative: 0.5 1.0; - rel2.to: "logo"; - align: 0.5 0.0; - FIXED_SIZE(20, 20) - visible: 0; - } - } - - part { name: "led-1"; type: RECT; - description { state: "default" 0.0; - rel1.relative: -1.0 0.0; - rel1.to: "led0"; - rel2.relative: -1.0 1.0; - rel2.to: "led0"; - align: 0.0 0.5; - FIXED_SIZE(20, 20) - visible: 0; - } - } - part { name: "led-2"; type: RECT; - description { state: "default" 0.0; - rel1.relative: -1.0 0.0; - rel1.to: "led-1"; - rel2.relative: -1.0 1.0; - rel2.to: "led-1"; - align: 0.0 0.5; - FIXED_SIZE(20, 20) - visible: 0; - } - } - part { name: "led-3"; type: RECT; - description { state: "default" 0.0; - rel1.relative: -1.0 0.0; - rel1.to: "led-2"; - rel2.relative: -1.0 1.0; - rel2.to: "led-2"; - align: 0.0 0.5; - FIXED_SIZE(20, 20) + color: 0 0 0 0; visible: 0; } } - - part { name: "led+1"; type: RECT; - description { state: "default" 0.0; - rel1.relative: 2.0 0.0; - rel1.to: "led0"; - rel2.relative: 2.0 1.0; - rel2.to: "led0"; - align: 1.0 0.5; - FIXED_SIZE(20, 20) - visible: 0; + } + programs { + program { signal: "load"; source: ""; + script { + set_int(is_ready, 0); + set_int(do_end, 0); } } - part { name: "led+2"; type: RECT; - description { state: "default" 0.0; - rel1.relative: 2.0 0.0; - rel1.to: "led+1"; - rel2.relative: 2.0 1.0; - rel2.to: "led+1"; - align: 1.0 0.5; - FIXED_SIZE(20, 20) - visible: 0; - } + program { signal: "show"; source: ""; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 1.0; + target: "blanker"; + after: "ready"; } - part { name: "led+3"; type: RECT; - description { state: "default" 0.0; - rel1.relative: 2.0 0.0; - rel1.to: "led+2"; - rel2.relative: 2.0 1.0; - rel2.to: "led+2"; - align: 1.0 0.5; - FIXED_SIZE(20, 20) - visible: 0; - } + program { name: "logo_pulse"; + signal: "show"; source: ""; + action: STATE_SET "active" 0.0; + target: "logo"; + transition: SINUSOIDAL 0.8; + after: "logo_pulse2"; + } + program { name: "logo_pulse2"; + action: STATE_SET "default" 0.0; + target: "logo"; + transition: SINUSOIDAL 0.8; + after: "logo_pulse"; + } + program { name: "ready"; + script { + new val = get_int(do_end); + if (val == 1) run_program(PROGRAM:"exit1"); + else set_int(is_ready, 1); + } + } + program { signal: "e,state,done"; source: "e"; + script { + new val = get_int(is_ready); + if (val == 1) run_program(PROGRAM:"exit1"); + else set_int(do_end, 1); + } + } + program { name: "exit1"; + signal: "e,state,done"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 1.0 CURRENT; + target: "blanker"; + after: "exit2"; } - - part { name: "blanker"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - color: 0 0 0 255; - visible: 1; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } + program { name: "exit2"; + action: SIGNAL_EMIT "e,state,done_ok" "e"; } } - programs { - program { - signal: "load"; source: ""; - script { - set_int(is_ready, 0); - set_int(do_end, 0); - } - } - -#define PROG(_NAME) \ - program { name: _NAME"0"; \ - signal: "show"; source: ""; \ - action: STATE_SET "col1" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"1"; \ - } \ - program { name: _NAME"1"; \ - action: STATE_SET "col2" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"2"; \ - } \ - program { name: _NAME"2"; \ - action: STATE_SET "col3" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"1"; \ - } \ - program { name: _NAME"3"; \ - action: STATE_SET "col4" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"1"; \ - } \ - program { name: _NAME"4"; \ - action: STATE_SET "col5" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"1"; \ - } \ - program { name: _NAME"5"; \ - action: STATE_SET "col6" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"1"; \ - } \ - program { name: _NAME"6"; \ - action: STATE_SET "default" 0.0; \ - target: _NAME"_base"; \ - target: _NAME"_glow"; \ - transition: SINUSOIDAL 0.5; \ - in: 0.2 0.5; \ - after: _NAME"1"; \ - } - PROG("l0") - PROG("l-1") - PROG("l-2") - PROG("l-3") - PROG("l+1") - PROG("l+2") - PROG("l+3") -#undef PROG - - program { - signal: "show"; source: ""; - action: STATE_SET "visible" 0.0; - transition: DECELERATE 1.0; - target: "shadow"; - target: "blanker"; - after: "ready"; - } - program { name: "logo_pulse"; - signal: "show"; source: ""; - action: STATE_SET "active" 0.0; - target: "logo_glow"; - transition: BOUNCE 0.8 0.5 6; - after: "logo_pulse2"; - } - program { name: "logo_pulse2"; - action: STATE_SET "default" 0.0; - target: "logo_glow"; - transition: SINUSOIDAL 0.8; - after: "logo_pulse"; - } - program { name: "ready"; - script { - new val; - val = get_int(do_end); - if (val == 1) - run_program(PROGRAM:"exit1"); - else - set_int(is_ready, 1); - } - } - program { - signal: "e,state,done"; source: "e"; - script { - new val; - val = get_int(is_ready); - if (val == 1) - run_program(PROGRAM:"exit1"); - else - set_int(do_end, 1); - } - } - program { name: "exit1"; - signal: "e,state,done"; source: "e"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0 CURRENT; - target: "shadow"; - target: "blanker"; - after: "exit2"; - } - program { name: "exit2"; - action: SIGNAL_EMIT "e,state,done_ok" "e"; - } - } } group { name: "e/init/extra_screen"; - images.image: "screen_circular_shadow.png" COMP; - images.image: "bg_radgrad.png" COMP; - images.image: "dot_pattern.png" COMP; parts { - part { name: "clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - } - } - part { name: "bg"; + part { name: "bg"; type: RECT; description { state: "default" 0.0; - image.normal: "bg_radgrad.png"; - image.scale_hint: STATIC; - fill.smooth: 0; - ASPECT_FILL((1024/653)) - } - } - part { name: "pat"; - description { state: "default" 0.0; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) - } - } - part { name: "shadow"; mouse_events: 0; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - color: 255 255 255 255; - image.normal: "screen_circular_shadow.png"; - fill.smooth: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.relative: -1.0 -1.0; - rel2.relative: 2.0 2.0; - color: 255 255 255 255; + color: 32 32 32 255; } } part { name: "blanker"; type: RECT; mouse_events: 0; @@ -568,12 +172,19 @@ group { name: "e/init/extra_screen"; } } programs { - program { - signal: "show"; source: ""; + program { signal: "show"; source: ""; action: STATE_SET "visible" 0.0; transition: DECELERATE 1.0; - target: "shadow"; target: "blanker"; } + program { signal: "e,state,done"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 1.0 CURRENT; + target: "blanker"; + after: "exit2"; + } + program { name: "exit2"; + action: SIGNAL_EMIT "e,state,done_ok" "e"; + } } } diff --git a/data/elementary/themes/edc/menu.edc b/data/elementary/themes/edc/menu.edc index ff85c19393..e535148177 100644 --- a/data/elementary/themes/edc/menu.edc +++ b/data/elementary/themes/edc/menu.edc @@ -1,45 +1,25 @@ group { name: "e/widgets/menu/default/background"; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.relative: 0.0 1.0; - rel1.to_y: "top"; - color_class: "menu_base"; color: 64 64 64 255; } } - part { name: "top"; mouse_events: 0; + part { name: "clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "vgrad_med_lighter.png"; - rel2.to_y: "e.text.title"; - rel2.offset: -1 0; - min: 0 23; - align: 0.0 0.0; - fill.smooth: 0; - TILED_HORIZ(120) - fixed: 0 1; - color_class: "menu_base"; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - min: 0 0; - rel2.offset: -1 1; + rel1.to: "base"; + rel2.to: "base"; } } part { name: "e.text.title"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; rel1.relative: 0.0 0.0; rel1.offset: 1 0; rel2.relative: 1.0 0.0; rel2.offset: -2 -1; align: 0.5 0.0; - color_class: "menu_title"; - color3: 255 255 255 255; + color: 255 255 255 255; max: 0 0; text { font: FNBD; size: 10; text_class: "menu_title"; @@ -59,36 +39,15 @@ group { name: "e/widgets/menu/default/background"; } } part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "clip"; description { state: "default" 0.0; - rel1.relative: 0.0 0.0; - rel1.offset: 0 3; - rel1.to_y: "bevel"; - rel2.offset: -1 -4; + rel1.to_y: "base"; } description { state: "active" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 1.0; - rel1.offset: 0 0; - rel1.to_y: "top"; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "top"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "top"; - FIXED_SIZE(69, 5) + rel1.offset: 0 5; + rel1.to_y: "e.text.title"; } } } @@ -96,14 +55,12 @@ group { name: "e/widgets/menu/default/background"; program { signal: "e,action,show,title"; source: "e"; action: STATE_SET "active" 0.0; - target: "top"; target: "e.text.title"; target: "e.swallow.content"; } program { signal: "e,action,hide,title"; source: "e"; action: STATE_SET "default" 0.0; - target: "top"; target: "e.text.title"; target: "e.swallow.content"; } @@ -113,13 +70,12 @@ group { name: "e/widgets/menu/default/background"; group { name: "e/widgets/menu/default/separator"; images.image: "separator_horiz.png" COMP; parts { - part { name: "base"; + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "separator_horiz.png"; - rel1.offset: 0 2; - rel2.offset: -1 -3; - min: 0 2; - fill.smooth: 0; + rel1.offset: 0 10; + rel2.offset: -1 -11; + min: 0 1; + color: 72 72 72 255; } } } @@ -127,30 +83,10 @@ group { name: "e/widgets/menu/default/separator"; group { name: "e/widgets/menu/default/item_bg"; alias: "e/widgets/menu/default/submenu_bg"; - images.image: "shadow_rounded_horiz.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_horiz_out.png" COMP; - images.image: "shine.png" COMP; parts { - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shadow_rounded_horiz.png"; - image.border: 0 0 9 9; - rel1.offset: 0 -4; - rel2.offset: -1 5; - fill.smooth: 0; - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "base"; mouse_events: 0; + part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - TILED_HORIZ(120) + color: 40 40 40 255; visible: 0; } description { state: "active" 0.0; @@ -161,37 +97,8 @@ group { name: "e/widgets/menu/default/item_bg"; part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; rel1.relative: 0.0 0.0; - rel1.offset: 3 3; - rel2.offset: -3 -4; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_horiz_out.png"; - image.border: 0 0 2 2; - image.middle: 0; - fill.smooth: 0; - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "base"; - FIXED_SIZE(69, 5) - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; + rel1.offset: 4 4; + rel2.offset: -5 -5; } } part { name: "events"; type: RECT; @@ -204,18 +111,12 @@ group { name: "e/widgets/menu/default/item_bg"; program { signal: "e,state,selected"; source: "e"; action: STATE_SET "active" 0.0; - target: "shadow"; target: "base"; - target: "bevel"; - target: "shine"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; - target: "shadow"; target: "base"; - target: "bevel"; - target: "shine"; } } } @@ -227,7 +128,7 @@ group { name: "e/widgets/menu/default/icon"; color: 255 255 255 255; } description { state: "disabled" 0.0; - color: 255 255 255 128; + color: 255 255 255 40; } } part { name: "e.swallow.content"; type: SWALLOW; @@ -235,8 +136,8 @@ group { name: "e/widgets/menu/default/icon"; scale: 1; description { state: "default" 0.0; min: 16 16; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: 4 2; + rel2.offset: -5 -3; } } } @@ -262,13 +163,12 @@ group { name: "e/widgets/menu/default/label"; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.offset: 5 -1; - rel2.offset: -4 -1; - color_class: "menu_item"; - color3: 255 255 255 255; + rel1.offset: 4 -1; + rel2.offset: -5 -1; + color: 160 160 160 255; + color3: 0 0 0 0; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -278,62 +178,12 @@ group { name: "e/widgets/menu/default/label"; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 0; - } - description { state: "disabled" 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: "menu_item_disabled"; - color3: 255 255 255 255; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.0 0.5; - text_class: "menu_item"; - } - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "label3"; type: TEXT; mouse_events: 0; - effect: GLOW; - scale: 1; - description { state: "default" 0.0; - rel1.offset: -2 -3; - rel1.to: "e.text.label"; - rel2.offset: 2 1; - rel2.to: "e.text.label"; - color_class: "menu_item_active"; - color2: 255 255 255 255; - color3: 255 255 255 255; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.0 0.5; - text_class: "menu_item"; - } - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; + color3: 0 0 0 64; } description { state: "disabled" 0.0; inherit: "default" 0.0; - visible: 0; + color: 96 96 96 255; } } } @@ -342,63 +192,40 @@ group { name: "e/widgets/menu/default/label"; signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "e.text.label"; - target: "label2"; - target: "label3"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; - target: "label2"; - target: "label3"; } program { signal: "e,state,enable"; source: "e"; action: STATE_SET "default" 0.0; target: "e.text.label"; - target: "label2"; - target: "label3"; } program { signal: "e,state,disable"; source: "e"; action: STATE_SET "disabled" 0.0; target: "e.text.label"; - target: "label2"; - target: "label3"; } } } group { name: "e/widgets/menu/default/submenu"; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "vertical_separated_bar_glow.png" COMP; + images.image: "menu_submenu.png" COMP; parts { part { name: "base"; description { state: "default" 0.0; - image.normal: "sym_right_light_normal.png"; - rel2.offset: -2 -1; + image.normal: "menu_submenu.png"; + rel1.offset: 4 0; + rel2.offset: -5 -1; min: 15 15; max: 15 15; + color: 160 160 160 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_right_glow_normal.png"; - } - } - part { name: "bar"; mouse_events: 0; - description { state: "default" 0.0; - rel1.relative: 1.0 0.0; - rel1.offset: -10 -8; - rel2.offset: 4 7; - image.normal: "vertical_separated_bar_glow.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } } @@ -407,125 +234,142 @@ group { name: "e/widgets/menu/default/submenu"; signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "base"; - target: "bar"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "base"; - target: "bar"; } } } group { name: "e/widgets/menu/default/check"; - images.image: "inset_shadow_tiny.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "sym_check_alum.png" COMP; + images.image: "check.png" COMP; parts { - part { name: "base"; type: RECT; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel1.to: "inset"; - rel2.offset: -2 -2; - rel2.to: "inset"; - color: 24 24 24 255; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow_tiny.png"; - rel1.to: "base"; - rel2.to: "base"; + part { name: "bg"; type: RECT; + description { state: "default"; + color: 0 0 0 64; + aspect: 1.0 1.0; aspect_preference: BOTH; + rel1.offset: 4 0; + rel2.offset: -5 -1; } } - part { name: "inset"; mouse_events: 0; + part { name: "base"; + clip_to: "selected"; description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + image.normal: "check.png"; + rel1.offset: 4 0; + rel2.offset: -5 -1; min: 13 13; max: 13 13; + visible: 0; + } + description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; } } - part { name: "indicator"; mouse_events: 0; + part { name: "selected"; type: RECT; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; - image.normal: "sym_check_alum.png"; - min: 11 11; - max: 11 11; - visible: 0; + color: 160 160 160 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } } programs { -// program { -// signal: "e,state,selected"; source: "e"; -// } -// program { -// signal: "e,state,unselected"; source: "e"; -// } program { - signal: "e,state,on"; source: "e"; + signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; - target: "indicator"; + target: "selected"; + } + program { + signal: "e,state,unselected"; source: "e"; + action: STATE_SET "default" 0.0; + target: "selected"; + } + program { + signal: "e,state,on"; source: "e"; + action: STATE_SET "on" 0.0; + target: "base"; } program { signal: "e,state,off"; source: "e"; action: STATE_SET "default" 0.0; - target: "indicator"; + target: "base"; } } } group { name: "e/widgets/menu/default/radio"; - images.image: "inset_shadow_circle_tiny.png" COMP; - images.image: "sym_radio_alum.png" COMP; + images.image: "radio.png" COMP; parts { + part { name: "bg"; + description { state: "default" 0.0; + image.normal: "radio.png"; + rel1.to: "base"; + rel2.to: "base"; + color: 0 0 0 64; + visible: 1; + } + description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "base"; + clip_to: "selected"; description { state: "default" 0.0; - image.normal: "inset_shadow_circle_tiny.png"; + image.normal: "radio.png"; + rel1.offset: 4 0; + rel2.offset: -5 -1; min: 13 13; max: 13 13; + visible: 0; + } + description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; } } - part { name: "indicator"; mouse_events: 0; + part { name: "selected"; type: RECT; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; - image.normal: "sym_radio_alum.png"; - min: 11 11; - max: 11 11; - visible: 0; + color: 160 160 160 255; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } } programs { -// program { -// signal: "e,state,selected"; source: "e"; -// } -// program { -// signal: "e,state,unselected"; source: "e"; -// } program { - signal: "e,state,on"; source: "e"; + signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; - target: "indicator"; + target: "selected"; + } + program { + signal: "e,state,unselected"; source: "e"; + action: STATE_SET "default" 0.0; + target: "selected"; + } + program { + signal: "e,state,on"; source: "e"; + action: STATE_SET "on" 0.0; + target: "base"; + target: "bg"; } program { signal: "e,state,off"; source: "e"; action: STATE_SET "default" 0.0; - target: "indicator"; + target: "base"; + target: "bg"; } } } diff --git a/data/elementary/themes/edc/mixer.edc b/data/elementary/themes/edc/mixer.edc index 1dff799992..363c567ed2 100644 --- a/data/elementary/themes/edc/mixer.edc +++ b/data/elementary/themes/edc/mixer.edc @@ -2,9 +2,8 @@ group { name: "e/modules/mixer/main"; alias: "e/gadget/mixer/main"; alias: "e/gadget/mixer/main_vert"; images.image: "speaker.png" COMP; - images.image: "inset_round_hilight.png" COMP; - images.image: "inset_round_shadow.png" COMP; - images.image: "inset_round_shading.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; @@ -16,110 +15,34 @@ group { name: "e/modules/mixer/main"; m = getarg(2); l = getarg(3); r = getarg(4); - + if (m) { run_program(PROGRAM:"mute"); } else { run_program(PROGRAM:"unmute"); } - - if (l <= 0) { - run_program(PROGRAM:"l0-off"); - run_program(PROGRAM:"l1-off"); - run_program(PROGRAM:"l2-off"); - run_program(PROGRAM:"l3-off"); - run_program(PROGRAM:"l4-off"); - } else if (l <= 20) { - run_program(PROGRAM:"l0-on"); - run_program(PROGRAM:"l1-off"); - run_program(PROGRAM:"l2-off"); - run_program(PROGRAM:"l3-off"); - run_program(PROGRAM:"l4-off"); - } else if (l <= 40) { - run_program(PROGRAM:"l0-on"); - run_program(PROGRAM:"l1-on"); - run_program(PROGRAM:"l2-off"); - run_program(PROGRAM:"l3-off"); - run_program(PROGRAM:"l4-off"); - } else if (l <= 60) { - run_program(PROGRAM:"l0-on"); - run_program(PROGRAM:"l1-on"); - run_program(PROGRAM:"l2-on"); - run_program(PROGRAM:"l3-off"); - run_program(PROGRAM:"l4-off"); - } else if (l <= 80) { - run_program(PROGRAM:"l0-on"); - run_program(PROGRAM:"l1-on"); - run_program(PROGRAM:"l2-on"); - run_program(PROGRAM:"l3-on"); - run_program(PROGRAM:"l4-off"); - } else { - run_program(PROGRAM:"l0-on"); - run_program(PROGRAM:"l1-on"); - run_program(PROGRAM:"l2-on"); - run_program(PROGRAM:"l3-on"); - run_program(PROGRAM:"l4-on"); - } - if (r <= 0) { - run_program(PROGRAM:"r0-off"); - run_program(PROGRAM:"r1-off"); - run_program(PROGRAM:"r2-off"); - run_program(PROGRAM:"r3-off"); - run_program(PROGRAM:"r4-off"); - } else if (r <= 20) { - run_program(PROGRAM:"r0-on"); - run_program(PROGRAM:"r1-off"); - run_program(PROGRAM:"r2-off"); - run_program(PROGRAM:"r3-off"); - run_program(PROGRAM:"r4-off"); - } else if (r <= 40) { - run_program(PROGRAM:"r0-on"); - run_program(PROGRAM:"r1-on"); - run_program(PROGRAM:"r2-off"); - run_program(PROGRAM:"r3-off"); - run_program(PROGRAM:"r4-off"); - } else if (r <= 60) { - run_program(PROGRAM:"r0-on"); - run_program(PROGRAM:"r1-on"); - run_program(PROGRAM:"r2-on"); - run_program(PROGRAM:"r3-off"); - run_program(PROGRAM:"r4-off"); - } else if (r <= 80) { - run_program(PROGRAM:"r0-on"); - run_program(PROGRAM:"r1-on"); - run_program(PROGRAM:"r2-on"); - run_program(PROGRAM:"r3-on"); - run_program(PROGRAM:"r4-off"); - } else { - run_program(PROGRAM:"r0-on"); - run_program(PROGRAM:"r1-on"); - run_program(PROGRAM:"r2-on"); - run_program(PROGRAM:"r3-on"); - run_program(PROGRAM:"r4-on"); - } + custom_state(PART:"vol-l", "default", 0.0); + set_state_val(PART:"vol-l", STATE_REL1, + (float(100 - l) * 0.5) / 100.0, + (float(100 - l) * 1.0) / 100.0); + set_state_val(PART:"vol-l", STATE_REL2, + 0.5 + ((float(l) * 0.5) / 100.0), + 1.0); + set_state(PART:"vol-l", "custom", 0.0); + + custom_state(PART:"vol-r", "default", 0.0); + set_state_val(PART:"vol-r", STATE_REL1, + (float(100 - r) * 0.5) / 100.0, + (float(100 - r) * 1.0) / 100.0); + set_state_val(PART:"vol-r", STATE_REL2, + 0.5 + ((float(r) * 0.5) / 100.0), + 1.0); + set_state(PART:"vol-r", "custom", 0.0); } } } parts { - part { name: "base-sh"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 0 -1; - rel2.to: "base"; - rel2.offset: -1 -2; - image.normal: "inset_round_shadow.png"; - } - } - part { name: "base-hi"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 0 1; - rel2.to: "base"; - rel2.offset: -1 0; - image.normal: "inset_round_hilight.png"; - } - } part { name: "base"; description { state: "default" 0.0; rel1.relative: (25/380) (25/380); @@ -130,8 +53,6 @@ group { name: "e/modules/mixer/main"; } part { name: "state"; type: RECT; description { state: "default" 0.0; - rel1.relative: -1.0 -1.0; - rel2.relative: 2.0 2.0; color: 51 153 255 255; } description { state: "mute" 0.0; @@ -139,51 +60,53 @@ group { name: "e/modules/mixer/main"; color: 255 153 51 255; } } -#define LED(_NAME, _BASE, _X, _SIZE) \ - part { name: _NAME; type: RECT; \ - clip_to: "state"; \ - description { state: "default" 0.0; \ - fixed: 1 1; \ - rel1.relative: ((_BASE+(_X*8))/160) (80/160); \ - rel2.relative: ((_BASE+(_X*8))/160) (80/160); \ - min: 1 1; \ - max: 1 1; \ - visible: 0; \ - color: 255 255 255 0; \ - } \ - description { state: "active" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - color: 255 255 255 255; \ - } \ - } \ - part { name: _NAME"g"; \ - clip_to: "state"; \ - description { state: "default" 0.0; \ - rel1.to: _NAME; \ - rel2.to: _NAME; \ - image.normal: "led_dot_white.png"; \ - min: _SIZE _SIZE; \ - visible: 0; \ - color: 255 255 255 0; \ - } \ - description { state: "active" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - color: 255 255 255 255; \ - } \ + part { name: "state-l"; type: RECT; + clip_to: "state"; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.5 1.0; + } + } + part { name: "state-r"; type: RECT; + clip_to: "state"; + description { state: "default" 0.0; + rel1.relative: 0.5 0.0; + rel2.relative: 1.0 1.0; + } + } + part { name: "vclip-l"; + clip_to: "state-l"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "speaker_clip.png"; + } + } + part { name: "vclip-r"; + clip_to: "state-r"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "speaker_clip.png"; + } + } + part { name: "vol-l"; + clip_to: "vclip-l"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "speaker_vol.png"; + } + } + part { name: "vol-r"; + clip_to: "vclip-r"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + rel2.offset: 0 0; + image.normal: "speaker_vol.png"; + } } - LED("r0", 99, 0, 1) - LED("r1", 99, 1, 9) - LED("r2", 99, 2, 15) - LED("r3", 99, 3, 21) - LED("r4", 99, 4, 27) - LED("l0", 61, 0, 1) - LED("l1", 61, -1, 9) - LED("l2", 61, -2, 15) - LED("l3", 61, -3, 21) - LED("l4", 61, -4, 27) -#undef LED part { name: "over"; type: RECT; description { state: "default" 0.0; color: 255 255 255 0; @@ -201,28 +124,6 @@ group { name: "e/modules/mixer/main"; transition: LINEAR 0.2; target: "state"; } -#define PROG(_NAME) \ - program { name: _NAME"-on"; \ - action: STATE_SET "active" 0.0; \ - target: _NAME; \ - target: _NAME"g"; \ - } \ - program { name: _NAME"-off"; \ - action: STATE_SET "default" 0.0; \ - target: _NAME; \ - target: _NAME"g"; \ - } - PROG("r0") - PROG("r1") - PROG("r2") - PROG("r3") - PROG("r4") - PROG("l0") - PROG("l1") - PROG("l2") - PROG("l3") - PROG("l4") -#undef PROG } } diff --git a/data/elementary/themes/edc/notification.edc b/data/elementary/themes/edc/notification.edc index ae93d03ba4..ab9e32b30d 100644 --- a/data/elementary/themes/edc/notification.edc +++ b/data/elementary/themes/edc/notification.edc @@ -1,54 +1,74 @@ group { name: "e/modules/notification/logo"; - images.image: "glow_exclam.png" COMP; + images.image: "exclam.png" COMP; parts { - part { name: "base"; mouse_events: 0; + part { name: "spacer"; type: SPACER; + scale: 1; description { state: "default" 0.0; - image.normal: "glow_exclam.png"; + aspect: 1.0 1.0; aspect_preference: BOTH; + min: 48 48; max: 48 48; - aspect: 1.0 1.0; + } + } + part { name: "base"; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + image.normal: "exclam.png"; + aspect: (56/160) (56/160); aspect_preference: BOTH; + fixed: 1 1; } } } } group { name: "e/modules/notification/main"; - images.image: "darken_square.png" COMP; - images.image: "sym_close_light_normal.png" COMP; - images.image: "sym_close_light_selected.png" COMP; + images.image: "border_close.png" COMP; + images.image: "win_shadow.png" COMP; data.item: "app_icon_max" "48 48"; - data.item: "shaped" "1"; - styles { - style { name: "notification_style_nowrap"; - base: "font="FN" font_size=10 align=left color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=notification_body"; - tag: "subject" "+ text_class=module_large style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12"; - tag: "body" "+ text_class=module_normal"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "b" "+ font="FNBD" text_class=module_bold"; - tag: "i" "+ font="FNIT" text_class=module_italic"; - tag: "u" "+ underline=on underline_color=#3399ffff"; - tag: "img" ""; // images not supported - tag: "a" ""; // links not supported - } + styles { style { name: "notification_style"; - base: "font="FN" font_size=10 align=left color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=notification_body"; - tag: "subject" "+ text_class=module_large style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12"; + base: "font="FN" font_size=10 align=left color=#a0a0a0ff wrap=word text_class=notification_body"; + tag: "subject" "+ text_class=module_large color=#3399ffff align=center"; tag: "body" "+ text_class=module_normal"; tag: "br" "\n"; tag: "ps" "ps"; - tag: "b" "+ font="FNBD" text_class=module_bold"; + tag: "b" "+ font="FNBD" text_class=module_bold color=#ffff"; tag: "i" "+ font="FNIT" text_class=module_italic"; tag: "u" "+ underline=on underline_color=#3399ffff"; tag: "img" ""; // images not supported tag: "a" ""; // links not supported } } - + parts { - part { name: "base"; + part { name: "rel1"; type: SPACER; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + min: 32 32; + max: 32 32; + } + } + part { name: "rel2"; type: SPACER; + scale: 1; + description { state: "default" 0.0; + align: 1.0 1.0; + min: 32 32; + max: 32 32; + } + } + part { name: "shadow"; mouse_events: 0; + description { state: "default" 0.0; + rel.to: "base"; + WIN_SHADOW; + } + } + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "darken_square.png"; - image.border: 6 6 6 6; + rel1.to: "rel1"; + rel1.relative: 1.0 1.0; + rel2.to: "rel2"; + rel2.relative: 0.0 0.0; + color: 0 0 0 192; } } part { name: "titleclip"; type: RECT; @@ -59,15 +79,20 @@ group { name: "e/modules/notification/main"; } part { name: "bodyclip"; type: RECT; description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; rel2.offset: -13 -13; min: 220 80; } } part { name: "notification.swallow.app_icon"; type: SWALLOW; mouse_events: 0; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; aspect: 1.0 1.0; aspect_preference: BOTH; + rel1.to: "base"; + rel2.to: "base"; rel1.offset: 12 12; rel2.offset: 12 -13; rel2.relative: 0.0 1.0; @@ -80,33 +105,54 @@ group { name: "e/modules/notification/main"; scale; description { state: "default" 0.0; align: 0.0 0.0; - min: 260 40; + rel1.to: "base"; + rel2.to: "base"; + rel1.to_x: "notification.swallow.app_icon"; + rel1.to_y: "notification.text.title"; + rel1.relative: 1.0 1.0; + rel1.offset: 4 4; + rel2.offset: -27 -13; + text { style: "notification_style"; + min: 0 1; + } + fixed: 1 1; + } + } + part { name: "message"; type: TEXTBLOCK; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + min: 200 20; + max: 400 99999; + rel1.to: "base"; + rel2.to: "base"; rel1.to_x: "notification.swallow.app_icon"; rel1.to_y: "notification.text.title"; rel1.relative: 1.0 1.0; rel1.offset: 4 4; - rel2.offset: -27 -11; + rel2.offset: -27 -13; text { style: "notification_style"; + text_source: "notification.textblock.message"; min: 0 1; } + visible: 0; } } part { name: "notification.text.title"; type: TEXT; mouse_events: 0; clip_to: "titleclip"; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; rel1.to_x: "notification.swallow.app_icon"; rel1.relative: 1.0 0.0; rel1.offset: 4 12; rel2.relative: 0.0 0.0; rel2.to_x: "e.event.close"; rel2.offset: -5 12; - color: FN_COL_DEFAULT; + color: 255 255 255 255; align: 0.0 0.0; - color_class: "notification_title"; text { font: FNBD; size: 10; - text: "title goes here blah blah"; min: 0 1; align: 0.0 0.5; text_class: "notification_title"; @@ -116,7 +162,7 @@ group { name: "e/modules/notification/main"; } part { name: "close"; description { state: "default" 0.0; - image.normal: "sym_close_light_normal.png"; + image.normal: "border_close.png"; rel1.to: "e.event.close"; rel2.to: "e.event.close"; min: 15 15; @@ -125,12 +171,14 @@ group { name: "e/modules/notification/main"; } description { state: "selected" 0.0; inherit: "default" 0.0; - image.normal: "sym_close_light_selected.png"; + color: 200 200 200 255; } } part { name: "e.event.close"; type: RECT; scale: 1; description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; rel1.relative: 1.0 0.0; rel1.offset: -13 12; rel2.relative: 1.0 0.0; diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc index 454c405515..dc687c53f4 100644 --- a/data/elementary/themes/edc/pager16.edc +++ b/data/elementary/themes/edc/pager16.edc @@ -1,44 +1,30 @@ group { name: "e/modules/pager16/popup"; - images.image: "vgrad_tall.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; + alias: "e/gadget/pager16/popup"; parts { - part { name: "base"; mouse_events: 0; + part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "vgrad_tall.png"; - fill.smooth: 0; - TILED_HORIZ(40) + color: 64 64 64 255; } } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; rel1.to_y: "e.text.label"; rel1.relative: 0.0 1.0; - rel1.offset: 2 0; + rel1.offset: 0 8; rel2.relative: 1.0 1.0; - rel2.offset: -3 -2; - } - } + rel2.offset: -1 -9; + } + } part { name: "e.text.label"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - color_class: "border_title"; rel1.to: "base"; rel1.offset: 0 1; rel2.to: "base"; rel2.relative: 1.0 0.0; rel2.offset: -1 1; align: 0.5 0.0; - color: FN_COL_DISABLE; + color: 160 160 160 255; text { font: FNBD; size: 10; text_class: "title_bar"; align: 0.5 0.0; @@ -47,51 +33,25 @@ group { name: "e/modules/pager16/popup"; fixed: 0 1; } } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - FIXED_SIZE(69, 5) - } - } } } group { name: "e/modules/pager16/desk"; - images.image: "vgrad_med_darker.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "shine.png" COMP; - images.image: "inset_shadow.png" COMP; + alias: "e/gadget/pager16/desk"; images.image: "mini_blue_glow_arrow_0.png" COMP; images.image: "mini_blue_glow_arrow_1.png" COMP; images.image: "mini_blue_glow_arrow_2.png" COMP; images.image: "mini_blue_glow_arrow_3.png" COMP; parts { - part { name: "base"; type: SPACER; - description { state: "default" 0.0; - rel1.to: "inset"; - rel1.offset: 1 1; - rel2.to: "inset"; - rel2.offset: -2 -2; - } - } - part { name: "bevel"; mouse_events: 0; + part { name: "base"; type: RECT; description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "base"; - rel2.to: "base"; - fill.smooth: 0; + color: 0 0 0 0; } } part { name: "clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + desc { "default"; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; } } part { name: "e.swallow.drop"; type: SWALLOW; @@ -108,46 +68,18 @@ group { name: "e/modules/pager16/desk"; } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - rel2.offset: -2 -1; + desc { "default"; link.base: "e,state,visible" "e"; } desc { "hid"; inherit; hid; link.base: "e,state,hidden" "e"; } } - 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: "base"; - rel2.to: "base"; - fill.smooth: 0; - } - } - part { name: "glow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "downlight_glow.png"; - image.border: 0 0 3 0; - rel1.to: "base"; - rel2.to: "base"; - color: 255 255 255 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } part { name: "e.text.label"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color_class: "module_label_invisible"; + desc { "default"; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; color3: 255 255 255 255; text { font: "Sans"; size: 10; text_class: "module_small"; @@ -155,30 +87,37 @@ group { name: "e/modules/pager16/desk"; } visible: 0; } - description { state: "active" 0.0; - inherit: "default" 0.0; + desc { "active"; inherit; color_class: "module_label"; - color3: 255 255 255 255; visible: 1; } } - 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.offset: 1 2; - rel2.offset: -2 -3; - fill.smooth: 0; + part { name: "sel"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "clip"; + desc { "default"; + color: 51 153 255 255; + visible: 0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + rel2.offset: -1 0; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + max: 99999 6; + } + desc { "active"; inherit; + inherit: "default" 0.0; + rel1.relative: 0.0 0.5; + visible: 1; } } part { name: "drop0"; mouse_events: 0; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_0.png"; - rel1.to: "base"; + rel1.to: "e.swallow.content"; rel1.offset: -1 -1; rel1.relative: 0.0 0.0; - rel2.to: "base"; + rel2.to: "e.swallow.content"; rel2.relative: 0.0 0.0; rel2.offset: -1 -1; align: 0.0 0.0; @@ -201,10 +140,10 @@ group { name: "e/modules/pager16/desk"; part { name: "drop1"; mouse_events: 0; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_1.png"; - rel1.to: "base"; + rel1.to: "e.swallow.content"; rel1.offset: 0 -1; rel1.relative: 1.0 0.0; - rel2.to: "base"; + rel2.to: "e.swallow.content"; rel2.relative: 1.0 0.0; rel2.offset: 0 -1; align: 1.0 0.0; @@ -227,10 +166,10 @@ group { name: "e/modules/pager16/desk"; part { name: "drop2"; mouse_events: 0; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_2.png"; - rel1.to: "base"; + rel1.to: "e.swallow.content"; rel1.offset: 0 0; rel1.relative: 1.0 1.0; - rel2.to: "base"; + rel2.to: "e.swallow.content"; rel2.relative: 1.0 1.0; rel2.offset: 0 0; align: 1.0 1.0; @@ -253,10 +192,10 @@ group { name: "e/modules/pager16/desk"; part { name: "drop3"; mouse_events: 0; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_3.png"; - rel1.to: "base"; + rel1.to: "e.swallow.content"; rel1.offset: -1 0; rel1.relative: 0.0 1.0; - rel2.to: "base"; + rel2.to: "e.swallow.content"; rel2.relative: 0.0 1.0; rel2.offset: -1 0; align: 0.0 1.0; @@ -287,8 +226,8 @@ group { name: "e/modules/pager16/desk"; program { name: "sel"; signal: "e,state,selected"; source: "e"; action: STATE_SET "active" 0.0; - transition: BOUNCE 0.4 0.5 4; - target: "glow"; + transition: DECELERATE 0.2; + target: "sel"; } program { signal: "e,state,unselected"; source: "e"; @@ -299,7 +238,7 @@ group { name: "e/modules/pager16/desk"; signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.2; - target: "glow"; + target: "sel"; } program { name: "drop1"; signal: "e,action,drag,in"; source: "e"; diff --git a/data/elementary/themes/edc/pointer.edc b/data/elementary/themes/edc/pointer.edc index 3f57e27982..7310e31068 100644 --- a/data/elementary/themes/edc/pointer.edc +++ b/data/elementary/themes/edc/pointer.edc @@ -1,6 +1,5 @@ group { name: "e/pointer/enlightenment/default/color"; images.image: "pointer.png" COMP; - images.image: "pointer_glow.png" COMP; data.item: "can_suspend" "1"; parts { part { name: "parent"; type: RECT; @@ -20,29 +19,18 @@ group { name: "e/pointer/enlightenment/default/color"; image.normal: "pointer.png"; rel.to: "parent"; } - } - part { name: "glow"; - description { state: "default" 0.0; - rel.to: "base"; - image.normal: "pointer_glow.png"; - color: 255 255 255 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - description { state: "faded" 0.0; + description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 51 153 255 255; } } part { name: "e.swallow.hotspot"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 1; visible: 0; - rel1.relative: (5/32) (5/32); rel.to: "base"; - rel2.relative: (5/32) (5/32); + rel1.relative: (5/32) (5/32); + rel2.relative: (5/32) (5/32); rel2.offset: 0 0; } } @@ -50,33 +38,52 @@ group { name: "e/pointer/enlightenment/default/color"; programs { program { signal: "e,action,mouse,down"; source: "e"; - action: STATE_SET "visible" 0.0; - target: "glow"; + action: STATE_SET "clicked" 0.0; + target: "base"; after: "fade"; } program { name: "fade"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.5; - target: "glow"; + target: "base"; } + program { + signal: "e,state,mouse,suspend"; source: "e"; + action: STATE_SET "suspend" 0.0; + transition: ACCELERATE 1.0; + target: "parent"; + sequence { + action: SIGNAL_EMIT "e,state,mouse,suspend,done" "e"; + } + } + program { + signal: "e,state,mouse,resume"; source: "e"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 1.0; + target: "parent"; + sequence { + action: SIGNAL_EMIT "e,state,mouse,resume,done" "e"; + } + } +/* program { name: "pulse"; signal: "e,state,mouse,idle"; source: "e"; in: 10.0 0.0; action: STATE_SET "faded" 0.0; transition: SINUSOIDAL 0.25; - target: "glow"; + target: "base"; after: "pulse2"; } program { name: "pulse2"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.5; - target: "glow"; + target: "base"; after: "pulse"; } program { signal: "e,state,mouse,active"; source: "e"; action: STATE_SET "default" 0.0; - target: "glow"; + target: "base"; after: "stop2"; } program { name: "stop2"; @@ -84,24 +91,7 @@ group { name: "e/pointer/enlightenment/default/color"; target: "pulse"; target: "pulse2"; } - program { - signal: "e,state,mouse,suspend"; source: "e"; - action: STATE_SET "suspend" 0.0; - transition: ACCELERATE 1.0; - target: "parent"; - sequence { - action: SIGNAL_EMIT "e,state,mouse,suspend,done" "e"; - } - } - program { - signal: "e,state,mouse,resume"; source: "e"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 1.0; - target: "parent"; - sequence { - action: SIGNAL_EMIT "e,state,mouse,resume,done" "e"; - } - } + */ } } @@ -131,13 +121,11 @@ group { name: "e/pointer/enlightenment/default/mono"; group { name: "e/pointer/enlightenment/resize_br/color"; inherit: "e/pointer/enlightenment/default/color"; - images.image: "mini_box_glow.png" COMP; parts { - part { name: "box"; - insert_after: "glow"; + part { name: "box"; type: RECT; + insert_after: "base"; description { state: "default" 0.0; - image.normal: "mini_box_glow.png"; - image.border: 7 7 7 7; + color: 51 153 255 192; rel1.relative: 0.3 0.3; rel2.relative: 0.7 0.7; } @@ -279,13 +267,11 @@ group { name: "e/pointer/enlightenment/resize_r/color"; group { name: "e/pointer/enlightenment/hand/color"; inherit: "e/pointer/enlightenment/default/color"; - images.image: "mini_box_glow.png" COMP; parts { - part { name: "box"; - insert_after: "glow"; + part { name: "box"; type: RECT; + insert_after: "base"; description { state: "default" 0.0; - image.normal: "mini_box_glow.png"; - image.border: 7 7 7 7; + color: 51 153 255 192; rel1.relative: 0.5 0.5; rel2.relative: 1.0 1.0; } @@ -348,32 +334,15 @@ group { name: "e/pointer/enlightenment/hand/color"; group { name: "e/pointer/enlightenment/move/color"; inherit: "e/pointer/enlightenment/hand/color"; - programs { - program { name: "move1"; - signal: "load"; source: ""; - action: STATE_SET "faded" 0.0; - transition: SINUSOIDAL 0.5; - target: "glow"; - after: "move2"; - } - program { name: "move2"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 0.5; - target: "glow"; - after: "move1"; - } - } } group { name: "e/pointer/enlightenment/rotate/color"; inherit: "e/pointer/enlightenment/default/color"; - images.image: "mini_box_glow.png" COMP; parts { - part { name: "box"; - insert_after: "glow"; + part { name: "box"; type: RECT; + insert_after: "base"; description { state: "default" 0.0; - image.normal: "mini_box_glow.png"; - image.border: 7 7 7 7; + color: 51 153 255 192; rel1.relative: 0.3 0.3; rel2.relative: 0.8 0.8; map.on: 1; @@ -414,29 +383,28 @@ group { name: "e/pointer/enlightenment/rotate/color"; } group { name: "e/pointer/enlightenment/plus/color"; - inherit: "e/pointer/enlightenment/default/color"; - images.image: "add_glow_small.png" COMP; +inherit: "e/pointer/enlightenment/default/color"; + images.image: "pointer_plus.png" COMP; parts { part { name: "add"; - insert_after: "glow"; + insert_after: "base"; description { state: "default" 0.0; - image.normal: "add_glow_small.png"; + image.normal: "pointer_plus.png"; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.relative: 0.3 0.3; - rel2.relative: 1.0 1.0; - align: 1.0 1.0; - max: 21 21; + rel1.relative: (40/128) (40/128); + rel2.relative: (76/128) (76/128); + color: 53 153 255 255; } description { state: "faded" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 53 153 255 128; } } } programs { program { name: "fade1"; signal: "load"; source: ""; - action: STATE_SET "faded" 0.0; + action: STATE_SET "clicked" 0.0; transition: SINUSOIDAL 0.5; target: "add"; after: "fade2"; @@ -451,38 +419,23 @@ group { name: "e/pointer/enlightenment/plus/color"; } group { name: "e/pointer/enlightenment/entry/color"; - images.image: "pointer_entry_bar.png" COMP; - images.image: "led_dot_white.png" COMP; + images.image: "pointer_entry.png" COMP; parts { part { name: "base"; description { state: "default" 0.0; - image.normal: "pointer_entry_bar.png"; - max: 15 99999; - min: 15 20; - image.normal: "pointer_entry_bar.png"; - image.border: 0 0 10 10; - rel1.offset: 0 2; - rel2.offset: -1 -3; + image.normal: "pointer_entry.png"; + aspect: (44/88) (44/88); aspect_preference: VERTICAL; } } part { name: "e.swallow.hotspot"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 1; visible: 0; - rel1.relative: 0.5 0.5; rel1.to: "base"; + rel1.relative: 0.5 0.5; rel2.to: "base"; rel2.relative: 0.5 0.5; rel2.offset: 0 0; - } - } - part { name: "shine"; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "led_dot_white.png"; - max: 27 27; - aspect: 1.0 1.0; aspect_preference: VERTICAL; } } } diff --git a/data/elementary/themes/edc/scrollframe.edc b/data/elementary/themes/edc/scrollframe.edc index 0a04cc938a..e7f9db1bef 100644 --- a/data/elementary/themes/edc/scrollframe.edc +++ b/data/elementary/themes/edc/scrollframe.edc @@ -1,6 +1,4 @@ group { name: "e/widgets/scrollframe"; - images.image: "inset_shadow.png" COMP; - images.image: "bevel_in.png" COMP; images.image: "bevel_out.png" COMP; images.image: "runner_horiz.png" COMP; images.image: "runner_vert.png" COMP; @@ -358,29 +356,6 @@ group { name: "e/widgets/scrollframe"; rel2.to_y: "sb_hbar"; } } - 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; - } - } - 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: "runner_vbar"; mouse_events: 0; clip_to: "sb_vbar_show"; description { state: "default" 0.0; diff --git a/data/elementary/themes/edc/shelf.edc b/data/elementary/themes/edc/shelf.edc index 23e234ca43..42108f967a 100644 --- a/data/elementary/themes/edc/shelf.edc +++ b/data/elementary/themes/edc/shelf.edc @@ -12,86 +12,23 @@ group { name: "e/shelf/default/base"; nomouse; * totally hidden */ // item: "instant_delay" "3.0"; } - images.image: "vgrad_med.png" COMP; - images.image: "vgrad_tall.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "holes_vert.png" COMP; - images.image: "holes_horiz.png" COMP; - images.image: "shine.png" COMP; parts { rect { "mouse"; mouse; desc { color: 0 0 0 0; } } - part { name: "bg"; - description { state: "default" 0.0; - image.normal: "vgrad_med.png"; - fill.smooth: 0; - TILED_HORIZ(120) - color_class: "shelf_base"; - } - description { state: "vert" 0.0; - image.normal: "vgrad_tall.png"; - fill.smooth: 0; - TILED_HORIZ(40) - color_class: "shelf_base"; - } - } - part { name: "bevel"; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "dots_start"; - description { state: "default" 0.0; - image.normal: "holes_vert.png"; - rel1.offset: 2 2; - rel2.relative: 0.0 1.0; - rel2.offset: 5 -3; - FIXED_SIZE(4, 14) - } - description { state: "vert" 0.0; - image.normal: "holes_horiz.png"; - rel1.offset: 2 2; - rel2.relative: 1.0 0.0; - rel2.offset: -3 5; - FIXED_SIZE(14, 4) - } - } - part { name: "dots_end"; + part { name: "bg"; type: RECT; description { state: "default" 0.0; - image.normal: "holes_vert.png"; - rel1.relative: 1.0 0.0; - rel1.offset: -6 2; - rel2.offset: -3 -3; - FIXED_SIZE(4, 14) - } - description { state: "vert" 0.0; - image.normal: "holes_horiz.png"; - rel1.relative: 0.0 1.0; - rel1.offset: 2 -6; - rel2.offset: -3 -3; - FIXED_SIZE(14, 4) + color: 64 64 64 255; } } spacer { "sizer"; description { state: "default" 0.0; - rel1.offset: 1 0; - rel1.relative: 1.0 0.0; - rel1.to_x: "dots_start"; - rel2.offset: -2 -1; - rel2.to_x: "dots_end"; - rel2.relative: 0.0 1.0; + rel1.offset: 4 0; + rel2.offset: -5 -1; } description { state: "vert" 0.0; - rel1.offset: 0 1; - rel1.relative: 0.0 1.0; - rel1.to_y: "dots_start"; - rel2.offset: -1 -2; - rel2.to_y: "dots_end"; - rel2.relative: 1.0 0.0; + rel1.offset: 0 4; + rel2.offset: -1 -5; } } part { name: "e.swallow.content"; type: SWALLOW; mouse; @@ -104,15 +41,6 @@ group { name: "e/shelf/default/base"; nomouse; link.base: "e,state,hidden" "e"; } } - part { name: "shine"; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - FIXED_SIZE(69, 5) - } - } rect { "events"; repeat; mouse; desc { color: 0 0 0 0; } } @@ -121,10 +49,7 @@ group { name: "e/shelf/default/base"; nomouse; program { \ signal: "e,state,orientation,"_ORIENT; source: "e"; \ action: STATE_SET _STATE 0.0; \ - target: "bg"; \ target: "sizer"; \ - target: "dots_start"; \ - target: "dots_end"; \ } } ORIENT_SATE("top", "default") @@ -147,8 +72,8 @@ group { name: "e/shelf/default/inset"; nomouse; alias: "e/shelf/alternate/inset"; alias: "e/shelf/invisible/inset"; alias: "e/shelf/translucent/inset"; - images.image: "horiz_bar_inset.png" COMP; - images.image: "vert_bar_inset.png" COMP; + images.image: "shadow_circle_horiz.png" COMP; + images.image: "shadow_circle_vert.png" COMP; parts { rect { "mouse"; mouse; desc { color: 0 0 0 0; } @@ -160,24 +85,24 @@ group { name: "e/shelf/default/inset"; nomouse; } part { name: "clip"; type: RECT; description { state: "default" 0.0; - rel1.offset: 3 1; - rel2.offset: -4 -2; + rel1.offset: 3 0; + rel2.offset: -4 -1; color: 255 255 255 255; } description { state: "vert" 0.0; - rel1.offset: 1 3; - rel2.offset: -2 -4; + rel1.offset: 0 3; + rel2.offset: -1 -4; color: 255 255 255 255; } } spacer { "sizer"; description { state: "default" 0.0; - rel1.offset: 4 1; - rel2.offset: -5 -2; + rel1.offset: 3 0; + rel2.offset: -4 -1; } description { state: "vert" 0.0; - rel1.offset: 1 4; - rel2.offset: -2 -5; + rel1.offset: 0 3; + rel2.offset: -1 -4; } } part { name: "e.swallow.content"; type: SWALLOW; mouse; @@ -191,22 +116,90 @@ group { name: "e/shelf/default/inset"; nomouse; link.base: "e,state,hidden" "e"; } } - part { name: "inset"; + part { name: "sh_horiz_clip"; type: RECT; description { state: "default" 0.0; - rel1.offset: 2 0; - rel2.offset: -3 -1; - image.normal: "horiz_bar_inset.png"; - image.border: 7 7 1 1; - image.middle: 0; - fill.smooth: 0; + rel1.to: "clip"; + rel2.to: "clip"; + visible: 1; } description { state: "vert" 0.0; - rel1.offset: 0 2; - rel2.offset: -1 -3; - image.normal: "vert_bar_inset.png"; - image.border: 1 1 8 6; - image.middle: 0; - fill.smooth: 0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "sh_l"; nomouse; + clip_to: "sh_horiz_clip"; + description { state: "default" 0.0; + rel1.to: "clip"; + rel2.to: "clip"; + rel2.relative: 0.0 1.0; + image.normal: "shadow_circle_vert.png"; + min: 0 0; + color: 255 255 255 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + min: 16 0; + color: 255 255 255 255; + } + } + part { name: "sh_r"; nomouse; + clip_to: "sh_horiz_clip"; + description { state: "default" 0.0; + rel1.to: "clip"; + rel2.to: "clip"; + rel1.relative: 1.0 0.0; + image.normal: "shadow_circle_vert.png"; + min: 0 0; + color: 255 255 255 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + min: 16 0; + color: 255 255 255 255; + } + } + part { name: "sh_vert_clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "clip"; + rel2.to: "clip"; + visible: 0; + } + description { state: "vert" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "sh_t"; nomouse; + clip_to: "sh_vert_clip"; + description { state: "default" 0.0; + rel1.to: "clip"; + rel2.to: "clip"; + rel2.relative: 1.0 0.0; + image.normal: "shadow_circle_horiz.png"; + min: 0 0; + color: 255 255 255 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + min: 0 16; + color: 255 255 255 255; + } + } + part { name: "sh_b"; nomouse; + clip_to: "sh_vert_clip"; + description { state: "default" 0.0; + rel1.to: "clip"; + rel2.to: "clip"; + rel1.relative: 0.0 1.0; + image.normal: "shadow_circle_horiz.png"; + min: 0 0; + color: 255 255 255 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + min: 0 16; + color: 255 255 255 255; } } rect { "events"; repeat; mouse; @@ -215,13 +208,14 @@ group { name: "e/shelf/default/inset"; nomouse; } programs { #define ORIENT_SATE(_ORIENT, _STATE) \ - program { \ - signal: "e,state,orientation,"_ORIENT; source: "e"; \ - action: STATE_SET _STATE 0.0; \ - target: "sizer"; \ - target: "inset"; \ - target: "clip"; \ - } +program { \ +signal: "e,state,orientation,"_ORIENT; source: "e"; \ +action: STATE_SET _STATE 0.0; \ +target: "sizer"; \ +target: "clip"; \ +target: "sh_horiz_clip"; \ +target: "sh_vert_clip"; \ +} ORIENT_SATE("top", "default") ORIENT_SATE("top_left", "default") ORIENT_SATE("top_right", "default") @@ -235,6 +229,62 @@ group { name: "e/shelf/default/inset"; nomouse; ORIENT_SATE("right_top", "vert") ORIENT_SATE("right_bottom", "vert") #undef ORIENT_SATE + program { + signal: "e,state,scroll,begin"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_l"; + target: "sh_t"; + } + program { + signal: "e,state,scroll,begin"; source: "e"; + action: STATE_SET "active" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_r"; + target: "sh_b"; + } + program { + signal: "e,state,scroll,middle"; source: "e"; + action: STATE_SET "active" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_l"; + target: "sh_t"; + } + program { + signal: "e,state,scroll,middle"; source: "e"; + action: STATE_SET "active" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_r"; + target: "sh_b"; + } + program { + signal: "e,state,scroll,end"; source: "e"; + action: STATE_SET "active" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_l"; + target: "sh_t"; + } + program { + signal: "e,state,scroll,end"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_r"; + target: "sh_b"; + } + program { + signal: "e,state,scroll,none"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_l"; + target: "sh_t"; + } + program { + signal: "e,state,scroll,none"; source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.5 CURRENT; + target: "sh_r"; + target: "sh_b"; + } } } @@ -253,11 +303,6 @@ group { name: "e/shelf/invisible/base"; nomouse; visible: 0; } } - part { name: "bevel"; - description { state: "default" 0.0; - visible: 0; - } - } part { name: "shine"; description { state: "default" 0.0; visible: 0; @@ -307,20 +352,10 @@ group { name: "e/shelf/translucent/base"; nomouse; parts { part { name: "bg"; description { state: "default" 0.0; - color: 127 127 127 135; + color: 255 255 255 128; } description { state: "vert" 0.0; - color: 127 127 127 135; - } - } - part { name: "bevel"; - description { state: "default" 0.0; - color: 127 127 127 135; - } - } - part { name: "shine"; - description { state: "default" 0.0; - color: 127 127 127 135; + color: 255 255 255 128; } } } @@ -346,8 +381,8 @@ group { name: "e/shelf/default/plain"; nomouse; } spacer { "sizer"; desc { - rel1.offset: 1 1; - rel2.offset: -2 -2; + rel1.offset: 0 0; + rel2.offset: -1 -1; } } part { name: "e.swallow.content"; type: SWALLOW; mouse; diff --git a/data/elementary/themes/edc/start.edc b/data/elementary/themes/edc/start.edc index edd558f155..db0cf7b398 100644 --- a/data/elementary/themes/edc/start.edc +++ b/data/elementary/themes/edc/start.edc @@ -1,13 +1,8 @@ group { name: "e/modules/start/main"; - alias: "e/gadget/start/main"; images.image: "big_arrow_down.png" COMP; - images.image: "big_arrow_down_shadow.png" COMP; images.image: "big_arrow_up.png" COMP; - images.image: "big_arrow_up_shadow.png" COMP; images.image: "big_arrow_left.png" COMP; - images.image: "big_arrow_left_shadow.png" COMP; images.image: "big_arrow_right.png" COMP; - images.image: "big_arrow_right_shadow.png" COMP; max: 128 128; parts { part { name: "arrow_base"; type: RECT; @@ -17,44 +12,17 @@ group { name: "e/modules/start/main"; color: 255 255 255 255; } description { state: "active" 0.0; - rel1.offset: 0 0; - rel2.offset: -1 -1; - color: 255 255 255 128; - } - } - part { name: "shadow"; - clip_to: "arrow_base"; - description { state: "default" 0.0; - image.normal: "big_arrow_up_shadow.png"; - rel1.to: "arrow_base"; - rel2.to: "arrow_base"; - aspect: (17/14) (17/14); - max: 17 14; - } - description { state: "down" 0.0; inherit: "default" 0.0; - image.normal: "big_arrow_down_shadow.png"; - aspect: (17/14) (17/14); - max: 17 14; - } - description { state: "left" 0.0; - inherit: "default" 0.0; - image.normal: "big_arrow_left_shadow.png"; - aspect: (14/17) (14/17); - max: 14 17; - } - description { state: "right" 0.0; - inherit: "default" 0.0; - image.normal: "big_arrow_right_shadow.png"; - aspect: (14/17) (14/17); - max: 14 17; + color: 255 255 255 64; } } - part { name: "arrow"; clip: "arrow_base"; + part { name: "arrow"; + clip_to: "arrow_base"; description { state: "default" 0.0; image.normal: "big_arrow_up.png"; aspect: (17/14) (17/14); max: 17 14; + color: 160 160 160 255; } description { state: "down" 0.0; inherit: "default" 0.0; @@ -99,7 +67,6 @@ group { name: "e/modules/start/main"; signal: "e,state,orientation,"_ORIENT; source: "e"; \ action: STATE_SET _STATE 0.0; \ target: "arrow"; \ - target: "shadow"; \ } ORIENT_SATE("top", "down") ORIENT_SATE("top_left", "down") diff --git a/data/elementary/themes/edc/syscon.edc b/data/elementary/themes/edc/syscon.edc index 32bc51c818..36e9dda467 100644 --- a/data/elementary/themes/edc/syscon.edc +++ b/data/elementary/themes/edc/syscon.edc @@ -1,30 +1,15 @@ group { name: "e/widgets/syscon/main"; - images.image: "vgrad_tall.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; parts { - part { name: "bg"; mouse_events: 0; + part { name: "bg"; type: RECT; description { state: "default" 0.0; - image.normal: "vgrad_tall.png"; - fill.smooth: 0; - TILED_HORIZ(40) - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 64 64 64 255; } } part { name: "e.swallow.main"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 3; - rel2.relative: 1.0 0.0; + rel1.offset: 8 8; + rel2.offset: -9 8; + rel2.relative: 1.0 0.0; align: 0.5 0.0; fixed: 0 1; } @@ -44,38 +29,19 @@ group { name: "e/widgets/syscon/main"; rel1.relative: 0.0 1.0; rel2.to: "e.swallow.secondary"; align: 0.5 0.0; - fixed: 0 1; + fixed: 0 1; } } - part { name: "base"; - description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; - rel1.offset: -6 -6; - rel1.to: "e.text.label"; - rel2.offset: 5 5; - rel2.to: "e.text.label"; - fill.smooth: 0; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; - } - } - part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; + part { name: "e.text.label"; type: TEXT; scale: 1; description { state: "default" 0.0; - rel1.offset: 0 12; + rel1.offset: 0 16; rel1.relative: 0.5 0.0; rel1.to_y: "e.swallow.extra"; - rel2.offset: -1 -14; + rel2.offset: -1 -17; rel2.relative: 0.5 1.0; - color: FN_COL_DEFAULT; - color_class: "button_text"; align: 0.5 1.0; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -84,60 +50,49 @@ group { name: "e/widgets/syscon/main"; } fixed: 1 0; } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } } - part { name: "shine"; mouse_events: 0; + part { name: "button"; type: RECT; description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - FIXED_SIZE(69, 5) + rel1.to: "e.text.label"; + rel1.offset: -12 -12; + rel2.to: "e.text.label"; + rel2.offset: 11 11; + color: 255 255 255 0; } } } programs { - program { - signal: "mouse,down,1*"; source: "base"; + program { + signal: "mouse,down,1*"; source: "button"; action: STATE_SET "clicked" 0.0; - target: "base"; target: "e.text.label"; } program { - signal: "mouse,up,1"; source: "base"; + signal: "mouse,up,1"; source: "button"; action: STATE_SET "default" 0.0; - target: "base"; target: "e.text.label"; } program { - signal: "mouse,clicked,1*"; source: "base"; + signal: "mouse,clicked,1*"; source: "button"; action: SIGNAL_EMIT "e,action,close" ""; } } } - + group { name: "e/widgets/syscon/item/button"; alias: "e/desklock/pin_button"; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "win_glow.png" COMP; parts { - part { name: "base"; + part { name: "clip"; type: RECT; mouse_events: 0; 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; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; } } part { name: "icon_clip"; type: RECT; description { state: "default" 0.0; + color: 160 160 160 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -148,35 +103,21 @@ group { name: "e/widgets/syscon/item/button"; clip_to: "icon_clip"; description { state: "default" 0.0; align: 0.5 0.0; - rel1.offset: 6 5; - rel1.to: "base"; + rel1.offset: 5 5; rel2.relative: 1.0 0.0; - rel2.offset: -7 -1; + rel2.offset: -6 -6; rel2.to_y: "e.text.label"; aspect: 1.0 1.0; aspect_preference: VERTICAL; } } - part { name: "label_clip"; type: RECT; - description { state: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } 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.relative: 0.0 1.0; - rel1.offset: 6 -7; - rel1.to_y: "base"; - rel2.offset: -7 -7; - rel2.to: "base"; + rel1.offset: 8 -9; + rel2.offset: -9 -9; align: 0.5 1.0; - color: FN_COL_DEFAULT; - color_class: "button_text"; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -186,47 +127,31 @@ group { name: "e/widgets/syscon/item/button"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 21 21 21 255; - color3: 255 255 255 25; - color_class: "button_text_disabled"; + color: 96 96 96 255; } - } - 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: FN_COL_DISABLE; - color_class: "button_text_disabled"; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.5 0.5; - text_class: "button"; - } - visible: 0; + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - description { state: "disabled" 0.0; + description { state: "focused" 0.0; inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } - part { name: "glow"; mouse_events: 0; + part { name: "sel"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "clip"; description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.to: "base"; - rel1.offset: -2 -3; - rel2.to: "base"; - rel2.offset: 1 0; - fill.smooth: 0; - color: 255 255 255 0; + color: 51 153 255 255; visible: 0; + rel2.offset: -1 0; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + max: 99999 6; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 255 255 255 150; + rel1.relative: 0.0 0.5; visible: 1; } } @@ -245,12 +170,12 @@ group { name: "e/widgets/syscon/item/button"; program { signal: "mouse,down,1"; source: "event"; action: STATE_SET "clicked" 0.0; - target: "base"; + target: "e.text.label"; } program { signal: "mouse,up,1"; source: "event"; action: STATE_SET "default" 0.0; - target: "base"; + target: "e.text.label"; } program { signal: "mouse,clicked,1*"; source: "event"; @@ -261,45 +186,48 @@ group { name: "e/widgets/syscon/item/button"; action: STATE_SET "disabled" 0.0; target: "event"; 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: "icon_clip"; - target: "label_clip"; - target: "label2"; + target: "e.text.label"; } program { signal: "e,state,focused"; source: "e"; action: STATE_SET "focused" 0.0; - target: "glow"; + transition: DECELERATE 0.2; + target: "e.text.label"; + target: "sel"; } program { signal: "e,state,unfocused"; source: "e"; action: STATE_SET "default" 0.0; - target: "glow"; + transition: DECELERATE 0.2; + target: "e.text.label"; + target: "sel"; } } } group { name: "e/modules/syscon/button"; - images.image: "btn_round_0.png" COMP; - images.image: "btn_round_1.png" COMP; - images.image: "btn_round_2.png" COMP; + images.image: "icon_system-shutdown.png" COMP; parts { part { name: "base"; description { state: "default" 0.0; - image.normal: "btn_round_0.png"; + rel1.relative: 0.1 0.1; + rel2.relative: 0.9 0.9; + image.normal: "icon_system-shutdown.png"; aspect: 1.0 1.0; aspect_preference: BOTH; + color: 160 160 160 255; } description { state: "hilight" 0.0; inherit: "default" 0.0; - image.normal: "btn_round_1.png"; + color: 255 255 255 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "btn_round_2.png"; + color: 160 160 160 255; } } } diff --git a/data/elementary/themes/edc/tasks.edc b/data/elementary/themes/edc/tasks.edc index d08dc2be74..daef1b5b10 100644 --- a/data/elementary/themes/edc/tasks.edc +++ b/data/elementary/themes/edc/tasks.edc @@ -1,153 +1,208 @@ group { name:"e/modules/tasks/item"; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "shadow_rounded_horiz.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "glow_small.png" COMP; - images.image: "horizontal_separated_bar_glow.png" COMP; + script { + public focused; + public iconic; + public eval_mode() { + new is_focused = get_int(focused); + new is_iconic = get_int(iconic); + if (is_iconic) { emit("state,iconic", "int"); } + else if (is_focused) { emit("state,focused", "int"); } + else { emit("state,default", "int"); } + } + public set_focused(m) { + set_int(focused, m); + eval_mode(); + } + public set_iconic(m) { + set_int(iconic, m); + eval_mode(); + } + } parts { - part { name: "sel_shadow"; mouse_events: 0; - clip_to: "sel_clip"; + part { name: "base"; type: RECT; mouse_events: 0; + clip_to: "clip"; + description { state: "default" 0.0; + color: 64 64 64 255; + } + description { state: "iconic" 0.0; + inherit: "default" 0.0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 40 40 40 255; + } + } + part { name: "click"; type: RECT; mouse_events: 0; + clip_to: "clip"; + description { state: "default" 0.0; + color: 32 32 32 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 32 32 32 255; + } + } + part { name: "urgent"; type: RECT; mouse_events: 0; + clip_to: "clip"; description { state: "default" 0.0; - image.normal: "shadow_rounded_horiz.png"; - image.border: 0 0 9 9; - rel1.offset: 0 -4; - rel1.to: "sel_base"; - rel2.offset: -1 5; - rel2.to: "sel_base"; - fill.smooth: 0; + color: 51 153 255 0; + } + description { state: "urgent" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; } } - part { name: "glow"; mouse_events: 0; - clip_to: "sel_clip"; + part { name: "label_clip"; type: RECT; mouse_events: 0; + clip_to: "clip"; description { state: "default" 0.0; - rel1.to: "sel_base"; - rel2.to: "sel_base"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - color: 255 255 255 0; - } - description { state: "visible" 0.0; + } + description { state: "text_only" 0.0; inherit: "default" 0.0; - rel1.offset: -4 -4; - rel2.offset: 3 3; - color: 255 255 255 128; } - description { state: "hilighted" 0.0; + description { state: "icon_only" 0.0; inherit: "default" 0.0; - rel1.offset: -4 -4; - rel2.offset: 3 3; - color: 255 255 255 255; + visible: 0; } } - part { name: "sel_base"; mouse_events: 0; - clip_to: "sel_clip"; + part { name: "icon_clip"; type: RECT; mouse_events: 0; + clip_to: "clip"; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - TILED_HORIZ(120) + } + description { state: "text_only" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { state: "icon_only" 0.0; + inherit: "default" 0.0; + visible: 1; } } - part { name: "sel_bevel"; mouse_events: 0; - clip_to: "sel_clip"; + part { name: "normal_clip"; type: RECT; mouse_events: 0; + clip_to: "label_clip"; description { state: "default" 0.0; - rel1.to: "sel_base"; - rel2.to: "sel_base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + visible: 1; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { state: "iconic" 0.0; + inherit: "default" 0.0; + visible: 0; } } - part { name: "sel_label"; type: TEXT; mouse_events: 0; - clip_to: "sel_clip"; - effect: GLOW; + part { name: "e.text.label"; type: TEXT; mouse_events: 0; + clip_to: "normal_clip"; scale: 1; description { state: "default" 0.0; - rel1.offset: -2 -3; - rel1.to: "e.text.label"; - rel2.offset: 3 1; - rel2.to: "e.text.label"; - color_class: "ilist_item_selected"; - color2: 255 255 255 255; - color3: 255 255 255 255; + rel1.to_x: "icon"; + rel1.relative: 1.0 0.0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + color: 160 160 160 255; text { font: FN; size: 10; - text_source: "e.text.label"; + min: 0 1; align: 0.0 0.5; - text_class: "ilist_item"; + text_class: "tasks_text"; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: FN_COL_HIGHLIGHT_CLICKED; + color: 255 255 255 255; } } - part { name: "base"; - clip_to: "clip"; + part { name: "focused_clip"; type: RECT; mouse_events: 0; + clip_to: "label_clip"; description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; - rel1.offset: -3 -2; - rel1.to: "sel_base"; - rel2.offset: 2 3; - rel2.to: "sel_base"; - fill.smooth: 0; + visible: 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "iconic" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "label_focused"; type: TEXT; mouse_events: 0; + clip_to: "focused_clip"; + scale: 1; + description { state: "default" 0.0; + rel1.to_x: "icon"; + rel1.relative: 1.0 0.0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + color: 255 255 255 255; + text { font: FNBD; size: 10; + min: 0 1; + align: 0.0 0.5; + text_class: "tasks_text"; + text_source: "e.text.label"; + } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + color: 220 220 220 255; } } - part { name: "e.text.label"; type: TEXT; mouse_events: 0; - clip_to: "clip"; - effect: SHADOW BOTTOM; + part { name: "iconic_clip"; type: RECT; mouse_events: 0; + clip_to: "label_clip"; + description { state: "default" 0.0; + visible: 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { state: "iconic" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "label_iconic"; type: TEXT; mouse_events: 0; + clip_to: "iconic_clip"; scale: 1; description { state: "default" 0.0; + rel1.to_x: "icon"; rel1.relative: 1.0 0.0; - rel1.offset: 2 3; - rel1.to_x: "icon2"; - rel1.to_y: "sel_base"; + rel1.offset: 4 4; rel2.offset: -5 -5; - rel2.to: "sel_base"; - color: FN_COL_DEFAULT; - color_class: "tasks_text"; + color: 128 128 128 255; text { font: FN; size: 10; min: 0 1; align: 0.0 0.5; text_class: "tasks_text"; + text_source: "e.text.label"; } } - description { state: "iconic" 0.0; + description { state: "clicked" 0.0; inherit: "default" 0.0; - color: FN_COL_DISABLE; + color: 255 255 255 255; } } part { name: "icon"; type: SPACER; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: VERTICAL; align: 0.0 0.5; - rel1.offset: 3 3; - rel1.to: "sel_base"; + rel1.offset: 4 4; rel2.relative: 0.0 1.0; - rel2.offset: 3 -4; - rel2.to: "sel_base"; + rel2.offset: 4 -5; } description { state: "icon_only" 0.0; inherit: "default" 0.0; align: 0.5 0.5; - rel1.offset: 2 2; + rel1.offset: 4 4; rel2.relative: 1.0 1.0; - rel2.offset: -3 -3; + rel2.offset: -5 -5; } description { state: "text_only" 0.0; inherit: "default" 0.0; + aspect: 0.0 0.0; aspect_preference: NONE; + rel1.offset: 0 0; + rel2.relative: 0.0 1.0; + rel2.offset: -1 -1; + max: 0 0; fixed: 1 1; } } @@ -155,56 +210,41 @@ group { name:"e/modules/tasks/item"; description { state: "default" 0.0; rel1.to: "icon"; rel2.to: "icon"; - } - description { state: "icon_only" 0.0; - inherit: "default" 0.0; - } - description { state: "text_only" 0.0; - inherit: "default" 0.0; fixed: 1 1; - rel2.relative: 0.0 1.0; } - } - part { name: "icon_clip"; type: RECT; - description { state: "default" 0.0; + description { state: "focused" 0.0; + inherit: "default" 0.0; } description { state: "iconic" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + rel1.relative: 0.2 0.2; + rel2.relative: 0.8 0.8; } } - part { name: "bar"; mouse_events: 0; - clip_to: "sel_clip"; + part { name: "bar"; type: RECT; mouse_events: 0; + clip_to: "clip"; description { state: "default" 0.0; - rel1.offset: -5 -10; + color: 51 153 255 255; + align: 0.5 1.0; + rel1.offset: 0 -1; rel1.relative: 0.0 1.0; - rel1.to: "sel_base"; - rel2.offset: 4 4; - rel2.to: "sel_base"; - image.normal: "horizontal_separated_bar_glow.png"; - image.border: 7 7 7 7; - fill.smooth: 0; + rel2.offset: -1 -1; fixed: 0 1; + visible: 0; + min: 0 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + min: 0 5; } } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; clip_to: "icon_clip"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: VERTICAL; - align: 0.0 0.5; - rel1.to: "icon"; - rel2.to: "icon"; - color: 255 0 0 128; - } - description { state: "bounce1" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.0 0.15; - rel2.relative: 1.0 1.15; - } - description { state: "bounce2" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.0 -0.15; - rel2.relative: 1.0 0.85; + rel1.to: "icon2"; + rel2.to: "icon2"; } } part { name: "event"; type: RECT; @@ -213,18 +253,6 @@ group { name:"e/modules/tasks/item"; color: 0 0 0 0; } } - part { name: "sel_shine"; mouse_events: 0; - clip_to: "sel_clip"; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "sel_base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "sel_base"; - FIXED_SIZE(69, 5) - } - } part { name: "clip"; type: RECT; description { state: "default" 0.0; rel1.offset: -20 -20; @@ -260,92 +288,136 @@ group { name:"e/modules/tasks/item"; program { signal: "mouse,down,1"; source: "event"; action: STATE_SET "clicked" 0.0; - target: "base"; + target: "click"; target: "e.text.label"; - target: "sel_label"; + target: "label_focused"; + target: "label_iconic"; } program { signal: "mouse,up,1"; source: "event"; action: STATE_SET "default" 0.0; - target: "base"; + target: "click"; target: "e.text.label"; - target: "sel_label"; + target: "label_focused"; + target: "label_iconic"; } program { signal: "mouse,up,clicked,1*"; source: "event"; action: SIGNAL_EMIT "e,action,click" ""; } + program { signal: "e,state,focused"; source: "e"; - action: STATE_SET "selected" 0.0; - target: "clip"; - target: "sel_clip"; + action: STATE_SET "focused" 0.0; + transition: ACCELERATE 0.2; + target: "bar"; } program { signal: "e,state,unfocused"; source: "e"; action: STATE_SET "default" 0.0; - target: "clip"; - target: "sel_clip"; - target: "glow"; + transition: DECELERATE 0.2; + target: "bar"; + } + + program { + signal: "state,default"; source: "int"; + action: STATE_SET "default" 0.0; + target: "normal_clip"; + target: "focused_clip"; + target: "iconic_clip"; + target: "base"; + } + program { + signal: "state,default"; source: "int"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.2; + target: "icon2"; } program { + signal: "state,focused"; source: "int"; + action: STATE_SET "focused" 0.0; + target: "normal_clip"; + target: "focused_clip"; + target: "iconic_clip"; + target: "base"; + } + program { + signal: "state,focused"; source: "int"; + action: STATE_SET "focused" 0.0; + transition: SINUSOIDAL 0.2; + target: "icon2"; + } + program { + signal: "state,iconic"; source: "int"; + action: STATE_SET "iconic" 0.0; + target: "normal_clip"; + target: "focused_clip"; + target: "iconic_clip"; + target: "base"; + } + program { + signal: "state,iconic"; source: "int"; + action: STATE_SET "iconic" 0.0; + transition: SINUSOIDAL 0.2; + target: "icon2"; + } + + program { signal: "e,state,focused"; source: "e"; - action: STATE_SET "hilighted" 0.0; - transition: DECELERATE 0.2; - target: "glow"; - after: "focus2"; + script { set_focused(1); } } - program { name: "focus2"; - action: STATE_SET "visible" 0.0; - transition: SINUSOIDAL 0.3; - target: "glow"; + program { + signal: "e,state,unfocused"; source: "e"; + script { set_focused(0); } } program { - signal: "e,state,urgent"; source: "e"; - action: STATE_SET "bounce1" 0.0; - target: "e.swallow.icon"; - after: "urg1"; + signal: "e,state,iconified"; source: "e"; + script { set_iconic(1); } } + program { + signal: "e,state,uniconified"; source: "e"; + script { set_iconic(0); } + } + program { name: "urg1"; - action: STATE_SET "bounce2" 0.0; - transition: DECELERATE 0.2; - target: "e.swallow.icon"; + signal: "e,state,urgent"; source: "e"; + action: STATE_SET "urgent" 0.0; + in: 0.4 0.0; + transition: SINUSOIDAL 0.2; + target: "urgent"; after: "urg2"; } program { name: "urg2"; - action: STATE_SET "bounce1" 0.0; - transition: ACCELERATE 0.2; - target: "e.swallow.icon"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.2; + target: "urgent"; after: "urg1"; } program { signal: "e,state,not_urgent"; source: "e"; - action: STATE_SET "default" 0.0; - target: "e.swallow.icon"; - } - program { - signal: "e,state,iconified"; source: "e"; - action: STATE_SET "iconic" 0.0; - target: "e.text.label"; - target: "icon_clip"; + action: ACTION_STOP; + target: "urg1"; + target: "urg2"; + after: "noturg2"; } - program { - signal: "e,state,uniconified"; source: "e"; + program { name: "noturg2"; action: STATE_SET "default" 0.0; - target: "e.text.label"; - target: "icon_clip"; + target: "urgent"; } + program { signal: "e,state,icon_only"; source: "e"; action: STATE_SET "icon_only" 0.0; target: "icon"; - target: "icon2"; + target: "icon_clip"; + target: "label_clip"; } program { signal: "e,state,text_only"; source: "e"; action: STATE_SET "text_only" 0.0; target: "icon"; - target: "icon2"; + target: "icon_clip"; + target: "label_clip"; } } } @@ -353,36 +425,74 @@ group { name:"e/modules/tasks/item"; group { name:"e/modules/tasks/item_vert"; inherit: "e/modules/tasks/item"; parts { - part { name: "sel_label"; + part { name: "e.text.label"; description { state: "default" 0.0; - rel1.offset: 0 0; - rel1.to: "icon"; - rel2.offset: -1 -1; - rel2.to: "icon"; - visible: 0; + rel1.to_y: "icon"; + rel1.to_x: ""; + rel1.relative: 0.0 1.0; + text { + min: 0 1; + align: 0.5 0.5; + } } description { state: "clicked" 0.0; inherit: "default" 0.0; + color: 255 255 255 255; } } - part { name: "e.text.label"; + part { name: "label_focused"; description { state: "default" 0.0; - rel1.offset: 0 0; - rel1.to: "icon"; - rel2.offset: -1 -1; - rel2.to: "icon"; - visible: 0; + rel1.to_y: "icon"; + rel1.to_x: ""; + rel1.relative: 0.0 1.0; + text { + min: 0 1; + align: 0.5 0.5; + } + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 220 220 220 255; + } + } + part { name: "label_iconic"; + description { state: "default" 0.0; + rel1.to_y: "icon"; + rel1.to_x: ""; + rel1.relative: 0.0 1.0; + text { + min: 0 1; + align: 0.5 0.5; + } } description { state: "clicked" 0.0; inherit: "default" 0.0; + color: 255 255 255 255; } } part { name: "icon"; description { state: "default" 0.0; - align: 0.5 0.5; - rel1.offset: 2 2; - rel2.relative: 1.0 1.0; - rel2.offset: -3 -3; + aspect_preference: HORIZONTAL; + align: 0.5 0.0; + rel2.relative: 1.0 0.0; + rel2.offset: -5 4; + } + description { state: "text_only" 0.0; + rel2.relative: 1.0 0.0; + max: 0 0; + } + } + part { name: "bar"; + description { state: "default" 0.0; + align: 1.0 0.5; + rel1.offset: -1 0; + rel1.relative: 1.0 0.0; + rel2.offset: -1 -1; + fixed: 1 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + min: 5 0; } } } diff --git a/data/elementary/themes/edc/temperature.edc b/data/elementary/themes/edc/temperature.edc index 76188be679..98250585f0 100644 --- a/data/elementary/themes/edc/temperature.edc +++ b/data/elementary/themes/edc/temperature.edc @@ -1,57 +1,66 @@ group { name: "e/modules/temperature/main"; + alias: "e/gadget/thermal/main"; + alias: "e/gadget/thermal/main_vert"; + alias: "e/modules/thermal/main"; + alias: "e/modules/thermal/main_vert"; + images.image: "therm_base.png" COMP; images.image: "therm_content.png" COMP; - images.image: "therm_shadow.png" COMP; - images.image: "therm_shine.png" COMP; + min: 16 16; + max: 128 128; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT) && (id == 1)) { new Float:val; val = getfarg(2); set_drag(PART:"temp_top", 0.0, val); + if (val <= 0.6) set_state(PART:"temp", "default", 0.0); + else if (val <= 0.8) set_state(PART:"temp", "warm", 0.0); + else if (val <= 1.0) set_state(PART:"temp", "hot", 0.0); } } } parts { - part { name: "shadow"; + part { name: "base"; description { state: "default" 0.0; - aspect: 0.5 0.5; aspect_preference: BOTH; - align: 0.5 0.5; - max: 80 160; - image.normal: "therm_shadow.png"; + rel1.to: "temp"; + rel2.to: "temp"; + image.normal: "therm_base.png"; } } part { name: "temp"; clip_to: "temp_clip"; description { state: "default" 0.0; - rel1.to: "shadow"; - rel2.to: "shadow"; + aspect: 0.5 0.5; aspect_preference: BOTH; + align: 0.5 0.5; + max: 80 160; image.normal: "therm_content.png"; + color: 51 153 255 255; } - } - part { name: "overlay"; - description { state: "default" 0.0; - rel1.to: "shadow"; - rel2.to: "shadow"; - image.normal: "therm_shine.png"; + description { state: "warm" 0.0; + inherit: "default" 0.0; + color: 255 153 51 255; + } + description { state: "hot" 0.0; + inherit: "default" 0.0; + color: 255 0 0 255; } } part { name: "e.text.reading"; type: TEXT; scale: 1; - effect: SHADOW BOTTOM; clip_to: "fade_clip"; description { state: "default" 0.0; - color_class: "module_label_invisible"; - color3: 255 255 255 255; - text { font: FN; size: 9; - fit: 1 1; + visible: 0; + color: 255 255 255 0; + text { font: FN; size: 10; + min: 1 1; ellipsis: -1; text_class: "module_small"; } } description { state: "visible" 0.0; inherit: "default" 0.0; - color_class: "module_label"; - color3: 255 255 255 255; + visible: 1; + color: 255 255 255 255; } } part { name: "fade_clip"; type: RECT; @@ -77,7 +86,9 @@ group { name: "e/modules/temperature/main"; } part { name: "temp_limit"; type: SPACER; description { state: "default" 0.0; + rel1.to: "temp"; rel1.relative: 0.0 0.1; + rel2.to: "temp"; rel2.relative: 1.0 0.9; } } diff --git a/data/elementary/themes/edc/xkbswitch.edc b/data/elementary/themes/edc/xkbswitch.edc index 1bbfbc9641..19edf75ffd 100644 --- a/data/elementary/themes/edc/xkbswitch.edc +++ b/data/elementary/themes/edc/xkbswitch.edc @@ -1,37 +1,37 @@ group { name: "e/modules/xkbswitch/main"; alias: "e/gadget/xkbswitch/main"; alias: "e/gadget/xkbswitch/main_vert"; - images.image: "shadow_square_tiny.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; + alias: "e/modules/xkbswitch/main_vert"; max: 128 128; parts { - part { name: "shadow"; + part { name: "e.swallow.flag"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "e.swallow.flag"; - rel1.offset: -3 -2; - rel2.to: "e.swallow.flag"; - rel2.offset: 2 4; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; + rel1.offset: 2 2; + rel2.offset: -3 -3; } } - part { name: "e.swallow.flag"; type: SWALLOW; mouse_events: 0; + part { name: "over"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; + rel1.to: "e.swallow.flag"; + rel2.to: "e.swallow.flag"; + color: 0 0 0 0;; + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 0 0 0 128; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: GLOW; description { state: "default" 0.0; + color: 255 255 255 0; + visible: 0; rel1.to: "e.swallow.flag"; rel1.relative: 0.0 0.5; rel2.to: "e.swallow.flag"; rel2.relative: 1.0 0.5; - color: FN_COL_OUTLINE_TRANSPARENT; - text { font: FN; size: 9; + text { font: FN; size: 10; min: 0 1; text_class: "module_small"; } @@ -39,35 +39,8 @@ group { name: "e/modules/xkbswitch/main"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: FN_COL_OUTLINE_DEFAULT; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "e.swallow.flag"; - rel2.to: "e.swallow.flag"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - rel1.to_x: "e.swallow.flag"; - rel2.to_x: "e.swallow.flag"; - } - } - part { name: "shine"; mouse_events: 0; - clip_to: "clip"; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "e.swallow.flag"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "e.swallow.flag"; - FIXED_SIZE(69, 5) + color: 255 255 255 255; + visible: 1; } } part { name: "event"; type: RECT; @@ -82,12 +55,14 @@ group { name: "e/modules/xkbswitch/main"; action: STATE_SET "visible" 0.0; transition: DECELERATE 0.25; target: "e.text.label"; + target: "over"; } program { signal: "mouse,out"; source: "event"; action: STATE_SET "default" 0.0; transition: DECELERATE 1.0; target: "e.text.label"; + target: "over"; } } } @@ -95,39 +70,24 @@ group { name: "e/modules/xkbswitch/main"; group { name: "e/modules/xkbswitch/noflag"; alias: "e/gadget/xkbswitch/noflag"; alias: "e/gadget/xkbswitch/noflag_vert"; - images.image: "shadow_square_tiny.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; max: 128 128; parts { - part { name: "shadow"; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: -3 -2; - rel2.to: "base"; - rel2.offset: 2 4; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - } - } part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; + rel1.offset: 2 2; + rel2.offset: -3 -3; aspect: 1.8 1.8; aspect_preference: BOTH; - color: 51 153 255 255; + color: 32 32 32 255; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; description { state: "default" 0.0; + color: 160 160 160 255;; rel1.to: "base"; rel1.relative: 0.0 0.5; rel2.to: "base"; rel2.relative: 1.0 0.5; - color: FN_COL_DEFAULT; - text { font: FNBD; size: 9; + text { font: FNBD; size: 10; min: 0 1; text_class: "module_small"; } @@ -135,34 +95,7 @@ group { name: "e/modules/xkbswitch/noflag"; } description { state: "visible" 0.0; inherit: "default" 0.0; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - rel1.to_x: "base"; - rel2.to_x: "base"; - } - } - part { name: "shine"; mouse_events: 0; - clip_to: "clip"; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "base"; - FIXED_SIZE(69, 5) + color: 255 255 255 255; } } part { name: "event"; type: RECT; diff --git a/data/elementary/themes/fonts.edc b/data/elementary/themes/fonts.edc index a7fba6d1f1..bf3089f411 100644 --- a/data/elementary/themes/fonts.edc +++ b/data/elementary/themes/fonts.edc @@ -49,7 +49,7 @@ #define ENABLED_TEXTBLOCK_TAGS \ tag: "em" "+ font_style=Oblique"; \ - tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80"; \ + tag: "hilight" "+ font_weight=Bold color=#3399ff"; \ tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \ tag: "preedit" "+ underline=on underline_color=#3399ff"; \ tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \ @@ -61,11 +61,11 @@ tag: "smaller" "+ font_size=7"; \ tag: "name" "+ color=#888888 font_weight=Bold"; \ tag: "val" "+ color=#ffffff"; \ - tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30"; \ - tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \ - tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \ - tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000030"; \ - tag: "code" "+ font=Mono style=plain color=#ffffff"; \ + tag: "info" "+ color=#3399ff"; \ + tag: "success" "+ color=#00ff00"; \ + tag: "warning" "+ color=#ff7c00"; \ + tag: "failure" "+ color=#ff0000"; \ + tag: "code" "+ font=Mono color=#ffffff"; \ tag: "comment" "+ color=#00B000"; \ tag: "string" "+ color=#ff3a35"; \ tag: "number" "+ color=#D4D42A font_weight=Bold"; \ @@ -82,8 +82,8 @@ #define DISABLED_TEXTBLOCK_TAGS \ tag: "em" "+ font_style=Oblique"; \ - tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20"; \ - tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on underline_color=#101820"; \ + tag: "hilight" "+ font_weight=Bold color=#3399ff"; \ + tag: "link" "+ color=#607080 underline=on underline_color=#3399ff"; \ tag: "preedit" "+ underline=on underline_color=#3399ff88"; \ tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \ tag: "title" "+ font_size=26"; \ @@ -94,11 +94,11 @@ tag: "smaller" "+ font_size=7"; \ tag: "name" "+ color=#151515 font_weight=Bold"; \ tag: "val" "+ color=#151515"; \ - tag: "info" "+ color=#3399ff60 style=glow glow_color=#3399ff18"; \ - tag: "success" "+ color=#00ff0060 style=glow glow_color=#00ff0018"; \ - tag: "warning" "+ color=#ff7c0060 style=glow glow_color=#ff7c0018"; \ - tag: "failure" "+ color=#ff000060 style=glow glow_color=#ff000018"; \ - tag: "code" "+ style=shadow,bottom shadow_color=#ffffff19 font=Mono color=#151515"; \ + tag: "info" "+ color=#3399ff60"; \ + tag: "success" "+ color=#00ff0060"; \ + tag: "warning" "+ color=#ff7c0060"; \ + tag: "failure" "+ color=#ff000060"; \ + tag: "code" "+ font=Mono color=#505050"; \ tag: "comment" "+ color=#002800"; \ tag: "string" "+ color=#300504"; \ tag: "number" "+ color=#202008 font_weight=Bold"; \ diff --git a/data/elementary/themes/img/O-batt.svgz b/data/elementary/themes/img/O-batt.svgz Binary files differnew file mode 100644 index 0000000000..f2441174d5 --- /dev/null +++ b/data/elementary/themes/img/O-batt.svgz diff --git a/data/elementary/themes/img/O-bulb.svgz b/data/elementary/themes/img/O-bulb.svgz Binary files differnew file mode 100644 index 0000000000..400d1b70e5 --- /dev/null +++ b/data/elementary/themes/img/O-bulb.svgz diff --git a/data/elementary/themes/img/O-clockbase.svg b/data/elementary/themes/img/O-clockbase.svg new file mode 100644 index 0000000000..e9d7b801a2 --- /dev/null +++ b/data/elementary/themes/img/O-clockbase.svg @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="144" + height="144" + viewBox="0 0 144 144" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="O-clockbase.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/clock_base.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="8.4513889" + inkscape:cx="72" + inkscape:cy="72" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + width="144px" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-center="true" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid4136" + empspacing="8" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-908.3622)"> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4138" + cx="72" + cy="980.36218" + r="72" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4140" + width="4" + height="8.0000172" + x="70" + y="910.36218" + inkscape:transform-center-y="-66.000009" /> + <rect + inkscape:transform-center-y="-1.7583069e-05" + y="-142.00002" + x="978.36218" + height="8.0000172" + width="4" + id="rect4166" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" + inkscape:transform-center-x="-66.000007" /> + <rect + inkscape:transform-center-x="-1.5583069e-05" + transform="scale(-1,-1)" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4168" + width="4" + height="8.0000172" + x="-74.000015" + y="-1050.3622" + inkscape:transform-center-y="65.999974" /> + <rect + inkscape:transform-center-y="4.3618225e-05" + y="2.0000172" + x="-982.36224" + height="8.0000172" + width="4" + id="rect4170" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,-1,1,0,0,0)" + inkscape:transform-center-x="65.999974" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4172" + width="2" + height="4" + x="-553.53491" + y="-747.01862" + inkscape:transform-center-y="-58.889699" + transform="matrix(-0.8660254,-0.5,0.5,-0.8660254,0,0)" + inkscape:transform-center-x="-33.99996" /> + <rect + inkscape:transform-center-y="58.889711" + y="951.01855" + x="-428.82727" + height="4" + width="2" + id="rect4174" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0.8660254,-0.5,0.5,0.8660254,0,0)" + inkscape:transform-center-x="-33.999994" /> + <rect + inkscape:transform-center-y="33.999975" + y="618.53491" + x="-814.01855" + height="4" + width="2" + id="rect4176" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0.5,-0.8660254,0.8660254,0.5,0,0)" + inkscape:transform-center-x="-58.889718" /> + <rect + inkscape:transform-center-y="58.889703" + y="879.01855" + x="551.53491" + height="4" + width="2" + id="rect4178" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0.8660254,0.5,-0.5,0.8660254,0,0)" + inkscape:transform-center-x="34.000009" /> + <rect + inkscape:transform-center-y="33.999968" + y="493.82724" + x="884.01855" + height="4" + width="2" + id="rect4180" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0.5,0.8660254,-0.8660254,0.5,0,0)" + inkscape:transform-center-x="58.889706" /> + <rect + inkscape:transform-center-y="-34.000009" + y="-486.53494" + x="812.01855" + height="4" + width="2" + id="rect4182" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(-0.5,0.8660254,-0.8660254,-0.5,0,0)" + inkscape:transform-center-x="58.88971" /> + <rect + inkscape:transform-center-y="-58.889691" + y="-819.01862" + x="426.82727" + height="4" + width="2" + id="rect4184" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(-0.8660254,0.5,-0.5,-0.8660254,0,0)" + inkscape:transform-center-x="33.999975" /> + <rect + inkscape:transform-center-y="-34.000001" + y="-361.8273" + x="-886.01855" + height="4" + width="2" + id="rect4186" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)" + inkscape:transform-center-x="-58.889695" /> + </g> +</svg> diff --git a/data/elementary/themes/img/O-cloudconn.svg b/data/elementary/themes/img/O-cloudconn.svg new file mode 100644 index 0000000000..efee12e0b9 --- /dev/null +++ b/data/elementary/themes/img/O-cloudconn.svg @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + width="160" + height="160" + viewBox="0 0 160 160" + sodipodi:docname="O-cloudconn.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/cloud-conn.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <sodipodi:namedview + pagecolor="#404040" + bordercolor="#000000" + borderopacity="0.25098039" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1377" + id="namedview4" + showgrid="true" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-midpoints="true" + inkscape:zoom="7.6" + inkscape:cx="80" + inkscape:cy="80" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:showpageshadow="false"> + <inkscape:grid + type="xygrid" + id="grid4138" + enabled="true" + visible="true" /> + </sodipodi:namedview> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path5405" + cx="45" + cy="90" + r="25" /> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path5405-6" + cx="60" + cy="70" + r="25" /> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path5405-6-2" + cx="85" + cy="80" + r="20" /> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path5405-6-2-9" + cx="120" + cy="100" + r="14.999997" /> + <rect + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5452" + width="75" + height="30" + x="45" + y="85" + ry="0" /> + <rect + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5456" + width="10" + height="30" + x="75" + y="110" /> + <rect + style="opacity:1;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5458" + width="80" + height="10" + x="40" + y="135" /> + <circle + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path5460" + cx="80" + cy="140" + r="10" /> + <circle + r="9.9999981" + cy="85" + cx="110" + id="circle5462" + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> +</svg> diff --git a/data/elementary/themes/img/O-cpufreq-base.svg b/data/elementary/themes/img/O-cpufreq-base.svg new file mode 100644 index 0000000000..dc1603f2d4 --- /dev/null +++ b/data/elementary/themes/img/O-cpufreq-base.svg @@ -0,0 +1,269 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="144" + height="144" + viewBox="0 0 144 144" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="O-cpufreq-base.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/cpu_base.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="8.4513889" + inkscape:cx="72" + inkscape:cy="72.059162" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + width="144px" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-center="true" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + showguides="false"> + <inkscape:grid + type="xygrid" + id="grid4136" + empspacing="8" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-908.3622)"> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4138" + cx="72" + cy="980.36218" + r="72" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4287" + width="56" + height="55.999981" + x="44" + y="952.36218" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289" + width="4" + height="10" + x="50" + y="944.36218" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1" + width="4" + height="10" + x="60" + y="944.36218" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-1" + width="4" + height="10" + x="70" + y="944.36218" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-1-8" + width="4" + height="10" + x="80" + y="944.36218" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4412" + width="10" + height="6" + x="-712.30908" + y="741.13245" + inkscape:transform-center-x="45.961949" + inkscape:transform-center-y="45.961945" + transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" /> + <rect + inkscape:transform-center-y="4.3652343e-05" + inkscape:transform-center-x="-65" + y="-983.36224" + x="-142" + height="6" + width="10" + id="rect4414" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="scale(-1,-1)" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-1-8-5" + width="4" + height="10" + x="90" + y="944.36218" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-9" + width="4" + height="10" + x="50" + y="1006.3622" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-6" + width="4" + height="10" + x="60" + y="1006.3622" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-1-7" + width="4" + height="10" + x="70" + y="1006.3622" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-1-8-3" + width="4" + height="10" + x="80" + y="1006.3622" /> + <rect + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4289-1-1-8-5-3" + width="4" + height="10" + x="90" + y="1006.3622" /> + <rect + y="-108" + x="958.36218" + height="10" + width="4" + id="rect4482" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-108" + x="968.36218" + height="10" + width="4" + id="rect4484" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-108" + x="978.36218" + height="10" + width="4" + id="rect4486" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-108" + x="988.36218" + height="10" + width="4" + id="rect4488" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-108" + x="998.36218" + height="10" + width="4" + id="rect4490" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-46" + x="958.36218" + height="10" + width="4" + id="rect4492" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-46" + x="968.36218" + height="10" + width="4" + id="rect4494" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-46" + x="978.36218" + height="10" + width="4" + id="rect4496" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-46" + x="988.36218" + height="10" + width="4" + id="rect4498" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-46" + x="998.36218" + height="10" + width="4" + id="rect4500" + style="opacity:1;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + <path + inkscape:connector-curvature="0" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 71.99707,908.3622 a 72,72 0 0 0 -7.94141,0.52539 l 7.94141,71.47461 7.94727,-71.52539 a 72,72 0 0 0 -7.94727,-0.47461 z" + id="circle4437" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> +</svg> diff --git a/data/elementary/themes/img/O-cpufreq.svg b/data/elementary/themes/img/O-cpufreq.svg new file mode 100644 index 0000000000..3161d25764 --- /dev/null +++ b/data/elementary/themes/img/O-cpufreq.svg @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="144" + height="144" + viewBox="0 0 144 144" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="O-cpufreq.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/cpu_clip3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="8.4513889" + inkscape:cx="72" + inkscape:cy="72.059162" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + width="144px" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-center="true" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid4136" + empspacing="8" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-908.3622)"> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4138" + cx="72" + cy="980.36218" + r="72" /> + <path + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 72 0 A 72 72 0 0 0 0 72 A 72 72 0 0 0 72 144 A 72 72 0 0 0 144 72 A 72 72 0 0 0 72 0 z M 72 8 A 64 64 0 0 1 136 72 A 64 64 0 0 1 72 136 A 64 64 0 0 1 8 72 A 64 64 0 0 1 72 8 z " + transform="translate(0,908.3622)" + id="path4253" /> + <path + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 72 10 A 62 62 0 0 0 10 72 A 62 62 0 0 0 72 134 A 62 62 0 0 0 134 72 A 62 62 0 0 0 72 10 z M 72 18 A 54 54 0 0 1 126 72 A 54 54 0 0 1 72 126 A 54 54 0 0 1 18 72 A 54 54 0 0 1 72 18 z " + transform="translate(0,908.3622)" + id="path4258" /> + <path + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 72 20 A 52 52 0 0 0 20 72 A 52 52 0 0 0 72 124 A 52 52 0 0 0 124 72 A 52 52 0 0 0 72 20 z M 72 28 A 44 44 0 0 1 116 72 A 44 44 0 0 1 72 116 A 44 44 0 0 1 28 72 A 44 44 0 0 1 72 28 z " + transform="translate(0,908.3622)" + id="path4263" /> + </g> +</svg> diff --git a/data/elementary/themes/img/O-ether.svg b/data/elementary/themes/img/O-ether.svg new file mode 100644 index 0000000000..79be1d9d5e --- /dev/null +++ b/data/elementary/themes/img/O-ether.svg @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + width="160" + height="160" + viewBox="0 0 160 160" + sodipodi:docname="O-ether.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/eth.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <sodipodi:namedview + pagecolor="#404040" + bordercolor="#000000" + borderopacity="0.1254902" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1438" + inkscape:window-height="1170" + id="namedview4" + showgrid="true" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-midpoints="true" + inkscape:zoom="7.60625" + inkscape:cx="80" + inkscape:cy="80" + inkscape:window-x="248" + inkscape:window-y="28" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" + inkscape:showpageshadow="false"> + <inkscape:grid + type="xygrid" + id="grid4138" + enabled="true" + visible="false" /> + <inkscape:grid + type="xygrid" + id="grid4701" /> + </sodipodi:namedview> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 70,145 20,0 0,-38 -20,0 z" + id="path4769" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 70,15 0,70 20,0 0,-70 z" + id="path4771" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 68,20 -18,0 0,85 60,0 0,-85 -18,0 0,67 -24,0 z" + id="path4773" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccc" /> +</svg> diff --git a/data/elementary/themes/img/O-speakerbase.svg b/data/elementary/themes/img/O-speakerbase.svg new file mode 100644 index 0000000000..4adbc85389 --- /dev/null +++ b/data/elementary/themes/img/O-speakerbase.svg @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="144" + height="144" + viewBox="0 0 144 144" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="O-speakerbase.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/speaker.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="8.4513889" + inkscape:cx="72" + inkscape:cy="72" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + width="144px" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-center="true" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid4136" + empspacing="8" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-908.3622)"> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4138" + cx="72" + cy="980.36218" + r="72" /> + <circle + style="opacity:1;fill:#303030;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4207" + cx="72" + cy="980.36218" + r="24" /> + </g> +</svg> diff --git a/data/elementary/themes/img/O-speakerclip.svg b/data/elementary/themes/img/O-speakerclip.svg new file mode 100644 index 0000000000..dcefd71d0d --- /dev/null +++ b/data/elementary/themes/img/O-speakerclip.svg @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="144" + height="144" + viewBox="0 0 144 144" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="O-speakerclip.svg" + inkscape:export-filename="/home/raster/C/th-efl/th/img/speaker_clip.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="8.4513889" + inkscape:cx="72" + inkscape:cy="72.059162" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + width="144px" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-center="true" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid4136" + empspacing="8" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-908.3622)"> + <path + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 72 0 A 72 72 0 0 0 0 72 A 72 72 0 0 0 72 144 A 72 72 0 0 0 144 72 A 72 72 0 0 0 72 0 z M 72 16 A 56 55.999996 0 0 1 128 72 A 56 55.999996 0 0 1 72 128 A 56 55.999996 0 0 1 16 72 A 56 55.999996 0 0 1 72 16 z " + transform="translate(0,908.3622)" + id="path4228" /> + </g> +</svg> diff --git a/data/elementary/themes/img/O-therm.svg b/data/elementary/themes/img/O-therm.svg new file mode 100644 index 0000000000..16eea0ef57 --- /dev/null +++ b/data/elementary/themes/img/O-therm.svg @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + width="80" + height="160" + viewBox="0 0 80 160" + sodipodi:docname="o-therm.svg"> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <sodipodi:namedview + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1377" + id="namedview4" + showgrid="true" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-midpoints="true" + inkscape:zoom="10.756862" + inkscape:cx="26.613196" + inkscape:cy="85.391907" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg2"> + <inkscape:grid + type="xygrid" + id="grid4138" + enabled="false" /> + </sodipodi:namedview> + <rect + style="opacity:1;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4144" + width="20" + height="91" + x="30" + y="25" /> + <circle + style="opacity:1;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4140" + cx="40" + cy="25" + r="10" /> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4146-0" + cx="40" + cy="25" + r="8" /> + <circle + style="opacity:1;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4142" + cx="40" + cy="127" + r="18" /> + <circle + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4148-9" + cx="40" + cy="127" + r="16" /> + <rect + style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4150-3" + width="16" + height="99" + x="32" + y="25" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4150" + width="12" + height="99" + x="34" + y="25" /> + <circle + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4146" + cx="40" + cy="25" + r="6" /> + <circle + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4148" + cx="40" + cy="127" + r="14" /> +</svg> diff --git a/data/elementary/themes/img/O-wifi.svgz b/data/elementary/themes/img/O-wifi.svgz Binary files differnew file mode 100644 index 0000000000..4e6e30194e --- /dev/null +++ b/data/elementary/themes/img/O-wifi.svgz diff --git a/data/elementary/themes/img/bat_base.png b/data/elementary/themes/img/bat_base.png Binary files differindex 7ec3421079..da73887288 100644 --- a/data/elementary/themes/img/bat_base.png +++ b/data/elementary/themes/img/bat_base.png diff --git a/data/elementary/themes/img/bat_content.png b/data/elementary/themes/img/bat_content.png Binary files differnew file mode 100644 index 0000000000..af89cd45d5 --- /dev/null +++ b/data/elementary/themes/img/bat_content.png diff --git a/data/elementary/themes/img/bevel_dark_in.png b/data/elementary/themes/img/bevel_dark_in.png Binary files differindex f40f132f16..c089df06a6 100644 --- a/data/elementary/themes/img/bevel_dark_in.png +++ b/data/elementary/themes/img/bevel_dark_in.png diff --git a/data/elementary/themes/img/bevel_dark_out.png b/data/elementary/themes/img/bevel_dark_out.png Binary files differindex f22c0ae21c..ea44549a84 100644 --- a/data/elementary/themes/img/bevel_dark_out.png +++ b/data/elementary/themes/img/bevel_dark_out.png diff --git a/data/elementary/themes/img/big_arrow_down.png b/data/elementary/themes/img/big_arrow_down.png Binary files differindex 24dae5d9c3..320988b19e 100644 --- a/data/elementary/themes/img/big_arrow_down.png +++ b/data/elementary/themes/img/big_arrow_down.png diff --git a/data/elementary/themes/img/big_arrow_left.png b/data/elementary/themes/img/big_arrow_left.png Binary files differindex 8f327da60c..d54d40b642 100644 --- a/data/elementary/themes/img/big_arrow_left.png +++ b/data/elementary/themes/img/big_arrow_left.png diff --git a/data/elementary/themes/img/big_arrow_right.png b/data/elementary/themes/img/big_arrow_right.png Binary files differindex fe174dfdf4..70f7516c1d 100644 --- a/data/elementary/themes/img/big_arrow_right.png +++ b/data/elementary/themes/img/big_arrow_right.png diff --git a/data/elementary/themes/img/big_arrow_up.png b/data/elementary/themes/img/big_arrow_up.png Binary files differindex 95f1787c36..c3db0e0093 100644 --- a/data/elementary/themes/img/big_arrow_up.png +++ b/data/elementary/themes/img/big_arrow_up.png diff --git a/data/elementary/themes/img/border_close.png b/data/elementary/themes/img/border_close.png Binary files differnew file mode 100644 index 0000000000..8f33967d14 --- /dev/null +++ b/data/elementary/themes/img/border_close.png diff --git a/data/elementary/themes/img/border_maximize.png b/data/elementary/themes/img/border_maximize.png Binary files differnew file mode 100644 index 0000000000..fd96d2a943 --- /dev/null +++ b/data/elementary/themes/img/border_maximize.png diff --git a/data/elementary/themes/img/border_minimize.png b/data/elementary/themes/img/border_minimize.png Binary files differnew file mode 100644 index 0000000000..45763d4a03 --- /dev/null +++ b/data/elementary/themes/img/border_minimize.png diff --git a/data/elementary/themes/img/bulb_middle.png b/data/elementary/themes/img/bulb_middle.png Binary files differnew file mode 100644 index 0000000000..ea906ed0d5 --- /dev/null +++ b/data/elementary/themes/img/bulb_middle.png diff --git a/data/elementary/themes/img/bulb_over.png b/data/elementary/themes/img/bulb_over.png Binary files differindex a653b49cec..eba13f1cb2 100644 --- a/data/elementary/themes/img/bulb_over.png +++ b/data/elementary/themes/img/bulb_over.png diff --git a/data/elementary/themes/img/busy_circle.png b/data/elementary/themes/img/busy_circle.png Binary files differnew file mode 100644 index 0000000000..c6852a3dcc --- /dev/null +++ b/data/elementary/themes/img/busy_circle.png diff --git a/data/elementary/themes/img/busy_glow1.png b/data/elementary/themes/img/busy_glow1.png Binary files differnew file mode 100644 index 0000000000..3907cb696b --- /dev/null +++ b/data/elementary/themes/img/busy_glow1.png diff --git a/data/elementary/themes/img/busy_glow2.png b/data/elementary/themes/img/busy_glow2.png Binary files differnew file mode 100644 index 0000000000..503de20b8b --- /dev/null +++ b/data/elementary/themes/img/busy_glow2.png diff --git a/data/elementary/themes/img/busy_glow3.png b/data/elementary/themes/img/busy_glow3.png Binary files differnew file mode 100644 index 0000000000..e987bdb92b --- /dev/null +++ b/data/elementary/themes/img/busy_glow3.png diff --git a/data/elementary/themes/img/busy_glow4.png b/data/elementary/themes/img/busy_glow4.png Binary files differnew file mode 100644 index 0000000000..1ba0039ecd --- /dev/null +++ b/data/elementary/themes/img/busy_glow4.png diff --git a/data/elementary/themes/img/calendar_next.png b/data/elementary/themes/img/calendar_next.png Binary files differnew file mode 100644 index 0000000000..e55f2dafea --- /dev/null +++ b/data/elementary/themes/img/calendar_next.png diff --git a/data/elementary/themes/img/calendar_prev.png b/data/elementary/themes/img/calendar_prev.png Binary files differnew file mode 100644 index 0000000000..ff6875328c --- /dev/null +++ b/data/elementary/themes/img/calendar_prev.png diff --git a/data/elementary/themes/img/check.png b/data/elementary/themes/img/check.png Binary files differnew file mode 100644 index 0000000000..6ec4c222d0 --- /dev/null +++ b/data/elementary/themes/img/check.png diff --git a/data/elementary/themes/img/check_fill.png b/data/elementary/themes/img/check_fill.png Binary files differnew file mode 100644 index 0000000000..aaa4c4466f --- /dev/null +++ b/data/elementary/themes/img/check_fill.png diff --git a/data/elementary/themes/img/clock_base.png b/data/elementary/themes/img/clock_base.png Binary files differindex 4a139bd3e9..2c594c1c65 100644 --- a/data/elementary/themes/img/clock_base.png +++ b/data/elementary/themes/img/clock_base.png diff --git a/data/elementary/themes/img/cloud-conn.png b/data/elementary/themes/img/cloud-conn.png Binary files differnew file mode 100644 index 0000000000..dcafa98a39 --- /dev/null +++ b/data/elementary/themes/img/cloud-conn.png diff --git a/data/elementary/themes/img/clouds.jpg b/data/elementary/themes/img/clouds.jpg Binary files differnew file mode 100644 index 0000000000..7c8d949de8 --- /dev/null +++ b/data/elementary/themes/img/clouds.jpg diff --git a/data/elementary/themes/img/cpu_base.png b/data/elementary/themes/img/cpu_base.png Binary files differnew file mode 100644 index 0000000000..102e82a472 --- /dev/null +++ b/data/elementary/themes/img/cpu_base.png diff --git a/data/elementary/themes/img/cpu_clip1.png b/data/elementary/themes/img/cpu_clip1.png Binary files differnew file mode 100644 index 0000000000..9d942b1613 --- /dev/null +++ b/data/elementary/themes/img/cpu_clip1.png diff --git a/data/elementary/themes/img/cpu_clip2.png b/data/elementary/themes/img/cpu_clip2.png Binary files differnew file mode 100644 index 0000000000..be5ae60375 --- /dev/null +++ b/data/elementary/themes/img/cpu_clip2.png diff --git a/data/elementary/themes/img/cpu_clip3.png b/data/elementary/themes/img/cpu_clip3.png Binary files differnew file mode 100644 index 0000000000..2efbeef880 --- /dev/null +++ b/data/elementary/themes/img/cpu_clip3.png diff --git a/data/elementary/themes/img/cpu_marker.png b/data/elementary/themes/img/cpu_marker.png Binary files differnew file mode 100644 index 0000000000..7be4396829 --- /dev/null +++ b/data/elementary/themes/img/cpu_marker.png diff --git a/data/elementary/themes/img/cpu_marker2.png b/data/elementary/themes/img/cpu_marker2.png Binary files differnew file mode 100644 index 0000000000..1065dd71cb --- /dev/null +++ b/data/elementary/themes/img/cpu_marker2.png diff --git a/data/elementary/themes/img/cpu_marker3.png b/data/elementary/themes/img/cpu_marker3.png Binary files differnew file mode 100644 index 0000000000..820adc1522 --- /dev/null +++ b/data/elementary/themes/img/cpu_marker3.png diff --git a/data/elementary/themes/img/cpu_marker4.png b/data/elementary/themes/img/cpu_marker4.png Binary files differnew file mode 100644 index 0000000000..f3b95415ab --- /dev/null +++ b/data/elementary/themes/img/cpu_marker4.png diff --git a/data/elementary/themes/img/digit_0.png b/data/elementary/themes/img/digit_0.png Binary files differindex c4c8d093d6..fe869097a8 100644 --- a/data/elementary/themes/img/digit_0.png +++ b/data/elementary/themes/img/digit_0.png diff --git a/data/elementary/themes/img/digit_1.png b/data/elementary/themes/img/digit_1.png Binary files differindex d79d752b55..6334528cf5 100644 --- a/data/elementary/themes/img/digit_1.png +++ b/data/elementary/themes/img/digit_1.png diff --git a/data/elementary/themes/img/digit_2.png b/data/elementary/themes/img/digit_2.png Binary files differindex 2e022b2a42..f045bdf3b0 100644 --- a/data/elementary/themes/img/digit_2.png +++ b/data/elementary/themes/img/digit_2.png diff --git a/data/elementary/themes/img/digit_3.png b/data/elementary/themes/img/digit_3.png Binary files differindex 6585e721ea..509520783c 100644 --- a/data/elementary/themes/img/digit_3.png +++ b/data/elementary/themes/img/digit_3.png diff --git a/data/elementary/themes/img/digit_4.png b/data/elementary/themes/img/digit_4.png Binary files differindex 8a01e4f90a..bd6f5c992b 100644 --- a/data/elementary/themes/img/digit_4.png +++ b/data/elementary/themes/img/digit_4.png diff --git a/data/elementary/themes/img/digit_5.png b/data/elementary/themes/img/digit_5.png Binary files differindex 254d87122c..e69efdb63e 100644 --- a/data/elementary/themes/img/digit_5.png +++ b/data/elementary/themes/img/digit_5.png diff --git a/data/elementary/themes/img/digit_6.png b/data/elementary/themes/img/digit_6.png Binary files differindex 82b7cb4f37..64f57793b2 100644 --- a/data/elementary/themes/img/digit_6.png +++ b/data/elementary/themes/img/digit_6.png diff --git a/data/elementary/themes/img/digit_7.png b/data/elementary/themes/img/digit_7.png Binary files differindex 90570ee554..9c204d4cc0 100644 --- a/data/elementary/themes/img/digit_7.png +++ b/data/elementary/themes/img/digit_7.png diff --git a/data/elementary/themes/img/digit_8.png b/data/elementary/themes/img/digit_8.png Binary files differindex ff08c92bd6..937f9eb8ae 100644 --- a/data/elementary/themes/img/digit_8.png +++ b/data/elementary/themes/img/digit_8.png diff --git a/data/elementary/themes/img/digit_9.png b/data/elementary/themes/img/digit_9.png Binary files differindex b5aceb205d..c31ece933a 100644 --- a/data/elementary/themes/img/digit_9.png +++ b/data/elementary/themes/img/digit_9.png diff --git a/data/elementary/themes/img/digit_am.png b/data/elementary/themes/img/digit_am.png Binary files differindex fad1bd9f7c..33307edebd 100644 --- a/data/elementary/themes/img/digit_am.png +++ b/data/elementary/themes/img/digit_am.png diff --git a/data/elementary/themes/img/digit_na.png b/data/elementary/themes/img/digit_na.png Binary files differindex 5b9fc59e27..e8652ef030 100644 --- a/data/elementary/themes/img/digit_na.png +++ b/data/elementary/themes/img/digit_na.png diff --git a/data/elementary/themes/img/digit_nm.png b/data/elementary/themes/img/digit_nm.png Binary files differindex 8b81f23a08..292a2a3b6d 100644 --- a/data/elementary/themes/img/digit_nm.png +++ b/data/elementary/themes/img/digit_nm.png diff --git a/data/elementary/themes/img/digit_pm.png b/data/elementary/themes/img/digit_pm.png Binary files differindex da7c8fdfb9..9d57c0cc00 100644 --- a/data/elementary/themes/img/digit_pm.png +++ b/data/elementary/themes/img/digit_pm.png diff --git a/data/elementary/themes/img/digit_sep.png b/data/elementary/themes/img/digit_sep.png Binary files differnew file mode 100644 index 0000000000..a8475f3c4c --- /dev/null +++ b/data/elementary/themes/img/digit_sep.png diff --git a/data/elementary/themes/img/eth-base.png b/data/elementary/themes/img/eth-base.png Binary files differnew file mode 100644 index 0000000000..91dbb8f3e5 --- /dev/null +++ b/data/elementary/themes/img/eth-base.png diff --git a/data/elementary/themes/img/eth-top.png b/data/elementary/themes/img/eth-top.png Binary files differnew file mode 100644 index 0000000000..2e1781576a --- /dev/null +++ b/data/elementary/themes/img/eth-top.png diff --git a/data/elementary/themes/img/eth.png b/data/elementary/themes/img/eth.png Binary files differindex 14cb9c1143..886da15618 100644 --- a/data/elementary/themes/img/eth.png +++ b/data/elementary/themes/img/eth.png diff --git a/data/elementary/themes/img/ether-good.png b/data/elementary/themes/img/ether-good.png Binary files differnew file mode 100644 index 0000000000..a5fb677a50 --- /dev/null +++ b/data/elementary/themes/img/ether-good.png diff --git a/data/elementary/themes/img/ether-off.png b/data/elementary/themes/img/ether-off.png Binary files differnew file mode 100644 index 0000000000..a656868c11 --- /dev/null +++ b/data/elementary/themes/img/ether-off.png diff --git a/data/elementary/themes/img/ether-on.png b/data/elementary/themes/img/ether-on.png Binary files differnew file mode 100644 index 0000000000..c374ffd30a --- /dev/null +++ b/data/elementary/themes/img/ether-on.png diff --git a/data/elementary/themes/img/exclam.png b/data/elementary/themes/img/exclam.png Binary files differnew file mode 100644 index 0000000000..ef66ed535e --- /dev/null +++ b/data/elementary/themes/img/exclam.png diff --git a/data/elementary/themes/img/grad-v-light.png b/data/elementary/themes/img/grad-v-light.png Binary files differnew file mode 100644 index 0000000000..fcb7b8b167 --- /dev/null +++ b/data/elementary/themes/img/grad-v-light.png diff --git a/data/elementary/themes/img/icon_system-lock-screen.png b/data/elementary/themes/img/icon_system-lock-screen.png Binary files differindex 288da75180..10acc53551 100644 --- a/data/elementary/themes/img/icon_system-lock-screen.png +++ b/data/elementary/themes/img/icon_system-lock-screen.png diff --git a/data/elementary/themes/img/icon_system-log-out.png b/data/elementary/themes/img/icon_system-log-out.png Binary files differindex e29f5936a2..a07f059ae4 100644 --- a/data/elementary/themes/img/icon_system-log-out.png +++ b/data/elementary/themes/img/icon_system-log-out.png diff --git a/data/elementary/themes/img/icon_system-restart.png b/data/elementary/themes/img/icon_system-restart.png Binary files differindex 893aa939e6..c83a32580a 100644 --- a/data/elementary/themes/img/icon_system-restart.png +++ b/data/elementary/themes/img/icon_system-restart.png diff --git a/data/elementary/themes/img/icon_system-shutdown.png b/data/elementary/themes/img/icon_system-shutdown.png Binary files differindex f71f7b8cc0..02d3f55462 100644 --- a/data/elementary/themes/img/icon_system-shutdown.png +++ b/data/elementary/themes/img/icon_system-shutdown.png diff --git a/data/elementary/themes/img/icon_system-suspend-hibernate.png b/data/elementary/themes/img/icon_system-suspend-hibernate.png Binary files differindex 6ecbebff5c..bce549a32a 100644 --- a/data/elementary/themes/img/icon_system-suspend-hibernate.png +++ b/data/elementary/themes/img/icon_system-suspend-hibernate.png diff --git a/data/elementary/themes/img/icon_system-suspend.png b/data/elementary/themes/img/icon_system-suspend.png Binary files differindex 28f912a003..19dc0c5da2 100644 --- a/data/elementary/themes/img/icon_system-suspend.png +++ b/data/elementary/themes/img/icon_system-suspend.png diff --git a/data/elementary/themes/img/logo.png b/data/elementary/themes/img/logo.png Binary files differnew file mode 100644 index 0000000000..3fbebc5214 --- /dev/null +++ b/data/elementary/themes/img/logo.png diff --git a/data/elementary/themes/img/logo2.png b/data/elementary/themes/img/logo2.png Binary files differnew file mode 100644 index 0000000000..49e5c0c1b3 --- /dev/null +++ b/data/elementary/themes/img/logo2.png diff --git a/data/elementary/themes/img/logo3.png b/data/elementary/themes/img/logo3.png Binary files differnew file mode 100644 index 0000000000..ee78594c17 --- /dev/null +++ b/data/elementary/themes/img/logo3.png diff --git a/data/elementary/themes/img/logo4.png b/data/elementary/themes/img/logo4.png Binary files differnew file mode 100644 index 0000000000..a703c692d0 --- /dev/null +++ b/data/elementary/themes/img/logo4.png diff --git a/data/elementary/themes/img/logo5.png b/data/elementary/themes/img/logo5.png Binary files differnew file mode 100644 index 0000000000..9f2fc2db59 --- /dev/null +++ b/data/elementary/themes/img/logo5.png diff --git a/data/elementary/themes/img/menu_submenu.png b/data/elementary/themes/img/menu_submenu.png Binary files differnew file mode 100644 index 0000000000..e55f2dafea --- /dev/null +++ b/data/elementary/themes/img/menu_submenu.png diff --git a/data/elementary/themes/img/pointer.png b/data/elementary/themes/img/pointer.png Binary files differindex 9d1aaaa1b7..683f5e0fd1 100644 --- a/data/elementary/themes/img/pointer.png +++ b/data/elementary/themes/img/pointer.png diff --git a/data/elementary/themes/img/pointer_entry.png b/data/elementary/themes/img/pointer_entry.png Binary files differnew file mode 100644 index 0000000000..b3cb8624a3 --- /dev/null +++ b/data/elementary/themes/img/pointer_entry.png diff --git a/data/elementary/themes/img/pointer_plus.png b/data/elementary/themes/img/pointer_plus.png Binary files differnew file mode 100644 index 0000000000..4ed6595123 --- /dev/null +++ b/data/elementary/themes/img/pointer_plus.png diff --git a/data/elementary/themes/img/radio.png b/data/elementary/themes/img/radio.png Binary files differnew file mode 100644 index 0000000000..d3d937efdd --- /dev/null +++ b/data/elementary/themes/img/radio.png diff --git a/data/elementary/themes/img/ringa1.png b/data/elementary/themes/img/ringa1.png Binary files differnew file mode 100644 index 0000000000..a9a3e61a6e --- /dev/null +++ b/data/elementary/themes/img/ringa1.png diff --git a/data/elementary/themes/img/ringa2.png b/data/elementary/themes/img/ringa2.png Binary files differnew file mode 100644 index 0000000000..b045658394 --- /dev/null +++ b/data/elementary/themes/img/ringa2.png diff --git a/data/elementary/themes/img/ringa3.png b/data/elementary/themes/img/ringa3.png Binary files differnew file mode 100644 index 0000000000..8dbb9ea35a --- /dev/null +++ b/data/elementary/themes/img/ringa3.png diff --git a/data/elementary/themes/img/ringa4.png b/data/elementary/themes/img/ringa4.png Binary files differnew file mode 100644 index 0000000000..29eaa0ac0d --- /dev/null +++ b/data/elementary/themes/img/ringa4.png diff --git a/data/elementary/themes/img/ringa5.png b/data/elementary/themes/img/ringa5.png Binary files differnew file mode 100644 index 0000000000..569ac2f079 --- /dev/null +++ b/data/elementary/themes/img/ringa5.png diff --git a/data/elementary/themes/img/ringb1.png b/data/elementary/themes/img/ringb1.png Binary files differnew file mode 100644 index 0000000000..11afdd5b52 --- /dev/null +++ b/data/elementary/themes/img/ringb1.png diff --git a/data/elementary/themes/img/ringb2.png b/data/elementary/themes/img/ringb2.png Binary files differnew file mode 100644 index 0000000000..4d23247b4d --- /dev/null +++ b/data/elementary/themes/img/ringb2.png diff --git a/data/elementary/themes/img/ringb3.png b/data/elementary/themes/img/ringb3.png Binary files differnew file mode 100644 index 0000000000..ef66c874b8 --- /dev/null +++ b/data/elementary/themes/img/ringb3.png diff --git a/data/elementary/themes/img/ringb4.png b/data/elementary/themes/img/ringb4.png Binary files differnew file mode 100644 index 0000000000..cfe321eb72 --- /dev/null +++ b/data/elementary/themes/img/ringb4.png diff --git a/data/elementary/themes/img/ringb5.png b/data/elementary/themes/img/ringb5.png Binary files differnew file mode 100644 index 0000000000..c5af9653fd --- /dev/null +++ b/data/elementary/themes/img/ringb5.png diff --git a/data/elementary/themes/img/ringc1.png b/data/elementary/themes/img/ringc1.png Binary files differnew file mode 100644 index 0000000000..11afdd5b52 --- /dev/null +++ b/data/elementary/themes/img/ringc1.png diff --git a/data/elementary/themes/img/ringc2.png b/data/elementary/themes/img/ringc2.png Binary files differnew file mode 100644 index 0000000000..f753af2b94 --- /dev/null +++ b/data/elementary/themes/img/ringc2.png diff --git a/data/elementary/themes/img/ringc3.png b/data/elementary/themes/img/ringc3.png Binary files differnew file mode 100644 index 0000000000..a5c246b04e --- /dev/null +++ b/data/elementary/themes/img/ringc3.png diff --git a/data/elementary/themes/img/ringc4.png b/data/elementary/themes/img/ringc4.png Binary files differnew file mode 100644 index 0000000000..e4aaa5df60 --- /dev/null +++ b/data/elementary/themes/img/ringc4.png diff --git a/data/elementary/themes/img/ringc5.png b/data/elementary/themes/img/ringc5.png Binary files differnew file mode 100644 index 0000000000..216f3db816 --- /dev/null +++ b/data/elementary/themes/img/ringc5.png diff --git a/data/elementary/themes/img/separator_horiz.png b/data/elementary/themes/img/separator_horiz.png Binary files differindex ed53e4d39d..cdbb39cff6 100644 --- a/data/elementary/themes/img/separator_horiz.png +++ b/data/elementary/themes/img/separator_horiz.png diff --git a/data/elementary/themes/img/shadow_circle_horiz.png b/data/elementary/themes/img/shadow_circle_horiz.png Binary files differnew file mode 100644 index 0000000000..f5fcc5ccaa --- /dev/null +++ b/data/elementary/themes/img/shadow_circle_horiz.png diff --git a/data/elementary/themes/img/shadow_circle_vert.png b/data/elementary/themes/img/shadow_circle_vert.png Binary files differnew file mode 100644 index 0000000000..f06b6223d2 --- /dev/null +++ b/data/elementary/themes/img/shadow_circle_vert.png diff --git a/data/elementary/themes/img/snow.jpg b/data/elementary/themes/img/snow.jpg Binary files differnew file mode 100644 index 0000000000..14e5db3275 --- /dev/null +++ b/data/elementary/themes/img/snow.jpg diff --git a/data/elementary/themes/img/speaker.png b/data/elementary/themes/img/speaker.png Binary files differindex f6622f51cc..0e23df0542 100644 --- a/data/elementary/themes/img/speaker.png +++ b/data/elementary/themes/img/speaker.png diff --git a/data/elementary/themes/img/speaker_clip.png b/data/elementary/themes/img/speaker_clip.png Binary files differnew file mode 100644 index 0000000000..bf2767961d --- /dev/null +++ b/data/elementary/themes/img/speaker_clip.png diff --git a/data/elementary/themes/img/speaker_vol.png b/data/elementary/themes/img/speaker_vol.png Binary files differnew file mode 100644 index 0000000000..0ae618d377 --- /dev/null +++ b/data/elementary/themes/img/speaker_vol.png diff --git a/data/elementary/themes/img/tacho_hand_big.png b/data/elementary/themes/img/tacho_hand_big.png Binary files differindex 886808def4..7b5f98e845 100644 --- a/data/elementary/themes/img/tacho_hand_big.png +++ b/data/elementary/themes/img/tacho_hand_big.png diff --git a/data/elementary/themes/img/tacho_hand_big2.png b/data/elementary/themes/img/tacho_hand_big2.png Binary files differindex a162457de8..b9daf77037 100644 --- a/data/elementary/themes/img/tacho_hand_big2.png +++ b/data/elementary/themes/img/tacho_hand_big2.png diff --git a/data/elementary/themes/img/tacho_hand_big3.png b/data/elementary/themes/img/tacho_hand_big3.png Binary files differindex 71832ac144..528de4a6b4 100644 --- a/data/elementary/themes/img/tacho_hand_big3.png +++ b/data/elementary/themes/img/tacho_hand_big3.png diff --git a/data/elementary/themes/img/tacho_hand_big4.png b/data/elementary/themes/img/tacho_hand_big4.png Binary files differindex c14b265eaa..576d4d42b4 100644 --- a/data/elementary/themes/img/tacho_hand_big4.png +++ b/data/elementary/themes/img/tacho_hand_big4.png diff --git a/data/elementary/themes/img/tacho_hand_small_min.png b/data/elementary/themes/img/tacho_hand_small_min.png Binary files differindex f7b91f02cb..e32cba00c7 100644 --- a/data/elementary/themes/img/tacho_hand_small_min.png +++ b/data/elementary/themes/img/tacho_hand_small_min.png diff --git a/data/elementary/themes/img/tacho_hand_small_min2.png b/data/elementary/themes/img/tacho_hand_small_min2.png Binary files differindex ab450ace37..ec3c0cc445 100644 --- a/data/elementary/themes/img/tacho_hand_small_min2.png +++ b/data/elementary/themes/img/tacho_hand_small_min2.png diff --git a/data/elementary/themes/img/tacho_hand_small_min3.png b/data/elementary/themes/img/tacho_hand_small_min3.png Binary files differindex def4b2f6f1..43ebf01da8 100644 --- a/data/elementary/themes/img/tacho_hand_small_min3.png +++ b/data/elementary/themes/img/tacho_hand_small_min3.png diff --git a/data/elementary/themes/img/tacho_hand_small_min4.png b/data/elementary/themes/img/tacho_hand_small_min4.png Binary files differindex 9b4f4aba5c..dd99507837 100644 --- a/data/elementary/themes/img/tacho_hand_small_min4.png +++ b/data/elementary/themes/img/tacho_hand_small_min4.png diff --git a/data/elementary/themes/img/tacho_hand_small_sec.png b/data/elementary/themes/img/tacho_hand_small_sec.png Binary files differnew file mode 100644 index 0000000000..759cb8bd8f --- /dev/null +++ b/data/elementary/themes/img/tacho_hand_small_sec.png diff --git a/data/elementary/themes/img/tacho_hand_small_sec2.png b/data/elementary/themes/img/tacho_hand_small_sec2.png Binary files differnew file mode 100644 index 0000000000..ab7adb76d4 --- /dev/null +++ b/data/elementary/themes/img/tacho_hand_small_sec2.png diff --git a/data/elementary/themes/img/tacho_hand_small_sec3.png b/data/elementary/themes/img/tacho_hand_small_sec3.png Binary files differnew file mode 100644 index 0000000000..a23f683d18 --- /dev/null +++ b/data/elementary/themes/img/tacho_hand_small_sec3.png diff --git a/data/elementary/themes/img/tacho_hand_small_sec4.png b/data/elementary/themes/img/tacho_hand_small_sec4.png Binary files differnew file mode 100644 index 0000000000..9fb90fa373 --- /dev/null +++ b/data/elementary/themes/img/tacho_hand_small_sec4.png diff --git a/data/elementary/themes/img/therm_base.png b/data/elementary/themes/img/therm_base.png Binary files differnew file mode 100644 index 0000000000..43eede7a9b --- /dev/null +++ b/data/elementary/themes/img/therm_base.png diff --git a/data/elementary/themes/img/therm_content.png b/data/elementary/themes/img/therm_content.png Binary files differindex 73f158e151..ae8535b8cd 100644 --- a/data/elementary/themes/img/therm_content.png +++ b/data/elementary/themes/img/therm_content.png diff --git a/data/elementary/themes/img/wifi-1.png b/data/elementary/themes/img/wifi-1.png Binary files differnew file mode 100644 index 0000000000..9583918a60 --- /dev/null +++ b/data/elementary/themes/img/wifi-1.png diff --git a/data/elementary/themes/img/wifi-2.png b/data/elementary/themes/img/wifi-2.png Binary files differnew file mode 100644 index 0000000000..3ff6aedf65 --- /dev/null +++ b/data/elementary/themes/img/wifi-2.png diff --git a/data/elementary/themes/img/wifi-3.png b/data/elementary/themes/img/wifi-3.png Binary files differnew file mode 100644 index 0000000000..24318d0f05 --- /dev/null +++ b/data/elementary/themes/img/wifi-3.png diff --git a/data/elementary/themes/img/wifi-4.png b/data/elementary/themes/img/wifi-4.png Binary files differnew file mode 100644 index 0000000000..064a3f8922 --- /dev/null +++ b/data/elementary/themes/img/wifi-4.png diff --git a/data/elementary/themes/img/wifi-5.png b/data/elementary/themes/img/wifi-5.png Binary files differnew file mode 100644 index 0000000000..0f85665a18 --- /dev/null +++ b/data/elementary/themes/img/wifi-5.png diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index 5f2e33ee66..a7bf5f8769 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -17,6 +17,16 @@ rel1.offset: -21 -14; \ rel2.offset: 20 27; \ fill.smooth: 0 +#define WIN_SHADOW_SMALL \ + image.normal: "win_shadow.png"; \ + image.border: 44 44 44 44; \ + image.border_scale: 1; \ + image.border_scale_by: 0.5; \ + image.middle: 0; \ + rel1.offset: -10 -7; \ + rel2.offset: 10 13; \ + fill.smooth: 0; \ + offscale #define WIN_SHADOW_SPACER \ rel1.offset: 21 14; \ rel2.offset: -21 -28 @@ -27,3 +37,216 @@ rel1.offset: -21 -14; \ rel2.offset: 20 27; \ fill.smooth: 0 + +#define IMAGE_RING(x, sz) \ + set { name: x; \ + image { image: x"1.png" COMP; size: (sz/2) (sz/2) 99999 99999; } \ + image { image: x"2.png" COMP; size: (sz/4) (sz/4) (sz/2) (sz/2); } \ + image { image: x"3.png" COMP; size: (sz/8) (sz/8) (sz/4) (sz/4); } \ + image { image: x"4.png" COMP; size: (sz/16) (sz/16) (sz/8) (sz/8); } \ + image { image: x"5.png" COMP; size: 0 0 (sz/16) (sz/16); } \ + } +#define BUSY(x, start1, start2, stop1, stop2) \ + program { signal: start1; source: start2; \ + action: STATE_SET "visible" 0.0; \ + transition: SINUSOIDAL 1.0; \ + target: "busy"; } \ + program { signal: start1; source: start2; \ + action: STATE_SET "default" 0.0; \ + target: "busy1"; \ + target: "busy2"; \ + target: "busy3"; \ + after: "busy-p11"; \ + after: "busy-p21"; \ + after: "busy-p31"; } \ + program { signal: stop1; source: stop2; \ + action: STATE_SET "default" 0.0; \ + transition: SINUSOIDAL 1.0; \ + target: "busy"; \ + after: "busy_stop2"; } \ + program { name: "busy_stop2"; \ + action: ACTION_STOP; \ + target: "busy-p11"; \ + target: "busy-p12"; \ + target: "busy-p21"; \ + target: "busy-p22"; \ + target: "busy-p31"; \ + target: "busy-p32"; } \ + part { name: "busy"; type: RECT; \ + description { state: "default" 0.0; \ + rel1.to: x; rel2.to: x; \ + color: 255 255 255 0; visible: 0; } \ + description { state: "visible" 0.0; \ + inherit: "default" 0.0; \ + color: 255 255 255 255; visible: 1; } } \ + part { name: "busy1"; \ + clip_to: "busy"; \ + description { state: "default" 0.0; \ + rel1.to: "busy"; rel2.to: "busy"; \ + aspect: 1.0 1.0; aspect_preference: BOTH; \ + image.normal: "ringa"; \ + color: 255 255 255 255; \ + map.on: 1; \ + map.smooth: 1; \ + map.rotation.center: "busy"; \ + map.rotation.z: 0; } \ + description { state: "default" 1.0; \ + inherit: "default" 0.0; \ + map.rotation.z: 360; } } \ + program { name: "busy-p11"; \ + action: STATE_SET "default" 1.0; \ + transition: LINEAR 1.0; \ + target: "busy1"; \ + after: "busy-p12"; } \ + program { name: "busy-p12"; \ + action: STATE_SET "default" 0.0; \ + target: "busy1"; \ + after: "busy-p11"; } \ + part { name: "busy2"; \ + clip_to: "busy"; \ + description { state: "default" 0.0; \ + rel1.to: "busy"; rel2.to: "busy"; \ + aspect: 1.0 1.0; aspect_preference: BOTH; \ + image.normal: "ringb"; \ + color: 255 255 255 128; \ + map.on: 1; \ + map.smooth: 1; \ + map.rotation.center: "busy"; \ + map.rotation.z: 420; } \ + description { state: "default" 1.0; \ + inherit: "default" 0.0; \ + map.rotation.z: 80; } } \ + program { name: "busy-p21"; \ + action: STATE_SET "default" 1.0; \ + transition: LINEAR 0.7; \ + target: "busy2"; \ + after: "busy-p22"; } \ + program { name: "busy-p22"; \ + action: STATE_SET "default" 0.0; \ + target: "busy2"; \ + after: "busy-p21"; } \ + part { name: "busy3"; \ + clip_to: "busy"; \ + description { state: "default" 0.0; \ + rel1.to: "busy"; rel2.to: "busy"; \ + aspect: 1.0 1.0; aspect_preference: BOTH; \ + image.normal: "ringc"; \ + color: 51 153 255 128; \ + map.on: 1; \ + map.smooth: 1; \ + map.rotation.center: "busy"; \ + map.rotation.z: 170; } \ + description { state: "default" 1.0; \ + inherit: "default" 0.0; \ + map.rotation.z: 530; } } \ + program { name: "busy-p31"; \ + action: STATE_SET "default" 1.0; \ + transition: LINEAR 1.4; \ + target: "busy3"; \ + after: "busy-p32"; } \ + program { name: "busy-p32"; \ + action: STATE_SET "default" 0.0; \ + target: "busy3"; \ + after: "busy-p31"; } + +#define ICON 1 +#define LABEL 2 +#define MASK 3 +#define DISABLE 4 +#define PRESSED 8 +#define BACKGROUND 16 +#define BUTTONMODE_SCRIPT \ + public btmode; \ + public eval_mode(m) { \ + new m1 = m & MASK; \ + new d = m & DISABLE; \ + new p = m & PRESSED; \ + new bg = m & BACKGROUND; \ + if (bg) { \ + set_state(PART:"base", "hidden", 0.0); \ + set_state(PART:"elm.swallow.background", "visible", 0.0); \ + } else { \ + set_state(PART:"elm.swallow.background", "default", 0.0); \ + if (!d) { \ + if (!p) \ + set_state(PART:"base", "default", 0.0); \ + else \ + set_state(PART:"base", "pressed", 0.0); \ + } else \ + set_state(PART:"base", "disabled", 0.0); \ + } \ + if (m1 == (ICON | LABEL)) { \ + if (!d) { \ + set_state(PART:"elm.swallow.content", "visible", 0.0); \ + set_state(PART:"sizer.content", "visible", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + if (!p) { \ + set_state(PART:"elm.text", "visible", 0.0); \ + set_state(PART:"icon_clip", "default", 0.0); \ + } else { \ + set_state(PART:"elm.text", "pressed_visible", 0.0); \ + set_state(PART:"icon_clip", "pressed", 0.0); \ + } \ + } else { \ + set_state(PART:"elm.swallow.content", "visible", 0.0); \ + set_state(PART:"sizer.content", "visible", 0.0); \ + set_state(PART:"elm.text", "disabled_visible", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } else if (m1 == (ICON)) { \ + if (!d) { \ + set_state(PART:"elm.swallow.content", "icononly", 0.0); \ + set_state(PART:"sizer.content", "icononly", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + set_state(PART:"elm.text", "default", 0.0); \ + if (!p) \ + set_state(PART:"icon_clip", "default", 0.0); \ + else \ + set_state(PART:"icon_clip", "pressed", 0.0); \ + } else { \ + set_state(PART:"elm.swallow.content", "icononly", 0.0); \ + set_state(PART:"sizer.content", "icononly", 0.0); \ + set_state(PART:"elm.text", "default", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } else if (m1 == (LABEL)) { \ + if (!d) { \ + set_state(PART:"elm.swallow.content", "default", 0.0); \ + set_state(PART:"sizer.content", "default", 0.0); \ + set_state(PART:"icon_clip", "default", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + if (!p) \ + set_state(PART:"elm.text", "textonly", 0.0); \ + else \ + set_state(PART:"elm.text", "pressed_textonly", 0.0); \ + } else { \ + set_state(PART:"elm.swallow.content", "default", 0.0); \ + set_state(PART:"sizer.content", "default", 0.0); \ + set_state(PART:"elm.text", "disabled_textonly", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } else { \ + if (!d) { \ + set_state(PART:"elm.swallow.content", "default", 0.0); \ + set_state(PART:"sizer.content", "default", 0.0); \ + set_state(PART:"icon_clip", "default", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + } else { \ + set_state(PART:"elm.swallow.content", "default", 0.0); \ + set_state(PART:"sizer.content", "default", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } \ + } \ + flag_set(flag) { \ + new m = get_int(btmode) | flag; \ + set_int(btmode, m); eval_mode(m); \ + } \ + flag_unset(flag) { \ + new m = get_int(btmode) & ~flag; \ + set_int(btmode, m); eval_mode(m); \ + } diff --git a/data/elementary/themes/orig/busy.xcf.gz b/data/elementary/themes/orig/busy.xcf.gz Binary files differnew file mode 100644 index 0000000000..c6db110b5c --- /dev/null +++ b/data/elementary/themes/orig/busy.xcf.gz diff --git a/data/elementary/themes/orig/icon-err-exclam.svgz b/data/elementary/themes/orig/icon-err-exclam.svgz Binary files differindex 09ac7ef9f3..f266e2eec5 100644 --- a/data/elementary/themes/orig/icon-err-exclam.svgz +++ b/data/elementary/themes/orig/icon-err-exclam.svgz diff --git a/data/elementary/themes/orig/ring.svg b/data/elementary/themes/orig/ring.svg new file mode 100644 index 0000000000..2f33e3ff13 --- /dev/null +++ b/data/elementary/themes/orig/ring.svg @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="160" + height="160" + viewBox="0 0 160 160" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="ring.svgz" + inkscape:export-filename="/home/raster/ring.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="6.26875" + inkscape:cx="80" + inkscape:cy="80" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:window-width="1576" + inkscape:window-height="1501" + inkscape:window-x="493" + inkscape:window-y="6" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid4138" + units="px" + spacingx="1" + spacingy="1" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-892.36216)"> + <ellipse + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4140" + cx="80" + cy="972.36218" + rx="65" + ry="65.000023" /> + </g> +</svg> |
