[radio.edc] Radio Widget Refactoring

Change-Id: I982b840494ccee21549ddeba1f223d22146f8a85

diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc
index f740e49..0932d27 100644 (file)
--- a/themes/widgets/radio.edc
+++ b/themes/widgets/radio.edc
@@ -43,26 +43,22 @@
       parts { \
          part { name: "back_bg"; \
             type: RECT; \
-            mouse_events: 1; \
             scale: 1; \
             description { state: "default" 0.0; \
                rel2.relative: 0.0 1.0; \
                align: 0 0.5; \
                min: min_width min_height; \
                fixed: 1 0; \
-               visible: 1; \
                color: 0 0 0 0; \
             } \
          } \
          part { name: "bg"; \
-            mouse_events: 1; \
             scale: 1; \
             type: RECT; \
             description { state: "default" 0.0; \
-               rel1{ to: "back_bg"; } \
-               rel2{ to: "back_bg"; } \
+               rel1.to: "back_bg"; \
+               rel2.to: "back_bg"; \
                fixed: 1 1; \
-               align: 0.5 0.5; \
                min: RADIO_STYLE_DEFAULT_BG_MIN_MAX_INC; \
                max: RADIO_STYLE_DEFAULT_BG_MIN_MAX_INC; \
                color: 0 0 0 0; \
@@ -80,7 +76,6 @@
                   to: "bg"; \
                   offset: 0 0; \
                } \
-               visible: 1; \
                color: 255 255 255 255; \
                image.normal: "00_button_radio_normal2.png"; \
             } \
@@ -105,12 +100,15 @@
                visible: 0; \
                color: 255 255 255 255; \
                align: 0.0 0.5; \
-               rel1.to_x: "bg"; \
-               rel1.relative: 1.0 0.0; \
-               rel1.offset: 1 1; \
-               rel2.to_x: "bg"; \
-               rel2.relative: 1.0 1.0; \
-               rel2.offset: 2 -2; \
+               rel1 { \
+                  to_x: "bg"; \
+                  relative: 1.0 0.0; \
+                  offset: 1 1; \
+               } \
+               rel2 { \
+                  to_x: "bg"; \
+                  offset: 2 -2; \
+               } \
             } \
             description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
@@ -138,8 +136,15 @@
             description { state: "default" 0.0; \
                visible: 0; \
                fixed: 0 1; \
-               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; } \
-               rel2 { relative: 1.0 0.5; offset: -2 -2; } \
+               rel1 { \
+                  relative: 1.0 0.5; \
+                  offset: 1 1; \
+                  to_x: "elm.swallow.content"; \
+               } \
+               rel2 { \
+                  relative: 1.0 0.5; \
+                  offset: -2 -2; \
+               } \
                color: 255 255 255 255; \
                align: 0.0 0.5; \
                text { \
@@ -180,7 +185,6 @@
          part { name: "disabler"; \
             type: RECT; \
             description { state: "default" 0.0; \
-               color: 0 0 0 0; \
                visible: 0; \
             } \
             description { state: "disabled" 0.0; \
@@ -213,25 +217,25 @@
          program { name: "text_show"; \
             signal: "elm,state,text,visible"; \
             source: "elm"; \
-            action:  STATE_SET "visible" 0.0; \
+            action: STATE_SET "visible" 0.0; \
             target: "elm.text"; \
          } \
          program { name: "text_hide"; \
             signal: "elm,state,text,hidden"; \
             source: "elm"; \
-            action:  STATE_SET "default" 0.0; \
+            action: STATE_SET "default" 0.0; \
             target: "elm.text"; \
          } \
          program { name: "icon_show"; \
             signal: "elm,state,icon,visible"; \
             source: "elm"; \
-            action:  STATE_SET "visible" 0.0; \
+            action: STATE_SET "visible" 0.0; \
             target: "elm.swallow.content"; \
          } \
          program { name: "icon_hide"; \
             signal: "elm,state,icon,hidden"; \
             source: "elm"; \
-            action:  STATE_SET "default" 0.0; \
+            action: STATE_SET "default" 0.0; \
             target: "elm.swallow.content"; \
          } \
          program { name: "disable"; \
@@ -247,23 +251,19 @@
                new Float:vl; \
                get_state(PART:"elm.text", st, 30, vl); \
                if (!strcmp(st, "visible")) \
-               set_state(PART:"elm.text", "disabled_visible", 0.0); \
+                 set_state(PART:"elm.text", "disabled_visible", 0.0); \
                else \
-               set_state(PART:"elm.text", "disabled", 0.0); \
+                 set_state(PART:"elm.text", "disabled", 0.0); \
                get_state(PART:"elm.swallow.content", st, 30, vl); \
                if (!strcmp(st, "visible")) \
-                  set_state(PART:"elm.swallow.content", "disabled_visible", 0.0); \
+                 set_state(PART:"elm.swallow.content", "disabled_visible", 0.0); \
                else \
-                  set_state(PART:"elm.swallow.content", "disabled", 0.0); \
+                 set_state(PART:"elm.swallow.content", "disabled", 0.0); \
                get_state(PART:"radio", st, 30, vl); \
                if (!strcmp(st, "visible")) \
-               { \
-                  set_state(PART:"radio", "disabled_visible", 0.0); \
-                } \
+                 set_state(PART:"radio", "disabled_visible", 0.0); \
                else \
-               { \
-                  set_state(PART:"radio", "disabled", 0.0); \
-               } \
+                 set_state(PART:"radio", "disabled", 0.0); \
             } \
          } \
          program { name: "enable"; \
@@ -279,23 +279,19 @@
                new Float:vl; \
                get_state(PART:"elm.text", st, 30, vl); \
                if (!strcmp(st, "disabled_visible")) \
-                  set_state(PART:"elm.text", "visible", 0.0); \
+                 set_state(PART:"elm.text", "visible", 0.0); \
                else \
-                  set_state(PART:"elm.text", "default", 0.0); \
+                 set_state(PART:"elm.text", "default", 0.0); \
                get_state(PART:"elm.swallow.content", st, 30, vl); \
                if (!strcmp(st, "disabled_visible")) \
-                  set_state(PART:"elm.swallow.content", "visible", 0.0); \
+                 set_state(PART:"elm.swallow.content", "visible", 0.0); \
                else \
-                  set_state(PART:"elm.swallow.content", "default", 0.0); \
+                 set_state(PART:"elm.swallow.content", "default", 0.0); \
                get_state(PART:"radio", st, 30, vl); \
                if (!strcmp(st, "disabled_visible")) \
-               { \
-                  set_state(PART:"radio", "visible", 0.0); \
-               } \
+                 set_state(PART:"radio", "visible", 0.0); \
                else \
-               { \
-                  set_state(PART:"radio", "default", 0.0); \
-               } \
+                 set_state(PART:"radio", "default", 0.0); \
             } \
          } \
       } \