progressbar: refactor progress/pending theme.

Change-Id: Ib92c26e93de07be3a3fb2800491f54b50981aa4b
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>

1 files changed, 55 insertions, 108 deletions

diff --git a/mobile/widgets/progressbar.edc b/mobile/widgets/progressbar.edc
index a3d891dc..7d429567 100644
--- a/mobile/widgets/progressbar.edc
+++ b/mobile/widgets/progressbar.edc
@@ -122,7 +122,7 @@
                rel.to: "base";
             }
          }
-         image { "progressbar";
+         image { "elm.progress.progressbar";
             desc { "default";
                rel.to: "base";
             }
@@ -306,12 +306,15 @@
                fixed: 1 1;
             }
          }
-         image { "progressbar";
+         image { "elm.progress.progressbar";
             scale;
             desc { "default";
                image.normal: "core_progress_bar.#";
-               rel.to: "elm.progress.progressbar";
                fixed: 1 1;
+               rel1.to: "bg_progressbar";
+               rel2.to_x: "elm.cur.progressbar";
+               rel2.to_y: "bg_progressbar";
+               rel2.offset: -1 -1;
                color_class: "progressbar/default/bar";
             }
             desc { "prev";
@@ -324,7 +327,8 @@
             }
             desc { "default_invert";
                inherit: "default";
-               rel1.to: "elm.progress.progressbar";
+               rel1.to_x: "elm.cur.progressbar";
+               rel1.to_y: "bg_progressbar";
                rel2.to: "bg_progressbar";
                rel1.relative: 1.0 0.0;
             }
@@ -338,54 +342,11 @@
                inherit: "prev_invert";
                color_class: "progressbar/default/bar_disabled";
             }
-         }
-         rect { "elm.progress.progressbar";
-            desc { "default";
-               min: 0 0;
-               fixed: 1 1;
-               rel1 {
-                  to: "bg_progressbar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_y: "bg_progressbar";
-                  to_x: "elm.cur.progressbar";
-                  offset: -1 -1;
-               }
-               color: 0 0 0 0;
-            }
-            desc { "invert";
-               inherit: "default";
-               rel1 {
-                  to_y: "bg_progressbar";
-                  to_x: "elm.cur.progressbar";
-               }
-               rel2 {
-                  to: "bg_progressbar";
-                  relative: 1.0 1.0;
-               }
-            }
             desc { "state_begin";
                inherit: "default";
-               rel1 {
-                  to: "bg_progressbar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg_progressbar";
-                  relative: 0.1 1.0;
-               }
             }
             desc { "state_end";
                inherit: "default";
-               rel1 {
-                  to: "bg_progressbar";
-                  relative: 0.9 0.0;
-               }
-               rel2 {
-                  to: "bg_progressbar";
-                  relative: 1.0 1.0;
-               }
             }
          }
          part { "elm.cur.progressbar";
@@ -400,7 +361,7 @@
                fixed: 1 1;
                hid;
                rel.to: "bg_drag";
-           }
+            }
          }
          spacer { "padding_bottom";
             scale;
@@ -517,9 +478,9 @@
             if (m) {
                set_state(PART:"bg_progressbar", "default", 0.0);
                if (!get_int(inverted))
-                  set_state(PART:"progressbar", "prev", 0.0);
+                  set_state(PART:"elm.progress.progressbar", "prev", 0.0);
                else
-                  set_state(PART:"progressbar", "prev_invert", 0.0);
+                  set_state(PART:"elm.progress.progressbar", "prev_invert", 0.0);
                if (get_int(text_top_right_show))
                   set_state(PART:"elm.text.top.right", "visible", 0.0);
                else
@@ -536,12 +497,13 @@
                   set_state(PART:"elm.text.status", "visible", 0.0);
                else
                   set_state(PART:"elm.text.status", "default", 0.0);
-            } else {
+            }
+            else {
                set_state(PART:"bg_progressbar", "disabled_visible", 0.0);
                if (!get_int(inverted))
-                  set_state(PART:"progressbar", "disabled_visible", 0.0);
+                  set_state(PART:"elm.progress.progressbar", "disabled_visible", 0.0);
                else
-                  set_state(PART:"progressbar", "disabled_visible_invert", 0.0);
+                  set_state(PART:"elm.progress.progressbar", "disabled_visible_invert", 0.0);
                if (get_int(text_top_right_show))
                   set_state(PART:"elm.text.top.right", "disabled_visible", 0.0);
                if (get_int(text_bottom_left_show))
@@ -577,11 +539,10 @@
          program { "on_visible_top_right";
             script {
                set_int(text_top_right_show, SHOW);
-               if (get_int(enabled)) {
+               if (get_int(enabled))
                   set_state(PART:"elm.text.top.right", "visible", 0.0);
-               } else {
+               else
                   set_state(PART:"elm.text.top.right", "disabled_visible", 0.0);
-               }
                run_program(PROGRAM:"base_size_set");
             }
          }
@@ -595,11 +556,10 @@
          program { "on_visible_bottom_left";
             script {
                set_int(text_bottom_left_show, SHOW);
-               if (get_int(enabled)) {
+               if (get_int(enabled))
                   set_state(PART:"elm.text.bottom.left", "visible", 0.0);
-               } else {
+               else
                   set_state(PART:"elm.text.bottom.left", "disabled_visible", 0.0);
-               }
                run_program(PROGRAM:"base_size_set");
             }
          }
@@ -617,7 +577,8 @@
                if (get_int(enabled)) {
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "visible", 0.0);
-               } else {
+               }
+               else {
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "disabled_visible", 0.0);
                }
@@ -638,7 +599,8 @@
                if (get_int(enabled)) {
                   set_state(PART:"elm.text.bottom.right", "default", 0.0);
                   set_state(PART:"elm.text.status", "visible", 0.0);
-               } else {
+               }
+               else {
                   set_state(PART:"elm.text.bottom.right", "default", 0.0);
                   set_state(PART:"elm.text.status", "disabled_visible", 0.0);
                }
@@ -653,17 +615,8 @@
             }
          }
          program { "slide_to_end";
-            action: STATE_SET "state_end";
-            transition: LINEAR 0.5;
-            target: "elm.progress.progressbar";
-            after: "slide_to_begin";
          }
          program { "slide_to_begin";
-            signal: "elm,state,slide,begin";
-            action: STATE_SET "state_begin";
-            target: "elm.progress.progressbar";
-            transition: LINEAR 0.5;
-            after: "slide_to_end";
          }
          program { "start_pulse";
             signal: "elm,state,pulse,start";
@@ -672,10 +625,6 @@
          program { "stop_pulse";
             signal: "elm,state,pulse,stop";
             source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
          }
          program { "state_pulse";
             signal: "elm,state,pulse";
@@ -684,21 +633,17 @@
          program { "state_fraction";
             signal: "elm,state,fraction";
             source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
          }
          program { "on_inverted_on";
             script {
                set_int(inverted, ENABLE);
-               set_state(PART:"progressbar", "prev_invert", 0.0);
+               set_state(PART:"elm.progress.progressbar", "prev_invert", 0.0);
             }
          }
          program { "on_inverted_off";
             script {
                set_int(inverted, DISABLE);
-               set_state(PART:"progressbar", "prev", 0.0);
+               set_state(PART:"elm.progress.progressbar", "prev", 0.0);
             }
          }
          program { "on_finished_animation";
@@ -731,7 +676,7 @@
                         custom_state(PART:"prev", "default", 0.0);
                         set_state_val(PART:"prev", STATE_REL2, dx, 1.0);
                         set_state(PART:"prev", "custom", 0.0);
-                        set_state(PART:"progressbar", "prev", 0.0);
+                        set_state(PART:"elm.progress.progressbar", "prev", 0.0);
                      }
                      get_drag(PART:"elm.cur.progressbar", dx, dy);
                      get_state_val(PART:"prev", STATE_REL2, rx, ry);
@@ -740,17 +685,18 @@
                         set_state_val(PART:"prev", STATE_REL2, 0.0, 1.0);
                         set_state(PART:"prev", "custom", 0.0);
                      }
-                     set_state(PART:"progressbar", "prev", 0.0);
+                     set_state(PART:"elm.progress.progressbar", "prev", 0.0);
                      run_program(PROGRAM:"animation");
                      set_int(is_anim, ENABLE);
-                  } else {
+                  }
+                  else {
                      if (get_int(is_anim)) {
                         set_int(is_anim, DISABLE);
                         get_drag(PART:"elm.cur.progressbar", dx, dy);
                         custom_state(PART:"prev", "default", 0.0);
                         set_state_val(PART:"prev", STATE_REL2, dx, 0.0);
                         set_state(PART:"prev", "custom", 0.0);
-                        set_state(PART:"progressbar", "prev_invert", 0.0);
+                        set_state(PART:"elm.progress.progressbar", "prev_invert", 0.0);
                      }
                      get_drag(PART:"elm.cur.progressbar", dx, dy);
                      get_state_val(PART:"prev", STATE_REL2, rx, ry);
@@ -759,40 +705,40 @@
                         set_state_val(PART:"prev", STATE_REL2, 1.0, 1.0);
                         set_state(PART:"prev", "custom", 0.0);
                      }
-                     set_state(PART:"progressbar", "prev_invert", 0.0);
+                     set_state(PART:"elm.progress.progressbar", "prev_invert", 0.0);
                      run_program(PROGRAM:"animation_invert");
                      set_int(is_anim, ENABLE);
                   }
-               } else {
-                  if (!get_int(inverted)) {
+               }
+               else {
+                  if (!get_int(inverted))
                      run_program(PROGRAM:"animation_disabled");
-                  } else {
+                  else
                      run_program(PROGRAM:"animation_disabled_invert");
-                  }
                   set_int(is_anim, DISABLE);
                }
             }
          }
          program { "animation";
             action: STATE_SET "default";
-            target: "progressbar";
+            target: "elm.progress.progressbar";
             transition: GLIDE_EASE_OUT(0.8);
             after: "prev_set";
          }
          program { "animation_disabled";
             action: STATE_SET "disabled_visible";
-            target: "progressbar";
+            target: "elm.progress.progressbar";
             after: "prev_set";
          }
          program { "animation_invert";
             action: STATE_SET "default_invert";
-            target: "progressbar";
+            target: "elm.progress.progressbar";
             transition: GLIDE_EASE_OUT(0.8);
             after: "prev_set";
          }
          program { "animation_disabled_invert";
             action: STATE_SET "disabled_visible_invert";
-            target: "progressbar";
+            target: "elm.progress.progressbar";
             after: "prev_set";
          }
          program { "prev_set";
@@ -805,15 +751,16 @@
                      custom_state(PART:"prev", "default", 0.0);
                      set_state_val(PART:"prev", STATE_REL2, dx, 1.0);
                      set_state(PART:"prev", "custom", 0.0);
-                     set_state(PART:"progressbar", "prev", 0.0);
+                     set_state(PART:"elm.progress.progressbar", "prev", 0.0);
                      emit("elm,action,animation,finished", "elm");
-                  } else {
+                  }
+                  else {
                      set_int(is_anim, DISABLE);
                      get_drag(PART:"elm.cur.progressbar", dx, dy);
                      custom_state(PART:"prev", "default", 0.0);
                      set_state_val(PART:"prev", STATE_REL2, dx, 0.0);
                      set_state(PART:"prev", "custom", 0.0);
-                     set_state(PART:"progressbar", "prev_invert", 0.0);
+                     set_state(PART:"elm.progress.progressbar", "prev_invert", 0.0);
                      emit("elm,action,animation,finished", "elm");
                   }
                }
@@ -1084,11 +1031,10 @@
          public set_enable(m) {
             if (m) {
                set_state(PART:"bg_progressbar", "default", 0.0);
-               if (!get_int(state_end)) {
+               if (!get_int(state_end))
                   set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
-               } else {
+               else
                   set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
-               }
                if (get_int(text_top_right_show))
                   set_state(PART:"elm.text.top.right", "visible", 0.0);
                else
@@ -1105,7 +1051,8 @@
                   set_state(PART:"elm.text.status", "visible", 0.0);
                else
                   set_state(PART:"elm.text.status", "default", 0.0);
-            } else {
+            }
+            else {
                set_state(PART:"bg_progressbar", "disabled_visible", 0.0);
                set_state(PART:"elm.progress.progressbar", "disabled_visible", 0.0);
                if (get_int(text_top_right_show))
@@ -1143,11 +1090,10 @@
          program { "on_visible_top_right";
             script {
                set_int(text_top_right_show, SHOW);
-               if (get_int(enabled)) {
+               if (get_int(enabled))
                   set_state(PART:"elm.text.top.right", "visible", 0.0);
-               } else {
+               else
                   set_state(PART:"elm.text.top.right", "disabled_visible", 0.0);
-               }
                run_program(PROGRAM:"base_size_set");
             }
          }
@@ -1161,11 +1107,10 @@
          program { "on_visible_bottom_left";
             script {
                set_int(text_bottom_left_show, SHOW);
-               if (get_int(enabled)) {
+               if (get_int(enabled))
                   set_state(PART:"elm.text.bottom.left", "visible", 0.0);
-               } else {
+               else
                   set_state(PART:"elm.text.bottom.left", "disabled_visible", 0.0);
-               }
                run_program(PROGRAM:"base_size_set");
             }
          }
@@ -1183,7 +1128,8 @@
                if (get_int(enabled)) {
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "visible", 0.0);
-               } else {
+               }
+               else {
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "disabled_visible", 0.0);
                }
@@ -1204,7 +1150,8 @@
                if (get_int(enabled)) {
                   set_state(PART:"elm.text.bottom.right", "default", 0.0);
                   set_state(PART:"elm.text.status", "visible", 0.0);
-               } else {
+               }
+               else {
                   set_state(PART:"elm.text.bottom.right", "default", 0.0);
                   set_state(PART:"elm.text.status", "disabled_visible", 0.0);
                }