summaryrefslogtreecommitdiff
path: root/data
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
parentcc6581a8f9f8b194729d8cb6464d5874176a8a6c (diff)
rationalise speaker gadget... same look as cpufreq/clock - just deeper
conical inset speaker look. SVN revision: 82873
Diffstat (limited to 'data')
-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 \
324img/spanner_hilight.png \ 324img/spanner_hilight.png \
325img/spanner_inset.png \ 325img/spanner_inset.png \
326img/speaker.png \ 326img/speaker.png \
327img/speaker_shadow.png \
328img/split_h_glow.png \ 327img/split_h_glow.png \
329img/split_h_hilight.png \ 328img/split_h_hilight.png \
330img/split_h_inset.png \ 329img/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 @@
1group { name: "e/modules/mixer/main"; 1group { name: "e/modules/mixer/main";
2 images.image: "speaker.png" COMP; 2 images.image: "speaker.png" COMP;
3 images.image: "speaker_shadow.png" COMP; 3 images.image: "inset_round_hilight.png" COMP;
4 images.image: "inset_round_shadow.png" COMP;
5 images.image: "inset_round_shading.png" COMP;
4 images.image: "led_dot_white.png" COMP; 6 images.image: "led_dot_white.png" COMP;
5 max: 160 160; 7 max: 160 160;
6 min: 16 16; 8 min: 16 16;
@@ -98,21 +100,29 @@ group { name: "e/modules/mixer/main";
98 } 100 }
99 } 101 }
100 parts { 102 parts {
101 part { name: "speaker_shadow"; 103 part { name: "base-sh";
102 description { state: "default" 0.0; 104 description { state: "default" 0.0;
103 rel1.to: "speaker"; 105 rel1.to: "base";
104 rel1.relative: 0.0 (4/160); 106 rel1.offset: 0 -1;
107 rel2.to: "base";
108 rel2.offset: -1 -2;
109 image.normal: "inset_round_shadow.png";
110 }
111 }
112 part { name: "base-hi";
113 description { state: "default" 0.0;
114 rel1.to: "base";
105 rel1.offset: 0 1; 115 rel1.offset: 0 1;
106 rel2.to: "speaker"; 116 rel2.to: "base";
107 rel2.relative: 1.0 (164/160);
108 rel2.offset: -1 0; 117 rel2.offset: -1 0;
109 image.normal: "speaker_shadow.png"; 118 image.normal: "inset_round_hilight.png";
110 color: 255 255 255 128;
111 } 119 }
112 } 120 }
113 part { name: "speaker"; 121 part { name: "base";
114 description { state: "default" 0.0; 122 description { state: "default" 0.0;
115 aspect: 1 1; aspect_preference: BOTH; 123 rel1.relative: (25/380) (25/380);
124 rel2.relative: (365/380) (365/380);
125 aspect: 1.0 1.0; aspect_preference: BOTH;
116 image.normal: "speaker.png"; 126 image.normal: "speaker.png";
117 } 127 }
118 } 128 }
@@ -173,8 +183,6 @@ group { name: "e/modules/mixer/main";
173#undef LED 183#undef LED
174 part { name: "over"; type: RECT; 184 part { name: "over"; type: RECT;
175 description { state: "default" 0.0; 185 description { state: "default" 0.0;
176 rel1.to: "speaker";
177 rel2.to: "speaker";
178 color: 255 255 255 0; 186 color: 255 255 255 0;
179 } 187 }
180 } 188 }
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