raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=272adbfbc3a0f43cb1b0c767782d59d757c0f5b7
commit 272adbfbc3a0f43cb1b0c767782d59d757c0f5b7
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sat Mar 27 18:05:29 2021 +0000
elm - make elm test edje build again - was including default theme stuff
---
data/elementary/objects/meson.build | 2 +-
data/elementary/objects/test_focus_style.edc | 2 ++
data/elementary/themes/default.edc | 14 +-------------
data/elementary/themes/meson.build | 1 +
data/elementary/themes/snd.edc | 12 ++++++++++++
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/data/elementary/objects/meson.build
b/data/elementary/objects/meson.build
index 92020a7795..c2379ea906 100644
--- a/data/elementary/objects/meson.build
+++ b/data/elementary/objects/meson.build
@@ -21,7 +21,7 @@ foreach edc_file : edc_files
input : edc_file,
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-sd', join_paths(meson.current_source_dir()),
+ '-sd', elm_themes_sound_include,
'-id', elm_themes_image_include,
'-id', join_paths(meson.current_source_dir()),
'-fd', join_paths(meson.current_source_dir()),
diff --git a/data/elementary/objects/test_focus_style.edc
b/data/elementary/objects/test_focus_style.edc
index 4359b8046d..e6d6c6f094 100644
--- a/data/elementary/objects/test_focus_style.edc
+++ b/data/elementary/objects/test_focus_style.edc
@@ -434,6 +434,8 @@ collections {
}
} //group ends
+#include "../../../data/elementary/themes/snd.edc"
+#include "../../../data/elementary/themes/ic.edc"
#include "../../../data/elementary/themes/macros.edc"
#include "../../../data/elementary/themes/fonts.edc"
#include "../../../data/elementary/themes/colorclasses.edc"
diff --git a/data/elementary/themes/default.edc
b/data/elementary/themes/default.edc
index 131524a54a..669f30ff26 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -11,19 +11,7 @@ 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: "synth-worble-dn" LOSSY 128; source:
"synth-worble-down.wav"; }
- sample { name: "synth-worble-up" LOSSY 128; source: "synth-worble-up.wav";
}
-}
-
+#include "snd.edc"
#include "ic.edc"
#include "fonts.edc"
diff --git a/data/elementary/themes/meson.build
b/data/elementary/themes/meson.build
index 8a30c71cb9..51594d5337 100644
--- a/data/elementary/themes/meson.build
+++ b/data/elementary/themes/meson.build
@@ -5,6 +5,7 @@ edc_files = [
elm_themes = []
elm_themes_image_include = join_paths(meson.current_source_dir(), 'img')
+elm_themes_sound_include = join_paths(meson.current_source_dir(), 'snd')
foreach edc_file : edc_files
elm_themes += custom_target('edje_cc_' + edc_file,
diff --git a/data/elementary/themes/snd.edc b/data/elementary/themes/snd.edc
new file mode 100644
index 0000000000..80d16882de
--- /dev/null
+++ b/data/elementary/themes/snd.edc
@@ -0,0 +1,12 @@
+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: "synth-worble-dn" LOSSY 128; source:
"synth-worble-down.wav"; }
+ sample { name: "synth-worble-up" LOSSY 128; source: "synth-worble-up.wav";
}
+}
--
