From: Amit Kamboj Date: Fri, 5 Apr 2013 04:02:57 +0000 (+0530) Subject: [UX 4.4] Check and Radio UX implementation X-Git-Tag: 2.1b_release~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2582f11f574aff9df814e329c0fcb0cbd0948022;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [UX 4.4] Check and Radio UX implementation Change-Id: Ifc4bd09524b64443100fb651f54fd2799615592b --- diff --git a/themes/images/tizen-hd/00_button_radio.png b/themes/images/tizen-hd/00_button_radio.png deleted file mode 100755 index 3ae8001..0000000 Binary files a/themes/images/tizen-hd/00_button_radio.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_radio_Activated.png b/themes/images/tizen-hd/00_button_radio_Activated.png new file mode 100644 index 0000000..e76b7a7 Binary files /dev/null and b/themes/images/tizen-hd/00_button_radio_Activated.png differ diff --git a/themes/images/tizen-hd/00_button_radio_bg.png b/themes/images/tizen-hd/00_button_radio_bg.png new file mode 100644 index 0000000..a916a26 Binary files /dev/null and b/themes/images/tizen-hd/00_button_radio_bg.png differ diff --git a/themes/images/tizen-hd/00_button_radio_dim.png b/themes/images/tizen-hd/00_button_radio_dim.png old mode 100755 new mode 100644 index 4e5c72f..c6109ce Binary files a/themes/images/tizen-hd/00_button_radio_dim.png and b/themes/images/tizen-hd/00_button_radio_dim.png differ diff --git a/themes/images/tizen-hd/00_button_radio_dim_bg.png b/themes/images/tizen-hd/00_button_radio_dim_bg.png new file mode 100644 index 0000000..2479100 Binary files /dev/null and b/themes/images/tizen-hd/00_button_radio_dim_bg.png differ diff --git a/themes/images/tizen-hd/00_button_radio_press.png b/themes/images/tizen-hd/00_button_radio_press.png deleted file mode 100755 index 5ce7984..0000000 Binary files a/themes/images/tizen-hd/00_button_radio_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_radio_select.png b/themes/images/tizen-hd/00_button_radio_select.png deleted file mode 100755 index 304d61b..0000000 Binary files a/themes/images/tizen-hd/00_button_radio_select.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_radio_select_dim.png b/themes/images/tizen-hd/00_button_radio_select_dim.png deleted file mode 100755 index 8e71cc0..0000000 Binary files a/themes/images/tizen-hd/00_button_radio_select_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_check_Activated.png b/themes/images/tizen-hd/00_check_Activated.png new file mode 100644 index 0000000..b20372e Binary files /dev/null and b/themes/images/tizen-hd/00_check_Activated.png differ diff --git a/themes/images/tizen-hd/00_check_bg.png b/themes/images/tizen-hd/00_check_bg.png old mode 100755 new mode 100644 index 80398ed..bb08643 Binary files a/themes/images/tizen-hd/00_check_bg.png and b/themes/images/tizen-hd/00_check_bg.png differ diff --git a/themes/images/tizen-hd/00_check_dim.png b/themes/images/tizen-hd/00_check_dim.png new file mode 100644 index 0000000..0854732 Binary files /dev/null and b/themes/images/tizen-hd/00_check_dim.png differ diff --git a/themes/images/tizen-hd/00_check_dim_bg.png b/themes/images/tizen-hd/00_check_dim_bg.png new file mode 100644 index 0000000..bb08643 Binary files /dev/null and b/themes/images/tizen-hd/00_check_dim_bg.png differ diff --git a/themes/images/tizen-hd/00_check_press_bg.png b/themes/images/tizen-hd/00_check_press_bg.png new file mode 100644 index 0000000..6656810 Binary files /dev/null and b/themes/images/tizen-hd/00_check_press_bg.png differ diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 50230f0..dc04751 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -29,10 +29,9 @@ group { name: "elm/check/base/"style_name; \ images { \ image: "00_check_bg.png" COMP; \ - image: "00_check_bg_press.png" COMP; \ - image: "00_check_bg_dim.png" COMP; \ - image: "00_check_checking.png" COMP; \ - image: "00_check_checking_dim.png" COMP; \ + image: "00_check_dim_bg.png" COMP; \ + image: "00_check_dim.png" COMP; \ + image: "00_check_Activated.png" COMP; \ } \ script { \ public check_state = CHECK_STATE_DEFAULT; \ @@ -65,13 +64,9 @@ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ } \ - description { state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - image.normal: "00_check_bg_press.png"; \ - } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_check_bg_dim.png"; \ + image.normal: "00_check_dim_bg.png"; \ } \ } \ part { name: "check"; \ @@ -82,7 +77,7 @@ rel1.to: "bg"; \ rel2.to: "bg"; \ visible: 0; \ - image.normal: "00_check_checking.png"; \ + image.normal: "00_check_Activated.png"; \ color: 255 255 255 0; \ } \ description { state: "visible" 0.0; \ @@ -93,7 +88,8 @@ description { state: "disabled_visible" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ - image.normal: "00_check_checking_dim.png"; \ + image.normal: "00_check_dim.png"; \ + color: 255 255 255 255; \ } \ } \ part { name: "sequence_clip"; \ @@ -241,18 +237,6 @@ program { name: "touch_sound"; \ action: PLAY_SAMPLE "touch_sound" 1.0; \ } \ - program { name: "bg_normal"; \ - signal: "mouse,up,1"; \ - source: "events2"; \ - action: STATE_SET "default" 0.0; \ - target: "bg"; \ - } \ - program { name: "pressed"; \ - signal: "mouse,down,1"; \ - source: "events2"; \ - action: STATE_SET "pressed" 0.0; \ - target: "bg"; \ - } \ program { name: "mouse,out"; \ signal: "mouse,out"; \ source: "events2"; \ @@ -411,9 +395,9 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI group { name: "elm/check/base/"style_name; \ images { \ image: "00_check_bg.png" COMP; \ - image: "00_check_bg_dim.png" COMP; \ - image: "00_check_checking.png" COMP; \ - image: "00_check_checking_dim.png" COMP; \ + image: "00_check_dim_bg.png" COMP; \ + image: "00_check_dim.png" COMP; \ + image: "00_check_Activated.png" COMP; \ } \ script { \ public check_state = CHECK_STATE_DEFAULT; \ @@ -442,7 +426,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_check_bg_dim.png"; \ + image.normal: "00_check_dim_bg.png"; \ } \ } \ part { name: "check"; \ @@ -452,7 +436,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI rel1.to: "bg"; \ rel2.to: "bg"; \ visible: 0; \ - image.normal: "00_check_checking.png"; \ + image.normal: "00_check_Activated.png"; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ @@ -461,7 +445,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI description { state: "disabled_visible" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ - image.normal: "00_check_checking_dim.png"; \ + image.normal: "00_check_dim.png"; \ } \ } \ part { name: "elm.swallow.content"; \ diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc index 86c223a..7fab1b5 100644 --- a/themes/widgets/radio.edc +++ b/themes/widgets/radio.edc @@ -38,11 +38,10 @@ #define RADIO_STYLE_DEFAULT(style_name, min_width, min_height) \ group { name: "elm/radio/base/"style_name; \ images { \ - image: "00_button_radio_select.png" COMP; \ image: "00_button_radio_dim.png" COMP; \ - image: "00_button_radio.png" COMP; \ - image: "00_button_radio_press.png" COMP; \ - image: "00_button_radio_select_dim.png" COMP; \ + image: "00_button_radio_Activated.png" COMP; \ + image: "00_button_radio_bg.png" COMP; \ + image: "00_button_radio_dim_bg.png" COMP; \ } \ parts { \ part { name: "back_bg"; \ @@ -65,15 +64,11 @@ fixed: 1 1; \ rel1.to: "back_bg"; \ rel2.to: "back_bg"; \ - image.normal: "00_button_radio.png"; \ + image.normal: "00_button_radio_bg.png"; \ } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_button_radio_dim.png"; \ - } \ - description { state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - image.normal: "00_button_radio_press.png"; \ + image.normal: "00_button_radio_dim_bg.png"; \ } \ } \ part { name: "radio"; \ @@ -84,7 +79,7 @@ rel1.to: "bg"; \ rel2.to: "bg"; \ max: 0 0; \ - image.normal: "00_button_radio_select.png"; \ + image.normal: "00_button_radio_Activated.png"; \ visible: 0; \ } \ description { state: "visible" 0.0; \ @@ -97,7 +92,7 @@ } \ description { state: "disabled_visible" 0.0; \ inherit: "visible" 0.0; \ - image.normal: "00_button_radio_select_dim.png"; \ + image.normal: "00_button_radio_dim.png"; \ } \ } \ part { name: "opacity_clip"; \