From: Amit Kamboj Date: Fri, 5 Apr 2013 04:49:29 +0000 (+0530) Subject: [check] Removed unused styles and images. X-Git-Tag: 2.1b_release~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=c41ffac1e14ab9dc2fc75f3a24906526dbb45cd3;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [check] Removed unused styles and images. Change-Id: I961a522362889958b38065c6b73e0f9404598153 --- diff --git a/themes/images/tizen-hd/00_button_edit.png b/themes/images/tizen-hd/00_button_edit.png deleted file mode 100644 index 7b84e4b..0000000 Binary files a/themes/images/tizen-hd/00_button_edit.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_edit_Delete.png b/themes/images/tizen-hd/00_button_edit_Delete.png deleted file mode 100644 index c70c13b..0000000 Binary files a/themes/images/tizen-hd/00_button_edit_Delete.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_edit_Delete_press.png b/themes/images/tizen-hd/00_button_edit_Delete_press.png deleted file mode 100644 index 5c6762a..0000000 Binary files a/themes/images/tizen-hd/00_button_edit_Delete_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_edit_dim.png b/themes/images/tizen-hd/00_button_edit_dim.png deleted file mode 100644 index 7b84e4b..0000000 Binary files a/themes/images/tizen-hd/00_button_edit_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_edit_focus.png b/themes/images/tizen-hd/00_button_edit_focus.png deleted file mode 100644 index 4fb3b2d..0000000 Binary files a/themes/images/tizen-hd/00_button_edit_focus.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_edit_press.png b/themes/images/tizen-hd/00_button_edit_press.png deleted file mode 100644 index cdea3c7..0000000 Binary files a/themes/images/tizen-hd/00_button_edit_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_minus.png b/themes/images/tizen-hd/00_button_minus.png deleted file mode 100644 index eadabad..0000000 Binary files a/themes/images/tizen-hd/00_button_minus.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_minus_press.png b/themes/images/tizen-hd/00_button_minus_press.png deleted file mode 100644 index eadabad..0000000 Binary files a/themes/images/tizen-hd/00_button_minus_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_check_bg_dim.png b/themes/images/tizen-hd/00_check_bg_dim.png deleted file mode 100755 index 72ced60..0000000 Binary files a/themes/images/tizen-hd/00_check_bg_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_check_bg_press.png b/themes/images/tizen-hd/00_check_bg_press.png deleted file mode 100755 index 834918e..0000000 Binary files a/themes/images/tizen-hd/00_check_bg_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_check_checking_dim.png b/themes/images/tizen-hd/00_check_checking_dim.png deleted file mode 100755 index 4d5c284..0000000 Binary files a/themes/images/tizen-hd/00_check_checking_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_check_press_bg.png b/themes/images/tizen-hd/00_check_press_bg.png deleted file mode 100644 index 6656810..0000000 Binary files a/themes/images/tizen-hd/00_check_press_bg.png and /dev/null differ diff --git a/themes/images/tizen-hd/multicheck_0001.png b/themes/images/tizen-hd/multicheck_0001.png deleted file mode 100644 index ac27607..0000000 Binary files a/themes/images/tizen-hd/multicheck_0001.png and /dev/null differ diff --git a/themes/images/tizen-hd/multicheck_0002.png b/themes/images/tizen-hd/multicheck_0002.png deleted file mode 100644 index 6bb95de..0000000 Binary files a/themes/images/tizen-hd/multicheck_0002.png and /dev/null differ diff --git a/themes/images/tizen-hd/multicheck_0003.png b/themes/images/tizen-hd/multicheck_0003.png deleted file mode 100644 index 194b8c0..0000000 Binary files a/themes/images/tizen-hd/multicheck_0003.png and /dev/null differ diff --git a/themes/images/tizen-hd/multicheck_0004.png b/themes/images/tizen-hd/multicheck_0004.png deleted file mode 100644 index e5ead65..0000000 Binary files a/themes/images/tizen-hd/multicheck_0004.png and /dev/null differ diff --git a/themes/images/tizen-hd/multicheck_0005.png b/themes/images/tizen-hd/multicheck_0005.png deleted file mode 100644 index 81cccfc..0000000 Binary files a/themes/images/tizen-hd/multicheck_0005.png and /dev/null differ diff --git a/themes/images/tizen-hd/multicheck_0006.png b/themes/images/tizen-hd/multicheck_0006.png deleted file mode 100644 index 81cccfc..0000000 Binary files a/themes/images/tizen-hd/multicheck_0006.png and /dev/null differ diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index dc04751..b1304f4 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -695,412 +695,6 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } } - group { name: "elm/check/base/multicheck"; - images { - image: "00_check_bg.png" COMP; - image: "00_check_bg_press.png" COMP; - image: "multicheck_0001.png" COMP; - image: "multicheck_0002.png" COMP; - image: "multicheck_0003.png" COMP; - image: "multicheck_0004.png" COMP; - image: "multicheck_0005.png" COMP; - image: "multicheck_0006.png" COMP; - image: "00_check_checking.png" COMP; - } - script { - public check_state = 0; //0:default, 1: visible, 2: disabled_visible - } - parts { - part { name: "bg"; - scale: 1; - clip_to: "disclip"; - description { state: "default" 0.0; - rel2.relative: 0.0 1.0; - align: 0.0 0.5; - min: 44 44; - max: 44 44; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - image.normal: "00_check_bg.png"; - fill.smooth : 0; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "00_check_bg_press.png"; - fill.smooth : 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - } - part { name: "check"; - mouse_events: 0; - clip_to: "disclip"; - scale: 1; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - visible: 0; - } - description { state: "visible_1" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0001.png"; - } - description { state: "visible_2" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0002.png"; - } - description { state: "visible_3" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0003.png"; - } - description { state: "visible_4" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0004.png"; - } - description { state: "visible_5" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0005.png"; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0006.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "multicheck_0006.png"; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - image.normal: "00_check_checking.png"; - visible: 1; - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "disclip"; - description { state: "default" 0.0; - fixed: 1 0; - visible: 0; - color: 255 255 255 255; - align: 0.0 0.5; - 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; - fixed: 1 1; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 128 128 128 128; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color: 128 128 128 128; - fixed: 1 1; - visible: 1; - aspect: 1.0 1.0; - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - clip_to: "disclip"; - mouse_events: 0; - scale: 1; - 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; - } - align: 0.0 0.5; - text { - style: "check_label_textblock_style"; - min: 0 0; - } - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; - color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; - } - } - part { name: "events1"; - type: RECT; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "disclip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - color: 255 255 255 255; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 102; - } - } - part { name: "events2"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "click"; - signal: "mouse,clicked,1"; - source: "events1"; - action: SIGNAL_EMIT "elm,action,check,toggle" ""; - after: "touch_sound"; - } - program { name: "touch_sound"; - action: PLAY_SAMPLE "touch_sound" 1.0; - } - program { name: "bg_normal"; - signal: "mouse,up,1"; - source: "events2"; - script { - new st[31]; - new Float:vl; - get_state(PART:"check", st, 30, vl); - if (!strcmp(st, "pressed")) - set_state(PART:"check", "visible", 0.0); - set_state(PART:"bg", "default", 0.0); - } - } - program { name: "pressed"; - signal: "mouse,down,1"; - source: "events2"; - script { - new st[31]; - new Float:vl; - get_state(PART:"check", st, 30, vl); - if (!strcmp(st, "default")) - set_state(PART:"check", "pressed", 0.0); - else - set_state(PART:"check", "default", 0.0); - set_state(PART:"bg", "pressed", 0.0); - } - } - program { name: "mouse,out"; - signal: "mouse,out"; - source: "events2"; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible", 0.0); - else - set_state(PART:"check", "default", 0.0); - } - } - program { name: "check_on"; - signal: "elm,state,check,on"; - source: "elm"; - script { - set_int(check_state, 1); - } - after: "check_on_1"; - } - program { name: "check_on_1"; - in: 0.05 0.0; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible_1", 0.0); - } - after: "check_on_2"; - } - program { name: "check_on_2"; - in: 0.05 0.0; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible_2", 0.0); - } - after: "check_on_3"; - } - program { name: "check_on_3"; - in: 0.05 0.0; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible_3", 0.0); - } - after: "check_on_4"; - } - program { name: "check_on_4"; - in: 0.05 0.0; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible_4", 0.0); - } - after: "check_on_5"; - } - program { name: "check_on_5"; - in: 0.05 0.0; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible_5", 0.0); - } - after: "check_on_6"; - } - program { name: "check_on_6"; - in: 0.05 0.0; - script { - if (get_int(check_state) == 1) - set_state(PART:"check", "visible", 0.0); - } - } - program { name: "check_off"; - signal: "elm,state,check,off"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "check"; - script { - if (get_int(check_state) == 1) - { - set_int(check_state, 0); - set_state(PART:"check", "default", 0.0); - } - } - } - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - 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; - target: "elm.text"; - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - 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; - target: "elm.swallow.content"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disabler"; - target: "disclip"; - target: "bg"; - after: "disable_text"; - } - program { name: "disable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "disabled_visible", 0.0); - else - 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); - else - 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, 2); - } - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disabler"; - target: "disclip"; - target: "bg"; - after: "enable_text"; - } - program { name: "enable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.text", "visible", 0.0); - else - 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); - else - 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, 1); - } - else - set_int(check_state, 0); - } - } - } - } - -////////////////////////////////////////////////////////////////////////////// group { name: "elm/check/base/on&off"; images { image: "00_button_on.png" COMP; @@ -1952,12 +1546,417 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } \ } \ } -//////////////////////////////////////////////////////////////////////////////// -CHECK_STYLE_FAVORITE("favorite", CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC) -//////////////////////////////////////////////////////////////////////////////// -CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC) -//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// +CHECK_STYLE_FAVORITE("favorite", CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC) +//////////////////////////////////////////////////////////////////////////////// +CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC) +//////////////////////////////////////////////////////////////////////////////// + + group { name: "elm/check/base/grid"; + images.image: "00_grid_select_check.png" COMP; + images.image: "00_grid_select_check_bg.png" COMP; + images.image: "00_grid_select_check_bg_press.png" COMP; + script { + public check_state = CHECK_STATE_DEFAULT; + public check_visible = CHECK_HIDE; + } + parts { + part { name: "bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + } + } + part { name: "top_right_padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC; + align: 1.0 0.0; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to: "bg"; + } + rel2 { + relative: 1.0 0.0; + to: "bg"; + } + } + } + part { name: "selected_bg"; + scale: 1; + type: RECT; + description { state: "default" 0.0; + visible: 0; + rel1.to: "bg"; + rel2.to: "bg"; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC; + } + } + part { name: "bg2"; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: GENGRID_EDIT_MODE_CHECK_SIZE_INC; + align: 1.0 0.0; + fixed: 1 1; + rel1 { + relative: 0.0 1.0; + to: "top_right_padding"; + } + rel2 { + relative: 0.0 1.0; + to: "top_right_padding"; + } + image.normal: "00_grid_select_check_bg.png"; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + image.normal: "00_grid_select_check_bg_press.png"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + } + part { name: "check"; + mouse_events: 0; + clip_to: "sequence_clip"; + scale: 1; + description { state: "default" 0.0; + visible: 0; + rel1.to: "bg2"; + rel2.to: "bg2"; + image.normal: "00_grid_select_check.png"; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + description { state: "pressed" 0.0; + inherit: "visible" 0.0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "sequence_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "bg2"; + rel2.to: "bg2"; + rel2.relative: 0.0 1.0; + color: 255 255 255 255; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel2.relative: 1.0 1.0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + description { + state: "default" 0.0; + fixed: 1 0; + visible: 0; + color: 255 255 255 255; + align: 0.0 0.5; + rel1 { + to_x: "bg2"; + relative: 1.0 0.0; + offset: 1 1; + } + rel2 { + to_x: "bg2"; + relative: 1.0 1.0; + offset: 2 -2; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + fixed: 1 1; + visible: 1; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 128 128 128 128; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: 128 128 128 128; + fixed: 1 1; + visible: 1; + aspect: 1.0 1.0; + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + 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; + } + color: 255 255 255 255; + align: 0.0 0.5; + text { + style: "check_label_textblock_style"; + min: 0 0; + } + color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; + } + } + part { name: "events"; + type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { name: "show"; + signal: "show"; + script { + set_int(check_visible, CHECK_SHOW); + } + } + program { name: "hide"; + signal: "hide"; + script { + set_int(check_visible, CHECK_HIDE); + } + } + program { name: "click"; + signal: "mouse,clicked,1"; + source: "events"; + action: SIGNAL_EMIT "elm,action,check,toggle" ""; + after: "touch_sound"; + } + program { name: "touch_sound"; + action: PLAY_SAMPLE "touch_sound" 1.0; + after: "bg_normal"; + } + program { name: "bg_normal"; + script { + set_state(PART:"bg2", "default", 0.0); + } + } + program { name: "pressed"; + signal: "mouse,down,1"; + source: "events"; + script { + new st[31]; + new Float:vl; + get_state(PART:"check", st, 30, vl); + if (!strcmp(st, "visible")) + { + set_state(PART:"check", "pressed", 0.0); + set_state(PART:"bg2", "visible", 0.0); + } + } + } + program { name: "mouse,out"; + signal: "mouse,out"; + source: "events"; + script { + if (get_int(check_state) == CHECK_STATE_VISIBLE) + { + set_state(PART:"check", "visible", 0.0); + set_state(PART:"sequence_clip", "visible", 0.0); + set_state(PART:"bg2", "visible", 0.0); + } + else + { + set_state(PART:"check", "default", 0.0); + set_state(PART:"sequence_clip", "default", 0.0); + set_state(PART:"bg2", "default", 0.0); + } + } + } + program { name: "check_on"; + signal: "elm,state,check,on"; + source: "elm"; + script { + set_int(check_state, CHECK_STATE_VISIBLE); + if (get_int(check_visible) == CHECK_SHOW) + { + run_program(PROGRAM:"check_show_effect"); + run_program(PROGRAM:"check_draw_effect"); + } + else + { + set_state(PART:"check", "visible", 0.0); + set_state(PART:"sequence_clip", "visible", 0.0); + } + set_state(PART:"bg2", "visible", 0.0); + set_state(PART:"selected_bg", "visible", 0.0); + } + } + program { name: "check_off"; + signal: "elm,state,check,off"; + source: "elm"; + 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); + set_state(PART:"sequence_clip", "default", 0.0); + } + set_state(PART:"bg2", "default", 0.0); + set_state(PART:"selected_bg", "default", 0.0); + } + } + program { name: "check_show_effect"; + action: STATE_SET "visible" 0.0; + transition: LINEAR 0.233; + target: "check"; + } + program { name: "check_draw_effect"; + action: STATE_SET "visible" 0.0; + transition: LINEAR 0.267; + target: "sequence_clip"; + } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + 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; + target: "elm.text"; + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; + source: "elm"; + 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; + target: "elm.swallow.content"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disabler"; + target: "bg2"; + after: "disable_text"; + } + program { name: "disable_text"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + 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); + else + 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); + } + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disabler"; + target: "bg2"; + after: "enable_text"; + } + program { name: "enable_text"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "visible", 0.0); + else + 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); + else + 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_state(PART:"sequence_clip", "visible", 0.0); + set_int(check_state, CHECK_STATE_VISIBLE); + } + else + set_int(check_state, CHECK_STATE_DEFAULT); + } + } + } + } +///////////////////////////////////////////////////////////////////////////// +#if 0 group { name: "elm/check/base/delete"; images { image: "00_button_minus.png" COMP; @@ -2456,77 +2455,40 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE } } -//////////////////////////////////////////////////////////////////////////////// - - group { name: "elm/check/base/grid"; - images.image: "00_grid_select_check.png" COMP; - images.image: "00_grid_select_check_bg.png" COMP; - images.image: "00_grid_select_check_bg_press.png" COMP; +//////////////////////////////////////////////////////////////////////////////////// + group { name: "elm/check/base/multicheck"; + images { + image: "00_check_bg.png" COMP; + image: "00_check_bg_press.png" COMP; + image: "multicheck_0001.png" COMP; + image: "multicheck_0002.png" COMP; + image: "multicheck_0003.png" COMP; + image: "multicheck_0004.png" COMP; + image: "multicheck_0005.png" COMP; + image: "multicheck_0006.png" COMP; + image: "00_check_checking.png" COMP; + } script { - public check_state = CHECK_STATE_DEFAULT; - public check_visible = CHECK_HIDE; + public check_state = 0; //0:default, 1: visible, 2: disabled_visible } parts { part { name: "bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - visible: 0; - } - } - part { name: "top_right_padding"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC; - align: 1.0 0.0; - fixed: 1 1; - rel1 { - relative: 1.0 0.0; - to: "bg"; - } - rel2 { - relative: 1.0 0.0; - to: "bg"; - } - } - } - part { name: "selected_bg"; - scale: 1; - type: RECT; - description { state: "default" 0.0; - visible: 0; - rel1.to: "bg"; - rel2.to: "bg"; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC; - } - } - part { name: "bg2"; - mouse_events: 0; scale: 1; + clip_to: "disclip"; description { state: "default" 0.0; - min: GENGRID_EDIT_MODE_CHECK_SIZE_INC; - align: 1.0 0.0; - fixed: 1 1; - rel1 { - relative: 0.0 1.0; - to: "top_right_padding"; - } - rel2 { - relative: 0.0 1.0; - to: "top_right_padding"; - } - image.normal: "00_grid_select_check_bg.png"; + rel2.relative: 0.0 1.0; + align: 0.0 0.5; + min: 44 44; + max: 44 44; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + image.normal: "00_check_bg.png"; + fill.smooth : 0; } - description { state: "visible" 0.0; + description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_grid_select_check_bg_press.png"; + image.normal: "00_check_bg_press.png"; + fill.smooth : 0; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -2534,57 +2496,69 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE } part { name: "check"; mouse_events: 0; - clip_to: "sequence_clip"; + clip_to: "disclip"; scale: 1; description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; visible: 0; - rel1.to: "bg2"; - rel2.to: "bg2"; - image.normal: "00_grid_select_check.png"; - color: 255 255 255 0; } - description { state: "visible" 0.0; + description { state: "visible_1" 0.0; inherit: "default" 0.0; visible: 1; - color: 255 255 255 255; + image.normal: "multicheck_0001.png"; } - description { state: "pressed" 0.0; - inherit: "visible" 0.0; + description { state: "visible_2" 0.0; + inherit: "default" 0.0; + visible: 1; + image.normal: "multicheck_0002.png"; } - description { state: "disabled_visible" 0.0; + description { state: "visible_3" 0.0; inherit: "default" 0.0; visible: 1; + image.normal: "multicheck_0003.png"; } - } - part { name: "sequence_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg2"; - rel2.to: "bg2"; - rel2.relative: 0.0 1.0; - color: 255 255 255 255; + description { state: "visible_4" 0.0; + inherit: "default" 0.0; + visible: 1; + image.normal: "multicheck_0004.png"; + } + description { state: "visible_5" 0.0; + inherit: "default" 0.0; + visible: 1; + image.normal: "multicheck_0005.png"; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel2.relative: 1.0 1.0; + visible: 1; + image.normal: "multicheck_0006.png"; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + visible: 1; + image.normal: "multicheck_0006.png"; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + image.normal: "00_check_checking.png"; + visible: 1; } } part { name: "elm.swallow.content"; type: SWALLOW; - description { - state: "default" 0.0; + clip_to: "disclip"; + description { state: "default" 0.0; fixed: 1 0; visible: 0; color: 255 255 255 255; align: 0.0 0.5; rel1 { - to_x: "bg2"; + to_x: "bg"; relative: 1.0 0.0; offset: 1 1; } rel2 { - to_x: "bg2"; + to_x: "bg"; relative: 1.0 1.0; offset: 2 -2; } @@ -2610,6 +2584,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE } part { name: "elm.text"; type: TEXTBLOCK; + clip_to: "disclip"; mouse_events: 0; scale: 1; description { state: "default" 0.0; @@ -2624,7 +2599,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE relative: 1.0 0.5; offset: -2 -2; } - color: 255 255 255 255; align: 0.0 0.5; text { style: "check_label_textblock_style"; @@ -2647,13 +2621,31 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; } } - part { name: "events"; + part { name: "events1"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; color: 0 0 0 0; } } + part { name: "disclip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 102; + } + } + part { name: "events2"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } part { name: "disabler"; type: RECT; description { state: "default" 0.0; @@ -2667,82 +2659,104 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE } } programs { - program { name: "show"; - signal: "show"; - script { - set_int(check_visible, CHECK_SHOW); - } - } - program { name: "hide"; - signal: "hide"; - script { - set_int(check_visible, CHECK_HIDE); - } - } program { name: "click"; signal: "mouse,clicked,1"; - source: "events"; + source: "events1"; action: SIGNAL_EMIT "elm,action,check,toggle" ""; after: "touch_sound"; } program { name: "touch_sound"; action: PLAY_SAMPLE "touch_sound" 1.0; - after: "bg_normal"; } program { name: "bg_normal"; + signal: "mouse,up,1"; + source: "events2"; script { - set_state(PART:"bg2", "default", 0.0); + new st[31]; + new Float:vl; + get_state(PART:"check", st, 30, vl); + if (!strcmp(st, "pressed")) + set_state(PART:"check", "visible", 0.0); + set_state(PART:"bg", "default", 0.0); } } program { name: "pressed"; signal: "mouse,down,1"; - source: "events"; + source: "events2"; script { new st[31]; new Float:vl; get_state(PART:"check", st, 30, vl); - if (!strcmp(st, "visible")) - { - set_state(PART:"check", "pressed", 0.0); - set_state(PART:"bg2", "visible", 0.0); - } + if (!strcmp(st, "default")) + set_state(PART:"check", "pressed", 0.0); + else + set_state(PART:"check", "default", 0.0); + set_state(PART:"bg", "pressed", 0.0); } } program { name: "mouse,out"; signal: "mouse,out"; - source: "events"; + source: "events2"; script { - if (get_int(check_state) == CHECK_STATE_VISIBLE) - { - set_state(PART:"check", "visible", 0.0); - set_state(PART:"sequence_clip", "visible", 0.0); - set_state(PART:"bg2", "visible", 0.0); - } + if (get_int(check_state) == 1) + set_state(PART:"check", "visible", 0.0); else - { - set_state(PART:"check", "default", 0.0); - set_state(PART:"sequence_clip", "default", 0.0); - set_state(PART:"bg2", "default", 0.0); - } + set_state(PART:"check", "default", 0.0); } } program { name: "check_on"; signal: "elm,state,check,on"; source: "elm"; script { - set_int(check_state, CHECK_STATE_VISIBLE); - if (get_int(check_visible) == CHECK_SHOW) - { - run_program(PROGRAM:"check_show_effect"); - run_program(PROGRAM:"check_draw_effect"); - } - else - { - set_state(PART:"check", "visible", 0.0); - set_state(PART:"sequence_clip", "visible", 0.0); - } - set_state(PART:"bg2", "visible", 0.0); - set_state(PART:"selected_bg", "visible", 0.0); + set_int(check_state, 1); + } + after: "check_on_1"; + } + program { name: "check_on_1"; + in: 0.05 0.0; + script { + if (get_int(check_state) == 1) + set_state(PART:"check", "visible_1", 0.0); + } + after: "check_on_2"; + } + program { name: "check_on_2"; + in: 0.05 0.0; + script { + if (get_int(check_state) == 1) + set_state(PART:"check", "visible_2", 0.0); + } + after: "check_on_3"; + } + program { name: "check_on_3"; + in: 0.05 0.0; + script { + if (get_int(check_state) == 1) + set_state(PART:"check", "visible_3", 0.0); + } + after: "check_on_4"; + } + program { name: "check_on_4"; + in: 0.05 0.0; + script { + if (get_int(check_state) == 1) + set_state(PART:"check", "visible_4", 0.0); + } + after: "check_on_5"; + } + program { name: "check_on_5"; + in: 0.05 0.0; + script { + if (get_int(check_state) == 1) + set_state(PART:"check", "visible_5", 0.0); + } + after: "check_on_6"; + } + program { name: "check_on_6"; + in: 0.05 0.0; + script { + if (get_int(check_state) == 1) + set_state(PART:"check", "visible", 0.0); } } program { name: "check_off"; @@ -2751,26 +2765,13 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE action: STATE_SET "default" 0.0; target: "check"; script { - if (get_int(check_state) == CHECK_STATE_VISIBLE) + if (get_int(check_state) == 1) { - set_int(check_state, CHECK_STATE_DEFAULT); + set_int(check_state, 0); set_state(PART:"check", "default", 0.0); - set_state(PART:"sequence_clip", "default", 0.0); } - set_state(PART:"bg2", "default", 0.0); - set_state(PART:"selected_bg", "default", 0.0); } } - program { name: "check_show_effect"; - action: STATE_SET "visible" 0.0; - transition: LINEAR 0.233; - target: "check"; - } - program { name: "check_draw_effect"; - action: STATE_SET "visible" 0.0; - transition: LINEAR 0.267; - target: "sequence_clip"; - } program { name: "text_show"; signal: "elm,state,text,visible"; source: "elm"; @@ -2800,7 +2801,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE source: "elm"; action: STATE_SET "disabled" 0.0; target: "disabler"; - target: "bg2"; + target: "disclip"; + target: "bg"; after: "disable_text"; } program { name: "disable_text"; @@ -2819,10 +2821,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE 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, 2); } } program { name: "enable"; @@ -2830,7 +2830,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE source: "elm"; action: STATE_SET "default" 0.0; target: "disabler"; - target: "bg2"; + target: "disclip"; + target: "bg"; after: "enable_text"; } program { name: "enable_text"; @@ -2851,15 +2852,15 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE if (!strcmp(st, "disabled_visible")) { set_state(PART:"check", "visible", 0.0); - set_state(PART:"sequence_clip", "visible", 0.0); - set_int(check_state, CHECK_STATE_VISIBLE); + set_int(check_state, 1); } else - set_int(check_state, CHECK_STATE_DEFAULT); + set_int(check_state, 0); } } } } +#endif #undef CHECK_STATE_DEFAULT #undef CHECK_STATE_VISIBLE