From: shaheba.m Date: Thu, 13 Jun 2013 07:32:19 +0000 (+0530) Subject: [Button, Check, Radio] Dark theme Implementation v02, v0.3. X-Git-Tag: accepted/tizen/20131029.210118~193 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5605e7a84417c984bd0cea426a7d0a87021b64d7;p=profile%2Fivi%2Fefl-theme-tizen.git [Button, Check, Radio] Dark theme Implementation v02, v0.3. Change-Id: Ia10af167fab688dcb02d9221e486273578630f13 Conflicts: themes/widgets/button.edc --- diff --git a/themes/images/HD/dark/Controls/00_arrow_expand.png b/themes/images/HD/dark/Controls/00_arrow_expand.png index 7100497..d67737e 100644 Binary files a/themes/images/HD/dark/Controls/00_arrow_expand.png and b/themes/images/HD/dark/Controls/00_arrow_expand.png differ diff --git a/themes/images/HD/dark/Controls/00_button_01_delete.png b/themes/images/HD/dark/Controls/00_button_01_delete.png index f381a57..09630c6 100644 Binary files a/themes/images/HD/dark/Controls/00_button_01_delete.png and b/themes/images/HD/dark/Controls/00_button_01_delete.png differ diff --git a/themes/images/HD/dark/Controls/00_button_01_delete_dim.png b/themes/images/HD/dark/Controls/00_button_01_delete_dim.png index f381a57..f66465f 100644 Binary files a/themes/images/HD/dark/Controls/00_button_01_delete_dim.png and b/themes/images/HD/dark/Controls/00_button_01_delete_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_button_01_delete_press.png b/themes/images/HD/dark/Controls/00_button_01_delete_press.png index 03f0fdc..321e484 100644 Binary files a/themes/images/HD/dark/Controls/00_button_01_delete_press.png and b/themes/images/HD/dark/Controls/00_button_01_delete_press.png differ diff --git a/themes/images/HD/dark/Controls/00_button_01_dim.png b/themes/images/HD/dark/Controls/00_button_01_dim.png old mode 100755 new mode 100644 diff --git a/themes/images/HD/dark/Controls/00_button_01_focus.png b/themes/images/HD/dark/Controls/00_button_01_focus.png new file mode 100644 index 0000000..2d02de8 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_01_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_button_handler_focus.png b/themes/images/HD/dark/Controls/00_button_handler_focus.png new file mode 100644 index 0000000..538de37 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_handler_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_button_off.png b/themes/images/HD/dark/Controls/00_button_off.png deleted file mode 100644 index e58e522..0000000 Binary files a/themes/images/HD/dark/Controls/00_button_off.png and /dev/null differ diff --git a/themes/images/HD/dark/Controls/00_button_off_dim.png b/themes/images/HD/dark/Controls/00_button_off_dim.png deleted file mode 100644 index 340ee9d..0000000 Binary files a/themes/images/HD/dark/Controls/00_button_off_dim.png and /dev/null differ diff --git a/themes/images/HD/dark/Controls/00_button_off_handler.png b/themes/images/HD/dark/Controls/00_button_off_handler.png new file mode 100644 index 0000000..5a0fd80 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_off_handler.png differ diff --git a/themes/images/HD/dark/Controls/00_button_off_handler_dim.png b/themes/images/HD/dark/Controls/00_button_off_handler_dim.png new file mode 100644 index 0000000..0ad4af3 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_off_handler_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_button_on.png b/themes/images/HD/dark/Controls/00_button_on.png deleted file mode 100644 index af8cdc5..0000000 Binary files a/themes/images/HD/dark/Controls/00_button_on.png and /dev/null differ diff --git a/themes/images/HD/dark/Controls/00_button_on_dim.png b/themes/images/HD/dark/Controls/00_button_on_dim.png deleted file mode 100644 index 202898a..0000000 Binary files a/themes/images/HD/dark/Controls/00_button_on_dim.png and /dev/null differ diff --git a/themes/images/HD/dark/Controls/00_button_on_handler.png b/themes/images/HD/dark/Controls/00_button_on_handler.png new file mode 100644 index 0000000..aeb582d Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_on_handler.png differ diff --git a/themes/images/HD/dark/Controls/00_button_on_handler_dim.png b/themes/images/HD/dark/Controls/00_button_on_handler_dim.png new file mode 100644 index 0000000..cdad146 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_on_handler_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_button_on_off_bg.png b/themes/images/HD/dark/Controls/00_button_on_off_bg.png new file mode 100644 index 0000000..8e52220 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_on_off_bg.png differ diff --git a/themes/images/HD/dark/Controls/00_button_on_off_bg_dim.png b/themes/images/HD/dark/Controls/00_button_on_off_bg_dim.png new file mode 100644 index 0000000..0f7bdba Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_on_off_bg_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button.png b/themes/images/HD/dark/Controls/00_circle_button.png index fefde0f..3ffa651 100644 Binary files a/themes/images/HD/dark/Controls/00_circle_button.png and b/themes/images/HD/dark/Controls/00_circle_button.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_delete.png b/themes/images/HD/dark/Controls/00_circle_button_delete.png index 314757d..098b298 100644 Binary files a/themes/images/HD/dark/Controls/00_circle_button_delete.png and b/themes/images/HD/dark/Controls/00_circle_button_delete.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_delete_dim.png b/themes/images/HD/dark/Controls/00_circle_button_delete_dim.png index 6659671..a8ebf03 100644 Binary files a/themes/images/HD/dark/Controls/00_circle_button_delete_dim.png and b/themes/images/HD/dark/Controls/00_circle_button_delete_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_delete_press.png b/themes/images/HD/dark/Controls/00_circle_button_delete_press.png index 9cd1c03..808ed4d 100644 Binary files a/themes/images/HD/dark/Controls/00_circle_button_delete_press.png and b/themes/images/HD/dark/Controls/00_circle_button_delete_press.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_dim.png b/themes/images/HD/dark/Controls/00_circle_button_dim.png index fefde0f..923d9eb 100644 Binary files a/themes/images/HD/dark/Controls/00_circle_button_dim.png and b/themes/images/HD/dark/Controls/00_circle_button_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_focus.png b/themes/images/HD/dark/Controls/00_circle_button_focus.png old mode 100755 new mode 100644 index 6712258..5c207df Binary files a/themes/images/HD/dark/Controls/00_circle_button_focus.png and b/themes/images/HD/dark/Controls/00_circle_button_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_press.png b/themes/images/HD/dark/Controls/00_circle_button_press.png index cded13b..11ff35c 100644 Binary files a/themes/images/HD/dark/Controls/00_circle_button_press.png and b/themes/images/HD/dark/Controls/00_circle_button_press.png differ diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72.png b/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72.png index b804323..a1556c2 100644 Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72.png and b/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72.png differ diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72_dim.png b/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72_dim.png index fb6f9e6..9cf262b 100644 Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72_dim.png and b/themes/images/HD/dark/Controls/00_icon_favorite_off_72x72_dim.png differ diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72.png b/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72.png index 2909e60..bc9897f 100644 Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72.png and b/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72.png differ diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72_dim.png b/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72_dim.png index e464f58..f7de79a 100644 Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72_dim.png and b/themes/images/HD/dark/Controls/00_icon_favorite_on_72x72_dim.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_add.png b/themes/images/HD/dark/Controls/Button/00_button_add.png index a3420f5..47417c9 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_add.png and b/themes/images/HD/dark/Controls/Button/00_button_add.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_add_press.png b/themes/images/HD/dark/Controls/Button/00_button_add_press.png index 016022d..47417c9 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_add_press.png and b/themes/images/HD/dark/Controls/Button/00_button_add_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_call.png b/themes/images/HD/dark/Controls/Button/00_button_call.png index 5dda0d1..a374e6d 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_call.png and b/themes/images/HD/dark/Controls/Button/00_button_call.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_call_press.png b/themes/images/HD/dark/Controls/Button/00_button_call_press.png index 68213a2..a374e6d 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_call_press.png and b/themes/images/HD/dark/Controls/Button/00_button_call_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_contact.png b/themes/images/HD/dark/Controls/Button/00_button_contact.png index d51ed97..25f07f0 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_contact.png and b/themes/images/HD/dark/Controls/Button/00_button_contact.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_contact_press.png b/themes/images/HD/dark/Controls/Button/00_button_contact_press.png index 17498b2..25f07f0 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_contact_press.png and b/themes/images/HD/dark/Controls/Button/00_button_contact_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_delete.png b/themes/images/HD/dark/Controls/Button/00_button_delete.png index 39260e5..b1ce778 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_delete.png and b/themes/images/HD/dark/Controls/Button/00_button_delete.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_delete_press.png b/themes/images/HD/dark/Controls/Button/00_button_delete_press.png index 39260e5..b1ce778 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_delete_press.png and b/themes/images/HD/dark/Controls/Button/00_button_delete_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_cancel.png b/themes/images/HD/dark/Controls/Button/00_button_expand_cancel.png index e24612a..4dd5215 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_cancel.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_cancel.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png index e2cd2f0..4dd5215 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_closed.png b/themes/images/HD/dark/Controls/Button/00_button_expand_closed.png index 41ee73f..ac3aef3 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_closed.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_closed.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png index 2098db2..ac3aef3 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_opened.png b/themes/images/HD/dark/Controls/Button/00_button_expand_opened.png index 547f884..9d17f5a 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_opened.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_opened.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png index d539fd0..9d17f5a 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_send.png b/themes/images/HD/dark/Controls/Button/00_button_expand_send.png index eccd335..d60d26d 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_send.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_send.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png index d4b4f9b..d60d26d 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png and b/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_info.png b/themes/images/HD/dark/Controls/Button/00_button_info.png index 76d3cdc..3b57fd2 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_info.png and b/themes/images/HD/dark/Controls/Button/00_button_info.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_info_press.png b/themes/images/HD/dark/Controls/Button/00_button_info_press.png index bba8850..3b57fd2 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_info_press.png and b/themes/images/HD/dark/Controls/Button/00_button_info_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_left.png b/themes/images/HD/dark/Controls/Button/00_button_left.png index dc60109..baa8955 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_left.png and b/themes/images/HD/dark/Controls/Button/00_button_left.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_left_press.png b/themes/images/HD/dark/Controls/Button/00_button_left_press.png index 67c04fc..baa8955 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_left_press.png and b/themes/images/HD/dark/Controls/Button/00_button_left_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_rename.png b/themes/images/HD/dark/Controls/Button/00_button_rename.png index 862cc38..5c87a4c 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_rename.png and b/themes/images/HD/dark/Controls/Button/00_button_rename.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_rename_press.png b/themes/images/HD/dark/Controls/Button/00_button_rename_press.png index c9c514e..5c87a4c 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_rename_press.png and b/themes/images/HD/dark/Controls/Button/00_button_rename_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_right.png b/themes/images/HD/dark/Controls/Button/00_button_right.png index 397221f..93e3395 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_right.png and b/themes/images/HD/dark/Controls/Button/00_button_right.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_right_press.png b/themes/images/HD/dark/Controls/Button/00_button_right_press.png index c3613ec..93e3395 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_right_press.png and b/themes/images/HD/dark/Controls/Button/00_button_right_press.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_warning.png b/themes/images/HD/dark/Controls/Button/00_button_warning.png index a07d6b8..057b20f 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_warning.png and b/themes/images/HD/dark/Controls/Button/00_button_warning.png differ diff --git a/themes/images/HD/dark/Controls/Button/00_button_warning_press.png b/themes/images/HD/dark/Controls/Button/00_button_warning_press.png index a07d6b8..057b20f 100644 Binary files a/themes/images/HD/dark/Controls/Button/00_button_warning_press.png and b/themes/images/HD/dark/Controls/Button/00_button_warning_press.png differ diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_activated.png b/themes/images/HD/dark/Controls/Check_box/00_check_activated.png index b20372e..c2a6b3c 100644 Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_activated.png and b/themes/images/HD/dark/Controls/Check_box/00_check_activated.png differ diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_activated_dim.png b/themes/images/HD/dark/Controls/Check_box/00_check_activated_dim.png index c321e28..d2c3348 100644 Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_activated_dim.png and b/themes/images/HD/dark/Controls/Check_box/00_check_activated_dim.png differ diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_bg.png b/themes/images/HD/dark/Controls/Check_box/00_check_bg.png index bb08643..efda6ba 100644 Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_bg.png and b/themes/images/HD/dark/Controls/Check_box/00_check_bg.png differ diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png b/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png index bb08643..ab7ff05 100644 Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png and b/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png differ diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_press.png b/themes/images/HD/dark/Controls/Check_box/00_check_focus.png similarity index 81% rename from themes/images/HD/dark/Controls/Check_box/00_check_press.png rename to themes/images/HD/dark/Controls/Check_box/00_check_focus.png index 9065f67..728f7e4 100644 Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_press.png and b/themes/images/HD/dark/Controls/Check_box/00_check_focus.png differ diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png b/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png index 6656810..3cd5418 100644 Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png and b/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated.png index e76b7a7..24e8741 100644 Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_dim.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_dim.png index d82a2d7..f377803 100644 Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_dim.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_dim.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_bg.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_bg.png index ac8350c..fd590c7 100644 Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_bg.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_bg.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png index dd08796..2963c39 100644 Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_focus.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_focus.png new file mode 100644 index 0000000..ec298f1 Binary files /dev/null and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_focus.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png index 462d83e..14357c3 100644 Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png differ diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png index b922f44..7c9da92 100644 Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png differ diff --git a/themes/images/HD/dark/Popup/00_popup_button.png b/themes/images/HD/dark/Popup/00_popup_button.png new file mode 100644 index 0000000..7a49896 Binary files /dev/null and b/themes/images/HD/dark/Popup/00_popup_button.png differ diff --git a/themes/images/HD/dark/Popup/00_popup_button_dim.png b/themes/images/HD/dark/Popup/00_popup_button_dim.png new file mode 100644 index 0000000..77268cf Binary files /dev/null and b/themes/images/HD/dark/Popup/00_popup_button_dim.png differ diff --git a/themes/images/HD/dark/Popup/00_popup_button_focus.png b/themes/images/HD/dark/Popup/00_popup_button_focus.png new file mode 100644 index 0000000..4f89112 Binary files /dev/null and b/themes/images/HD/dark/Popup/00_popup_button_focus.png differ diff --git a/themes/images/HD/dark/Popup/00_popup_button_press.png b/themes/images/HD/dark/Popup/00_popup_button_press.png new file mode 100644 index 0000000..faa5cea Binary files /dev/null and b/themes/images/HD/dark/Popup/00_popup_button_press.png differ diff --git a/themes/images/HD/light/Controls/00_button_off_handler.png b/themes/images/HD/light/Controls/00_button_off_handler.png new file mode 100755 index 0000000..5a0fd80 Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_off_handler.png differ diff --git a/themes/images/HD/light/Controls/00_button_off_handler_dim.png b/themes/images/HD/light/Controls/00_button_off_handler_dim.png new file mode 100755 index 0000000..0ad4af3 Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_off_handler_dim.png differ diff --git a/themes/images/HD/light/Controls/00_button_on_handler.png b/themes/images/HD/light/Controls/00_button_on_handler.png new file mode 100755 index 0000000..aeb582d Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_on_handler.png differ diff --git a/themes/images/HD/light/Controls/00_button_on_handler_dim.png b/themes/images/HD/light/Controls/00_button_on_handler_dim.png new file mode 100755 index 0000000..cdad146 Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_on_handler_dim.png differ diff --git a/themes/images/HD/light/Controls/00_button_on_off_bg.png b/themes/images/HD/light/Controls/00_button_on_off_bg.png new file mode 100755 index 0000000..8e52220 Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_on_off_bg.png differ diff --git a/themes/images/HD/light/Controls/00_button_on_off_bg_dim.png b/themes/images/HD/light/Controls/00_button_on_off_bg_dim.png new file mode 100755 index 0000000..0f7bdba Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_on_off_bg_dim.png differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index f7e1599..2cdba54 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -302,7 +302,7 @@ #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#6E6F76FF" #define GENLIST_PART_MATCH_TAG_COLOR "+ color=#1382FF" -#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255 +#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 191 #define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255 #define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255 @@ -317,14 +317,14 @@ #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 -#define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 58 58 58 76 +#define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 250 250 250 128 -#define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 58 58 58 76 +#define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 250 250 250 128 #define BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 #define BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 @@ -356,35 +356,35 @@ #define BUTTON_RECEIVE_BUBBLE_TEXT_DISABLED_COLOR_INC 255 255 255 76 #define BUTTON_RECEIVE_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 153 -#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 58 58 58 76 +#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76 +#define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 0 0 0 255 +#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 128 #define BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC 249 249 249 255 #define BUTTON_EXPAND_BUTTON_PRESSED_COLOR_INC 249 249 249 255 #define BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC 249 249 249 255 #define BUTTON_EXPAND_BUTTON_DISABLED_COLOR_INC 48 49 50 255 -#define BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255 -#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76 +#define BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76 +#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 255 +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128 #define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 @@ -405,21 +405,21 @@ #define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF" #define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C" -#define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 101 101 101 255 -#define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 101 101 101 76 +#define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC 255 255 255 255 -#define BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC 255 255 255 76 +#define BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 101 101 101 255 -#define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 101 101 101 76 +#define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 255 255 255 255 -#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 255 255 255 76 +#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 250 250 250 128 #define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 58 58 58 255 #define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 255 255 255 255 @@ -458,7 +458,7 @@ #define BUTTON_TEXT_STYLE1_BG_MIN_INC 100 74 #define BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC 148 74 #define BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC 74 74 -#define BUTTON_TEXT_STYLE1_BG_BORDER_INC 13 13 13 13 +#define BUTTON_TEXT_STYLE1_BG_BORDER_INC 13 13 15 15 #define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 12 0 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45 #define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0 @@ -469,7 +469,7 @@ #define BUTTON_TEXT_STYLE2_BG_MIN_INC 100 74 #define BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC 148 74 #define BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC 74 74 -#define BUTTON_TEXT_STYLE2_BG_BORDER_INC 13 13 13 13 +#define BUTTON_TEXT_STYLE2_BG_BORDER_INC 13 13 15 15 #define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 12 0 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45 #define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0 @@ -488,8 +488,8 @@ #define BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC 110 #define BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC 110 -#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 74 -#define BUTTON_POPUP_BG_BORDER_INC 13 13 13 13 +#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 76 +#define BUTTON_POPUP_BG_BORDER_INC 13 13 9 9 #define BUTTON_POPUP_PADDING_MIN_INC 12 3 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 45 45 @@ -505,7 +505,7 @@ #define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 90 #define BUTTON_SWEEP_BG_NORMAL_MIN_INC 74 74 -#define BUTTON_SWEEP_BG_BORDER_INC 13 13 13 13 +#define BUTTON_SWEEP_BG_BORDER_INC 13 13 15 15 #define BUTTON_SWEEP_PADDING_MIN_INC 12 0 #define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 45 #define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0 @@ -515,11 +515,11 @@ #define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30 -#define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 98 46 -#define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 13 13 13 13 +#define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 92 45 +#define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 13 13 15 15 #define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 12 1 -#define BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC 24 46 -#define BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC 50 46 +#define BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC 18 45 +#define BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC 50 45 #define BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC 28 #define BUTTON_CONTACT_BG_MIN_INC 18 66 @@ -586,7 +586,7 @@ #define BUTTON_TICKERNOTI_FONT_SIZE_INC 36 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74 -#define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 13 13 +#define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 15 15 #define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74 #define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74 @@ -633,7 +633,7 @@ #define CHECK_ONOFF_BG_NORMAL_MIN_MAX_INC 135 63 #define CHECK_ONOFF_ON_FONT_SIZE_INC 24 #define CHECK_ONOFF_OFF_FONT_SIZE_INC 24 -#define CHECK_ONOFF_HANDLER_MIN_MAX_INC 63 63 +#define CHECK_ONOFF_HANDLER_MIN_MAX_INC 81 63 #define CHECK_STYLE_FAVORITE_SMALL_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 45 #define CHECK_STYLE_FAVORITE_SMALL_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 45 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index b8f803c..f48c2e2 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -277,7 +277,6 @@ inherit: "default" 0.0; visible: 1; color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -285,7 +284,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; } description { state: "focused" 0.0; @@ -551,7 +549,6 @@ inherit: "default" 0.0; visible: 1; color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -559,7 +556,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; } description { state: "focused" 0.0; @@ -638,7 +634,6 @@ inherit: "default" 0.0; visible: 1; color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -646,7 +641,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; } description { state: "focused" 0.0; @@ -724,7 +718,6 @@ inherit: "default" 0.0; visible: 1; color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -732,7 +725,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; } description { state: "focused" 0.0; @@ -1293,7 +1285,6 @@ inherit: "default" 0.0; visible: 1; color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -1301,7 +1292,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; } description { state: "focused" 0.0; @@ -1730,7 +1720,6 @@ visible: 1; min: 0 0; color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -1738,7 +1727,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; min: BUTTON_SWEEP_TEXT_MIN_INC; } @@ -2033,7 +2021,6 @@ visible: 1; min: 0 0; color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -2041,7 +2028,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; min: BUTTON_SWEEP_TEXT_MIN_INC; } @@ -2067,10 +2053,9 @@ item: "focus_highlight" "on"; } images { - image: "00_button_01.png" COMP; - image: "00_button_01_dim.png" COMP; - image: "00_button_01_press.png" COMP; - image: "00_button_01_focus.png" COMP; + image: "00_popup_button.png" COMP; + image: "00_popup_button_dim.png" COMP; + image: "00_popup_button_press.png" COMP; } script { public button_state = BUTTON_STATE_ENABLED; @@ -2215,7 +2200,7 @@ color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC; color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; text { - font: "Tizen:style=Regular"; + font: "Tizen:style=Bold"; size: BUTTON_POPUP_TEXT_FONT_SIZE_INC; min: 0 0; text_class: "tizen"; @@ -2231,7 +2216,6 @@ visible: 1; min: 0 0; color: BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -2239,7 +2223,6 @@ description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; visible: 1; min: BUTTON_POPUP_TEXT_MIN_INC; } @@ -3039,9 +3022,8 @@ image: "00_circle_button.png" COMP; \ image: "00_circle_button_press.png" COMP; \ image: "00_circle_button_dim.png" COMP; \ - image: edit_normal COMP; \ - image: edit_press COMP; \ - image: 00_circle_button_focus.png COMP; \ + image: image_normal COMP; \ + image: image_press COMP; \ } \ parts { \ part { name: "button_image"; \ @@ -3679,7 +3661,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; visible: 1; min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC; } @@ -6989,7 +6970,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC; } description { state: "focused" 0.0; inherit: "default" 0.0; diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 4bf17a0..784e577 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -33,7 +33,7 @@ image: "00_check_activated_dim.png" COMP; \ image: "00_check_activated.png" COMP; \ image: "00_check_press_bg.png" COMP; \ - image: "00_check_press.png" COMP; \ + image: "00_check_focus.png" COMP; \ } \ script { \ public check_state = CHECK_STATE_DEFAULT; \ @@ -98,10 +98,7 @@ color: 255 255 255 255; \ } \ description { state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - image.normal: "00_check_press.png"; \ - color: 255 255 255 255; \ + inherit: "visible" 0.0; \ } \ } \ part { name: "sequence_clip"; \ @@ -488,10 +485,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI color: 255 255 255 255; \ } \ description { state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - image.normal: "00_check_press.png"; \ - color: 255 255 255 255; \ + inherit: "visible" 0.0; \ } \ } \ part { name: "sequence_clip"; \ @@ -1102,12 +1096,13 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ group { name: "elm/check/base/on&off"; images { - image: "00_button_on.png" COMP; - image: "00_button_on_dim.png" COMP; - image: "00_button_off.png" COMP; - image: "00_button_off_dim.png" COMP; - image: "00_button_on_off_handler.png" COMP; - image: "00_button_on_off_handler_dim.png" COMP; + image: "00_button_on_handler.png" COMP; + image: "00_button_on_handler_dim.png" COMP; + image: "00_button_off_handler.png" COMP; + image: "00_button_off_handler_dim.png" COMP; + image: "00_button_on_off_bg.png" COMP; + image: "00_button_on_off_bg_dim.png" COMP; + image: "00_button_handler_focus.png" COMP; } script { public is_rtl = 0; @@ -1211,27 +1206,27 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ to_x: "bg"; to_y: "padding_bottom"; } - image.normal: "00_button_off.png"; + image.normal: "00_button_on_off_bg.png"; } description { state: "visible" 0.0; inherit: "default" 0.0; - image.normal: "00_button_on.png"; + image.normal: "00_button_on_off_bg.png"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_button_off.png"; + image.normal: "00_button_on_off_bg.png"; } description { state: "visible_pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_button_on.png"; + image.normal: "00_button_on_off_bg.png"; } description { state: "visible_disable" 0.0; inherit: "default" 0.0; - image.normal: "00_button_on_dim.png"; + image.normal: "00_button_on_off_bg_dim.png"; } description { state: "off_disable" 0.0; inherit: "default" 0.0; - image.normal: "00_button_off_dim.png"; + image.normal: "00_button_on_off_bg_dim.png"; } } part { name: "drag_container"; @@ -1286,11 +1281,19 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ rel2.to: "bg"; align: 0.0 0.5; fixed: 1 1; - image.normal: "00_button_on_off_handler.png"; + image.normal: "00_button_off_handler.png"; } - description { state: "disabled" 0.0; + description { state: "on" 0.0; inherit: "default" 0.0; - image.normal: "00_button_on_off_handler_dim.png"; + image.normal: "00_button_on_handler.png"; + } + description { state: "on_disabled" 0.0; + inherit: "default" 0.0; + image.normal: "00_button_on_handler_dim.png"; + } + description { state: "off_disabled" 0.0; + inherit: "default" 0.0; + image.normal: "00_button_off_handler_dim.png"; } } part { name: "button_events"; @@ -1567,6 +1570,7 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } set_drag(PART:"button", drag, 0.0); set_state(PART:"bg_image", "visible", 0.0); + set_state(PART:"button", "on", 0.0); set_int(check_on, 1); } } @@ -1583,6 +1587,7 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } set_drag(PART:"button", drag, 0.0); set_state(PART:"bg_image", "default", 0.0); + set_state(PART:"button", "default", 0.0); set_int(check_on, 0); } } @@ -1631,16 +1636,18 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ else set_state(PART:"elm.text", "disabled", 0.0); get_state(PART:"bg_image", st, 30, vl); - if (!strcmp(st, "visible")) + if (!strcmp(st, "visible")) { set_state(PART:"bg_image", "visible_disable", 0.0); - else + set_state(PART:"button", "on_disabled", 0.0); + } else { set_state(PART:"bg_image", "off_disable", 0.0); + set_state(PART:"button", "off_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); - set_state(PART:"button", "disabled", 0.0); } } program { name: "enable"; diff --git a/themes/widgets/genlist/genlist_email.edc b/themes/widgets/genlist/genlist_email.edc index ab4a46f..4ed6cb6 100755 --- a/themes/widgets/genlist/genlist_email.edc +++ b/themes/widgets/genlist/genlist_email.edc @@ -785,7 +785,6 @@ image: "00_check_activated_dim.png" COMP; image: "00_check_activated.png" COMP; image: "00_check_press_bg.png" COMP; - image: "00_check_press.png" COMP; } script { @@ -839,9 +838,7 @@ image.normal: "00_check_activated_dim.png"; } description { state: "pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "00_check_press.png"; + inherit: "visible" 0.0; } ) diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc index 01a9b7a..d9e1b79 100644 --- a/themes/widgets/radio.edc +++ b/themes/widgets/radio.edc @@ -39,7 +39,7 @@ image: "00_button_radio_bg.png" COMP; \ image: "00_button_radio_dim_bg.png" COMP; \ image: "00_button_radio_press_bg.png" COMP; \ - image: "00_button_radio_press.png" COMP; \ + image: "00_button_radio_focus.png" COMP; \ } \ script { \ public radio_state = RADIO_STATE_DEFAULT; \ @@ -101,7 +101,6 @@ } \ description { state: "pressed" 0.0; \ inherit: "visible" 0.0; \ - image.normal: "00_button_radio_press.png"; \ } \ } \ part { name: "opacity_clip"; \