From 59731373c9ea1acdceb055371a6767a1d343effe Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 16 Nov 2012 13:57:49 +0000 Subject: [PATCH] add new splash... i'm not so happy with the colored led's tho... :( SVN revision: 79390 --- data/themes/Makefile.am | 6 + data/themes/default.edc | 3 +- data/themes/edc/init.edc | 583 +++++++++++++++++++++++++ data/themes/img/led_square_base.png | Bin 0 -> 278 bytes data/themes/img/led_square_glow.png | Bin 0 -> 289 bytes data/themes/img/led_square_shading.png | Bin 0 -> 236 bytes data/themes/img/led_square_shadow.png | Bin 0 -> 307 bytes data/themes/img/led_square_shine.png | Bin 0 -> 145 bytes 8 files changed, 591 insertions(+), 1 deletion(-) create mode 100644 data/themes/edc/init.edc create mode 100644 data/themes/img/led_square_base.png create mode 100644 data/themes/img/led_square_glow.png create mode 100644 data/themes/img/led_square_shading.png create mode 100644 data/themes/img/led_square_shadow.png create mode 100644 data/themes/img/led_square_shine.png diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index ba9d35331..31f424c14 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -34,6 +34,7 @@ edc/frame.edc \ edc/gadman.edc \ edc/ibar-ibox.edc \ edc/ilist.edc \ +edc/init.edc \ edc/label.edc \ edc/menu.edc \ edc/pager.edc \ @@ -211,6 +212,11 @@ img/led_dark.png \ img/led_light.png \ img/led_tiny_green.png \ img/led_tiny_orange.png \ +img/led_square_base.png \ +img/led_square_glow.png \ +img/led_square_shading.png \ +img/led_square_shadow.png \ +img/led_square_shine.png \ img/logo_blue_small.png \ img/logo_blue_small_glow.png \ img/media_busy_progress.png \ diff --git a/data/themes/default.edc b/data/themes/default.edc index 26a3b7198..d6c6f383f 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -15,6 +15,7 @@ collections { #include "edc/winlist.edc" #include "edc/desklock.edc" #include "edc/wizard.edc" +#include "edc/init.edc" // widgets #include "edc/menu.edc" #include "edc/button.edc" @@ -58,13 +59,13 @@ collections { #include "edc/O/gadman.edc" #include "edc/O/icons.edc" #include "edc/O/illume_gad.edc" -#include "edc/O/init.edc" #include "edc/O/mixer.edc" #include "edc/O/randr.edc" #include "edc/O/spectrum.edc" #include "edc/O/temperature.edc" #include "edc/O/transitions.edc" #include "edc/O/wallpaper.edc" +//#include "edc/O/init.edc" //#include "edc/O/ibarbox.edc" //#include "edc/O/wizard.edc" //#include "edc/O/desklock.edc" diff --git a/data/themes/edc/init.edc b/data/themes/edc/init.edc new file mode 100644 index 000000000..648ea0a40 --- /dev/null +++ b/data/themes/edc/init.edc @@ -0,0 +1,583 @@ +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; + script { + public is_ready; + public do_end; + } + parts { + part { name: "clip"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + } + } + part { name: "bg"; + 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: "logo"; + 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"; + 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: "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.to_y: "e.text.status"; + rel2.relative: 0.95 0.0; + rel2.offset: -5 -1; + rel2.to_y: "e.text.status"; + color: 255 255 255 255; + color3: 0 0 0 128; + text { font: "Sans:style=Bold"; size: 20; + min: 0 1; + text_class: "init_title"; + } + fixed: 0 1; + } + } + 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; + rel2.relative: 0.95 0.0; + rel2.offset: -5 -1; + rel2.to_y: "logo"; + color: 51 153 255 255; + color2: 51 153 255 24; + color3: 51 153 255 18; + text { font: "Sans"; size: 10; + min: 0 1; + text_class: "init_status"; + } + fixed: 0 1; + } + } + part { name: "e.text.version"; type: TEXT; + effect: GLOW; + description { state: "default" 0.0; + align: 1.0 1.0; + rel1.relative: 1.0 1.0; + rel1.offset: -4 -4; + rel2.relative: 1.0 1.0; + rel2.offset: -4 -4; + color: 51 153 255 255; + color2: 51 153 255 24; + color3: 51 153 255 18; + text { font: "Sans"; size: 8; + text: "0.17.0"; + min: 1 1; + align: 1.0 1.0; + text_class: "init_version"; + } + fixed: 1 1; + } + } + + 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; + } + } + +#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) + 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; + } + } + 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; + } + } + 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; + } + } + + 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; + } + } + } + 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"; + 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; + } + } + 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; + } + } + } + programs { + program { + signal: "show"; source: ""; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 1.0; + target: "shadow"; + target: "blanker"; + } + } +} diff --git a/data/themes/img/led_square_base.png b/data/themes/img/led_square_base.png new file mode 100644 index 0000000000000000000000000000000000000000..802bcc535cf74ccee4139dfb57ee521285d06b66 GIT binary patch literal 278 zcmV+x0qOpUP)+rSyPMQ+IrxEhp%3TDNpaU?TDkgP(%m!fE5|0l;YW0+VL7m~Vl z>Wjxzf8PMiOiw_E&4C551gZcobptYR0j|Jb2ektB18jgbP&?Fms>?tN9DxIHj!+~e zNh?WPNjpg=z1PWex9&}`cQZ-9lA3|A2yNUuqv%oPzgdsi)H<~0X*VqfMyLw@hYIb* zF?o0NtgLV{eHT#SN{!KjFBKp2KY%$xQxRzW8LBQn_f>fDySX0-Z9Vts-p>q&&y24r c2khj!1NF+#pHoE;a{vGU07*qoM6N<$g6~jp5&!@I literal 0 HcmV?d00001 diff --git a/data/themes/img/led_square_glow.png b/data/themes/img/led_square_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..e59ca9a50a47b4ee594e1d5bbbf0ef2c6afc00d3 GIT binary patch literal 289 zcmV++0p9+JP)`3(M6x(s#$IIsXVb#nWHwJX*EE7=YVz*!8lKqmoREIMEf zY{k%li|!0kn*&Gy+yGw!HQ*FjUi8Q$V6Iqhfqh`rg+AIClUgjOSEq$3=eZ>hz)j!c z2RMX&9f4l4!gv4uwL*0ci)EexTr}g!RKSNlMZ)2f0D>j@Pv`?72CJD7YZvpr&gvO(ArVnV0NL# jSl{Vx literal 0 HcmV?d00001 diff --git a/data/themes/img/led_square_shadow.png b/data/themes/img/led_square_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..a080744147e427cd1db672f25dfd5ed26743b054 GIT binary patch literal 307 zcmV-30nGl1P)PHxM6gY*-x&4ChF0t-Q1L|q4*fEuWPvxnveI1y|E zto1yLsO*78pgpjY(pw0eO4%CN0xJPy3LD^{^-=H!ZPQ1gZI*(SQXPv{b7_tS3v?QV zRLum-6Atltg{glyAOA8-*d?@BW?>|3@p1eYaM0*&D<#6_4&h%OOb0X?Z35Psyv{+aW03^uCK3Muy-8!)(Be9oz% ztnc7$b|RxEEtMro%wfvR2SF)}A}c1u*IL!)DSF!O(q-?Hlh~M~zceTP)H4-bd)}8#=?X`N{>s`kC{t2ngK47&Y4rm91r>mdKI;Vst0BhMVasU7T literal 0 HcmV?d00001