raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=9a70d3cc976c1008ad061801b6e090a5723fd6b8
commit 9a70d3cc976c1008ad061801b6e090a5723fd6b8 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Mar 17 22:52:08 2021 +0000 TH - battery - add sound for ac on/off - very useful --- data/elementary/themes/default.edc | 22 ++++++++++++---------- data/elementary/themes/edc/batman.edc | 15 +++++---------- data/elementary/themes/edc/battery.edc | 6 ++++++ data/elementary/themes/snd/synth-worble-down.wav | Bin 0 -> 68792 bytes data/elementary/themes/snd/synth-worble-up.wav | Bin 0 -> 68792 bytes 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc index 44f26d96f7..71630f1512 100644 --- a/data/elementary/themes/default.edc +++ b/data/elementary/themes/default.edc @@ -1,4 +1,4 @@ -efl_version: 1 22; +efl_version: 1 25; #include "macros.edc" @@ -6,20 +6,22 @@ externals.external: "elm"; // theme api version. from 1.10 on we will check version to avoid // compat issues -data.item: "version" "119"; +data.item: "version" "125"; data.item: "efl_theme_base" "dark"; collections { sounds { - sample { name: "splash" LOSSY 256; source: "splash.wav"; } - sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; } - sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; } - 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"; } + sample { name: "splash" LOSSY 256; source: "splash.wav"; } + sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; } + sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; } + 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"; } + sample { name: "synth-worble-dn" LOSSY 128; source: "synth-worble-down.wav"; } + sample { name: "synth-worble-up" LOSSY 128; source: "synth-worble-up.wav"; } } #include "ic.edc" diff --git a/data/elementary/themes/edc/batman.edc b/data/elementary/themes/edc/batman.edc index 001beb3d54..e13c586e5e 100644 --- a/data/elementary/themes/edc/batman.edc +++ b/data/elementary/themes/edc/batman.edc @@ -69,13 +69,11 @@ group { name: "e/gadget/batman/main"; } } programs { - program { - signal: "e,state,charging"; source: "e"; + program { signal: "e,state,charging"; source: "e"; action: STATE_SET "charging" 0.0; target: "fill"; } - program { - signal: "e,state,discharging"; source: "e"; + program { signal: "e,state,discharging"; source: "e"; action: STATE_SET "default" 0.0; target: "fill"; } @@ -92,8 +90,7 @@ group { name: "e/gadget/batman/main"; target: "pulse_clip"; after: "pulse"; } - program { - signal: "e,action,pulse,stop"; source: "e"; + program { signal: "e,action,pulse,stop"; source: "e"; action: ACTION_STOP; target: "pulse"; target: "pulse2"; @@ -104,14 +101,12 @@ group { name: "e/gadget/batman/main"; action: STATE_SET "default" 0.0; target: "pulse_clip"; } - program { - signal: "mouse,in"; source: "over"; + program { signal: "mouse,in"; source: "over"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 0.3; target: "fill_clip_dim"; } - program { - signal: "mouse,out"; source: "over"; + program { signal: "mouse,out"; source: "over"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.3; target: "fill_clip_dim"; diff --git a/data/elementary/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc index 8b1b34c2ce..46d895eba4 100644 --- a/data/elementary/themes/edc/battery.edc +++ b/data/elementary/themes/edc/battery.edc @@ -112,6 +112,12 @@ group { name: "e/modules/battery/main"; } } programs { + program { signal: "e,state,ac,on"; source: "e"; + action: PLAY_SAMPLE "synth-worble-up" 1.0 ALERT; + } + program { signal: "e,state,ac,off"; source: "e"; + action: PLAY_SAMPLE "synth-worble-dn" 1.0 ALERT; + } program { signal: "e,state,charging"; source: "e"; action: STATE_SET "charging" 0.0; target: "fill"; diff --git a/data/elementary/themes/snd/synth-worble-down.wav b/data/elementary/themes/snd/synth-worble-down.wav new file mode 100644 index 0000000000..51a28d3be5 Binary files /dev/null and b/data/elementary/themes/snd/synth-worble-down.wav differ diff --git a/data/elementary/themes/snd/synth-worble-up.wav b/data/elementary/themes/snd/synth-worble-up.wav new file mode 100644 index 0000000000..f2caec56a1 Binary files /dev/null and b/data/elementary/themes/snd/synth-worble-up.wav differ --