raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=7cc3f1c5a0243d58a3495b106faeaad537ce9f3b
commit 7cc3f1c5a0243d58a3495b106faeaad537ce9f3b
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Mon Aug 4 17:34:45 2014 +0900
rage - make music only mode display a nice speaker from mixer module
nice aesthetic change
---
data/themes/default.edc | 66 ++++++++++++++++++++++++++++-
data/themes/images/Makefile.am | 8 ++--
data/themes/images/inset_round_hilight.png | Bin 0 -> 1367 bytes
data/themes/images/inset_round_shading.png | Bin 0 -> 6785 bytes
data/themes/images/inset_round_shadow.png | Bin 0 -> 2034 bytes
data/themes/images/speaker.png | Bin 0 -> 19879 bytes
6 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 5aaa1dc..cce94ef 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -39,6 +39,11 @@ collections {
images.image: "bg_shine.png" COMP;
images.image: "bg_glint.png" COMP;
+ images.image: "speaker.png" COMP;
+ images.image: "inset_round_hilight.png" COMP;
+ images.image: "inset_round_shadow.png" COMP;
+ images.image: "inset_round_shading.png" COMP;
+
set { name: "pos_indicator";
image { image: "pos_indicator_big.png" COMP; size: 32 28 99999 99999;
}
image { image: "pos_indicator.png" COMP; size: 0 0 31 27; }
@@ -160,6 +165,25 @@ collections {
visible: 0;
}
}
+ part { name: "base_bevel";
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ image.normal: "bevel_dark_out.png";
+ image.border: 1 1 1 1;
+ image.middle: 0;
+ fill.smooth: 0;
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ description { state: "play" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
part { name: "exclam"; mouse_events: 0;
scale: 1;
clip_to: "novid_clip";
@@ -188,6 +212,7 @@ collections {
action: STATE_SET "default" 0.0;
target: "exclam";
target: "base";
+ target: "base_bevel";
after: "newvid2";
}
program { name: "newvid2";
@@ -196,12 +221,14 @@ collections {
transition: SINUSOIDAL 1.0;
target: "exclam";
target: "base";
+ target: "base_bevel";
}
program {
signal: "action,frame"; source: "rage";
action: STATE_SET "play" 0.0;
target: "exclam";
target: "base";
+ target: "base_bevel";
}
part { name: "novid_clip"; type: RECT;
@@ -220,15 +247,50 @@ collections {
color: 32 32 32 255;
}
}
+ part { name: "novid_base_bevel";
+ clip_to: "novid_clip2";
+ description { state: "default" 0.0;
+ rel1.to: "novid_base";
+ rel2.to: "novid_base";
+ image.normal: "bevel_dark_out.png";
+ image.border: 1 1 1 1;
+ image.middle: 0;
+ fill.smooth: 0;
+ }
+ }
+ part { name: "base-sh";
+ clip_to: "novid_clip2";
+ description { state: "default" 0.0;
+ rel1.to: "novid";
+ rel1.offset: 0 -1;
+ rel2.to: "novid";
+ rel2.offset: -1 -2;
+ image.normal: "inset_round_shadow.png";
+ }
+ }
+ part { name: "base-hi";
+ clip_to: "novid_clip2";
+ description { state: "default" 0.0;
+ rel1.to: "novid";
+ rel1.offset: 0 1;
+ rel2.to: "novid";
+ rel2.offset: -1 0;
+ image.normal: "inset_round_hilight.png";
+ }
+ }
part { name: "novid"; mouse_events: 0;
scale: 1;
clip_to: "novid_clip2";
description { state: "default" 0.0;
rel1.to: "base";
+ rel1.relative: 0.1 0.1;
+ rel1.offset: 4 4;
rel2.to: "base";
+ rel2.relative: 0.9 0.9;
+ rel2.offset: -5 -5;
fixed: 1 1;
- image.normal: "icon_volume.png";
- max: 24 24;
+ image.normal: "speaker.png";
+ max: 160 160;
aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 2d10d85..92babfa 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -45,6 +45,8 @@ icon_close2.png \
icon_fullscreen.png \
icon_fullscreen2.png \
icon_unfullscreen.png \
-icon_unfullscreen2.png
-
-
+icon_unfullscreen2.png \
+inset_round_hilight.png \
+inset_round_shading.png \
+inset_round_shadow.png \
+speaker.png
diff --git a/data/themes/images/inset_round_hilight.png
b/data/themes/images/inset_round_hilight.png
new file mode 100644
index 0000000..7696175
Binary files /dev/null and b/data/themes/images/inset_round_hilight.png differ
diff --git a/data/themes/images/inset_round_shading.png
b/data/themes/images/inset_round_shading.png
new file mode 100644
index 0000000..429f073
Binary files /dev/null and b/data/themes/images/inset_round_shading.png differ
diff --git a/data/themes/images/inset_round_shadow.png
b/data/themes/images/inset_round_shadow.png
new file mode 100644
index 0000000..5dd3b0c
Binary files /dev/null and b/data/themes/images/inset_round_shadow.png differ
diff --git a/data/themes/images/speaker.png b/data/themes/images/speaker.png
new file mode 100644
index 0000000..f6622f5
Binary files /dev/null and b/data/themes/images/speaker.png differ
--
