summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Houston <stephen@localhost.localdomain>2018-02-27 11:47:39 -0600
committerStephen Houston <stephen@localhost.localdomain>2018-02-27 11:47:39 -0600
commit32aef1a37f8a19bd7a7b5b48dbcd4aa20dfbda12 (patch)
treef7138568e802117390a6b25b63b223f6e5456dcd
parent9c8a801229a89d64885b1441885d220f268c8500 (diff)
Update theme to match flat theme.
-rw-r--r--theme/cloud-conn.pngbin0 -> 2232 bytes
-rw-r--r--theme/eth-base.pngbin0 -> 159 bytes
-rw-r--r--theme/eth-top.pngbin0 -> 221 bytes
-rw-r--r--theme/eth.pngbin3087 -> 0 bytes
-rw-r--r--theme/exlclam.pngbin4328 -> 0 bytes
-rw-r--r--theme/hole_tiny.pngbin128 -> 0 bytes
-rw-r--r--theme/led_tiny_green.pngbin225 -> 0 bytes
-rw-r--r--theme/led_tiny_orange.pngbin234 -> 0 bytes
-rw-r--r--theme/lock_insecure.pngbin8014 -> 0 bytes
-rw-r--r--theme/lock_locked.pngbin7054 -> 0 bytes
-rw-r--r--theme/slot_horiz_bottom.pngbin199 -> 0 bytes
-rw-r--r--theme/slot_horiz_top.pngbin269 -> 0 bytes
-rw-r--r--theme/wifi-1.pngbin0 -> 2108 bytes
-rw-r--r--theme/wifi-2.pngbin0 -> 2091 bytes
-rw-r--r--theme/wifi-3.pngbin0 -> 2311 bytes
-rw-r--r--theme/wifi-4.pngbin0 -> 2537 bytes
-rw-r--r--theme/wifi-5.pngbin0 -> 2672 bytes
-rw-r--r--theme/wifi_base.pngbin5017 -> 0 bytes
-rw-r--r--theme/wifi_shadow.pngbin3932 -> 0 bytes
-rw-r--r--theme/wifi_sig_1.pngbin1709 -> 0 bytes
-rw-r--r--theme/wifi_sig_2.pngbin4510 -> 0 bytes
-rw-r--r--theme/wifi_sig_3.pngbin8332 -> 0 bytes
-rw-r--r--theme/wireless.edc632
23 files changed, 163 insertions, 469 deletions
diff --git a/theme/cloud-conn.png b/theme/cloud-conn.png
new file mode 100644
index 0000000..dcafa98
--- /dev/null
+++ b/theme/cloud-conn.png
Binary files differ
diff --git a/theme/eth-base.png b/theme/eth-base.png
new file mode 100644
index 0000000..91dbb8f
--- /dev/null
+++ b/theme/eth-base.png
Binary files differ
diff --git a/theme/eth-top.png b/theme/eth-top.png
new file mode 100644
index 0000000..2e17815
--- /dev/null
+++ b/theme/eth-top.png
Binary files differ
diff --git a/theme/eth.png b/theme/eth.png
deleted file mode 100644
index 14cb9c1..0000000
--- a/theme/eth.png
+++ /dev/null
Binary files differ
diff --git a/theme/exlclam.png b/theme/exlclam.png
deleted file mode 100644
index d4958c2..0000000
--- a/theme/exlclam.png
+++ /dev/null
Binary files differ
diff --git a/theme/hole_tiny.png b/theme/hole_tiny.png
deleted file mode 100644
index 49f7648..0000000
--- a/theme/hole_tiny.png
+++ /dev/null
Binary files differ
diff --git a/theme/led_tiny_green.png b/theme/led_tiny_green.png
deleted file mode 100644
index a66ffd2..0000000
--- a/theme/led_tiny_green.png
+++ /dev/null
Binary files differ
diff --git a/theme/led_tiny_orange.png b/theme/led_tiny_orange.png
deleted file mode 100644
index 0bcb574..0000000
--- a/theme/led_tiny_orange.png
+++ /dev/null
Binary files differ
diff --git a/theme/lock_insecure.png b/theme/lock_insecure.png
deleted file mode 100644
index ddafaf7..0000000
--- a/theme/lock_insecure.png
+++ /dev/null
Binary files differ
diff --git a/theme/lock_locked.png b/theme/lock_locked.png
deleted file mode 100644
index 91d3ad8..0000000
--- a/theme/lock_locked.png
+++ /dev/null
Binary files differ
diff --git a/theme/slot_horiz_bottom.png b/theme/slot_horiz_bottom.png
deleted file mode 100644
index a8c6fdc..0000000
--- a/theme/slot_horiz_bottom.png
+++ /dev/null
Binary files differ
diff --git a/theme/slot_horiz_top.png b/theme/slot_horiz_top.png
deleted file mode 100644
index e0dba5c..0000000
--- a/theme/slot_horiz_top.png
+++ /dev/null
Binary files differ
diff --git a/theme/wifi-1.png b/theme/wifi-1.png
new file mode 100644
index 0000000..9583918
--- /dev/null
+++ b/theme/wifi-1.png
Binary files differ
diff --git a/theme/wifi-2.png b/theme/wifi-2.png
new file mode 100644
index 0000000..3ff6aed
--- /dev/null
+++ b/theme/wifi-2.png
Binary files differ
diff --git a/theme/wifi-3.png b/theme/wifi-3.png
new file mode 100644
index 0000000..24318d0
--- /dev/null
+++ b/theme/wifi-3.png
Binary files differ
diff --git a/theme/wifi-4.png b/theme/wifi-4.png
new file mode 100644
index 0000000..064a3f8
--- /dev/null
+++ b/theme/wifi-4.png
Binary files differ
diff --git a/theme/wifi-5.png b/theme/wifi-5.png
new file mode 100644
index 0000000..0f85665
--- /dev/null
+++ b/theme/wifi-5.png
Binary files differ
diff --git a/theme/wifi_base.png b/theme/wifi_base.png
deleted file mode 100644
index 077b0a3..0000000
--- a/theme/wifi_base.png
+++ /dev/null
Binary files differ
diff --git a/theme/wifi_shadow.png b/theme/wifi_shadow.png
deleted file mode 100644
index b1dc20f..0000000
--- a/theme/wifi_shadow.png
+++ /dev/null
Binary files differ
diff --git a/theme/wifi_sig_1.png b/theme/wifi_sig_1.png
deleted file mode 100644
index f7aebf2..0000000
--- a/theme/wifi_sig_1.png
+++ /dev/null
Binary files differ
diff --git a/theme/wifi_sig_2.png b/theme/wifi_sig_2.png
deleted file mode 100644
index a723881..0000000
--- a/theme/wifi_sig_2.png
+++ /dev/null
Binary files differ
diff --git a/theme/wifi_sig_3.png b/theme/wifi_sig_3.png
deleted file mode 100644
index 1d40d81..0000000
--- a/theme/wifi_sig_3.png
+++ /dev/null
Binary files differ
diff --git a/theme/wireless.edc b/theme/wireless.edc
index 1d6f376..7ba7910 100644
--- a/theme/wireless.edc
+++ b/theme/wireless.edc
@@ -1,86 +1,86 @@
1collections { 1group { name: "e/gadget/wireless/ethernet"; nomouse;
2 2 images.image: "cloud-conn.png" COMP;
3group { name: "wireless/ethernet"; nomouse; 3 images.image: "eth-base.png" COMP;
4 images.image: "slot_horiz_top.png" COMP; 4 images.image: "eth-top.png" COMP;
5 images.image: "slot_horiz_bottom.png" COMP;
6 images.image: "eth.png" COMP;
7 images.image: "exlclam.png" COMP;
8 images.image: "hole_tiny.png" COMP;
9 images.image: "led_tiny_orange.png" COMP;
10 images.image: "led_tiny_green.png" COMP;
11 images.image: "lock_locked.png" COMP;
12 images.image: "lock_insecure.png" COMP;
13 5
14 script { 6 script {
15 public message(Msg_Type:type, id, ...) { 7 public message(Msg_Type:type, id, ...) {
16 if ((type == MSG_INT_SET) && (id == 1)) { 8 if ((type == MSG_INT_SET) && (id == 1)) {
17 new state = getarg(2); 9 new state = getarg(2);
18 if ((state == 1)) { 10 if ((state <= 1)) {
19 set_state(PART:"led", "default", 0.0); 11 set_state(PART:"eth-base", "default", 0.0);
12 set_state(PART:"eth", "default", 0.0);
13 }
14 else if ((state == 1)) {
15 set_state(PART:"eth-base", "default", 0.0);
16 set_state(PART:"eth", "default", 0.0);
20 run_program(PROGRAM:"connecting"); 17 run_program(PROGRAM:"connecting");
21 return; 18 return;
22 } 19 }
23 else if ((state == 2)) { set_state(PART:"led", "connected", 0.0); } 20 stop_programs_on(PART:"eth-base");
24 else if ((state == 3)) { set_state(PART:"led", "online", 0.0); } 21 stop_programs_on(PART:"eth");
25 else { set_state(PART:"led", "default", 0.0); } 22 if ((state == 2)) {
23 set_state(PART:"eth-base", "connected", 0.0);
24 set_state(PART:"eth", "connected", 0.0);
25 }
26 else if ((state == 3)) {
27 set_state(PART:"eth-base", "online", 0.0);
28 set_state(PART:"eth", "online", 0.0);
29 }
30 else {
31 set_state(PART:"eth-base", "default", 0.0);
32 set_state(PART:"eth", "default", 0.0);
33 }
26 } 34 }
27 } 35 }
28 } 36 }
29 parts { 37 parts {
30 part { name: "slot_bottom";
31 description { state: "default" 0.0;
32 rel1.to: "slot";
33 rel2.relative: 1.0 0.5;
34 rel2.to: "slot";
35 min: 0 3;
36 image.normal: "slot_horiz_bottom.png";
37 fixed: 0 1;
38 }
39 }
40///////////////////////
41 part { name: "exclam_base"; 38 part { name: "exclam_base";
42 clip_to: "clip_exclam"; 39 clip_to: "clip_exclam";
43 description { state: "default" 0.0; 40 description { state: "default" 0.0;
44 aspect: (71/144) (71/144); aspect_preference: BOTH; 41 min: 11 10;
45 align: 0.5 1.0; 42 rel1.relative: (20/160) (50/160);
46 rel2.relative: 1.0 0.5; 43 rel2.relative: (135/160) (150/160);
47 rel2.to_y: "slot"; 44 aspect: (115/105) (115/105); aspect_preference: BOTH;
48 image.normal: "exlclam.png"; 45 image.normal: "cloud-conn.png";
49 } 46 }
50 } 47 }
51/////////////////////// 48///////////////////////
52 part { name: "eth_base"; 49 part { name: "eth-base";
53 clip_to: "clip_eth"; 50 clip_to: "clip_eth";
54 description { state: "default" 0.0; 51 description { state: "default" 0.0;
55 aspect: (60/144) (60/144); aspect_preference: BOTH; 52 min: 6 13;
56 align: 0.5 1.0; 53 aspect: (60/130) (60/130); aspect_preference: BOTH;
57 rel2.relative: 1.0 0.5; 54 rel1.relative: (50/160) (15/160);
58 rel2.to_y: "slot"; 55 rel2.relative: (110/160) (145/160);
59 image.normal: "eth.png"; 56 image.normal: "eth-base.png";
57 color: 160 160 160 128;
60 } 58 }
61 } 59 description { state: "connected" 0.0;
62 part { name: "slot"; 60 inherit: "default" 0.0;
63 description { state: "default" 0.0; 61 color: 160 160 160 255;
64 rel1.offset: 0 -1; 62 }
65 rel1.relative: (21/160) 1.0; 63 description { state: "online" 0.0;
66 rel2.offset: -1 -1; 64 inherit: "default" 0.0;
67 rel2.relative: (140/160) 1.0; 65 color: 51 153 255 255;
68 align: 0.5 1.0;
69 min: 0 6;
70 image.normal: "slot_horiz_top.png";
71 fixed: 0 1;
72 } 66 }
73 } 67 }
74 part { name: "hole"; 68 part { name: "eth"; mouse_events: 0;
69 scale: 1;
70 clip_to: "clip_eth";
75 description { state: "default" 0.0; 71 description { state: "default" 0.0;
76 rel1.offset: -4 -4; 72 rel1.to: "eth-base";
77 rel1.relative: 1.0 1.0; 73 rel2.to: "eth-base";
78 rel2.offset: -4 -4; 74 image.normal: "eth-top.png";
79 align: 1.0 1.0; 75 color: 160 160 160 128;
80 min: 4 4; 76 }
81 max: 4 4; 77 description { state: "connected" 0.0;
82 image.normal: "hole_tiny.png"; 78 inherit: "default" 0.0;
83 fixed: 1 1; 79 color: 160 160 160 255;
80 }
81 description { state: "online" 0.0;
82 inherit: "default" 0.0;
83 color: 160 160 160 255;
84 } 84 }
85 } 85 }
86 part { name: "clip_exclam"; type: RECT; 86 part { name: "clip_exclam"; type: RECT;
@@ -99,27 +99,6 @@ group { name: "wireless/ethernet"; nomouse;
99 visible: 1; 99 visible: 1;
100 } 100 }
101 } 101 }
102 part { name: "led";
103 description { state: "default" 0.0;
104 rel1.to: "hole";
105 rel2.to: "hole";
106 min: 10 10;
107 max: 10 10;
108 image.normal: "led_tiny_orange.png";
109 fixed: 1 1;
110 visible: 0;
111 }
112 description { state: "connected" 0.0;
113 inherit: "default" 0.0;
114 image.normal: "led_tiny_orange.png";
115 visible: 1;
116 }
117 description { state: "online" 0.0;
118 inherit: "default" 0.0;
119 image.normal: "led_tiny_green.png";
120 visible: 1;
121 }
122 }
123 part { name: "event"; type: RECT; mouse; 102 part { name: "event"; type: RECT; mouse;
124 description { state: "default" 0.0; 103 description { state: "default" 0.0;
125 color: 0 0 0 0; 104 color: 0 0 0 0;
@@ -128,242 +107,150 @@ group { name: "wireless/ethernet"; nomouse;
128 } 107 }
129 108
130 programs { 109 programs {
110 target_group: "eths" "eth-base" "eth";
131 program { name: "connecting"; 111 program { name: "connecting";
132 action: STATE_SET "connected" 0.0; 112 action: STATE_SET "connected" 0.0;
133 target: "led"; 113 groups: "eths";
134 in: 0.3 0.0; 114 in: 0.3 0.0;
135 after: "connecting2"; 115 after: "connecting2";
136 } 116 }
137 program { name: "connecting2"; 117 program { name: "connecting2";
138 action: STATE_SET "default" 0.0; 118 action: STATE_SET "default" 0.0;
139 target: "led"; 119 groups: "eths";
140 in: 0.3 0.0; 120 in: 0.3 0.0;
141 after: "connecting"; 121 after: "connecting";
142 } 122 }
143 target_group: "clips" "clip_exclam" "clip_eth"; 123 target_group: "clips" "clip_exclam" "clip_eth";
144 program { 124 program {
145 signal: "wireless,state,error"; source: "wireless"; 125 signal: "e,state,error"; source: "e";
146 action: STATE_SET "default" 0.0; 126 action: STATE_SET "default" 0.0;
147 groups: "clips"; 127 groups: "clips";
148 } 128 }
149 program { 129 program {
150 signal: "wireless,state,default"; source: "wireless"; 130 signal: "e,state,default"; source: "e";
151 action: STATE_SET "eth" 0.0; 131 action: STATE_SET "eth" 0.0;
152 groups: "clips"; 132 groups: "clips";
153 } 133 }
154 } 134 }
155} 135}
156 136
157group { name: "wireless/wifi"; nomouse; 137group { name: "e/gadget/wireless/wifi"; nomouse;
158 images.image: "slot_horiz_top.png" COMP; 138 images.image: "cloud-conn.png" COMP;
159 images.image: "slot_horiz_bottom.png" COMP; 139 images.image: "wifi-1.png" COMP;
160 images.image: "wifi_shadow.png" COMP; 140 images.image: "wifi-2.png" COMP;
161 images.image: "wifi_base.png" COMP; 141 images.image: "wifi-3.png" COMP;
162 images.image: "wifi_sig_1.png" COMP; 142 images.image: "wifi-4.png" COMP;
163 images.image: "wifi_sig_2.png" COMP; 143 images.image: "wifi-5.png" COMP;
164 images.image: "wifi_sig_3.png" COMP;
165 images.image: "exlclam.png" COMP;
166 images.image: "hole_tiny.png" COMP;
167 images.image: "led_tiny_orange.png" COMP;
168 images.image: "led_tiny_green.png" COMP;
169 images.image: "lock_locked.png" COMP;
170 images.image: "lock_insecure.png" COMP;
171 144
172 script { 145 script {
173 public message(Msg_Type:type, id, ...) { 146 public message(Msg_Type:type, id, ...) {
174 if ((type == MSG_INT_SET) && (id == 1)) { 147 if ((type == MSG_INT_SET) && (id == 1)) {
175 new state = getarg(2), signl = getarg(3); 148 new state = getarg(2), signl = getarg(3);
176 if (state <= 1) { 149 if (state <= 1) {
177 set_state(PART:"wifi_1", "default", 0.0); 150 set_state(PART:"wifi-base", "default", 0.0);
178 set_state(PART:"wifi_2", "default", 0.0); 151 set_state(PART:"wifi", "default", 0.0);
179 set_state(PART:"wifi_3", "default", 0.0);
180 set_state(PART:"led", "default", 0.0);
181 } 152 }
182 if (state == 1) { 153 if (state == 1) {
183 run_program(PROGRAM:"connecting"); 154 run_program(PROGRAM:"connecting");
184 run_program(PROGRAM:"connecting_wifi"); 155 run_program(PROGRAM:"connecting_wifi");
185 return; 156 return;
186 } 157 }
187 stop_programs_on(PART:"led"); 158 stop_programs_on(PART:"wifi-base");
159 stop_programs_on(PART:"wifi");
188 if (signl <= 14) { 160 if (signl <= 14) {
189 set_state(PART:"wifi_1", "default", 0.0); 161 set_state(PART:"wifi", "default", 0.0);
190 set_state(PART:"wifi_2", "default", 0.0);
191 set_state(PART:"wifi_3", "default", 0.0);
192 } 162 }
193 else if (signl <= 28) { 163 else if (signl <= 28) {
194 set_state(PART:"wifi_1", "partly", 0.0); 164 set_state(PART:"wifi", "default", 0.25);
195 set_state(PART:"wifi_2", "default", 0.0);
196 set_state(PART:"wifi_3", "default", 0.0);
197 } 165 }
198 else if (signl <= 42) { 166 else if (signl <= 42) {
199 set_state(PART:"wifi_1", "visible", 0.0); 167 set_state(PART:"wifi", "default", 0.25);
200 set_state(PART:"wifi_2", "default", 0.0);
201 set_state(PART:"wifi_3", "default", 0.0);
202 } 168 }
203 else if (signl <= 57) { 169 else if (signl <= 57) {
204 set_state(PART:"wifi_1", "visible", 0.0); 170 set_state(PART:"wifi", "default", 0.50);
205 set_state(PART:"wifi_2", "partly", 0.0);
206 set_state(PART:"wifi_3", "default", 0.0);
207 } 171 }
208 else if (signl <= 71) { 172 else if (signl <= 71) {
209 set_state(PART:"wifi_1", "visible", 0.0); 173 set_state(PART:"wifi", "default", 0.50);
210 set_state(PART:"wifi_2", "visible", 0.0);
211 set_state(PART:"wifi_3", "default", 0.0);
212 } 174 }
213 else if (signl <= 85) { 175 else if (signl <= 85) {
214 set_state(PART:"wifi_1", "visible", 0.0); 176 set_state(PART:"wifi", "default", 0.75);
215 set_state(PART:"wifi_2", "visible", 0.0);
216 set_state(PART:"wifi_3", "partly", 0.0);
217 } 177 }
218 else { 178 else {
219 set_state(PART:"wifi_1", "visible", 0.0); 179 set_state(PART:"wifi", "default", 0.75);
220 set_state(PART:"wifi_2", "visible", 0.0); 180 }
221 set_state(PART:"wifi_3", "visible", 0.0); 181 if ((state == 2)) {
182 set_state(PART:"wifi-base", "connected", 0.0);
183 set_state(PART:"wifi", "default", 1.0);
184 }
185 else if ((state == 3)) {
186 set_state(PART:"wifi-base", "online", 0.0);
187 set_state(PART:"wifi", "default", 1.0);
188 }
189 else {
190 set_state(PART:"wifi-base", "default", 0.0);
191 set_state(PART:"wifi", "default", 0.0);
222 } 192 }
223 if ((state == 2)) { set_state(PART:"led", "connected", 0.0); }
224 else if ((state == 3)) { set_state(PART:"led", "online", 0.0); }
225 else { set_state(PART:"led", "default", 0.0); }
226 } 193 }
227 } 194 }
228 } 195 }
229 parts { 196 parts {
230 part { name: "slot_bottom";
231 description { state: "default" 0.0;
232 rel1.to: "slot";
233 rel2.relative: 1.0 0.5;
234 rel2.to: "slot";
235 min: 0 3;
236 image.normal: "slot_horiz_bottom.png";
237 fixed: 0 1;
238 }
239 }
240///////////////////////
241 part { name: "exclam_base"; 197 part { name: "exclam_base";
242 clip_to: "clip_exclam"; 198 clip_to: "clip_exclam";
243 description { state: "default" 0.0; 199 description { state: "default" 0.0;
244 aspect: (71/144) (71/144); aspect_preference: BOTH; 200 min: 11 10;
245 align: 0.5 1.0; 201 rel1.relative: (20/160) (50/160);
246 rel2.relative: 1.0 0.5; 202 rel2.relative: (135/160) (150/160);
247 rel2.to_y: "slot"; 203 aspect: (115/105) (115/105); aspect_preference: BOTH;
248 image.normal: "exlclam.png"; 204 image.normal: "cloud-conn.png";
249 } 205 }
250 } 206 }
251/////////////////////// 207///////////////////////
252 part { name: "wifi_shadow"; 208 part { name: "wifi-base";
253 clip_to: "clip_wifi"; 209 clip_to: "clip_wifi";
254 description { state: "default" 0.0; 210 description { state: "default" 0.0;
255 aspect: (160/144) (160/144); aspect_preference: BOTH; 211 min: 14 10;
256 align: 0.5 1.0; 212 aspect: (140/100) (140/100); aspect_preference: BOTH;
257 rel2.relative: 1.0 0.5; 213 rel1.relative: (10/160) (30/160);
258 rel2.to_y: "slot"; 214 rel2.relative: (150/160) (130/160);
259 image.normal: "wifi_shadow.png"; 215 image.normal: "wifi-1.png";
216 color: 160 160 160 255;
260 } 217 }
261 } 218 description { state: "connected" 0.0;
262 part { name: "wifi_base";
263 clip_to: "clip_wifi";
264 description { state: "default" 0.0;
265 aspect: (160/144) (160/144); aspect_preference: BOTH;
266 align: 0.5 1.0;
267 rel2.relative: 1.0 0.5;
268 rel2.to_y: "slot";
269 image.normal: "wifi_base.png";
270 }
271 }
272 part { name: "wifi_1";
273 clip_to: "clip_wifi";
274 description { state: "default" 0.0;
275 rel1.to: "wifi_base";
276 rel2.to: "wifi_base";
277 image.normal: "wifi_sig_1.png";
278 visible: 0;
279 }
280 description { state: "partly" 0.0;
281 inherit: "default" 0.0; 219 inherit: "default" 0.0;
282 color: 255 255 255 128; 220 color: 160 160 160 255;
283 visible: 1;
284 } 221 }
285 description { state: "visible" 0.0; 222 description { state: "online" 0.0;
286 inherit: "default" 0.0; 223 inherit: "default" 0.0;
287 visible: 1; 224 color: 51 153 255 255;
288 } 225 }
289 } 226 }
290 part { name: "wifi_2"; 227 part { name: "wifi"; mouse_events: 0;
291 clip_to: "clip_wifi"; 228 clip_to: "clip_wifi";
292 description { state: "default" 0.0; 229 description { state: "default" 0.0;
293 rel1.to: "wifi_base"; 230 rel1.to: "wifi-base";
294 rel2.to: "wifi_base"; 231 rel2.to: "wifi-base";
295 image.normal: "wifi_sig_2.png"; 232 image.normal: "wifi-1.png";
296 visible: 0; 233 color: 0 0 0 0;
297 } 234 }
298 description { state: "partly" 0.0; 235 description { state: "default" 0.25;
299 inherit: "default" 0.0; 236 inherit: "default" 0.0;
300 color: 255 255 255 128; 237 image.normal: "wifi-2.png";
301 visible: 1; 238 color: 160 160 160 255;
302 } 239 }
303 description { state: "visible" 0.0; 240 description { state: "default" 0.5;
304 inherit: "default" 0.0; 241 inherit: "default" 0.0;
305 visible: 1; 242 image.normal: "wifi-3.png";
243 color: 160 160 160 255;
306 } 244 }
307 } 245 description { state: "default" 0.75;
308 part { name: "wifi_3";
309 clip_to: "clip_wifi";
310 description { state: "default" 0.0;
311 rel1.to: "wifi_base";
312 rel2.to: "wifi_base";
313 image.normal: "wifi_sig_3.png";
314 visible: 0;
315 }
316 description { state: "partly" 0.0;
317 inherit: "default" 0.0; 246 inherit: "default" 0.0;
318 color: 255 255 255 128; 247 image.normal: "wifi-4.png";
319 visible: 1; 248 color: 160 160 160 255;
320 } 249 }
321 description { state: "visible" 0.0; 250 description { state: "default" 1.0;
322 inherit: "default" 0.0; 251 inherit: "default" 0.0;
323 visible: 1; 252 image.normal: "wifi-5.png";
324 } 253 color: 160 160 160 255;
325 }
326 part { name: "lock";
327 clip_to: "clip_wifi";
328 description { state: "default" 0.0; hid;
329 aspect: (160/144) (160/144); aspect_preference: BOTH;
330 align: 0.5 1.0;
331 rel2.relative: 1.0 0.5;
332 rel2.to_y: "slot";
333 image.normal: "lock_locked.png";
334 link.base: "wireless,state,unsecured" "wireless";
335 }
336 desc { "insecure"; inherit; vis;
337 image.normal: "lock_insecure.png";
338 link.base: "wireless,state,insecure" "wireless";
339 }
340 desc { "secure"; inherit; vis;
341 link.base: "wireless,state,secure" "wireless";
342 }
343 }
344//////////////////////////
345 part { name: "slot";
346 description { state: "default" 0.0;
347 rel1.offset: 0 -1;
348 rel1.relative: (21/160) 1.0;
349 rel2.offset: -1 -1;
350 rel2.relative: (140/160) 1.0;
351 align: 0.5 1.0;
352 min: 0 6;
353 image.normal: "slot_horiz_top.png";
354 fixed: 0 1;
355 }
356 }
357 part { name: "hole";
358 description { state: "default" 0.0;
359 rel1.offset: -4 -4;
360 rel1.relative: 1.0 1.0;
361 rel2.offset: -4 -4;
362 align: 1.0 1.0;
363 min: 4 4;
364 max: 4 4;
365 image.normal: "hole_tiny.png";
366 fixed: 1 1;
367 } 254 }
368 } 255 }
369 part { name: "clip_exclam"; type: RECT; 256 part { name: "clip_exclam"; type: RECT;
@@ -382,27 +269,6 @@ group { name: "wireless/wifi"; nomouse;
382 visible: 1; 269 visible: 1;
383 } 270 }
384 } 271 }
385 part { name: "led";
386 description { state: "default" 0.0;
387 rel1.to: "hole";
388 rel2.to: "hole";
389 min: 10 10;
390 max: 10 10;
391 image.normal: "led_tiny_orange.png";
392 fixed: 1 1;
393 visible: 0;
394 }
395 description { state: "connected" 0.0;
396 inherit: "default" 0.0;
397 image.normal: "led_tiny_orange.png";
398 visible: 1;
399 }
400 description { state: "online" 0.0;
401 inherit: "default" 0.0;
402 image.normal: "led_tiny_green.png";
403 visible: 1;
404 }
405 }
406 part { name: "event"; type: RECT; mouse; 272 part { name: "event"; type: RECT; mouse;
407 description { state: "default" 0.0; 273 description { state: "default" 0.0;
408 color: 0 0 0 0; 274 color: 0 0 0 0;
@@ -412,68 +278,60 @@ group { name: "wireless/wifi"; nomouse;
412 programs { 278 programs {
413 program { "connecting_wifi"; 279 program { "connecting_wifi";
414 action: STATE_SET "default"; 280 action: STATE_SET "default";
415 targets: "wifi_1" "wifi_2" "wifi_3"; 281 targets: "wifi";
416 sequence { 282 sequence {
417 action: STATE_SET "partly"; 283 action: STATE_SET "default" 0.0;
418 target: "wifi_1"; 284 target: "wifi";
419 transition: LINEAR 0.085;
420 action: STATE_SET "visible";
421 target: "wifi_1";
422 transition: LINEAR 0.085; 285 transition: LINEAR 0.085;
423 action: STATE_SET "partly"; 286 action: STATE_SET "default" 0.25;
424 target: "wifi_2"; 287 target: "wifi";
425 transition: LINEAR 0.085; 288 transition: LINEAR 0.085;
426 action: STATE_SET "visible"; 289 action: STATE_SET "default" 0.50;
427 target: "wifi_2"; 290 target: "wifi";
428 transition: LINEAR 0.085; 291 transition: LINEAR 0.085;
429 action: STATE_SET "partly"; 292 action: STATE_SET "default" 0.75;
430 target: "wifi_3"; 293 target: "wifi";
431 transition: LINEAR 0.085; 294 transition: LINEAR 0.085;
432 action: STATE_SET "visible"; 295 action: STATE_SET "default" 1.0;
433 target: "wifi_3"; 296 target: "wifi";
434 transition: LINEAR 0.085; 297 transition: LINEAR 0.085;
435 after: "connecting_wifi"; 298 after: "connecting_wifi";
436 } 299 }
437 } 300 }
438 program { "connecting"; 301 program { "connecting";
439 action: STATE_SET "connected"; 302 action: STATE_SET "connected";
440 target: "led"; 303 target: "wifi-base";
441 in: 0.3 0.0; 304 in: 0.3 0.0;
442 sequence { 305 sequence {
443 action: STATE_SET "default"; 306 action: STATE_SET "default";
444 target: "led"; 307 target: "wifi-base";
445 in: 0.3 0.0; 308 in: 0.3 0.0;
446 after: "connecting"; 309 after: "connecting";
447 } 310 }
448 } 311 }
449 target_group: "clips" "clip_exclam" "clip_wifi"; 312 target_group: "clips" "clip_exclam" "clip_wifi";
450 program { 313 program {
451 signal: "wireless,state,error"; source: "wireless"; 314 signal: "e,state,error"; source: "e";
452 action: STATE_SET "default" 0.0; 315 action: STATE_SET "default" 0.0;
453 groups: "clips"; 316 groups: "clips";
454 } 317 }
455 program { 318 program {
456 signal: "wireless,state,default"; source: "wireless"; 319 signal: "e,state,default"; source: "e";
457 action: STATE_SET "wifi" 0.0; 320 action: STATE_SET "wifi" 0.0;
458 groups: "clips"; 321 groups: "clips";
459 } 322 }
460 } 323 }
461} 324}
462 325
463group { name: "wireless/bluetooth"; nomouse; 326group { name: "e/gadget/wireless/bluetooth"; nomouse;
464 images.image: "slot_horiz_top.png" COMP; 327 images.image: "cloud-conn.png" COMP;
465 images.image: "slot_horiz_bottom.png" COMP;
466 images.image: "exlclam.png" COMP;
467 images.image: "hole_tiny.png" COMP;
468 images.image: "led_tiny_orange.png" COMP;
469 images.image: "led_tiny_green.png" COMP;
470 images.image: "bt_base.png" COMP; 328 images.image: "bt_base.png" COMP;
471 images.image: "bt_sig_1.png" COMP; 329 images.image: "bt_sig_1.png" COMP;
472 images.image: "bt_sig_2.png" COMP; 330 images.image: "bt_sig_2.png" COMP;
473 script { 331 script {
474 public message(Msg_Type:type, id, ...) { 332 public message(Msg_Type:type, id, ...) {
475 if ((type == MSG_INT_SET) && (id == 1)) { 333 if ((type == MSG_INT_SET) && (id == 1)) {
476 new state = getarg(2), signl = getarg(3); 334 new signl = getarg(3);
477 if (signl <= 20) { 335 if (signl <= 20) {
478 set_state(PART:"bt_1", "default", 0.0); 336 set_state(PART:"bt_1", "default", 0.0);
479 set_state(PART:"bt_2", "default", 0.0); 337 set_state(PART:"bt_2", "default", 0.0);
@@ -494,38 +352,19 @@ group { name: "wireless/bluetooth"; nomouse;
494 set_state(PART:"bt_1", "visible", 0.0); 352 set_state(PART:"bt_1", "visible", 0.0);
495 set_state(PART:"bt_2", "visible", 0.0); 353 set_state(PART:"bt_2", "visible", 0.0);
496 } 354 }
497 if ((state == 2)) {
498 set_state(PART:"led", "default", 0.0);
499 run_program(PROGRAM:"connecting");
500 return;
501 }
502 else if ((state == 3)) { return; }
503 else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); }
504 else if ((state == 5)) { set_state(PART:"led", "online", 0.0); }
505 else { set_state(PART:"led", "default", 0.0); }
506 } 355 }
507 } 356 }
508 } 357 }
509 parts { 358 parts {
510 part { name: "slot_bottom";
511 description { state: "default" 0.0;
512 rel1.to: "slot";
513 rel2.relative: 1.0 0.5;
514 rel2.to: "slot";
515 min: 0 3;
516 image.normal: "slot_horiz_bottom.png";
517 fixed: 0 1;
518 }
519 }
520/////////////////////// 359///////////////////////
521 part { name: "exclam_base"; 360 part { name: "exclam_base";
522 clip_to: "clip_exclam"; 361 clip_to: "clip_exclam";
523 description { state: "default" 0.0; 362 description { state: "default" 0.0;
524 aspect: (71/144) (71/144); aspect_preference: BOTH; 363 min: 11 10;
525 align: 0.5 1.0; 364 rel1.relative: (20/160) (50/160);
526 rel2.relative: 1.0 0.5; 365 rel2.relative: (135/160) (150/160);
527 rel2.to_y: "slot"; 366 aspect: (115/105) (115/105); aspect_preference: BOTH;
528 image.normal: "exlclam.png"; 367 image.normal: "cloud-conn.png";
529 } 368 }
530 } 369 }
531/////////////////////// 370///////////////////////
@@ -533,9 +372,6 @@ group { name: "wireless/bluetooth"; nomouse;
533 clip_to: "clip_bt"; 372 clip_to: "clip_bt";
534 description { state: "default" 0.0; 373 description { state: "default" 0.0;
535 aspect: (160/144) (160/144); aspect_preference: BOTH; 374 aspect: (160/144) (160/144); aspect_preference: BOTH;
536 align: 0.5 1.0;
537 rel2.relative: 1.0 0.5;
538 rel2.to_y: "slot";
539 image.normal: "bt_base.png"; 375 image.normal: "bt_base.png";
540 } 376 }
541 } 377 }
@@ -576,30 +412,6 @@ group { name: "wireless/bluetooth"; nomouse;
576 } 412 }
577 } 413 }
578/////////////////////// 414///////////////////////
579 part { name: "slot";
580 description { state: "default" 0.0;
581 rel1.offset: 0 -1;
582 rel1.relative: (21/160) 1.0;
583 rel2.offset: -1 -1;
584 rel2.relative: (140/160) 1.0;
585 align: 0.5 1.0;
586 min: 0 6;
587 image.normal: "slot_horiz_top.png";
588 fixed: 0 1;
589 }
590 }
591 part { name: "hole";
592 description { state: "default" 0.0;
593 rel1.offset: -4 -4;
594 rel1.relative: 1.0 1.0;
595 rel2.offset: -4 -4;
596 align: 1.0 1.0;
597 min: 4 4;
598 max: 4 4;
599 image.normal: "hole_tiny.png";
600 fixed: 1 1;
601 }
602 }
603 part { name: "clip_exclam"; type: RECT; 415 part { name: "clip_exclam"; type: RECT;
604 description { state: "default" 0.0; 416 description { state: "default" 0.0;
605 visible: 1; 417 visible: 1;
@@ -616,27 +428,6 @@ group { name: "wireless/bluetooth"; nomouse;
616 visible: 1; 428 visible: 1;
617 } 429 }
618 } 430 }
619 part { name: "led";
620 description { state: "default" 0.0;
621 rel1.to: "hole";
622 rel2.to: "hole";
623 min: 10 10;
624 max: 10 10;
625 image.normal: "led_tiny_orange.png";
626 fixed: 1 1;
627 visible: 0;
628 }
629 description { state: "connected" 0.0;
630 inherit: "default" 0.0;
631 image.normal: "led_tiny_orange.png";
632 visible: 1;
633 }
634 description { state: "online" 0.0;
635 inherit: "default" 0.0;
636 image.normal: "led_tiny_green.png";
637 visible: 1;
638 }
639 }
640 part { name: "event"; type: RECT; mouse; 431 part { name: "event"; type: RECT; mouse;
641 description { state: "default" 0.0; 432 description { state: "default" 0.0;
642 color: 0 0 0 0; 433 color: 0 0 0 0;
@@ -644,26 +435,14 @@ group { name: "wireless/bluetooth"; nomouse;
644 } 435 }
645 } 436 }
646 programs { 437 programs {
647 program { name: "connecting";
648 action: STATE_SET "connected" 0.0;
649 target: "led";
650 in: 0.3 0.0;
651 after: "connecting2";
652 }
653 program { name: "connecting2";
654 action: STATE_SET "default" 0.0;
655 target: "led";
656 in: 0.3 0.0;
657 after: "connecting";
658 }
659 program { 438 program {
660 signal: "wireless,state,error"; source: "wireless"; 439 signal: "e,state,error"; source: "e";
661 action: STATE_SET "default" 0.0; 440 action: STATE_SET "default" 0.0;
662 target: "clip_exclam"; 441 target: "clip_exclam";
663 target: "clip_bt"; 442 target: "clip_bt";
664 } 443 }
665 program { 444 program {
666 signal: "wireless,state,default"; source: "wireless"; 445 signal: "e,state,default"; source: "e";
667 action: STATE_SET "bt" 0.0; 446 action: STATE_SET "bt" 0.0;
668 target: "clip_exclam"; 447 target: "clip_exclam";
669 target: "clip_bt"; 448 target: "clip_bt";
@@ -671,13 +450,8 @@ group { name: "wireless/bluetooth"; nomouse;
671 } 450 }
672} 451}
673 452
674group { name: "wireless/cellular"; 453group { name: "e/gadget/wireless/cellular";
675 images.image: "slot_horiz_top.png" COMP; 454 images.image: "cloud-conn.png" COMP;
676 images.image: "slot_horiz_bottom.png" COMP;
677 images.image: "exlclam.png" COMP;
678 images.image: "hole_tiny.png" COMP;
679 images.image: "led_tiny_orange.png" COMP;
680 images.image: "led_tiny_green.png" COMP;
681 images.image: "cell_base.png" COMP; 455 images.image: "cell_base.png" COMP;
682 images.image: "cell_sig_1.png" COMP; 456 images.image: "cell_sig_1.png" COMP;
683 images.image: "cell_sig_2.png" COMP; 457 images.image: "cell_sig_2.png" COMP;
@@ -687,7 +461,7 @@ group { name: "wireless/cellular";
687 script { 461 script {
688 public message(Msg_Type:type, id, ...) { 462 public message(Msg_Type:type, id, ...) {
689 if ((type == MSG_INT_SET) && (id == 1)) { 463 if ((type == MSG_INT_SET) && (id == 1)) {
690 new state = getarg(2), signl = getarg(3); 464 new signl = getarg(3);
691 if (signl <= 11) { 465 if (signl <= 11) {
692 set_state(PART:"cell_1", "default", 0.0); 466 set_state(PART:"cell_1", "default", 0.0);
693 set_state(PART:"cell_2", "default", 0.0); 467 set_state(PART:"cell_2", "default", 0.0);
@@ -742,37 +516,19 @@ group { name: "wireless/cellular";
742 set_state(PART:"cell_3", "visible", 0.0); 516 set_state(PART:"cell_3", "visible", 0.0);
743 set_state(PART:"cell_4", "visible", 0.0); 517 set_state(PART:"cell_4", "visible", 0.0);
744 } 518 }
745 if ((state == 1)) {
746 set_state(PART:"led", "default", 0.0);
747 run_program(PROGRAM:"connecting");
748 return;
749 }
750 else if ((state == 2)) { set_state(PART:"led", "connected", 0.0); }
751 else if ((state == 3)) { set_state(PART:"led", "online", 0.0); }
752 else { set_state(PART:"led", "default", 0.0); }
753 } 519 }
754 } 520 }
755 } 521 }
756 parts { 522 parts {
757 part { name: "slot_bottom"; mouse_events: 0;
758 description { state: "default" 0.0;
759 rel1.to: "slot";
760 rel2.relative: 1.0 0.5;
761 rel2.to: "slot";
762 min: 0 3;
763 image.normal: "slot_horiz_bottom.png";
764 fixed: 0 1;
765 }
766 }
767/////////////////////// 523///////////////////////
768 part { name: "exclam_base"; mouse_events: 0; 524 part { name: "exclam_base";
769 clip_to: "clip_exclam"; 525 clip_to: "clip_exclam";
770 description { state: "default" 0.0; 526 description { state: "default" 0.0;
771 aspect: (71/144) (71/144); aspect_preference: BOTH; 527 min: 11 10;
772 align: 0.5 1.0; 528 rel1.relative: (20/160) (50/160);
773 rel2.relative: 1.0 0.5; 529 rel2.relative: (135/160) (150/160);
774 rel2.to_y: "slot"; 530 aspect: (115/105) (115/105); aspect_preference: BOTH;
775 image.normal: "exlclam.png"; 531 image.normal: "cloud-conn.png";
776 } 532 }
777 } 533 }
778/////////////////////// 534///////////////////////
@@ -780,9 +536,6 @@ group { name: "wireless/cellular";
780 clip_to: "clip_cell"; 536 clip_to: "clip_cell";
781 description { state: "default" 0.0; 537 description { state: "default" 0.0;
782 aspect: (160/144) (160/144); aspect_preference: BOTH; 538 aspect: (160/144) (160/144); aspect_preference: BOTH;
783 align: 0.5 1.0;
784 rel2.relative: 1.0 0.5;
785 rel2.to_y: "slot";
786 image.normal: "cell_base.png"; 539 image.normal: "cell_base.png";
787 } 540 }
788 } 541 }
@@ -859,30 +612,6 @@ group { name: "wireless/cellular";
859 } 612 }
860 } 613 }
861/////////////////////// 614///////////////////////
862 part { name: "slot"; mouse_events: 0;
863 description { state: "default" 0.0;
864 rel1.offset: 0 -1;
865 rel1.relative: (21/160) 1.0;
866 rel2.offset: -1 -1;
867 rel2.relative: (140/160) 1.0;
868 align: 0.5 1.0;
869 min: 0 6;
870 image.normal: "slot_horiz_top.png";
871 fixed: 0 1;
872 }
873 }
874 part { name: "hole"; mouse_events: 0;
875 description { state: "default" 0.0;
876 rel1.offset: -4 -4;
877 rel1.relative: 1.0 1.0;
878 rel2.offset: -4 -4;
879 align: 1.0 1.0;
880 min: 4 4;
881 max: 4 4;
882 image.normal: "hole_tiny.png";
883 fixed: 1 1;
884 }
885 }
886 part { name: "clip_exclam"; type: RECT; 615 part { name: "clip_exclam"; type: RECT;
887 description { state: "default" 0.0; 616 description { state: "default" 0.0;
888 visible: 1; 617 visible: 1;
@@ -899,27 +628,6 @@ group { name: "wireless/cellular";
899 visible: 1; 628 visible: 1;
900 } 629 }
901 } 630 }
902 part { name: "led"; mouse_events: 0;
903 description { state: "default" 0.0;
904 rel1.to: "hole";
905 rel2.to: "hole";
906 min: 10 10;
907 max: 10 10;
908 image.normal: "led_tiny_orange.png";
909 fixed: 1 1;
910 visible: 0;
911 }
912 description { state: "connected" 0.0;
913 inherit: "default" 0.0;
914 image.normal: "led_tiny_orange.png";
915 visible: 1;
916 }
917 description { state: "online" 0.0;
918 inherit: "default" 0.0;
919 image.normal: "led_tiny_green.png";
920 visible: 1;
921 }
922 }
923 part { name: "event"; type: RECT; 631 part { name: "event"; type: RECT;
924 description { state: "default" 0.0; 632 description { state: "default" 0.0;
925 color: 0 0 0 0; 633 color: 0 0 0 0;
@@ -928,31 +636,17 @@ group { name: "wireless/cellular";
928 } 636 }
929 637
930 programs { 638 programs {
931 program { name: "connecting";
932 action: STATE_SET "connected" 0.0;
933 target: "led";
934 in: 0.3 0.0;
935 after: "connecting2";
936 }
937 program { name: "connecting2";
938 action: STATE_SET "default" 0.0;
939 target: "led";
940 in: 0.3 0.0;
941 after: "connecting";
942 }
943 program { 639 program {
944 signal: "wireless,state,error"; source: "wireless"; 640 signal: "e,state,error"; source: "e";
945 action: STATE_SET "default" 0.0; 641 action: STATE_SET "default" 0.0;
946 target: "clip_exclam"; 642 target: "clip_exclam";
947 target: "clip_cell"; 643 target: "clip_cell";
948 } 644 }
949 program { 645 program {
950 signal: "wireless,state,default"; source: "wireless"; 646 signal: "e,state,default"; source: "e";
951 action: STATE_SET "cell" 0.0; 647 action: STATE_SET "cell" 0.0;
952 target: "clip_exclam"; 648 target: "clip_exclam";
953 target: "clip_cell"; 649 target: "clip_cell";
954 } 650 }
955 } 651 }
956} 652}
957
958}