raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=6dad4823e5d40ed546b07843e34e9d2e2f7272f0
commit 6dad4823e5d40ed546b07843e34e9d2e2f7272f0
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Feb 23 01:00:38 2021 +0000
TH - move samples to single location
---
data/elementary/themes/default.edc | 12 +++++++++++
data/elementary/themes/edc/efl/check.edc | 8 --------
data/elementary/themes/edc/efl/text.edc | 17 ----------------
data/elementary/themes/edc/elm/check.edc | 8 --------
data/elementary/themes/edc/elm/entry.edc | 34 --------------------------------
data/elementary/themes/edc/init.edc | 5 -----
6 files changed, 12 insertions(+), 72 deletions(-)
diff --git a/data/elementary/themes/default.edc
b/data/elementary/themes/default.edc
index 4e2ae66b46..44f26d96f7 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -10,6 +10,18 @@ data.item: "version" "119";
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"; }
+}
+
#include "ic.edc"
#include "fonts.edc"
diff --git a/data/elementary/themes/edc/efl/check.edc
b/data/elementary/themes/edc/efl/check.edc
index adf6c25c5b..c07594520f 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -33,14 +33,6 @@ Group: efl/check (@since 1.23)
group { name: "efl/check";
data.item: "version" "123";
- sounds {
- sample { name: "wood-tap1" LOSSY 64;
- source: "wood-tap.wav";
- }
- sample { name: "wood-tap2" LOSSY 64;
- source: "wood-tap2.wav";
- }
- }
script {
BUTTONMODE_SCRIPT2
}
diff --git a/data/elementary/themes/edc/efl/text.edc
b/data/elementary/themes/edc/efl/text.edc
index 818ea79190..24116c2b65 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -522,23 +522,6 @@ group { "efl/text";
item: "guide.font.size" "10";
item: "guide.style.color" "#666";
}
- 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";
- }
- }
styles {
style { name: "efl_ui_text_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";
diff --git a/data/elementary/themes/edc/elm/check.edc
b/data/elementary/themes/edc/elm/check.edc
index c2bb5ddb99..635c94052b 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,12 +1,4 @@
group { name: "elm/check/base/default";
- sounds {
- sample { name: "wood-tap1" LOSSY 64;
- source: "wood-tap.wav";
- }
- sample { name: "wood-tap2" LOSSY 64;
- source: "wood-tap2.wav";
- }
- }
script {
BUTTONMODE_SCRIPT
}
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elementary/themes/edc/elm/entry.edc
index 2f1bb8fb9e..5e6fbf7ef6 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -539,23 +539,6 @@ group { name: "elm/entry/anchor/default";
}
group { name: "elm/entry/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";
- }
- }
styles {
style { name: "entry_style";
base: "font="FN" font_size=10 color=#a0a0a0 wrap=word
text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
@@ -1147,23 +1130,6 @@ 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;
diff --git a/data/elementary/themes/edc/init.edc
b/data/elementary/themes/edc/init.edc
index 948aae03b4..e39d2c802e 100644
--- a/data/elementary/themes/edc/init.edc
+++ b/data/elementary/themes/edc/init.edc
@@ -1,9 +1,4 @@
group { name: "e/init/splash";
- sounds {
- sample { name: "splash" LOSSY 256;
- source: "splash.wav";
- }
- }
set { name: "logo_mono";
image { image: "logo.png" COMP; size: 601 601 99999 99999; }
image { image: "logo2.png" COMP; size: 301 301 600 600; }
--
