TH - efl ui image zoomable

2 files changed, 11 insertions, 92 deletions

diff --git a/data/elementary/themes/edc/efl/image_zoomable.edc b/data/elementary/themes/edc/efl/image_zoomable.edc
index 535cbbde6b..64d759a723 100644
--- a/data/elementary/themes/edc/efl/image_zoomable.edc
+++ b/data/elementary/themes/edc/efl/image_zoomable.edc
@@ -17,101 +17,22 @@ Group: efl/image_zoomable (@since 1.23)
 group { name: "efl/image_zoomable";
    inherit: "efl/scroller";
    data.item: "version" "123";
-   images.image: "knob_round_busy.png" COMP;
-   images.image: "glow_round_corners.png" COMP;
+   IMAGE_RING("ringa", 160)
+   IMAGE_RING("ringb", 160)
+   IMAGE_RING("ringc", 160)
    parts {
-      part { name: "busy_clip"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "active" 0.0;
-            visible: 1;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "knob"; mouse_events: 0;
-         clip_to: "busy_clip";
+      BUSY("base", "elm,state,pulse,started", "efl", "elm,state,pulse,stopped", "efl")
+      part { name: "base"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            image.normal: "knob_round_busy.png";
+            color: 0 0 0 0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            align: 1.0 1.0;
             min: 40 40;
             max: 40 40;
-            align: 0.0 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: 3 3;
-            fixed: 1 1;
+            offscale;
          }
       }
-      part { name: "knob_spinner"; mouse_events: 0;
-         clip_to: "busy_clip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "knob";
-            rel2.to: "knob";
-            image.normal: "glow_round_corners.png";
-            map.on: 1;
-            map.smooth: 1;
-            map.rotation.center: "knob";
-         }
-         description { state: "spin" 0.0;
-            inherit: "default" 0.0;
-            map.rotation.z: 360;
-         }
-      }
-   }
-   programs {
-      program { name: "spin";
-         signal: "efl,state,busy,started"; source: "efl";
-         action: ACTION_STOP;
-         target: "spin";
-         target: "spin0";
-         target: "spin1";
-         target: "spin2";
-         target: "spin3";
-         target: "spin4";
-         after: "spin0";
-      }
-      program { name: "spin0";
-         action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-         after: "spin1";
-      }
-      program { name: "spin1";
-         action: STATE_SET "spin" 0.0;
-         transition: LINEAR 1.0;
-         target: "knob_spinner";
-         after: "spin2";
-      }
-      program { name: "spin2";
-         action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-         after: "spin1";
-      }
-      
-      program {
-         signal: "efl,state,busy,started"; source: "efl";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.25;
-         target: "busy_clip";
-      }
-      
-      program {
-         signal: "efl,state,busy,stopped"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 1.0;
-         target: "busy_clip";
-         after: "spin3";
-      }
-      program { name: "spin3";
-         action: ACTION_STOP;
-         target: "spin";
-         target: "spin2";
-         after: "spin4";
-      }
-      program { name: "spin4";
-         action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-      }
    }
 }
diff --git a/data/elementary/themes/edc/elm/thumb.edc b/data/elementary/themes/edc/elm/thumb.edc
index 57d1f6f05f..f35865fd6d 100644
--- a/data/elementary/themes/edc/elm/thumb.edc
+++ b/data/elementary/themes/edc/elm/thumb.edc
@@ -1,7 +1,5 @@
 group { name: "elm/thumb/base/default";
-   images.image: "knob_round_busy.png" COMP;
-   images.image: "glow_round_corners.png" COMP;
-   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "win_shadow.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
          scale: 1;