From 4a6b05c74560e0ee9fbd24cc4eb2df6f03e85cee Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Tue, 27 Dec 2011 11:44:36 +0530 Subject: [PATCH] [check.edc] Widget refactoring for genlist style according to E-Coding guidelines. Change-Id: Idf9af1690ba2fb2ec30185e9103e21efe12381ae --- themes/widgets/check.edc | 100 ++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 97df6aa..e301c99 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -302,7 +302,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI //////////////////////////////////////////////////////////////////////////////// #define CHECK_STYLE_FOR_GENLIST(style_name, min_width, min_height) \ - group { name: "elm/check/base/"style_name; \ + group { name: "elm/check/base/"style_name; \ images { \ image: "00_check_bg.png" COMP; \ image: "00_check_bg_dim.png" COMP; \ @@ -314,13 +314,10 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI parts { \ part { name: "back_bg"; \ type: RECT; \ - mouse_events: 1; \ scale: 1; \ description { state: "default" 0.0; \ - align: 0.5 0.5; \ min: min_width min_height; \ fixed: 0 0; \ - visible: 1; \ color: 0 0 0 0; \ } \ } \ @@ -331,20 +328,14 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI min: CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC; \ max: CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC; \ fixed: 1 1; \ - rel1{ to: "back_bg"; } \ - rel2{ to: "back_bg"; } \ - align: 0.5 0.5; \ - visible: 1; \ - image { \ - normal: "00_check_bg.png"; \ - } \ + rel1.to: "back_bg"; \ + rel2.to: "back_bg"; \ + image.normal: "00_check_bg.png"; \ fill.smooth : 0; \ } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image { \ - normal: "00_check_bg_dim.png"; \ - } \ + image.normal: "00_check_bg_dim.png"; \ fill.smooth : 0; \ } \ } \ @@ -373,12 +364,16 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI 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"; \ + relative: 1.0 1.0; \ + offset: 2 -2; \ + } \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ @@ -406,8 +401,15 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI 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; \ + } \ align: 0.0 0.5; \ text { \ style: "check_label_textblock_style"; \ @@ -473,38 +475,38 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI program { name: "check_off"; \ signal: "elm,state,check,off"; \ source: "elm"; \ - action: STATE_SET "default" 0.0; \ + action: STATE_SET "default" 0.0; \ target: "check"; \ script { \ - if(get_int(check_state) == CHECK_STATE_VISIBLE) \ - { \ - set_int(check_state, CHECK_STATE_DEFAULT); \ - set_state(PART:"check", "default", 0.0); \ - } \ + if (get_int(check_state) == CHECK_STATE_VISIBLE) \ + { \ + set_int(check_state, CHECK_STATE_DEFAULT); \ + set_state(PART:"check", "default", 0.0); \ + } \ } \ } \ 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"; \ @@ -521,20 +523,20 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI 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:"check", st, 30, vl); \ if (!strcmp(st, "visible")) \ - { \ - set_state(PART:"check", "disabled_visible", 0.0); \ - set_int(check_state, CHECK_STATE_DISABLED_VISIBLE); \ - } \ + { \ + set_state(PART:"check", "disabled_visible", 0.0); \ + set_int(check_state, CHECK_STATE_DISABLED_VISIBLE); \ + } \ } \ } \ program { name: "enable"; \ @@ -551,22 +553,22 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI 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, "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:"check", st, 30, vl); \ if (!strcmp(st, "disabled_visible")) \ - { \ - set_state(PART:"check", "visible", 0.0); \ - set_int(check_state, CHECK_STATE_VISIBLE); \ - } \ + { \ + set_state(PART:"check", "visible", 0.0); \ + set_int(check_state, CHECK_STATE_VISIBLE); \ + } \ else \ - set_int(check_state, CHECK_STATE_DEFAULT); \ + set_int(check_state, CHECK_STATE_DEFAULT); \ } \ } \ } \ -- 2.7.4