aboutsummaryrefslogtreecommitdiffstats
path: root/data/themes
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2013-01-16 11:09:04 +0000
committerCarsten Haitzler <raster@rasterman.com>2013-01-16 11:09:04 +0000
commit350496bb382dc44c69d6a74fdafbe6f15894b634 (patch)
tree122593c6d1c714460928e6f714357048fc29e472 /data/themes
parentcc6581a8f9f8b194729d8cb6464d5874176a8a6c (diff)
downloadenlightenment-350496bb382dc44c69d6a74fdafbe6f15894b634.tar.gz
enlightenment-350496bb382dc44c69d6a74fdafbe6f15894b634.tar.xz
enlightenment-350496bb382dc44c69d6a74fdafbe6f15894b634.zip
rationalise speaker gadget... same look as cpufreq/clock - just deeper
conical inset speaker look. SVN revision: 82873
Diffstat (limited to 'data/themes')
-rw-r--r--data/themes/Makefile.am1
-rw-r--r--data/themes/edc/mixer.edc32
-rw-r--r--data/themes/img/speaker.pngbin35362 -> 19879 bytes
-rw-r--r--data/themes/img/speaker_shadow.pngbin10157 -> 0 bytes
4 files changed, 20 insertions, 13 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2abd64a41..f0c4efa00 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -324,7 +324,6 @@ img/spanner_glow.png \
img/spanner_hilight.png \
img/spanner_inset.png \
img/speaker.png \
-img/speaker_shadow.png \
img/split_h_glow.png \
img/split_h_hilight.png \
img/split_h_inset.png \
diff --git a/data/themes/edc/mixer.edc b/data/themes/edc/mixer.edc
index 13829a24a..c9b5cc6ac 100644
--- a/data/themes/edc/mixer.edc
+++ b/data/themes/edc/mixer.edc
@@ -1,6 +1,8 @@
group { name: "e/modules/mixer/main";
images.image: "speaker.png" COMP;
- images.image: "speaker_shadow.png" COMP;
+ images.image: "inset_round_hilight.png" COMP;
+ images.image: "inset_round_shadow.png" COMP;
+ images.image: "inset_round_shading.png" COMP;
images.image: "led_dot_white.png" COMP;
max: 160 160;
min: 16 16;
@@ -98,21 +100,29 @@ group { name: "e/modules/mixer/main";
}
}
parts {
- part { name: "speaker_shadow";
+ part { name: "base-sh";
description { state: "default" 0.0;
- rel1.to: "speaker";
- rel1.relative: 0.0 (4/160);
+ rel1.to: "base";
+ rel1.offset: 0 -1;
+ rel2.to: "base";
+ rel2.offset: -1 -2;
+ image.normal: "inset_round_shadow.png";
+ }
+ }
+ part { name: "base-hi";
+ description { state: "default" 0.0;
+ rel1.to: "base";
rel1.offset: 0 1;
- rel2.to: "speaker";
- rel2.relative: 1.0 (164/160);
+ rel2.to: "base";
rel2.offset: -1 0;
- image.normal: "speaker_shadow.png";
- color: 255 255 255 128;
+ image.normal: "inset_round_hilight.png";
}
}
- part { name: "speaker";
+ part { name: "base";
description { state: "default" 0.0;
- aspect: 1 1; aspect_preference: BOTH;
+ rel1.relative: (25/380) (25/380);
+ rel2.relative: (365/380) (365/380);
+ aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "speaker.png";
}
}
@@ -173,8 +183,6 @@ group { name: "e/modules/mixer/main";
#undef LED
part { name: "over"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "speaker";
- rel2.to: "speaker";
color: 255 255 255 0;
}
}
diff --git a/data/themes/img/speaker.png b/data/themes/img/speaker.png
index 92f9b4477..f6622f51c 100644
--- a/data/themes/img/speaker.png
+++ b/data/themes/img/speaker.png
Binary files differ
diff --git a/data/themes/img/speaker_shadow.png b/data/themes/img/speaker_shadow.png
deleted file mode 100644
index 55ed44d10..000000000
--- a/data/themes/img/speaker_shadow.png
+++ /dev/null
Binary files differ