summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2020-03-17 09:39:11 +0900
committerHermet Park <chuneon.park@samsung.com>2020-03-17 09:39:11 +0900
commit466471e5e81fa0b8c08bd039bcd669ceba889e82 (patch)
tree2b303c5fc367805a5d5ea8db8c64a75230190a27
parenta40ab2cf5f9b6d0b72029e2fae5c6d737e888c50 (diff)
parent883294ff4102db1f39d2716ef3241f0f28524fbf (diff)
Merge branch 'feature/themes/flat' into devs/hermet/lottie
-rw-r--r--data/elementary/themes/edc/elm/toolbar.edc6
-rw-r--r--data/elementary/themes/edc/init.edc8
-rw-r--r--data/elementary/themes/snd/splash.wavbin0 -> 1798368 bytes
-rw-r--r--data/elementary/themes/snd/splash.xmbin0 -> 3678915 bytes
4 files changed, 10 insertions, 4 deletions
diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index 7512b2971d..490ce77e85 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -492,7 +492,6 @@ group { name: "elm/toolbar/item/default";
492 rel1.offset: 4 0; 492 rel1.offset: 4 0;
493 rel2.relative: 1.0 0.0; 493 rel2.relative: 1.0 0.0;
494 rel2.offset: -5 -5; 494 rel2.offset: -5 -5;
495 fixed: 1 1;
496 } 495 }
497 description { state: "icononly" 0.0; 496 description { state: "icononly" 0.0;
498 inherit: "default" 0.0; 497 inherit: "default" 0.0;
@@ -532,7 +531,6 @@ group { name: "elm/toolbar/item/default";
532 rel1.offset: 4 0; 531 rel1.offset: 4 0;
533 rel2.relative: 1.0 0.0; 532 rel2.relative: 1.0 0.0;
534 rel2.offset: -5 0; 533 rel2.offset: -5 0;
535 fixed: 1 1;
536 } 534 }
537 description { state: "icononly" 0.0; 535 description { state: "icononly" 0.0;
538 inherit: "default" 0.0; 536 inherit: "default" 0.0;
@@ -583,7 +581,7 @@ group { name: "elm/toolbar/item/default";
583 description { state: "noicon" 0.0; 581 description { state: "noicon" 0.0;
584 inherit: "default" 0.0; 582 inherit: "default" 0.0;
585 rel1.offset: 4 -5; 583 rel1.offset: 4 -5;
586 rel1.relative: 0.0 0.0; 584 rel1.relative: 0.0 1.0;
587 } 585 }
588 description { state: "noicon_disabled" 0.0; 586 description { state: "noicon_disabled" 0.0;
589 inherit: "noicon" 0.0; 587 inherit: "noicon" 0.0;
@@ -636,7 +634,7 @@ group { name: "elm/toolbar/item/default";
636 description { state: "noicon" 0.0; 634 description { state: "noicon" 0.0;
637 inherit: "default" 0.0; 635 inherit: "default" 0.0;
638 rel1.offset: 4 -5; 636 rel1.offset: 4 -5;
639 rel1.relative: 0.0 0.0; 637 rel1.relative: 0.0 1.0;
640 } 638 }
641 description { state: "noicon_disabled" 0.0; 639 description { state: "noicon_disabled" 0.0;
642 inherit: "noicon" 0.0; 640 inherit: "noicon" 0.0;
diff --git a/data/elementary/themes/edc/init.edc b/data/elementary/themes/edc/init.edc
index e2ee550a54..948aae03b4 100644
--- a/data/elementary/themes/edc/init.edc
+++ b/data/elementary/themes/edc/init.edc
@@ -1,4 +1,9 @@
1group { name: "e/init/splash"; 1group { name: "e/init/splash";
2 sounds {
3 sample { name: "splash" LOSSY 256;
4 source: "splash.wav";
5 }
6 }
2 set { name: "logo_mono"; 7 set { name: "logo_mono";
3 image { image: "logo.png" COMP; size: 601 601 99999 99999; } 8 image { image: "logo.png" COMP; size: 601 601 99999 99999; }
4 image { image: "logo2.png" COMP; size: 301 301 600 600; } 9 image { image: "logo2.png" COMP; size: 301 301 600 600; }
@@ -132,6 +137,9 @@ group { name: "e/init/splash";
132 transition: SINUSOIDAL 0.8; 137 transition: SINUSOIDAL 0.8;
133 after: "ready"; 138 after: "ready";
134 } 139 }
140 program { signal: "show"; source: "";
141 action: PLAY_SAMPLE "splash" 1.0 EFFECT;
142 }
135 program { name: "ready"; 143 program { name: "ready";
136 script { 144 script {
137 new val; 145 new val;
diff --git a/data/elementary/themes/snd/splash.wav b/data/elementary/themes/snd/splash.wav
new file mode 100644
index 0000000000..bc15f21251
--- /dev/null
+++ b/data/elementary/themes/snd/splash.wav
Binary files differ
diff --git a/data/elementary/themes/snd/splash.xm b/data/elementary/themes/snd/splash.xm
new file mode 100644
index 0000000000..56c90541a3
--- /dev/null
+++ b/data/elementary/themes/snd/splash.xm
Binary files differ