summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-10-16 22:28:55 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-10-16 22:30:32 +0900
commit12bbcd1a3a5c9e0a1a235166de2fca99dcfa5a0c (patch)
tree6cad0c1996a0a8cce7e4e9e3c135f4ba35e76ee6
parentf85321cf18dce00beff5ff80e99cf26bbd61a7b0 (diff)
progressbar: Swaped the layer of 'progress' and 'progress1'.
- 'progress' is the main progress so it should be on top. - 'progress' should move slower than 'progress1' in the example. - Changed the name of multi progress image name from 'recording' to 'double'.
-rwxr-xr-xdata/themes/images/bt_double.png (renamed from data/themes/images/bt_recording.png)bin495 -> 495 bytes
-rw-r--r--data/themes/widgets/progressbar.edc10
-rw-r--r--src/bin/test_progressbar.c12
3 files changed, 12 insertions, 10 deletions
diff --git a/data/themes/images/bt_recording.png b/data/themes/images/bt_double.png
index e5937ba0e..e5937ba0e 100755
--- a/data/themes/images/bt_recording.png
+++ b/data/themes/images/bt_double.png
Binary files differ
diff --git a/data/themes/widgets/progressbar.edc b/data/themes/widgets/progressbar.edc
index de826b903..3772cb0e0 100644
--- a/data/themes/widgets/progressbar.edc
+++ b/data/themes/widgets/progressbar.edc
@@ -850,10 +850,11 @@ group { name: "elm/progressbar/horizontal/wheel";
850group { name: "elm/progressbar/horizontal/double"; 850group { name: "elm/progressbar/horizontal/double";
851 inherit: "elm/progressbar/horizontal/default"; 851 inherit: "elm/progressbar/horizontal/default";
852 images { 852 images {
853 image: "bt_recording.png" COMP; 853 image: "bt_double.png" COMP;
854 } 854 }
855 parts { 855 parts {
856 part { name: "elm.progress.progressbar1"; 856 part { name: "elm.progress.progressbar1";
857 insert_after: "elm.text.status";
857 mouse_events: 0; 858 mouse_events: 0;
858 clip_to: "elm.background.progressbar"; 859 clip_to: "elm.background.progressbar";
859 description { 860 description {
@@ -870,7 +871,7 @@ group { name: "elm/progressbar/horizontal/double";
870 offset: -1 -1; 871 offset: -1 -1;
871 } 872 }
872 image { 873 image {
873 normal: "bt_recording.png"; 874 normal: "bt_double.png";
874 border: 6 6 6 6; 875 border: 6 6 6 6;
875 } 876 }
876 } 877 }
@@ -986,10 +987,11 @@ group { name: "elm/progressbar/horizontal/double";
986group { name: "elm/progressbar/vertical/double"; 987group { name: "elm/progressbar/vertical/double";
987 inherit: "elm/progressbar/vertical/default"; 988 inherit: "elm/progressbar/vertical/default";
988 images { 989 images {
989 image: "bt_recording.png" COMP; 990 image: "bt_double.png" COMP;
990 } 991 }
991 parts { 992 parts {
992 part { name: "elm.progress.progressbar1"; 993 part { name: "elm.progress.progressbar1";
994 insert_after: "background";
993 mouse_events: 0; 995 mouse_events: 0;
994 clip_to: "elm.background.progressbar"; 996 clip_to: "elm.background.progressbar";
995 description { 997 description {
@@ -1006,7 +1008,7 @@ group { name: "elm/progressbar/vertical/double";
1006 offset: -1 -1; 1008 offset: -1 -1;
1007 } 1009 }
1008 image { 1010 image {
1009 normal: "bt_recording.png"; 1011 normal: "bt_double.png";
1010 border: 6 6 6 6; 1012 border: 6 6 6 6;
1011 } 1013 }
1012 } 1014 }
diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index d82c343f1..131ad311c 100644
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -271,15 +271,15 @@ _progressbar2_timer_cb(void *data)
271 { 271 {
272 progress += 0.0123; 272 progress += 0.0123;
273 elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress); 273 elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress);
274 elm_progressbar_value_set(pd->pb2, progress); 274 elm_progressbar_part_value_set(pd->pb2, "elm.cur.progressbar1", progress);
275 elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar", progress); 275 elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar1", progress);
276 elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar", progress); 276 elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar1", progress);
277 } 277 }
278 278
279 _set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar1"); 279 _set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar");
280 _set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar1"); 280 _set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar");
281 281
282 if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar1")) 282 if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar"))
283 return ECORE_CALLBACK_RENEW; 283 return ECORE_CALLBACK_RENEW;
284 284
285 pd->timer = NULL; 285 pd->timer = NULL;