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'.

diff --git a/legacy/elementary/data/themes/images/bt_recording.png b/legacy/elementary/data/themes/images/bt_double.png
similarity index 100%
rename from legacy/elementary/data/themes/images/bt_recording.png
rename to legacy/elementary/data/themes/images/bt_double.png

diff --git a/legacy/elementary/data/themes/widgets/progressbar.edc b/legacy/elementary/data/themes/widgets/progressbar.edc
index de826b9..3772cb0 100644 (file)
--- a/legacy/elementary/data/themes/widgets/progressbar.edc
+++ b/legacy/elementary/data/themes/widgets/progressbar.edc
@@ -850,10 +850,11 @@ group { name: "elm/progressbar/horizontal/wheel";
 group { name: "elm/progressbar/horizontal/double";
    inherit: "elm/progressbar/horizontal/default";
    images {
-      image: "bt_recording.png" COMP;
+      image: "bt_double.png" COMP;
    }
    parts {
       part { name: "elm.progress.progressbar1";
+         insert_after: "elm.text.status";
          mouse_events: 0;
          clip_to: "elm.background.progressbar";
          description {
@@ -870,7 +871,7 @@ group { name: "elm/progressbar/horizontal/double";
                offset: -1 -1;
             }
             image {
-               normal: "bt_recording.png";
+               normal: "bt_double.png";
                border: 6 6 6 6;
             }
          }
@@ -986,10 +987,11 @@ group { name: "elm/progressbar/horizontal/double";
 group { name: "elm/progressbar/vertical/double";
    inherit: "elm/progressbar/vertical/default";
    images {
-      image: "bt_recording.png" COMP;
+      image: "bt_double.png" COMP;
    }
    parts {
       part { name: "elm.progress.progressbar1";
+         insert_after: "background";
          mouse_events: 0;
          clip_to: "elm.background.progressbar";
          description {
@@ -1006,7 +1008,7 @@ group { name: "elm/progressbar/vertical/double";
                offset: -1 -1;
             }
             image {
-               normal: "bt_recording.png";
+               normal: "bt_double.png";
                border: 6 6 6 6;
             }
          }

diff --git a/legacy/elementary/src/bin/test_progressbar.c b/legacy/elementary/src/bin/test_progressbar.c
index d82c343..131ad31 100644 (file)
--- a/legacy/elementary/src/bin/test_progressbar.c
+++ b/legacy/elementary/src/bin/test_progressbar.c
@@ -271,15 +271,15 @@ _progressbar2_timer_cb(void *data)
       {
          progress += 0.0123;
          elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress);
-         elm_progressbar_value_set(pd->pb2, progress);
-         elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar", progress);
-         elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar", progress);
+         elm_progressbar_part_value_set(pd->pb2, "elm.cur.progressbar1", progress);
+         elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar1", progress);
+         elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar1", progress);
       }
 
-   _set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar1");
-   _set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar1");
+   _set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar");
+   _set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar");
 
-   if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar1"))
+   if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar"))
      return ECORE_CALLBACK_RENEW;
 
    pd->timer = NULL;