diff --git a/data/themes/default.edc b/data/themes/default.edc index 95e5cec5..d091c4b5 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -6,7 +6,9 @@ collections { image: "bg_shine.png" COMP; image: "bg_glint.png" COMP; image: "bg_shadow.png" COMP; + image: "bg_led_base.png" COMP; image: "bg_led.png" COMP; + image: "bg_led_strobe.png" COMP; } parts { part { name: "shadow"; @@ -109,15 +111,32 @@ collections { aspect_preference: HORIZONTAL; } } - part { name: "bell"; + part { name: "bell_base"; mouse_events: 0; description { state: "default" 0.0; + fixed: 1 1; visible: 0; color: 255 255 255 0; min: 32 32; max: 32 32; - rel2.offset: -5 -5; + rel2.offset: -1 -1; align: 1.0 1.0; + image.normal: "bg_led_base.png"; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "bell"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + rel1.to: "bell_base"; + rel2.to: "bell_base"; image.normal: "bg_led.png"; } description { state: "visible" 0.0; @@ -126,6 +145,34 @@ collections { color: 255 255 255 255; } } + part { name: "bell_strobe"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + rel1.to: "bell"; + rel2.to: "bell"; + image.normal: "bg_led_strobe.png"; + map { + on: 1; + smooth: 1; + rotation.center: "bell"; + } + } + description { state: "spin" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + map.rotation.z: 36.0; + } + description { state: "spin_done" 0.0; + inherit: "default" 0.0; + visible: 0; + color: 255 255 255 0; + map.rotation.z: 684.0; + } + } part { name: "terminology.options"; type: SWALLOW; scale: 1; description { state: "default" 0.0; @@ -187,17 +234,48 @@ collections { target: "shadow"; target: "fade"; } - program { name: "bell"; + program { name: "bell0"; signal: "bell"; source: "terminology"; - action: STATE_SET "visible" 0.0; + action: STATE_SET "default" 0.0; + target: "bell_base"; target: "bell"; + target: "bell_strobe"; + after: "bell"; + } + program { name: "bell"; + action: STATE_SET "visible" 0.0; + target: "bell_base"; after: "bell2"; } program { name: "bell2"; - action: STATE_SET "default" 0.0; - transition: BOUNCE 1.0 1.0 3.0; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.1; target: "bell"; + after: "bell3"; + } + program { name: "bell3"; + action: STATE_SET "spin" 0.0; + transition: LINEAR 0.1; + target: "bell_strobe"; + after: "bell4.0"; + after: "bell4.1"; + after: "bell4.2"; + } + program { name: "bell4.0"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 1.2; + target: "bell"; + } + program { name: "bell4.1"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 1.6; + target: "bell_base"; + } + program { name: "bell4.2"; + action: STATE_SET "spin_done" 0.0; + transition: LINEAR 0.9; + target: "bell_strobe"; } // program { name: "focus_in"; // signal: "focus,in"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 1497cdc0..e87ac298 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -4,6 +4,8 @@ bg_bevel.png \ bg_shine.png \ bg_glint.png \ bg_led.png \ +bg_led_base.png \ +bg_led_strobe.png \ bg_shadow.png \ cr_fill.png \ cr_key.png \ diff --git a/data/themes/images/bg_led.png b/data/themes/images/bg_led.png index 45557cf2..1d994302 100644 Binary files a/data/themes/images/bg_led.png and b/data/themes/images/bg_led.png differ diff --git a/data/themes/images/bg_led_base.png b/data/themes/images/bg_led_base.png new file mode 100644 index 00000000..75fe30d0 Binary files /dev/null and b/data/themes/images/bg_led_base.png differ diff --git a/data/themes/images/bg_led_strobe.png b/data/themes/images/bg_led_strobe.png new file mode 100644 index 00000000..a6ae8ed2 Binary files /dev/null and b/data/themes/images/bg_led_strobe.png differ