summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-03-03 08:43:53 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-03-04 14:34:53 -0500
commitda6f1644bf32c2704155f3dda8c8cd474e4e3464 (patch)
treea5e8e6f9a74156e99695d72d9cbe5b5408d54641
parent0a368a4b1f8f1db66ed1c5809e495c7368776b99 (diff)
theme: move digit* images to O/
-rw-r--r--data/themes/Makefile.am28
-rw-r--r--data/themes/edc/clock.edc50
-rw-r--r--data/themes/edc/elm/clock.edc58
-rw-r--r--data/themes/img/O/digit_0.png (renamed from data/themes/img/digit_0.png)bin2490 -> 2490 bytes
-rw-r--r--data/themes/img/O/digit_1.png (renamed from data/themes/img/digit_1.png)bin523 -> 523 bytes
-rw-r--r--data/themes/img/O/digit_2.png (renamed from data/themes/img/digit_2.png)bin2380 -> 2380 bytes
-rw-r--r--data/themes/img/O/digit_3.png (renamed from data/themes/img/digit_3.png)bin2134 -> 2134 bytes
-rw-r--r--data/themes/img/O/digit_4.png (renamed from data/themes/img/digit_4.png)bin1511 -> 1511 bytes
-rw-r--r--data/themes/img/O/digit_5.png (renamed from data/themes/img/digit_5.png)bin2295 -> 2295 bytes
-rw-r--r--data/themes/img/O/digit_6.png (renamed from data/themes/img/digit_6.png)bin2534 -> 2534 bytes
-rw-r--r--data/themes/img/O/digit_7.png (renamed from data/themes/img/digit_7.png)bin1485 -> 1485 bytes
-rw-r--r--data/themes/img/O/digit_8.png (renamed from data/themes/img/digit_8.png)bin2608 -> 2608 bytes
-rw-r--r--data/themes/img/O/digit_9.png (renamed from data/themes/img/digit_9.png)bin2607 -> 2607 bytes
-rw-r--r--data/themes/img/O/digit_am.png (renamed from data/themes/img/digit_am.png)bin1292 -> 1292 bytes
-rw-r--r--data/themes/img/O/digit_na.png (renamed from data/themes/img/digit_na.png)bin4333 -> 4333 bytes
-rw-r--r--data/themes/img/O/digit_nm.png (renamed from data/themes/img/digit_nm.png)bin924 -> 924 bytes
-rw-r--r--data/themes/img/O/digit_pm.png (renamed from data/themes/img/digit_pm.png)bin1164 -> 1164 bytes
17 files changed, 68 insertions, 68 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 1a7627c07..c026ac43a 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -237,20 +237,20 @@ img/day_single_normal.png \
237img/day_single_press.png \ 237img/day_single_press.png \
238img/day_single_selected.png \ 238img/day_single_selected.png \
239img/diagonal_stripes.png \ 239img/diagonal_stripes.png \
240img/digit_0.png \ 240img/O/digit_0.png \
241img/digit_1.png \ 241img/O/digit_1.png \
242img/digit_2.png \ 242img/O/digit_2.png \
243img/digit_3.png \ 243img/O/digit_3.png \
244img/digit_4.png \ 244img/O/digit_4.png \
245img/digit_5.png \ 245img/O/digit_5.png \
246img/digit_6.png \ 246img/O/digit_6.png \
247img/digit_7.png \ 247img/O/digit_7.png \
248img/digit_8.png \ 248img/O/digit_8.png \
249img/digit_9.png \ 249img/O/digit_9.png \
250img/digit_am.png \ 250img/O/digit_am.png \
251img/digit_na.png \ 251img/O/digit_na.png \
252img/digit_nm.png \ 252img/O/digit_nm.png \
253img/digit_pm.png \ 253img/O/digit_pm.png \
254img/dot_pattern.png \ 254img/dot_pattern.png \
255img/downlight_glow_left.png \ 255img/downlight_glow_left.png \
256img/downlight_glow.png \ 256img/downlight_glow.png \
diff --git a/data/themes/edc/clock.edc b/data/themes/edc/clock.edc
index 730861c00..a6ccdaa57 100644
--- a/data/themes/edc/clock.edc
+++ b/data/themes/edc/clock.edc
@@ -1,20 +1,20 @@
1group { name: "e/modules/clock/digital"; 1group { name: "e/modules/clock/digital";
2 min: 64 16; 2 min: 64 16;
3 max: 512 128; 3 max: 512 128;
4 images.image: "digit_na.png" COMP; 4 images.image: "O/digit_na.png" COMP;
5 images.image: "digit_nm.png" COMP; 5 images.image: "O/digit_nm.png" COMP;
6 images.image: "digit_0.png" COMP; 6 images.image: "O/digit_0.png" COMP;
7 images.image: "digit_1.png" COMP; 7 images.image: "O/digit_1.png" COMP;
8 images.image: "digit_2.png" COMP; 8 images.image: "O/digit_2.png" COMP;
9 images.image: "digit_3.png" COMP; 9 images.image: "O/digit_3.png" COMP;
10 images.image: "digit_4.png" COMP; 10 images.image: "O/digit_4.png" COMP;
11 images.image: "digit_5.png" COMP; 11 images.image: "O/digit_5.png" COMP;
12 images.image: "digit_6.png" COMP; 12 images.image: "O/digit_6.png" COMP;
13 images.image: "digit_7.png" COMP; 13 images.image: "O/digit_7.png" COMP;
14 images.image: "digit_8.png" COMP; 14 images.image: "O/digit_8.png" COMP;
15 images.image: "digit_9.png" COMP; 15 images.image: "O/digit_9.png" COMP;
16 images.image: "digit_am.png" COMP; 16 images.image: "O/digit_am.png" COMP;
17 images.image: "digit_pm.png" COMP; 17 images.image: "O/digit_pm.png" COMP;
18 images.image: "hole_tiny.png" COMP; 18 images.image: "hole_tiny.png" COMP;
19 script { 19 script {
20 public do_seconds, do_24h, do_date, tick_timer; 20 public do_seconds, do_24h, do_date, tick_timer;
@@ -305,7 +305,7 @@ group { name: "e/modules/clock/digital";
305 description { state: "default" 0.0; \ 305 description { state: "default" 0.0; \
306 rel1.to: _TO; rel2.to: _TO; \ 306 rel1.to: _TO; rel2.to: _TO; \
307 aspect: (52/72) (52/72); aspect_preference: BOTH; \ 307 aspect: (52/72) (52/72); aspect_preference: BOTH; \
308 image.normal: "digit_"_DIGIT".png"; \ 308 image.normal: "O/digit_"_DIGIT".png"; \
309 visible: 0; \ 309 visible: 0; \
310 color: 255 255 255 0; \ 310 color: 255 255 255 0; \
311 } \ 311 } \
@@ -332,7 +332,7 @@ group { name: "e/modules/clock/digital";
332 description { state: "default" 0.0; \ 332 description { state: "default" 0.0; \
333 rel1.to: _TO; rel2.to: _TO; \ 333 rel1.to: _TO; rel2.to: _TO; \
334 aspect: (52/72) (52/72); aspect_preference: BOTH; \ 334 aspect: (52/72) (52/72); aspect_preference: BOTH; \
335 image.normal: "digit_"_DIGIT".png"; \ 335 image.normal: "O/digit_"_DIGIT".png"; \
336 visible: 0; \ 336 visible: 0; \
337 color: 255 255 255 0; \ 337 color: 255 255 255 0; \
338 } \ 338 } \
@@ -360,11 +360,11 @@ group { name: "e/modules/clock/digital";
360 description { state: "default" 0.0; \ 360 description { state: "default" 0.0; \
361 rel1.to: _TO; rel2.to: _TO; \ 361 rel1.to: _TO; rel2.to: _TO; \
362 aspect: (48/31) (48/31); aspect_preference: BOTH; \ 362 aspect: (48/31) (48/31); aspect_preference: BOTH; \
363 image.normal: "digit_am.png"; \ 363 image.normal: "O/digit_am.png"; \
364 } \ 364 } \
365 description { state: "active" 0.0; \ 365 description { state: "active" 0.0; \
366 inherit: "default" 0.0; \ 366 inherit: "default" 0.0; \
367 image.normal: "digit_pm.png"; \ 367 image.normal: "O/digit_pm.png"; \
368 } \ 368 } \
369 } 369 }
370#define BASE(_NAME, _BASE, _IMG) \ 370#define BASE(_NAME, _BASE, _IMG) \
@@ -387,14 +387,14 @@ group { name: "e/modules/clock/digital";
387 } \ 387 } \
388 } 388 }
389 389
390 BASE ("ha", "h0-0", "digit_na.png") 390 BASE ("ha", "h0-0", "O/digit_na.png")
391 BASE ("hb", "h1-0", "digit_na.png") 391 BASE ("hb", "h1-0", "O/digit_na.png")
392 BASE ("ma", "m0-0", "digit_na.png") 392 BASE ("ma", "m0-0", "O/digit_na.png")
393 BASE ("mb", "m1-0", "digit_na.png") 393 BASE ("mb", "m1-0", "O/digit_na.png")
394 394
395 BASEC("sa", "secclip", "s0-0", "digit_na.png") 395 BASEC("sa", "secclip", "s0-0", "O/digit_na.png")
396 BASEC("sb", "secclip", "s1-0", "digit_na.png") 396 BASEC("sb", "secclip", "s1-0", "O/digit_na.png")
397 BASEC("aa", "ampmclip", "ap", "digit_nm.png") 397 BASEC("aa", "ampmclip", "ap", "O/digit_nm.png")
398 398
399 DIGIT ("h0", "hours1") 399 DIGIT ("h0", "hours1")
400 DIGIT ("h1", "hours2") 400 DIGIT ("h1", "hours2")
diff --git a/data/themes/edc/elm/clock.edc b/data/themes/edc/elm/clock.edc
index 60d8c3866..f3bbd4416 100644
--- a/data/themes/edc/elm/clock.edc
+++ b/data/themes/edc/elm/clock.edc
@@ -1,15 +1,15 @@
1group { name: "elm/clock/flipdigit/default"; 1group { name: "elm/clock/flipdigit/default";
2 images.image: "digit_na.png" COMP; 2 images.image: "O/digit_na.png" COMP;
3 images.image: "digit_0.png" COMP; 3 images.image: "O/digit_0.png" COMP;
4 images.image: "digit_1.png" COMP; 4 images.image: "O/digit_1.png" COMP;
5 images.image: "digit_2.png" COMP; 5 images.image: "O/digit_2.png" COMP;
6 images.image: "digit_3.png" COMP; 6 images.image: "O/digit_3.png" COMP;
7 images.image: "digit_4.png" COMP; 7 images.image: "O/digit_4.png" COMP;
8 images.image: "digit_5.png" COMP; 8 images.image: "O/digit_5.png" COMP;
9 images.image: "digit_6.png" COMP; 9 images.image: "O/digit_6.png" COMP;
10 images.image: "digit_7.png" COMP; 10 images.image: "O/digit_7.png" COMP;
11 images.image: "digit_8.png" COMP; 11 images.image: "O/digit_8.png" COMP;
12 images.image: "digit_9.png" COMP; 12 images.image: "O/digit_9.png" COMP;
13 images.image: "icon_arrow_up.png" COMP; 13 images.image: "icon_arrow_up.png" COMP;
14 images.image: "icon_arrow_down.png" COMP; 14 images.image: "icon_arrow_down.png" COMP;
15 script { 15 script {
@@ -36,18 +36,18 @@ group { name: "elm/clock/flipdigit/default";
36 set_int(v0_cur, value); 36 set_int(v0_cur, value);
37 set_int(v0_lock, 1); 37 set_int(v0_lock, 1);
38 snprintf(buf, 10, "%i", get_int(v0_cur)); 38 snprintf(buf, 10, "%i", get_int(v0_cur));
39 set_state(PART:"digit", buf, 0.0); 39 set_state(PART:"O/digit", buf, 0.0);
40 anim(1.0, "animator1", 1); 40 anim(1.0, "animator1", 1);
41 } 41 }
42 } 42 }
43 } 43 }
44 parts { 44 parts {
45 part { name: "digit_bg"; 45 part { name: "O/digit_bg";
46 scale: 1; 46 scale: 1;
47 description { state: "default" 0.0; 47 description { state: "default" 0.0;
48 rel1.to: "digit"; 48 rel1.to: "O/digit";
49 rel2.to: "digit"; 49 rel2.to: "O/digit";
50 image.normal: "digit_na.png"; 50 image.normal: "O/digit_na.png";
51 color: 255 255 255 128; 51 color: 255 255 255 128;
52 } 52 }
53 } 53 }
@@ -79,7 +79,7 @@ group { name: "elm/clock/flipdigit/default";
79 visible: 1; 79 visible: 1;
80 } 80 }
81 } 81 }
82 part { name: "digit"; 82 part { name: "O/digit";
83 mouse_events: 0; 83 mouse_events: 0;
84 scale: 1; 84 scale: 1;
85 description { state: "default" 0.0; 85 description { state: "default" 0.0;
@@ -88,12 +88,12 @@ group { name: "elm/clock/flipdigit/default";
88 rel2.to_y: "abot"; 88 rel2.to_y: "abot";
89 rel2.relative: 1.0 0.0; 89 rel2.relative: 1.0 0.0;
90 aspect: (52/72) (52/72); aspect_preference: BOTH; 90 aspect: (52/72) (52/72); aspect_preference: BOTH;
91 image.normal: "digit_0.png"; 91 image.normal: "O/digit_0.png";
92 } 92 }
93#define DIGIT_DESC(_DIGIT) \ 93#define DIGIT_DESC(_DIGIT) \
94 description { state: _DIGIT 0.0; \ 94 description { state: _DIGIT 0.0; \
95 inherit: "default" 0.0; \ 95 inherit: "default" 0.0; \
96 image.normal: "digit_"_DIGIT".png"; \ 96 image.normal: "O/digit_"_DIGIT".png"; \
97 } 97 }
98 DIGIT_DESC("0") 98 DIGIT_DESC("0")
99 DIGIT_DESC("1") 99 DIGIT_DESC("1")
@@ -254,30 +254,30 @@ group { name: "elm/clock/flipdigit/default";
254 254
255group { name: "elm/clock/flipampm/default"; 255group { name: "elm/clock/flipampm/default";
256 inherit: "elm/clock/flipdigit/default"; 256 inherit: "elm/clock/flipdigit/default";
257 images.image: "digit_nm.png" COMP; 257 images.image: "O/digit_nm.png" COMP;
258 images.image: "digit_am.png" COMP; 258 images.image: "O/digit_am.png" COMP;
259 images.image: "digit_pm.png" COMP; 259 images.image: "O/digit_pm.png" COMP;
260 parts { 260 parts {
261 part { name: "digit_bg"; 261 part { name: "O/digit_bg";
262 scale: 1; 262 scale: 1;
263 description { state: "default" 0.0; 263 description { state: "default" 0.0;
264 rel1.to: "digit"; 264 rel1.to: "O/digit";
265 rel2.to: "digit"; 265 rel2.to: "O/digit";
266 image.normal: "digit_nm.png"; 266 image.normal: "O/digit_nm.png";
267 color: 255 255 255 128; 267 color: 255 255 255 128;
268 } 268 }
269 } 269 }
270 part { name: "digit"; 270 part { name: "O/digit";
271 mouse_events: 0; 271 mouse_events: 0;
272 scale: 1; 272 scale: 1;
273 description { state: "default" 0.0; 273 description { state: "default" 0.0;
274 aspect: (48/31) (48/31); aspect_preference: BOTH; 274 aspect: (48/31) (48/31); aspect_preference: BOTH;
275 image.normal: "digit_am.png"; 275 image.normal: "O/digit_am.png";
276 } 276 }
277#define DIGIT_DESC(_DIGIT, _AMPM) \ 277#define DIGIT_DESC(_DIGIT, _AMPM) \
278 description { state: _DIGIT 0.0; \ 278 description { state: _DIGIT 0.0; \
279 inherit: "default" 0.0; \ 279 inherit: "default" 0.0; \
280 image.normal: "digit_"_AMPM".png"; \ 280 image.normal: "O/digit_"_AMPM".png"; \
281 } 281 }
282 DIGIT_DESC("0", "am") 282 DIGIT_DESC("0", "am")
283 DIGIT_DESC("1", "pm") 283 DIGIT_DESC("1", "pm")
diff --git a/data/themes/img/digit_0.png b/data/themes/img/O/digit_0.png
index 9cdc3b189..9cdc3b189 100644
--- a/data/themes/img/digit_0.png
+++ b/data/themes/img/O/digit_0.png
Binary files differ
diff --git a/data/themes/img/digit_1.png b/data/themes/img/O/digit_1.png
index e68ef0a62..e68ef0a62 100644
--- a/data/themes/img/digit_1.png
+++ b/data/themes/img/O/digit_1.png
Binary files differ
diff --git a/data/themes/img/digit_2.png b/data/themes/img/O/digit_2.png
index 463a6a1ac..463a6a1ac 100644
--- a/data/themes/img/digit_2.png
+++ b/data/themes/img/O/digit_2.png
Binary files differ
diff --git a/data/themes/img/digit_3.png b/data/themes/img/O/digit_3.png
index 1f9c5f443..1f9c5f443 100644
--- a/data/themes/img/digit_3.png
+++ b/data/themes/img/O/digit_3.png
Binary files differ
diff --git a/data/themes/img/digit_4.png b/data/themes/img/O/digit_4.png
index 58b1c0723..58b1c0723 100644
--- a/data/themes/img/digit_4.png
+++ b/data/themes/img/O/digit_4.png
Binary files differ
diff --git a/data/themes/img/digit_5.png b/data/themes/img/O/digit_5.png
index d9f648323..d9f648323 100644
--- a/data/themes/img/digit_5.png
+++ b/data/themes/img/O/digit_5.png
Binary files differ
diff --git a/data/themes/img/digit_6.png b/data/themes/img/O/digit_6.png
index 0f5a55d42..0f5a55d42 100644
--- a/data/themes/img/digit_6.png
+++ b/data/themes/img/O/digit_6.png
Binary files differ
diff --git a/data/themes/img/digit_7.png b/data/themes/img/O/digit_7.png
index 0d36ec28e..0d36ec28e 100644
--- a/data/themes/img/digit_7.png
+++ b/data/themes/img/O/digit_7.png
Binary files differ
diff --git a/data/themes/img/digit_8.png b/data/themes/img/O/digit_8.png
index cd24056eb..cd24056eb 100644
--- a/data/themes/img/digit_8.png
+++ b/data/themes/img/O/digit_8.png
Binary files differ
diff --git a/data/themes/img/digit_9.png b/data/themes/img/O/digit_9.png
index 4691191f4..4691191f4 100644
--- a/data/themes/img/digit_9.png
+++ b/data/themes/img/O/digit_9.png
Binary files differ
diff --git a/data/themes/img/digit_am.png b/data/themes/img/O/digit_am.png
index a77956332..a77956332 100644
--- a/data/themes/img/digit_am.png
+++ b/data/themes/img/O/digit_am.png
Binary files differ
diff --git a/data/themes/img/digit_na.png b/data/themes/img/O/digit_na.png
index e8652ef03..e8652ef03 100644
--- a/data/themes/img/digit_na.png
+++ b/data/themes/img/O/digit_na.png
Binary files differ
diff --git a/data/themes/img/digit_nm.png b/data/themes/img/O/digit_nm.png
index 292a2a3b6..292a2a3b6 100644
--- a/data/themes/img/digit_nm.png
+++ b/data/themes/img/O/digit_nm.png
Binary files differ
diff --git a/data/themes/img/digit_pm.png b/data/themes/img/O/digit_pm.png
index e3ccf7777..e3ccf7777 100644
--- a/data/themes/img/digit_pm.png
+++ b/data/themes/img/O/digit_pm.png
Binary files differ