Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/uifw/efl-theme...
authorSungho Kwak <sungho1.kwak@samsung.com>
Mon, 1 Jul 2013 09:34:07 +0000 (18:34 +0900)
committerSungho Kwak <sungho1.kwak@samsung.com>
Mon, 1 Jul 2013 09:34:07 +0000 (18:34 +0900)
360 files changed:
efl-theme-tizen-HD-light.manifest [deleted file]
packaging/efl-theme-tizen-hd.spec
themes/images/HD/dark/Content_views/00_expandable_bg_bottom.png
themes/images/HD/dark/Content_views/00_expandable_bg_center.png
themes/images/HD/dark/Content_views/00_picker_arrow_down.png [deleted file]
themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png [deleted file]
themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png [deleted file]
themes/images/HD/dark/Controls/00_button_01.png [changed mode: 0755->0644]
themes/images/HD/dark/Controls/00_button_01_delete.png
themes/images/HD/dark/Controls/00_button_01_delete_dim.png
themes/images/HD/dark/Controls/00_button_01_delete_press.png
themes/images/HD/dark/Controls/00_button_01_dim.png
themes/images/HD/dark/Controls/00_button_01_focus.png [changed mode: 0755->0644]
themes/images/HD/dark/Controls/00_button_01_press.png [changed mode: 0755->0644]
themes/images/HD/dark/Controls/00_button_01_send.png
themes/images/HD/dark/Controls/00_button_01_send_dim.png
themes/images/HD/dark/Controls/00_button_01_send_press.png
themes/images/HD/dark/Controls/00_button_on_off_handler.png [deleted file]
themes/images/HD/dark/Controls/00_button_on_off_handler_dim.png [deleted file]
themes/images/HD/dark/Controls/00_button_radio_focus.png [deleted file]
themes/images/HD/dark/Controls/00_contacts_button_dim.png [moved from themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_01.png with 86% similarity, mode: 0755]
themes/images/HD/dark/Controls/00_picker_arrow_down.png [new file with mode: 0644]
themes/images/HD/dark/Controls/00_picker_arrow_down_dim.png [new file with mode: 0644]
themes/images/HD/dark/Controls/00_picker_arrow_down_press.png [new file with mode: 0644]
themes/images/HD/dark/Controls/00_picker_arrow_up.png [moved from themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png with 84% similarity]
themes/images/HD/dark/Controls/00_picker_arrow_up_dim.png [new file with mode: 0644]
themes/images/HD/dark/Controls/00_picker_arrow_up_press.png [moved from themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png with 84% similarity]
themes/images/HD/dark/Controls/00_slider_popup.png [deleted file]
themes/images/HD/dark/Controls/Check_box/00_check_activated_press.png [moved from themes/images/HD/dark/Controls/00_check_focus.png with 85% similarity, mode: 0644]
themes/images/HD/dark/Controls/Check_box/00_check_bg.png
themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png
themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png
themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_press.png [new file with mode: 0644]
themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png
themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_center.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_center_reverse.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_01.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_01_reverse.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_reverse.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_01.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_01_reverse.png
themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_reverse.png
themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier.png [changed mode: 0644->0755]
themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_left.png
themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_middle.png
themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_right.png
themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png [new file with mode: 0644]
themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png [changed mode: 0755->0644]
themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png [changed mode: 0755->0644]
themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png [changed mode: 0755->0644]
themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png [changed mode: 0755->0644]
themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_02.png [deleted file]
themes/images/HD/dark/Naviframe/00_effect_title_text_dim_left.png [moved from themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_01.png with 86% similarity, mode: 0755]
themes/images/HD/dark/Naviframe/00_effect_title_text_dim_right.png [moved from themes/images/tizen-hd/Naviframe/Icon/00_icon_focus.png with 86% similarity, mode: 0755]
themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png
themes/images/HD/dark/Naviframe/Icon/00_icon_cancel.png [moved from themes/images/HD/light/Controls/Check_box/00_check_press.png with 81% similarity, mode: 0755]
themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png [new file with mode: 0755]
themes/images/HD/dark/Naviframe/Icon/00_icon_done.png [moved from themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png with 75% similarity, mode: 0755]
themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png
themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png
themes/images/HD/dark/Naviframe/Icon/00_icon_search.png [new file with mode: 0755]
themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png [new file with mode: 0755]
themes/images/HD/dark/Popup/00_popup_button_dim.png
themes/images/HD/dark/Screen_Reader/B16-8_TTS_focus.png [new file with mode: 0644]
themes/images/HD/dark/Screen_Reader/access_glow.png [deleted file]
themes/images/HD/light/Content_views/00_circle_thumbnail_bg.png [changed mode: 0755->0644]
themes/images/HD/light/Content_views/00_circle_thumbnail_bg_press.png [changed mode: 0755->0644]
themes/images/HD/light/Content_views/00_edit_field_bg.png
themes/images/HD/light/Content_views/00_edit_field_focus.png
themes/images/HD/light/Content_views/00_expandable_bg.png
themes/images/HD/light/Content_views/00_expandable_bg_bottom.png
themes/images/HD/light/Content_views/00_expandable_bg_center.png
themes/images/HD/light/Content_views/00_expandable_bg_top.png
themes/images/HD/light/Content_views/00_list_group_bg.png
themes/images/HD/light/Content_views/00_list_group_bg_bottom.png
themes/images/HD/light/Content_views/00_list_group_bg_bottom_press.png
themes/images/HD/light/Content_views/00_list_group_bg_center.png
themes/images/HD/light/Content_views/00_list_group_bg_center_press.png
themes/images/HD/light/Content_views/00_list_group_bg_press.png
themes/images/HD/light/Content_views/00_list_group_bg_top.png
themes/images/HD/light/Content_views/00_list_group_bg_top_press.png
themes/images/HD/light/Content_views/00_messagebubble_bg_receive.png [changed mode: 0755->0644]
themes/images/HD/light/Content_views/00_messagebubble_bg_sent.png [changed mode: 0755->0644]
themes/images/HD/light/Content_views/00_picker_arrow_down.png [deleted file]
themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png [deleted file]
themes/images/HD/light/Content_views/00_square_thumbnail_bg.png [changed mode: 0755->0644]
themes/images/HD/light/Content_views/00_square_thumbnail_bg_press.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png [deleted file]
themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png [deleted file]
themes/images/HD/light/Controls/00_button_01.png
themes/images/HD/light/Controls/00_button_01_delete.png
themes/images/HD/light/Controls/00_button_01_delete_dim.png
themes/images/HD/light/Controls/00_button_01_delete_press.png
themes/images/HD/light/Controls/00_button_01_dim.png
themes/images/HD/light/Controls/00_button_01_focus.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_01_press.png
themes/images/HD/light/Controls/00_button_01_send.png
themes/images/HD/light/Controls/00_button_01_send_dim.png
themes/images/HD/light/Controls/00_button_01_send_press.png
themes/images/HD/light/Controls/00_button_handler_focus.png [moved from themes/images/HD/light/Controls/00_button_on_off_handler_focus.png with 66% similarity, mode: 0644]
themes/images/HD/light/Controls/00_button_off.png [deleted file]
themes/images/HD/light/Controls/00_button_off_dim.png [deleted file]
themes/images/HD/light/Controls/00_button_off_handler.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_off_handler_dim.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_on.png [deleted file]
themes/images/HD/light/Controls/00_button_on_dim.png [deleted file]
themes/images/HD/light/Controls/00_button_on_handler.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_on_handler_dim.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_on_off_bg.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_on_off_bg_dim.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_button_on_off_handler.png [deleted file]
themes/images/HD/light/Controls/00_button_on_off_handler_dim.png [deleted file]
themes/images/HD/light/Controls/00_button_radio_focus.png [deleted file]
themes/images/HD/light/Controls/00_circle_button.png
themes/images/HD/light/Controls/00_circle_button_delete.png
themes/images/HD/light/Controls/00_circle_button_delete_dim.png
themes/images/HD/light/Controls/00_circle_button_delete_press.png
themes/images/HD/light/Controls/00_circle_button_dim.png
themes/images/HD/light/Controls/00_circle_button_focus.png [changed mode: 0755->0644]
themes/images/HD/light/Controls/00_circle_button_press.png
themes/images/HD/light/Controls/00_contacts_button.png
themes/images/HD/light/Controls/00_contacts_button_dim.png [moved from themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png with 80% similarity, mode: 0755]
themes/images/HD/light/Controls/00_contacts_button_focus.png
themes/images/HD/light/Controls/00_contacts_button_press.png
themes/images/HD/light/Controls/00_picker_arrow_down.png [new file with mode: 0644]
themes/images/HD/light/Controls/00_picker_arrow_down_dim.png [new file with mode: 0644]
themes/images/HD/light/Controls/00_picker_arrow_down_press.png [moved from themes/images/HD/light/Content_views/00_picker_arrow_up.png with 86% similarity]
themes/images/HD/light/Controls/00_picker_arrow_up.png [new file with mode: 0644]
themes/images/HD/light/Controls/00_picker_arrow_up_dim.png [moved from themes/images/HD/light/Content_views/00_edit_field_rename.png with 74% similarity]
themes/images/HD/light/Controls/00_picker_arrow_up_press.png [moved from themes/images/HD/dark/Content_views/00_picker_arrow_up.png with 86% similarity]
themes/images/HD/light/Controls/00_progress_bar.png
themes/images/HD/light/Controls/00_progress_bar_dim.png
themes/images/HD/light/Controls/00_progress_bg.png
themes/images/HD/light/Controls/00_progress_bg_dim.png
themes/images/HD/light/Controls/00_progress_pending_01_bg.png
themes/images/HD/light/Controls/00_progress_pending_01_bg_dim.png
themes/images/HD/light/Controls/00_progress_pending_01_bg_h.png
themes/images/HD/light/Controls/00_progress_pending_01_bg_h_dim.png
themes/images/HD/light/Controls/00_progress_pending_02_bg.png
themes/images/HD/light/Controls/00_progress_pending_02_bg_dim.png
themes/images/HD/light/Controls/00_progress_pending_02_bg_h.png
themes/images/HD/light/Controls/00_progress_pending_02_bg_h_dim.png
themes/images/HD/light/Controls/00_slider_handle.png
themes/images/HD/light/Controls/00_slider_handle_dim.png
themes/images/HD/light/Controls/00_slider_handle_focus.png
themes/images/HD/light/Controls/00_slider_handle_press.png
themes/images/HD/light/Controls/00_slider_popup.png [deleted file]
themes/images/HD/light/Controls/00_slider_popup_center.png
themes/images/HD/light/Controls/00_slider_popup_left.png
themes/images/HD/light/Controls/00_slider_popup_right.png
themes/images/HD/light/Controls/Button/00_button_add.png
themes/images/HD/light/Controls/Button/00_button_call.png
themes/images/HD/light/Controls/Button/00_button_contact.png
themes/images/HD/light/Controls/Button/00_button_delete.png
themes/images/HD/light/Controls/Button/00_button_expand_cancel.png
themes/images/HD/light/Controls/Button/00_button_expand_closed.png
themes/images/HD/light/Controls/Button/00_button_expand_opened.png
themes/images/HD/light/Controls/Button/00_button_expand_send.png
themes/images/HD/light/Controls/Button/00_button_info.png
themes/images/HD/light/Controls/Button/00_button_left.png
themes/images/HD/light/Controls/Button/00_button_rename.png
themes/images/HD/light/Controls/Button/00_button_right.png
themes/images/HD/light/Controls/Button/00_button_warning.png
themes/images/HD/light/Controls/Check_box/00_check_activated.png
themes/images/HD/light/Controls/Check_box/00_check_activated_dim.png
themes/images/HD/light/Controls/Check_box/00_check_activated_press.png [new file with mode: 0644]
themes/images/HD/light/Controls/Check_box/00_check_bg.png
themes/images/HD/light/Controls/Check_box/00_check_dim_bg.png
themes/images/HD/light/Controls/Check_box/00_check_focus.png [moved from themes/images/HD/light/Controls/00_check_focus.png with 79% similarity, mode: 0644]
themes/images/HD/light/Controls/Check_box/00_check_press_bg.png
themes/images/HD/light/Controls/Radio_button/00_button_radio_activated.png
themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_dim.png
themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_press.png [new file with mode: 0644]
themes/images/HD/light/Controls/Radio_button/00_button_radio_bg.png
themes/images/HD/light/Controls/Radio_button/00_button_radio_dim_bg.png
themes/images/HD/light/Controls/Radio_button/00_button_radio_focus.png [new file with mode: 0644]
themes/images/HD/light/Controls/Radio_button/00_button_radio_press.png [deleted file]
themes/images/HD/light/Controls/Radio_button/00_button_radio_press_bg.png
themes/images/HD/light/Focus/00_focus.png [changed mode: 0755->0644]
themes/images/HD/light/Focus/00_list_group_bg_bottom_focus.png
themes/images/HD/light/Focus/00_list_group_bg_center_focus.png
themes/images/HD/light/Focus/00_list_group_bg_top_focus.png
themes/images/HD/light/Focus/00_more_popup_focus.png [changed mode: 0755->0644]
themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png [new file with mode: 0644]
themes/images/HD/light/GUI_Style_Guide/00_nocontents_devices.png
themes/images/HD/light/GUI_Style_Guide/00_nocontents_multimedia.png
themes/images/HD/light/GUI_Style_Guide/00_nocontents_picture.png
themes/images/HD/light/GUI_Style_Guide/00_nocontents_unnamed.png
themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg.png
themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_02.png [deleted file]
themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_focus.png
themes/images/HD/light/Naviframe/00_badge_bg.png
themes/images/HD/light/Naviframe/00_effect_tab_bounce_left.png
themes/images/HD/light/Naviframe/00_effect_tab_bounce_right.png
themes/images/HD/light/Naviframe/00_effect_tab_text_dim_left.png [changed mode: 0755->0644]
themes/images/HD/light/Naviframe/00_effect_tab_text_dim_left_02.png [changed mode: 0755->0644]
themes/images/HD/light/Naviframe/00_effect_tab_text_dim_right.png [changed mode: 0755->0644]
themes/images/HD/light/Naviframe/00_effect_tab_text_dim_right_02.png [changed mode: 0755->0644]
themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png [new file with mode: 0644]
themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png [new file with mode: 0644]
themes/images/HD/light/Naviframe/00_sub_title_bg.png
themes/images/HD/light/Naviframe/00_tab_focus.png
themes/images/HD/light/Naviframe/00_tab_press.png
themes/images/HD/light/Naviframe/00_tab_select_bar.png
themes/images/HD/light/Naviframe/00_title_bg.png
themes/images/HD/light/Naviframe/00_title_press.png [changed mode: 0755->0644]
themes/images/HD/light/Naviframe/00_toolbar_bg.png
themes/images/HD/light/Naviframe/00_toolbar_press.png
themes/images/HD/light/Naviframe/Icon/00_icon_SIP_close.png
themes/images/HD/light/Naviframe/Icon/00_icon_cancel.png [new file with mode: 0644]
themes/images/HD/light/Naviframe/Icon/00_icon_delete.png [new file with mode: 0644]
themes/images/HD/light/Naviframe/Icon/00_icon_done.png [new file with mode: 0644]
themes/images/HD/light/Naviframe/Icon/00_icon_edit.png
themes/images/HD/light/Naviframe/Icon/00_icon_focus.png [changed mode: 0755->0644]
themes/images/HD/light/Naviframe/Icon/00_icon_plus.png
themes/images/HD/light/Naviframe/Icon/00_icon_search.png [new file with mode: 0644]
themes/images/HD/light/Naviframe/Icon/00_icon_select_all.png [new file with mode: 0644]
themes/images/HD/light/Overscrolling/00_overscrolling_bottom.png
themes/images/HD/light/Overscrolling/00_overscrolling_left.png
themes/images/HD/light/Overscrolling/00_overscrolling_right.png
themes/images/HD/light/Overscrolling/00_overscrolling_top.png
themes/images/HD/light/Popup/00_more_popup_press.png
themes/images/HD/light/Popup/00_notification_bg.png
themes/images/HD/light/Popup/00_popup_bg.png
themes/images/HD/light/Popup/00_popup_bubble_02_bg.png [changed mode: 0755->0644]
themes/images/HD/light/Popup/00_popup_bubble_bg.png
themes/images/HD/light/Popup/00_popup_bubble_tail_bottom.png
themes/images/HD/light/Popup/00_popup_bubble_tail_left.png
themes/images/HD/light/Popup/00_popup_bubble_tail_right.png
themes/images/HD/light/Popup/00_popup_bubble_tail_top.png
themes/images/HD/light/Popup/00_popup_button.png
themes/images/HD/light/Popup/00_popup_button_bg.png
themes/images/HD/light/Popup/00_popup_button_dim.png
themes/images/HD/light/Popup/00_popup_button_focus.png
themes/images/HD/light/Popup/00_popup_button_press.png
themes/images/HD/light/Popup/00_popup_title_bg.png
themes/images/HD/light/Screen_Reader/B16-8_TTS_focus.png [moved from themes/images/HD/light/Screen_Reader/access_glow.png with 100% similarity]
themes/images/tizen-hd/Controls/00_button_01_focus.png [deleted file]
themes/images/tizen-hd/Naviframe/00_toolbar_button_focus.png [deleted file]
themes/inc/tizen-dark-inc.edc
themes/inc/tizen-light-inc.edc
themes/tizen.edc
themes/widgets/access.edc
themes/widgets/button.edc
themes/widgets/check.edc
themes/widgets/ctxpopup.edc
themes/widgets/datetime.edc
themes/widgets/editfield.edc [deleted file]
themes/widgets/entry.edc
themes/widgets/genlist/genlist_email.edc
themes/widgets/genlist/genlist_macro.edc
themes/widgets/genlist/genlist_normal.edc
themes/widgets/label.edc
themes/widgets/layout.edc
themes/widgets/multibuttonentry.edc
themes/widgets/naviframe.edc
themes/widgets/popup.edc
themes/widgets/progressbar.edc
themes/widgets/radio.edc
themes/widgets/tickernoti.edc
themes/widgets/toolbar.edc

diff --git a/efl-theme-tizen-HD-light.manifest b/efl-theme-tizen-HD-light.manifest
deleted file mode 100644 (file)
index 97e8c31..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>
index df3179a..15febbf 100644 (file)
@@ -1,6 +1,6 @@
 Name:          efl-theme-tizen-hd
 Summary:       Tizen theme files
-Version:       1.0.196r02
+Version:       1.0.197
 Release:       1
 Group:         TO_BE/FILLED_IN
 License:       APLv2
@@ -18,12 +18,6 @@ Summary: Development package
 %description -n efl-theme-tizen-devel
 Development package
 
-%package -n efl-theme-tizen-HD-light
-Summary: Development package
-
-%description -n efl-theme-tizen-HD-light
-Development package
-
 %prep
 %setup -q 
 
@@ -45,16 +39,11 @@ cp %{buildroot}/usr/share/elementary/themes/tizen-HD-dark.edj %{buildroot}/usr/s
 %files
 %defattr(-,root,root,-)
 %{_datadir}/elementary/themes/tizen-HD-dark.edj
+%{_datadir}/elementary/themes/tizen-HD-light.edj
 %{_datadir}/elementary/themes/tizen-hd.edj
 %manifest %{name}.manifest
 /usr/share/license/%{name}
 
-%files -n efl-theme-tizen-HD-light
-%defattr(-,root,root,-)
-%{_datadir}/elementary/themes/tizen-HD-light.edj
-%manifest efl-theme-tizen-HD-light.manifest
-/usr/share/license/%{name}
-
 %files -n efl-theme-tizen-devel
 %defattr(-,root,root,-)
 /opt/var/efl-theme-tizen-edc/*
index 980e6b2..fe51d16 100644 (file)
Binary files a/themes/images/HD/dark/Content_views/00_expandable_bg_bottom.png and b/themes/images/HD/dark/Content_views/00_expandable_bg_bottom.png differ
index 3fbc5c2..0dba910 100644 (file)
Binary files a/themes/images/HD/dark/Content_views/00_expandable_bg_center.png and b/themes/images/HD/dark/Content_views/00_expandable_bg_center.png differ
diff --git a/themes/images/HD/dark/Content_views/00_picker_arrow_down.png b/themes/images/HD/dark/Content_views/00_picker_arrow_down.png
deleted file mode 100644 (file)
index e08bd51..0000000
Binary files a/themes/images/HD/dark/Content_views/00_picker_arrow_down.png and /dev/null differ
diff --git a/themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png b/themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png
deleted file mode 100644 (file)
index 8fd0805..0000000
Binary files a/themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg.png
deleted file mode 100644 (file)
index 52486a2..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png
deleted file mode 100644 (file)
index 61d56ca..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png
deleted file mode 100644 (file)
index 0693a6f..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png
deleted file mode 100644 (file)
index 818c50b..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png
deleted file mode 100644 (file)
index d09870d..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png
deleted file mode 100644 (file)
index d4bfe3d..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png
deleted file mode 100644 (file)
index 9f1b445..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png
deleted file mode 100644 (file)
index 51be405..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png
deleted file mode 100644 (file)
index 0d9baba..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png
deleted file mode 100644 (file)
index 3d01f4d..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png
deleted file mode 100644 (file)
index 675b322..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png
deleted file mode 100644 (file)
index ac13700..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png
deleted file mode 100644 (file)
index 9f30d1a..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png
deleted file mode 100644 (file)
index 74c7225..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png
deleted file mode 100644 (file)
index 044d8bc..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png
deleted file mode 100644 (file)
index 747e110..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png
deleted file mode 100644 (file)
index a9ad232..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png
deleted file mode 100644 (file)
index c969b5b..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png
deleted file mode 100644 (file)
index 25fe0f1..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png
deleted file mode 100644 (file)
index 18efc19..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png
deleted file mode 100644 (file)
index 3e729e7..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png
deleted file mode 100644 (file)
index df2401f..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png
deleted file mode 100644 (file)
index d72581f..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png
deleted file mode 100644 (file)
index d3ecd55..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png
deleted file mode 100644 (file)
index 6930a91..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png
deleted file mode 100644 (file)
index f475bec..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png
deleted file mode 100644 (file)
index 6d4e0eb..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png
deleted file mode 100644 (file)
index 3cc7ec4..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png
deleted file mode 100644 (file)
index eec0f7d..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png
deleted file mode 100644 (file)
index 7615348..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png
deleted file mode 100644 (file)
index e856a58..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png
deleted file mode 100644 (file)
index 53493f0..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png
deleted file mode 100644 (file)
index 697008a..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png
deleted file mode 100644 (file)
index 4e8b92e..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png
deleted file mode 100644 (file)
index 5945a8d..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png
deleted file mode 100644 (file)
index 4737242..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png
deleted file mode 100644 (file)
index e4939b8..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png
deleted file mode 100644 (file)
index 7426128..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png
deleted file mode 100644 (file)
index c0ca872..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png
deleted file mode 100644 (file)
index de5a812..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png
deleted file mode 100644 (file)
index 57609fb..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png
deleted file mode 100644 (file)
index 1980fbb..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png
deleted file mode 100644 (file)
index f1a5d22..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png
deleted file mode 100644 (file)
index aff8034..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png
deleted file mode 100644 (file)
index 44c0273..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png
deleted file mode 100644 (file)
index 0e60cac..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png
deleted file mode 100644 (file)
index 344341d..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png
deleted file mode 100644 (file)
index 401ac91..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png b/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png
deleted file mode 100644 (file)
index 1aa6483..0000000
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index a86bff0..0b5b03e
Binary files a/themes/images/HD/dark/Controls/00_button_01.png and b/themes/images/HD/dark/Controls/00_button_01.png differ
index 09630c6..d91a118 100644 (file)
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
index f66465f..6f712bf 100644 (file)
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
index 321e484..6d3bce7 100644 (file)
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
index 86e1599..3c7ff94 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_dim.png and b/themes/images/HD/dark/Controls/00_button_01_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 2d02de8..6541cf2
Binary files a/themes/images/HD/dark/Controls/00_button_01_focus.png and b/themes/images/HD/dark/Controls/00_button_01_focus.png differ
old mode 100755 (executable)
new mode 100644 (file)
index d899bc1..9bf4539
Binary files a/themes/images/HD/dark/Controls/00_button_01_press.png and b/themes/images/HD/dark/Controls/00_button_01_press.png differ
index bc58cb5..a428276 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_send.png and b/themes/images/HD/dark/Controls/00_button_01_send.png differ
index bc58cb5..4bc722f 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_send_dim.png and b/themes/images/HD/dark/Controls/00_button_01_send_dim.png differ
index 6e80527..a20bf6e 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_send_press.png and b/themes/images/HD/dark/Controls/00_button_01_send_press.png differ
diff --git a/themes/images/HD/dark/Controls/00_button_on_off_handler.png b/themes/images/HD/dark/Controls/00_button_on_off_handler.png
deleted file mode 100644 (file)
index 725bb67..0000000
Binary files a/themes/images/HD/dark/Controls/00_button_on_off_handler.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_button_on_off_handler_dim.png b/themes/images/HD/dark/Controls/00_button_on_off_handler_dim.png
deleted file mode 100644 (file)
index e87a16e..0000000
Binary files a/themes/images/HD/dark/Controls/00_button_on_off_handler_dim.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/00_button_radio_focus.png b/themes/images/HD/dark/Controls/00_button_radio_focus.png
deleted file mode 100755 (executable)
index ec298f1..0000000
Binary files a/themes/images/HD/dark/Controls/00_button_radio_focus.png and /dev/null differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 86%
rename from themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_01.png
rename to themes/images/HD/dark/Controls/00_contacts_button_dim.png
index 64e8380..3a0ed86
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_01.png and b/themes/images/HD/dark/Controls/00_contacts_button_dim.png differ
diff --git a/themes/images/HD/dark/Controls/00_picker_arrow_down.png b/themes/images/HD/dark/Controls/00_picker_arrow_down.png
new file mode 100644 (file)
index 0000000..e0fe525
Binary files /dev/null and b/themes/images/HD/dark/Controls/00_picker_arrow_down.png differ
diff --git a/themes/images/HD/dark/Controls/00_picker_arrow_down_dim.png b/themes/images/HD/dark/Controls/00_picker_arrow_down_dim.png
new file mode 100644 (file)
index 0000000..eb0aff2
Binary files /dev/null and b/themes/images/HD/dark/Controls/00_picker_arrow_down_dim.png differ
diff --git a/themes/images/HD/dark/Controls/00_picker_arrow_down_press.png b/themes/images/HD/dark/Controls/00_picker_arrow_down_press.png
new file mode 100644 (file)
index 0000000..ee90f47
Binary files /dev/null and b/themes/images/HD/dark/Controls/00_picker_arrow_down_press.png differ
similarity index 84%
rename from themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png
rename to themes/images/HD/dark/Controls/00_picker_arrow_up.png
index 6393a84..62e1fbb 100644 (file)
Binary files a/themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png and b/themes/images/HD/dark/Controls/00_picker_arrow_up.png differ
diff --git a/themes/images/HD/dark/Controls/00_picker_arrow_up_dim.png b/themes/images/HD/dark/Controls/00_picker_arrow_up_dim.png
new file mode 100644 (file)
index 0000000..16a7dc5
Binary files /dev/null and b/themes/images/HD/dark/Controls/00_picker_arrow_up_dim.png differ
similarity index 84%
rename from themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png
rename to themes/images/HD/dark/Controls/00_picker_arrow_up_press.png
index 6393a84..ae6eff2 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png and b/themes/images/HD/dark/Controls/00_picker_arrow_up_press.png differ
diff --git a/themes/images/HD/dark/Controls/00_slider_popup.png b/themes/images/HD/dark/Controls/00_slider_popup.png
deleted file mode 100644 (file)
index 2308c68..0000000
Binary files a/themes/images/HD/dark/Controls/00_slider_popup.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
similarity index 85%
rename from themes/images/HD/dark/Controls/00_check_focus.png
rename to themes/images/HD/dark/Controls/Check_box/00_check_activated_press.png
index 728f7e4..44b86f1
Binary files a/themes/images/HD/dark/Controls/00_check_focus.png and b/themes/images/HD/dark/Controls/Check_box/00_check_activated_press.png differ
index efda6ba..80d1dc9 100644 (file)
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
index ab7ff05..7033ce4 100644 (file)
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
index 3cd5418..b268899 100644 (file)
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_press.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..11fa3b0
Binary files /dev/null and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_press.png differ
index 2963c39..2c09cfc 100644 (file)
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
index 7c9da92..405592b 100644 (file)
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
index 127cbda..61ab852 100755 (executable)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_center.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_center.png differ
index 909efca..fb9829d 100755 (executable)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_center_reverse.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_center_reverse.png differ
index f9e98fb..da293c3 100755 (executable)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left.png differ
index 6ee3b80..ba10440 100755 (executable)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_01.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_01.png differ
index 2e579ed..a8c9245 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_01_reverse.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_01_reverse.png differ
index eac56f1..fe2f3c2 100755 (executable)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_reverse.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_left_reverse.png differ
index 2822d3d..3ab7a43 100755 (executable)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right.png differ
index ffb124c..5f8b832 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_01.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_01.png differ
index 7b8424a..345e674 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_01_reverse.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_01_reverse.png differ
index 2788094..e34df2a 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_reverse.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Handler_right_reverse.png differ
old mode 100644 (file)
new mode 100755 (executable)
index ed848d9..3c7b289
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier.png differ
index 307c1dc..03df769 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_left.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_left.png differ
index 38bee91..fcedbc7 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_middle.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_middle.png differ
index 4467cd6..98546de 100644 (file)
Binary files a/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_right.png and b/themes/images/HD/dark/Copy_Paste/copy&paste_Magnifier_right.png differ
diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png
new file mode 100644 (file)
index 0000000..097ee75
Binary files /dev/null and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png differ
old mode 100755 (executable)
new mode 100644 (file)
index d0befd0..a8fc9ea
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 7eebcd6..f996f5a
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png differ
old mode 100755 (executable)
new mode 100644 (file)
index d717e58..57e6382
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 7534b67..d559c97
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png differ
diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_02.png b/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_02.png
deleted file mode 100644 (file)
index 8f0e69b..0000000
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_02.png and /dev/null differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 86%
rename from themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_01.png
rename to themes/images/HD/dark/Naviframe/00_effect_title_text_dim_left.png
index 64e8380..e2c6a24
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_01.png and b/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_left.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 86%
rename from themes/images/tizen-hd/Naviframe/Icon/00_icon_focus.png
rename to themes/images/HD/dark/Naviframe/00_effect_title_text_dim_right.png
index be33990..d4cbfbf
Binary files a/themes/images/tizen-hd/Naviframe/Icon/00_icon_focus.png and b/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_right.png differ
index 76f10ec..2f74cbc 100755 (executable)
Binary files a/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 81%
rename from themes/images/HD/light/Controls/Check_box/00_check_press.png
rename to themes/images/HD/dark/Naviframe/Icon/00_icon_cancel.png
index 9065f67..bc34366
Binary files a/themes/images/HD/light/Controls/Check_box/00_check_press.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_cancel.png differ
diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png
new file mode 100755 (executable)
index 0000000..5274a73
Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 75%
rename from themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png
rename to themes/images/HD/dark/Naviframe/Icon/00_icon_done.png
index 14357c3..1ab559d
Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_done.png differ
index a56d1f6..9b3ad23 100755 (executable)
Binary files a/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png differ
index d49406f..b743802 100755 (executable)
Binary files a/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png differ
diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_search.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_search.png
new file mode 100755 (executable)
index 0000000..c4d63b8
Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_search.png differ
diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png
new file mode 100755 (executable)
index 0000000..0c531fc
Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png differ
index 77268cf..68bfcf4 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_popup_button_dim.png and b/themes/images/HD/dark/Popup/00_popup_button_dim.png differ
diff --git a/themes/images/HD/dark/Screen_Reader/B16-8_TTS_focus.png b/themes/images/HD/dark/Screen_Reader/B16-8_TTS_focus.png
new file mode 100644 (file)
index 0000000..9802ce8
Binary files /dev/null and b/themes/images/HD/dark/Screen_Reader/B16-8_TTS_focus.png differ
diff --git a/themes/images/HD/dark/Screen_Reader/access_glow.png b/themes/images/HD/dark/Screen_Reader/access_glow.png
deleted file mode 100644 (file)
index 95fd32a..0000000
Binary files a/themes/images/HD/dark/Screen_Reader/access_glow.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index d971783..86895ad
Binary files a/themes/images/HD/light/Content_views/00_circle_thumbnail_bg.png and b/themes/images/HD/light/Content_views/00_circle_thumbnail_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 54dcf12..362616d
Binary files a/themes/images/HD/light/Content_views/00_circle_thumbnail_bg_press.png and b/themes/images/HD/light/Content_views/00_circle_thumbnail_bg_press.png differ
index 11b3cad..cc3643a 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_edit_field_bg.png and b/themes/images/HD/light/Content_views/00_edit_field_bg.png differ
index e52f16c..4c4530d 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_edit_field_focus.png and b/themes/images/HD/light/Content_views/00_edit_field_focus.png differ
index 15416fa..75dbbae 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_expandable_bg.png and b/themes/images/HD/light/Content_views/00_expandable_bg.png differ
index 980e6b2..3f3a28c 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_expandable_bg_bottom.png and b/themes/images/HD/light/Content_views/00_expandable_bg_bottom.png differ
index 3fbc5c2..adc4ca9 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_expandable_bg_center.png and b/themes/images/HD/light/Content_views/00_expandable_bg_center.png differ
index da46be4..505de52 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_expandable_bg_top.png and b/themes/images/HD/light/Content_views/00_expandable_bg_top.png differ
index a925ce4..722d4ac 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg.png and b/themes/images/HD/light/Content_views/00_list_group_bg.png differ
index 09109f2..a01907b 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_bottom.png and b/themes/images/HD/light/Content_views/00_list_group_bg_bottom.png differ
index efc5a41..e8cec02 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_bottom_press.png and b/themes/images/HD/light/Content_views/00_list_group_bg_bottom_press.png differ
index 72413b8..2448261 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_center.png and b/themes/images/HD/light/Content_views/00_list_group_bg_center.png differ
index b64a79a..59ee2e5 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_center_press.png and b/themes/images/HD/light/Content_views/00_list_group_bg_center_press.png differ
index d152cea..3277bca 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_press.png and b/themes/images/HD/light/Content_views/00_list_group_bg_press.png differ
index 965403a..3f2ca17 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_top.png and b/themes/images/HD/light/Content_views/00_list_group_bg_top.png differ
index f372bca..dfb6439 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_list_group_bg_top_press.png and b/themes/images/HD/light/Content_views/00_list_group_bg_top_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 8ebc32e..143a15c
Binary files a/themes/images/HD/light/Content_views/00_messagebubble_bg_receive.png and b/themes/images/HD/light/Content_views/00_messagebubble_bg_receive.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 3761235..a81291b
Binary files a/themes/images/HD/light/Content_views/00_messagebubble_bg_sent.png and b/themes/images/HD/light/Content_views/00_messagebubble_bg_sent.png differ
diff --git a/themes/images/HD/light/Content_views/00_picker_arrow_down.png b/themes/images/HD/light/Content_views/00_picker_arrow_down.png
deleted file mode 100644 (file)
index e08bd51..0000000
Binary files a/themes/images/HD/light/Content_views/00_picker_arrow_down.png and /dev/null differ
diff --git a/themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png b/themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png
deleted file mode 100644 (file)
index 8fd0805..0000000
Binary files a/themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index 29e28ec..494c716
Binary files a/themes/images/HD/light/Content_views/00_square_thumbnail_bg.png and b/themes/images/HD/light/Content_views/00_square_thumbnail_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index fb02ed9..2e824b0
Binary files a/themes/images/HD/light/Content_views/00_square_thumbnail_bg_press.png and b/themes/images/HD/light/Content_views/00_square_thumbnail_bg_press.png differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg.png
deleted file mode 100644 (file)
index 52486a2..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png
deleted file mode 100644 (file)
index d719200..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png
deleted file mode 100644 (file)
index 61d56ca..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_03.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png
deleted file mode 100644 (file)
index 0693a6f..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_04.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png
deleted file mode 100644 (file)
index 818c50b..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_05.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png
deleted file mode 100644 (file)
index d09870d..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_06.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png
deleted file mode 100644 (file)
index d4bfe3d..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_07.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png
deleted file mode 100644 (file)
index 9f1b445..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_08.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png
deleted file mode 100644 (file)
index 51be405..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_09.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png
deleted file mode 100644 (file)
index 0d9baba..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_10.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png
deleted file mode 100644 (file)
index 3d01f4d..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_11.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png
deleted file mode 100644 (file)
index 675b322..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_12.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png
deleted file mode 100644 (file)
index ac13700..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_13.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png
deleted file mode 100644 (file)
index 9f30d1a..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_14.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png
deleted file mode 100644 (file)
index 74c7225..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_15.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png
deleted file mode 100644 (file)
index 044d8bc..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_16.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png
deleted file mode 100644 (file)
index 747e110..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_17.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png
deleted file mode 100644 (file)
index a9ad232..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_18.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png
deleted file mode 100644 (file)
index c969b5b..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_19.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png
deleted file mode 100644 (file)
index 25fe0f1..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_20.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png
deleted file mode 100644 (file)
index 18efc19..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_21.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png
deleted file mode 100644 (file)
index 3e729e7..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_22.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png
deleted file mode 100644 (file)
index df2401f..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_23.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png
deleted file mode 100644 (file)
index d72581f..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_24.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png
deleted file mode 100644 (file)
index d3ecd55..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_25.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png
deleted file mode 100644 (file)
index 6930a91..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_26.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png
deleted file mode 100644 (file)
index f475bec..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_27.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png
deleted file mode 100644 (file)
index 6d4e0eb..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_28.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png
deleted file mode 100644 (file)
index 3cc7ec4..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_29.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png
deleted file mode 100644 (file)
index eec0f7d..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_30.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png
deleted file mode 100644 (file)
index 7615348..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_31.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png
deleted file mode 100644 (file)
index e856a58..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_32.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png
deleted file mode 100644 (file)
index 53493f0..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_33.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png
deleted file mode 100644 (file)
index 697008a..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_34.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png
deleted file mode 100644 (file)
index 4e8b92e..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_35.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png
deleted file mode 100644 (file)
index 5945a8d..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_36.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png
deleted file mode 100644 (file)
index 4737242..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_37.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png
deleted file mode 100644 (file)
index e4939b8..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_38.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png
deleted file mode 100644 (file)
index 7426128..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_39.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png
deleted file mode 100644 (file)
index c0ca872..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_40.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png
deleted file mode 100644 (file)
index de5a812..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_41.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png
deleted file mode 100644 (file)
index 57609fb..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_42.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png
deleted file mode 100644 (file)
index 1980fbb..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_43.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png
deleted file mode 100644 (file)
index f1a5d22..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_44.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png
deleted file mode 100644 (file)
index aff8034..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_45.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png
deleted file mode 100644 (file)
index 44c0273..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_46.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png
deleted file mode 100644 (file)
index 0e60cac..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_47.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png
deleted file mode 100644 (file)
index 344341d..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_48.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png
deleted file mode 100644 (file)
index 401ac91..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_49.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png b/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png
deleted file mode 100644 (file)
index 1aa6483..0000000
Binary files a/themes/images/HD/light/Controls/00_Progress_circle_bg/00_progress_circle_bg_50.png and /dev/null differ
index 163bed6..66044c9 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01.png and b/themes/images/HD/light/Controls/00_button_01.png differ
index f381a57..c0d358d 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_delete.png and b/themes/images/HD/light/Controls/00_button_01_delete.png differ
index f381a57..562d36c 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_delete_dim.png and b/themes/images/HD/light/Controls/00_button_01_delete_dim.png differ
index 03f0fdc..515c53f 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_delete_press.png and b/themes/images/HD/light/Controls/00_button_01_delete_press.png differ
index 163bed6..e0f8d91 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_dim.png and b/themes/images/HD/light/Controls/00_button_01_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 39fb82a..cca30ab
Binary files a/themes/images/HD/light/Controls/00_button_01_focus.png and b/themes/images/HD/light/Controls/00_button_01_focus.png differ
index 7a99f6c..ef77037 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_press.png and b/themes/images/HD/light/Controls/00_button_01_press.png differ
index bc58cb5..026b750 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_send.png and b/themes/images/HD/light/Controls/00_button_01_send.png differ
index bc58cb5..bb117ef 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_send_dim.png and b/themes/images/HD/light/Controls/00_button_01_send_dim.png differ
index 6e80527..1110183 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_button_01_send_press.png and b/themes/images/HD/light/Controls/00_button_01_send_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
similarity index 66%
rename from themes/images/HD/light/Controls/00_button_on_off_handler_focus.png
rename to themes/images/HD/light/Controls/00_button_handler_focus.png
index fa8d992..231dac7
Binary files a/themes/images/HD/light/Controls/00_button_on_off_handler_focus.png and b/themes/images/HD/light/Controls/00_button_handler_focus.png differ
diff --git a/themes/images/HD/light/Controls/00_button_off.png b/themes/images/HD/light/Controls/00_button_off.png
deleted file mode 100644 (file)
index e58e522..0000000
Binary files a/themes/images/HD/light/Controls/00_button_off.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_button_off_dim.png b/themes/images/HD/light/Controls/00_button_off_dim.png
deleted file mode 100644 (file)
index 340ee9d..0000000
Binary files a/themes/images/HD/light/Controls/00_button_off_dim.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_button_on.png b/themes/images/HD/light/Controls/00_button_on.png
deleted file mode 100644 (file)
index af8cdc5..0000000
Binary files a/themes/images/HD/light/Controls/00_button_on.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_button_on_dim.png b/themes/images/HD/light/Controls/00_button_on_dim.png
deleted file mode 100644 (file)
index 202898a..0000000
Binary files a/themes/images/HD/light/Controls/00_button_on_dim.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index aeb582d..e6356e6
Binary files a/themes/images/HD/light/Controls/00_button_on_handler.png and b/themes/images/HD/light/Controls/00_button_on_handler.png differ
old mode 100755 (executable)
new mode 100644 (file)
index cdad146..3ee94e9
Binary files a/themes/images/HD/light/Controls/00_button_on_handler_dim.png and b/themes/images/HD/light/Controls/00_button_on_handler_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 8e52220..3b8b041
Binary files a/themes/images/HD/light/Controls/00_button_on_off_bg.png and b/themes/images/HD/light/Controls/00_button_on_off_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 0f7bdba..f54e048
Binary files a/themes/images/HD/light/Controls/00_button_on_off_bg_dim.png and b/themes/images/HD/light/Controls/00_button_on_off_bg_dim.png differ
diff --git a/themes/images/HD/light/Controls/00_button_on_off_handler.png b/themes/images/HD/light/Controls/00_button_on_off_handler.png
deleted file mode 100644 (file)
index 725bb67..0000000
Binary files a/themes/images/HD/light/Controls/00_button_on_off_handler.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_button_on_off_handler_dim.png b/themes/images/HD/light/Controls/00_button_on_off_handler_dim.png
deleted file mode 100644 (file)
index e87a16e..0000000
Binary files a/themes/images/HD/light/Controls/00_button_on_off_handler_dim.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/00_button_radio_focus.png b/themes/images/HD/light/Controls/00_button_radio_focus.png
deleted file mode 100755 (executable)
index 61a187c..0000000
Binary files a/themes/images/HD/light/Controls/00_button_radio_focus.png and /dev/null differ
index fefde0f..5b8ec08 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_circle_button.png and b/themes/images/HD/light/Controls/00_circle_button.png differ
index 314757d..e65617d 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_circle_button_delete.png and b/themes/images/HD/light/Controls/00_circle_button_delete.png differ
index 6659671..f68b947 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_circle_button_delete_dim.png and b/themes/images/HD/light/Controls/00_circle_button_delete_dim.png differ
index 9cd1c03..f9443f4 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_circle_button_delete_press.png and b/themes/images/HD/light/Controls/00_circle_button_delete_press.png differ
index fefde0f..f307cd7 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_circle_button_dim.png and b/themes/images/HD/light/Controls/00_circle_button_dim.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 6712258..cebbc46
Binary files a/themes/images/HD/light/Controls/00_circle_button_focus.png and b/themes/images/HD/light/Controls/00_circle_button_focus.png differ
index cded13b..b1f3b74 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_circle_button_press.png and b/themes/images/HD/light/Controls/00_circle_button_press.png differ
index 5b5606a..3a3df36 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_contacts_button.png and b/themes/images/HD/light/Controls/00_contacts_button.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 80%
rename from themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png
rename to themes/images/HD/light/Controls/00_contacts_button_dim.png
index d719200..4217a47
Binary files a/themes/images/HD/dark/Controls/00_Progress_circle_bg/00_progress_circle_bg_02.png and b/themes/images/HD/light/Controls/00_contacts_button_dim.png differ
index 21b031d..51ddd04 100755 (executable)
Binary files a/themes/images/HD/light/Controls/00_contacts_button_focus.png and b/themes/images/HD/light/Controls/00_contacts_button_focus.png differ
index d771460..7795512 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_contacts_button_press.png and b/themes/images/HD/light/Controls/00_contacts_button_press.png differ
diff --git a/themes/images/HD/light/Controls/00_picker_arrow_down.png b/themes/images/HD/light/Controls/00_picker_arrow_down.png
new file mode 100644 (file)
index 0000000..3a27f49
Binary files /dev/null and b/themes/images/HD/light/Controls/00_picker_arrow_down.png differ
diff --git a/themes/images/HD/light/Controls/00_picker_arrow_down_dim.png b/themes/images/HD/light/Controls/00_picker_arrow_down_dim.png
new file mode 100644 (file)
index 0000000..08ca1da
Binary files /dev/null and b/themes/images/HD/light/Controls/00_picker_arrow_down_dim.png differ
similarity index 86%
rename from themes/images/HD/light/Content_views/00_picker_arrow_up.png
rename to themes/images/HD/light/Controls/00_picker_arrow_down_press.png
index b115233..a571190 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_picker_arrow_up.png and b/themes/images/HD/light/Controls/00_picker_arrow_down_press.png differ
diff --git a/themes/images/HD/light/Controls/00_picker_arrow_up.png b/themes/images/HD/light/Controls/00_picker_arrow_up.png
new file mode 100644 (file)
index 0000000..317410f
Binary files /dev/null and b/themes/images/HD/light/Controls/00_picker_arrow_up.png differ
similarity index 74%
rename from themes/images/HD/light/Content_views/00_edit_field_rename.png
rename to themes/images/HD/light/Controls/00_picker_arrow_up_dim.png
index e31e5bc..3e9b728 100644 (file)
Binary files a/themes/images/HD/light/Content_views/00_edit_field_rename.png and b/themes/images/HD/light/Controls/00_picker_arrow_up_dim.png differ
similarity index 86%
rename from themes/images/HD/dark/Content_views/00_picker_arrow_up.png
rename to themes/images/HD/light/Controls/00_picker_arrow_up_press.png
index b115233..6b51cfc 100644 (file)
Binary files a/themes/images/HD/dark/Content_views/00_picker_arrow_up.png and b/themes/images/HD/light/Controls/00_picker_arrow_up_press.png differ
index 551ec63..d411a99 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_bar.png and b/themes/images/HD/light/Controls/00_progress_bar.png differ
index e446428..338c831 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_bar_dim.png and b/themes/images/HD/light/Controls/00_progress_bar_dim.png differ
index 4ced646..8b80872 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_bg.png and b/themes/images/HD/light/Controls/00_progress_bg.png differ
index 5bc8973..d6143ab 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_bg_dim.png and b/themes/images/HD/light/Controls/00_progress_bg_dim.png differ
index 95110ef..7add5ba 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_01_bg.png and b/themes/images/HD/light/Controls/00_progress_pending_01_bg.png differ
index fc34921..03d6466 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_01_bg_dim.png and b/themes/images/HD/light/Controls/00_progress_pending_01_bg_dim.png differ
index 68bc54c..2b52b04 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_01_bg_h.png and b/themes/images/HD/light/Controls/00_progress_pending_01_bg_h.png differ
index b22726d..2e2bb88 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_01_bg_h_dim.png and b/themes/images/HD/light/Controls/00_progress_pending_01_bg_h_dim.png differ
index 34d5193..f071aab 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_02_bg.png and b/themes/images/HD/light/Controls/00_progress_pending_02_bg.png differ
index 4308aa3..439125f 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_02_bg_dim.png and b/themes/images/HD/light/Controls/00_progress_pending_02_bg_dim.png differ
index 927c174..5399a27 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_02_bg_h.png and b/themes/images/HD/light/Controls/00_progress_pending_02_bg_h.png differ
index 2f17d64..8239c76 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_progress_pending_02_bg_h_dim.png and b/themes/images/HD/light/Controls/00_progress_pending_02_bg_h_dim.png differ
index 1952507..a700a5d 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_handle.png and b/themes/images/HD/light/Controls/00_slider_handle.png differ
index e8b2e80..3fd13e5 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_handle_dim.png and b/themes/images/HD/light/Controls/00_slider_handle_dim.png differ
index 7789cce..d910ef2 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_handle_focus.png and b/themes/images/HD/light/Controls/00_slider_handle_focus.png differ
index 60bacb8..dec32d6 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_handle_press.png and b/themes/images/HD/light/Controls/00_slider_handle_press.png differ
diff --git a/themes/images/HD/light/Controls/00_slider_popup.png b/themes/images/HD/light/Controls/00_slider_popup.png
deleted file mode 100644 (file)
index 2308c68..0000000
Binary files a/themes/images/HD/light/Controls/00_slider_popup.png and /dev/null differ
index d5dc403..67f4f6e 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_popup_center.png and b/themes/images/HD/light/Controls/00_slider_popup_center.png differ
index b6daf32..54023c1 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_popup_left.png and b/themes/images/HD/light/Controls/00_slider_popup_left.png differ
index 5aaac50..a8d05d8 100644 (file)
Binary files a/themes/images/HD/light/Controls/00_slider_popup_right.png and b/themes/images/HD/light/Controls/00_slider_popup_right.png differ
index 47417c9..014b861 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_add.png and b/themes/images/HD/light/Controls/Button/00_button_add.png differ
index a374e6d..ed122a8 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_call.png and b/themes/images/HD/light/Controls/Button/00_button_call.png differ
index 25f07f0..cbe88ad 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_contact.png and b/themes/images/HD/light/Controls/Button/00_button_contact.png differ
index b1ce778..0600f38 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_delete.png and b/themes/images/HD/light/Controls/Button/00_button_delete.png differ
index 4dd5215..94c65a1 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png and b/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png differ
index ac3aef3..c60ee91 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_closed.png and b/themes/images/HD/light/Controls/Button/00_button_expand_closed.png differ
index 9d17f5a..b962e4f 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_opened.png and b/themes/images/HD/light/Controls/Button/00_button_expand_opened.png differ
index d60d26d..df91fc0 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_send.png and b/themes/images/HD/light/Controls/Button/00_button_expand_send.png differ
index 3b57fd2..3f60e32 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_info.png and b/themes/images/HD/light/Controls/Button/00_button_info.png differ
index baa8955..062b298 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_left.png and b/themes/images/HD/light/Controls/Button/00_button_left.png differ
index 5c87a4c..b0d230e 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_rename.png and b/themes/images/HD/light/Controls/Button/00_button_rename.png differ
index 93e3395..4e83d92 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_right.png and b/themes/images/HD/light/Controls/Button/00_button_right.png differ
index 057b20f..6840191 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_warning.png and b/themes/images/HD/light/Controls/Button/00_button_warning.png differ
index b20372e..a1fe2a8 100644 (file)
Binary files a/themes/images/HD/light/Controls/Check_box/00_check_activated.png and b/themes/images/HD/light/Controls/Check_box/00_check_activated.png differ
index c321e28..071ac75 100644 (file)
Binary files a/themes/images/HD/light/Controls/Check_box/00_check_activated_dim.png and b/themes/images/HD/light/Controls/Check_box/00_check_activated_dim.png differ
diff --git a/themes/images/HD/light/Controls/Check_box/00_check_activated_press.png b/themes/images/HD/light/Controls/Check_box/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..166ab4a
Binary files /dev/null and b/themes/images/HD/light/Controls/Check_box/00_check_activated_press.png differ
index bb08643..6f43970 100644 (file)
Binary files a/themes/images/HD/light/Controls/Check_box/00_check_bg.png and b/themes/images/HD/light/Controls/Check_box/00_check_bg.png differ
index bb08643..82523a1 100644 (file)
Binary files a/themes/images/HD/light/Controls/Check_box/00_check_dim_bg.png and b/themes/images/HD/light/Controls/Check_box/00_check_dim_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
similarity index 79%
rename from themes/images/HD/light/Controls/00_check_focus.png
rename to themes/images/HD/light/Controls/Check_box/00_check_focus.png
index d058cb4..182cad7
Binary files a/themes/images/HD/light/Controls/00_check_focus.png and b/themes/images/HD/light/Controls/Check_box/00_check_focus.png differ
index 6656810..cda624f 100644 (file)
Binary files a/themes/images/HD/light/Controls/Check_box/00_check_press_bg.png and b/themes/images/HD/light/Controls/Check_box/00_check_press_bg.png differ
index e76b7a7..ea71020 100644 (file)
Binary files a/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated.png and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated.png differ
index d82a2d7..418978f 100644 (file)
Binary files a/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_dim.png and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_dim.png differ
diff --git a/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_press.png b/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..47a5f30
Binary files /dev/null and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_activated_press.png differ
index ac8350c..5ce6a7a 100644 (file)
Binary files a/themes/images/HD/light/Controls/Radio_button/00_button_radio_bg.png and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_bg.png differ
index dd08796..bdb1db5 100644 (file)
Binary files a/themes/images/HD/light/Controls/Radio_button/00_button_radio_dim_bg.png and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_dim_bg.png differ
diff --git a/themes/images/HD/light/Controls/Radio_button/00_button_radio_focus.png b/themes/images/HD/light/Controls/Radio_button/00_button_radio_focus.png
new file mode 100644 (file)
index 0000000..fbc7bd0
Binary files /dev/null and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_focus.png differ
diff --git a/themes/images/HD/light/Controls/Radio_button/00_button_radio_press.png b/themes/images/HD/light/Controls/Radio_button/00_button_radio_press.png
deleted file mode 100644 (file)
index 462d83e..0000000
Binary files a/themes/images/HD/light/Controls/Radio_button/00_button_radio_press.png and /dev/null differ
index b922f44..6be258a 100644 (file)
Binary files a/themes/images/HD/light/Controls/Radio_button/00_button_radio_press_bg.png and b/themes/images/HD/light/Controls/Radio_button/00_button_radio_press_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index b5b4679..eba017f
Binary files a/themes/images/HD/light/Focus/00_focus.png and b/themes/images/HD/light/Focus/00_focus.png differ
index 8f5de41..7c542ee 100644 (file)
Binary files a/themes/images/HD/light/Focus/00_list_group_bg_bottom_focus.png and b/themes/images/HD/light/Focus/00_list_group_bg_bottom_focus.png differ
index 4f5e9f4..18f10b5 100644 (file)
Binary files a/themes/images/HD/light/Focus/00_list_group_bg_center_focus.png and b/themes/images/HD/light/Focus/00_list_group_bg_center_focus.png differ
index 6c27ae6..748b8dc 100644 (file)
Binary files a/themes/images/HD/light/Focus/00_list_group_bg_top_focus.png and b/themes/images/HD/light/Focus/00_list_group_bg_top_focus.png differ
old mode 100755 (executable)
new mode 100644 (file)
index eafe886..9be358b
Binary files a/themes/images/HD/light/Focus/00_more_popup_focus.png and b/themes/images/HD/light/Focus/00_more_popup_focus.png differ
diff --git a/themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png
new file mode 100644 (file)
index 0000000..097ee75
Binary files /dev/null and b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png differ
index a46caea..a8fc9ea 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_nocontents_devices.png and b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_devices.png differ
index 04e2e11..f996f5a 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_nocontents_multimedia.png and b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_multimedia.png differ
index 7677efc..57e6382 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_nocontents_picture.png and b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_picture.png differ
index 2312869..d559c97 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_nocontents_unnamed.png and b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_unnamed.png differ
index 6c671f4..1521fa2 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg.png and b/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg.png differ
diff --git a/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_02.png b/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_02.png
deleted file mode 100644 (file)
index 8f0e69b..0000000
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_02.png and /dev/null differ
index d147537..f0fc5a8 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_focus.png and b/themes/images/HD/light/GUI_Style_Guide/00_search_edit_field_bg_focus.png differ
index a04eed3..15d94a4 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_badge_bg.png and b/themes/images/HD/light/Naviframe/00_badge_bg.png differ
index c1e3afb..2cbd953 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_effect_tab_bounce_left.png and b/themes/images/HD/light/Naviframe/00_effect_tab_bounce_left.png differ
index 691ec73..3a24521 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_effect_tab_bounce_right.png and b/themes/images/HD/light/Naviframe/00_effect_tab_bounce_right.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 61f804b..32bb37b
Binary files a/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_left.png and b/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_left.png differ
old mode 100755 (executable)
new mode 100644 (file)
index fe72199..e50cc5c
Binary files a/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_left_02.png and b/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_left_02.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 2c890d9..1e593aa
Binary files a/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_right.png and b/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_right.png differ
old mode 100755 (executable)
new mode 100644 (file)
index c37480d..c430b60
Binary files a/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_right_02.png and b/themes/images/HD/light/Naviframe/00_effect_tab_text_dim_right_02.png differ
diff --git a/themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png
new file mode 100644 (file)
index 0000000..e574e11
Binary files /dev/null and b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png differ
diff --git a/themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png
new file mode 100644 (file)
index 0000000..f945037
Binary files /dev/null and b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png differ
index 37fe6f7..bd3de24 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_sub_title_bg.png and b/themes/images/HD/light/Naviframe/00_sub_title_bg.png differ
index d14a8e0..18f10b5 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_tab_focus.png and b/themes/images/HD/light/Naviframe/00_tab_focus.png differ
index 6e2104d..28e736a 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_tab_press.png and b/themes/images/HD/light/Naviframe/00_tab_press.png differ
index d14a8e0..e37ddb8 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_tab_select_bar.png and b/themes/images/HD/light/Naviframe/00_tab_select_bar.png differ
index eef8f3a..49d3046 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_title_bg.png and b/themes/images/HD/light/Naviframe/00_title_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 2450e2b..8025867
Binary files a/themes/images/HD/light/Naviframe/00_title_press.png and b/themes/images/HD/light/Naviframe/00_title_press.png differ
index eef8f3a..80d307a 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_toolbar_bg.png and b/themes/images/HD/light/Naviframe/00_toolbar_bg.png differ
index 9e405c8..67fa94a 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/00_toolbar_press.png and b/themes/images/HD/light/Naviframe/00_toolbar_press.png differ
index f79459c..87d6ca4 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/Icon/00_icon_SIP_close.png and b/themes/images/HD/light/Naviframe/Icon/00_icon_SIP_close.png differ
diff --git a/themes/images/HD/light/Naviframe/Icon/00_icon_cancel.png b/themes/images/HD/light/Naviframe/Icon/00_icon_cancel.png
new file mode 100644 (file)
index 0000000..2a95274
Binary files /dev/null and b/themes/images/HD/light/Naviframe/Icon/00_icon_cancel.png differ
diff --git a/themes/images/HD/light/Naviframe/Icon/00_icon_delete.png b/themes/images/HD/light/Naviframe/Icon/00_icon_delete.png
new file mode 100644 (file)
index 0000000..ef2fe6d
Binary files /dev/null and b/themes/images/HD/light/Naviframe/Icon/00_icon_delete.png differ
diff --git a/themes/images/HD/light/Naviframe/Icon/00_icon_done.png b/themes/images/HD/light/Naviframe/Icon/00_icon_done.png
new file mode 100644 (file)
index 0000000..7f52495
Binary files /dev/null and b/themes/images/HD/light/Naviframe/Icon/00_icon_done.png differ
index 0e68b5d..7a94246 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/Icon/00_icon_edit.png and b/themes/images/HD/light/Naviframe/Icon/00_icon_edit.png differ
old mode 100755 (executable)
new mode 100644 (file)
index be33990..2a40944
Binary files a/themes/images/HD/light/Naviframe/Icon/00_icon_focus.png and b/themes/images/HD/light/Naviframe/Icon/00_icon_focus.png differ
index 74f628c..7660106 100644 (file)
Binary files a/themes/images/HD/light/Naviframe/Icon/00_icon_plus.png and b/themes/images/HD/light/Naviframe/Icon/00_icon_plus.png differ
diff --git a/themes/images/HD/light/Naviframe/Icon/00_icon_search.png b/themes/images/HD/light/Naviframe/Icon/00_icon_search.png
new file mode 100644 (file)
index 0000000..ff2dc34
Binary files /dev/null and b/themes/images/HD/light/Naviframe/Icon/00_icon_search.png differ
diff --git a/themes/images/HD/light/Naviframe/Icon/00_icon_select_all.png b/themes/images/HD/light/Naviframe/Icon/00_icon_select_all.png
new file mode 100644 (file)
index 0000000..ecaab49
Binary files /dev/null and b/themes/images/HD/light/Naviframe/Icon/00_icon_select_all.png differ
index f50977e..665b62a 100644 (file)
Binary files a/themes/images/HD/light/Overscrolling/00_overscrolling_bottom.png and b/themes/images/HD/light/Overscrolling/00_overscrolling_bottom.png differ
index b7da1ad..7b98495 100644 (file)
Binary files a/themes/images/HD/light/Overscrolling/00_overscrolling_left.png and b/themes/images/HD/light/Overscrolling/00_overscrolling_left.png differ
index ce5a939..deb64c4 100644 (file)
Binary files a/themes/images/HD/light/Overscrolling/00_overscrolling_right.png and b/themes/images/HD/light/Overscrolling/00_overscrolling_right.png differ
index 17a64f2..940f559 100644 (file)
Binary files a/themes/images/HD/light/Overscrolling/00_overscrolling_top.png and b/themes/images/HD/light/Overscrolling/00_overscrolling_top.png differ
index d29cb70..8eac781 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_more_popup_press.png and b/themes/images/HD/light/Popup/00_more_popup_press.png differ
index 0ed4293..98effa7 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_notification_bg.png and b/themes/images/HD/light/Popup/00_notification_bg.png differ
index 28f1c62..af8e538 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_bg.png and b/themes/images/HD/light/Popup/00_popup_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 8d61308..d4755d4
Binary files a/themes/images/HD/light/Popup/00_popup_bubble_02_bg.png and b/themes/images/HD/light/Popup/00_popup_bubble_02_bg.png differ
index a45f02b..e5a7502 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_bubble_bg.png and b/themes/images/HD/light/Popup/00_popup_bubble_bg.png differ
index adcd374..2eecc91 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_bubble_tail_bottom.png and b/themes/images/HD/light/Popup/00_popup_bubble_tail_bottom.png differ
index baa805d..588b4a6 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_bubble_tail_left.png and b/themes/images/HD/light/Popup/00_popup_bubble_tail_left.png differ
index a07f62c..a4d0454 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_bubble_tail_right.png and b/themes/images/HD/light/Popup/00_popup_bubble_tail_right.png differ
index 0ab75d3..df1bab9 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_bubble_tail_top.png and b/themes/images/HD/light/Popup/00_popup_bubble_tail_top.png differ
index 7a49896..3861a1c 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_button.png and b/themes/images/HD/light/Popup/00_popup_button.png differ
index 11e17c6..64060f1 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_button_bg.png and b/themes/images/HD/light/Popup/00_popup_button_bg.png differ
index 77268cf..bac77c9 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_button_dim.png and b/themes/images/HD/light/Popup/00_popup_button_dim.png differ
index 4f89112..9c4532b 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_button_focus.png and b/themes/images/HD/light/Popup/00_popup_button_focus.png differ
index faa5cea..fa16d6b 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_button_press.png and b/themes/images/HD/light/Popup/00_popup_button_press.png differ
index ab43b59..7c8e1c2 100644 (file)
Binary files a/themes/images/HD/light/Popup/00_popup_title_bg.png and b/themes/images/HD/light/Popup/00_popup_title_bg.png differ
diff --git a/themes/images/tizen-hd/Controls/00_button_01_focus.png b/themes/images/tizen-hd/Controls/00_button_01_focus.png
deleted file mode 100644 (file)
index 39fb82a..0000000
Binary files a/themes/images/tizen-hd/Controls/00_button_01_focus.png and /dev/null differ
diff --git a/themes/images/tizen-hd/Naviframe/00_toolbar_button_focus.png b/themes/images/tizen-hd/Naviframe/00_toolbar_button_focus.png
deleted file mode 100644 (file)
index 5a80838..0000000
Binary files a/themes/images/tizen-hd/Naviframe/00_toolbar_button_focus.png and /dev/null differ
index 2584083..29ce794 100755 (executable)
@@ -48,7 +48,7 @@
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 50
 #define NAVIFRAME_TITLE_FONT_MIN_SIZE_INC 46
 #define NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC 50
-#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 44
+#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 42
 #define NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC 38
 #define NAVIFRAME_ICON_SIZE_INC 45 45
 #define NAVIFRAME_PADDING_INC 26 0
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 250 250 250 255
 #define NAVIFRAME_TITLE_STYLE_COLOR_INC "#FAFAFA"
 #define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 250 250 250 255
-#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
+#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 30
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28
 #define NAVIFRAME_SUBTITLE_H_INC 37
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC 30
-#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 6
+#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 2
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC 4
-#define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 250 250 250 255;
 #define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82
+#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC 63 27
+#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC 0 0 13 12
 
 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
@@ -87,7 +88,6 @@
 #define CTXPOPUP_MORE_TEXT_MAX_INC 599
 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26
 #define CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER 26 26 25 0
-#define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255
 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8
 #define CTXPOPUP_SHADOW_LEFT_PADDING 14
 #define CTXPOPUP_SHADOW_RIGHT_PADDING 14
 #define GENGRID_PART_BACKGROUND_COLOR_INC 0 0 0 0
 #define GENGRID_EDIT_MODE_CHECK_TOP_RIGHT_INC 6 6
 #define GENGRID_EDIT_MODE_CHECK_SIZE_INC 63 63
-#define GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC 0 0 0 154
 #define GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC 6 6
 
 #define GENGRID_DEFAULT_LEFT_TOP_PADDING_INC 2 2
 #define BUBBLE_DISCLIP_COLOR                        255 255 255 102 // opacity 40%
 
 // List bg color
+#define GENLIST_LIST_BG_POPUP_COLOR                 29 38 60 255
 #define GENLIST_LIST_BG_COLOR                       0 0 0 255
 #define GENLIST_LIST_PRESS_COLOR                    43 58 175 255
 #define GENLIST_LIST_DIM_COLOR                      0 0 0 255
 #define GENLIST_LIST_LINE2_COLOR                    64 64 64 255
 #define GENLIST_LIST_DIVIDER1_COLOR                 255 255 255 51
 #define GENLIST_LIST_DIVIDER2_COLOR                 255 255 255 51
-#define GENLIST_LIST_CENTERLINE1_COLOR              206 205 202 255
 #define GENLIST_SELECT_ALL_BG_COLOR                 34 44 71 255
 
-
 // Group Index
 #define GENLIST_GROUPINDEX_LIST_SIZE                     32
 #define GENLIST_GROUPINDEX_LIST_COLOR                    66 87 144 255
 #define GENLIST_LIST_MAIN_TEXT_SIZE                         44
 #define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR                 250 250 250 255
 #define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE           "#FAFAFAFF"
-#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR             250 250 250 102
-#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE       "#FAFAFA66"
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR             250 250 250 153
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE       "#FAFAFA99"
 #define GENLIST_LIST_MAIN_TEXT_READ_COLOR                   110 111 118 255
-#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR               110 111 118 204
+#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR               110 111 118 127
 #define GENLIST_LIST_TEXT_FOCUS_COLOR                       250 250 250 255
 #define GENLIST_LIST_TEXT_FOCUS_COLOR_STYLE                 "#FAFAFAFF"
 
 #define GENLIST_LIST_SUB_TEXT_SIZE                          32
 #define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR                 110 111 118 255
 #define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE           "#6E6F76FF"
-#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR             110 111 118 204
-#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE       "#6E6F76CC"
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR             110 111 118 153
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE       "#6E6F7699"
 #define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR                104 144 255 255
 #define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE          "#6890FFFF"
-#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR            104 144 255 76
-#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE      "#6890FF4C"
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR            104 144 255 153
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE      "#6890FF99"
 
 #define GENLIST_LIST_SUB_TEXT_02_SIZE                       24
 #define GENLIST_LIST_SUB_TEXT_02_COLOR                      209 0 0 255
 #define GENLIST_APPS_PRICE_SALE_COLOR                   209 0 0 255
 #define GENLIST_APPS_PRICE_FREE_COLOR                   93 131 255 255
 
-#define GENLIST_ENTRY_RENAME_COLOR                      177 177 177 255
-
 #define DIALOGUE_PASSWORD_TITLE_SIZE                    32
 #define DIALOGUE_PASSWORD_TITLE_COLOR                   249 249 249 255
 
 #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE    "#6E6F76FF"
 #define GENLIST_PART_MATCH_TAG_COLOR                    "+ color=#1382FF"
 
-#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
+#define GENLIST_EXPANDABLE_ARROW_CLIP_COLOR             250 250 250 255
+#define GENLIST_EXPANDABLE_ARROW_DIM_COLOR              250 250 250 153
+#define GENLIST_EXPANDABLE_ARROW_PRESS_COLOR            250 250 250 255
+
+#define GENLIST_EMAIL_TEXT_FOCUS_COLOR                  250 250 250 255
+#define GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE            "#FAFAFAFF"
+
+#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_COLOR_STYLE      "#FAFAFAFF"
+#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE  "#FAFAFA99"
+#define GENLIST_EMAIL_MAIN_TEXT_READ_COLOR_STYLE        "#6E6F76FF"
+#define GENLIST_EMAIL_MAIN_TEXT_READ_DIM_COLOR_STYLE    "#6E6F7699"
+
+#define GENLIST_EMAIL_SUB_TEXT_UNREAD_COLOR_STYLE       "#6E6F76FF"
+#define GENLIST_EMAIL_SUB_TEXT_READ_COLOR_STYLE         "#6E6F76FF"
+
+#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR           104 144 255 255
+#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR_STYLE     "#6890FFFF"
+#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR             110 111 118 255
+#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR_STYLE       "#6E6F76FF"
+
+#define GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE         "#6E6F76FF"
+
+#define GENLIST_EMAIL_MATCH_TAG_COLOR                   "+ color=#1382FF"
+
+#define GENLIST_LIST_READ_BG_COLOR                      1 1 1 255
+#define GENLIST_LIST_UNREAD_BG_COLOR                    0 0 0 255
 
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FFFFFFFF"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
 
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 163
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163
-
-#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#FFFFFFA3"
-#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000A3"
-
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 #define BUTTON_TICKER_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
 
-#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_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 
 #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_NUMBER_ICON_DISABLED_COLOR_INC 250 250 250 153
+
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
-#define BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
-#define BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
 
 #define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 250 250 250 135
 #define BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 
 #define BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC 250 250 250 153
 #define BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 
 #define BUTTON_SEND_BUBBLE_TEXT_NORMAL_COLOR_INC 58 58 58 255
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
 
-#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_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#000000FF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAC0"
 #define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
 
-#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 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_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 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_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
 
-#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 255
-
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
 
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
-
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 250 250 250 255
 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 93 131 255 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 250 250 250 76
-
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_DISABLED_COLOR_INC 250 250 250 102
-
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_PRESSED_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C"
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 250 250 250 128
 
 #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_DISABLED_COLOR_INC 250 250 250 153
 
 #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_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_EDIT_STYLE_DISABLED_COLOR_INC 250 250 250 153
 
 #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_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 250 250 250 153
 
 #define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC 85 85
 #define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 63 63
 
-#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 249 249 249 255
-#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 250 250 250 255
+#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 250 250 250 255
 
 #define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 115 96
 #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 115 91
 #define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC "#FAFAFA"
 #define BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC "#000000"
 
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC 234 81
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC 668 81
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC 178 81
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_PRESSED_BORDER_INC 40 40 81 81
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC 28 0
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC 36
-#define BUTTON_NAVIFRAME_TOOLBAR_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255
-
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC 330 72
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1228 72
-#define BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC 612 81
-
 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98
 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85
 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 128
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 153
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 42 57 172 255
-#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 93 97 118 153
 
 #define BUTTON_JUMP_STYLE_BG_MIN_INC 74 74
 #define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 250 250 250 255
 #define INDEX_ROLLOVER_ACTIVE_TEXT_COLOR_INC 93 131 255 255
 #define INDEX_DIVIDER_COLOR_INC 64 64 64 255
 #define INDEX_BOTTOM_LINE_WIDTH_INC 1
-#define INDEX_LEFT_LINE_COLOR_INC 65 119 184 255
+#define INDEX_LEFT_LINE_COLOR_INC 59 115 182 255
 #define INDEX_LEFT_LINE_WIDTH_INC 3
 #define INDEX_POPUP_TOP_PADDING_SIZE_INC 10
 #define INDEX_POPUP_BOTTOM_PADDING_SIZE_INC 10
 #define SEGMENT_CONTROL_BADGE_TEXT_FONT_SIZE_INC 26;
 
 #define EDITFIELD_TITLE_SIZE_INC 32
-#define EDITFIELD_TITLE_COLOR_INC 59 115 182 255
+#define EDITFIELD_TITLE_COLOR_INC 110 111 118 255
 #define EDITFIELD_GUIDE_TEXT_COLOR_INC 121 131 138 255
 #define EDITFIELD_DEFAULT_ERASER_MINW_INC 48
 #define EDITFIELD_DEFAULT_ERASER_MINH_INC 48
 #define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 48
 #define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 70
-#define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38
-#define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38
-#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC 38
-#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINH_INC 50
 #define EDITFIELD_DEFAULT_MINH_INC 112
 #define EDITFIELD_TITLE_MINH_INC 128
-#define EDITFIELD_SEARCHBAR_MINH_INC 50
 #define EDITFIELD_DEFAULT_TOP1_SINGLE_INC 27
 #define EDITFIELD_DEFAULT_TOP1_MULTI_INC 56
 #define EDITFIELD_DEFAULT_TOP2_INC 8
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
-#define EDITFIELD_DEFAULT_LEFT3_INC 1
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 56
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
 #define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 25
 #define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 8
-#define EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC 32
 #define EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC 12
-#define EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC 85
-#define EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC 60
-#define EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC 6
-#define EDITFIELD_SEARCHBAR_TOP1_MULTI_INC 10
-#define EDITFIELD_SEARCHBAR_TOP2_INC 10
-#define EDITFIELD_SEARCHBAR_LEFT1_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT2_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT3_INC 1
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 56
-#define EDITFIELD_SEARCHBAR_RIGHT2_INC 0
-#define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
-#define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2
-#define EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC 16
-#define EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC 2
-#define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 50
-#define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
-#define EDITFIELD_ERASER_DEFAULT_COLOR_INC 128 128 128 255
-#define EDITFIELD_ERASER_PRESSED_COLOR_INC 59 115 182 255
+#define EDITFIELD_ERASER_DEFAULT_COLOR_INC 79 93 147 255
+#define EDITFIELD_ERASER_PRESSED_COLOR_INC 250 250 250 255
 
 #define BUTTON_TICKERNOTI_NORMAL_COLOR_INC        225 215 215 255
 #define BUTTON_TICKERNOTI_PRESSED_COLOR_INC       255 255 255 255
 #define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      225 215 215 76
 
 #define BUTTON_DISCLIP_NORMAL_COLOR_INC           255 255 255 255
-#define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 76
+#define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 153
 
-#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        "#FAFAFAFF"
-#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      "#FAFAFA7F"
+#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        "#FFFFFFFF"
+#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      "#FFFFFF80"
 #define CHECK_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
-#define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
+#define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 128
 
-#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        "#FAFAFAFF"
-#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      "#FAFAFA7F"
+#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        "#FFFFFFFF"
+#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      "#FFFFFF80"
 #define RADIO_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
-#define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
+#define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 128
 
 #define CONTROLBAR_LARGE_HEIGHT_INC 122
-#define CONTROLBAR_SMALL_HEIGHT_INC 114
-#define CONTROLBAR_WIDTH_INC 122
-#define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 23 34 38 255
-#define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 58 68 74 255
 
 #define MULTIBUTTONENTRY_WIDTH_PAD_INC 26
 #define MULTIBUTTONENTRY_HEIGHT_PAD_INC 16
 #define MULTIBUTTONENTRY_LABEL_HEIGHT_INC 66 // same as button
 #define MULTIBUTTONENTRY_LABEL_PAD_INC 8
 #define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 36
-#define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC "#808080"
+#define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC "#FAFAFA"
 #define MULTIBUTTONENTRY_GUIDE_HEIGHT_INC 66 // same as button
 #define MULTIBUTTONENTRY_GUIDE_TEXT_SIZE_INC 36
-#define MULTIBUTTONENTRY_GUIDE_TEXT_COLOR_INC "#79838A" //same as editfield
+#define MULTIBUTTONENTRY_GUIDE_TEXT_COLOR_INC "#485D93" //same as editfield
 #define MULTIBUTTONENTRY_BUTTON_HEIGHT_INC 66
 #define MULTIBUTTONENTRY_BUTTON_PAD_INC 12
 #define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 8 8 17 17
 #define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 32
-#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
-#define MULTIBUTTONENTRY_NUMBER_TEXT_COLOR_INC 128 128 128 255 // same as multibuttonentry label
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FAFAFA"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_NORMAL_SHADOW_COLOR_INC "#000000BF"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_PRESSED_SHADOW_COLOR_INC "#000000BF"
+#define MULTIBUTTONENTRY_NUMBER_TEXT_COLOR_INC 250 250 250 255 // same as multibuttonentry label
 #define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 64
 
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 136
 #define POPUP_ITEM_LEFT_MIN_PADDING_INC 26 0
 #define POPUP_ITEM_RIGHT_MIN_PADDING_INC 26 0
 #define POPUP_ITEM_ICON_TEXT_PADDING_INC 16 0
-#define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 250 250 250 102
-#define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 250 250 250 102
+#define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 250 250 250 153
+#define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 250 250 250 153
 
 #define POPUP_ITEM_BG_LANDCAPE_MIN_INC 800 112
 
-#define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC "#fafafa"
-#define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#000000bf"
+#define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC "#FAFAFA"
+#define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#000000BF"
 #define POPUP_DEFAULT_TITLE_TEXT_SHADOW_STYLE "far_shadow,bottom"
 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#FFFFFF"
 #define POPUP_DIM_BG_DEFAULT_COLOR_INC 0 0 0 0
 #define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 76
 #define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 28
 
-#define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          128 128 128 255
-#define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          128 128 128 255
+#define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          110 111 118 255
+#define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          110 111 118 255
 #define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 36
 #define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 36
 #define PROGRESSBAR_PROGRESS_CIRCLE_BG_SIZE_INC 126 126
 #define PROGRESS_BAR_IMAGE_BORDER_INC  17 17 0 0
 #define PROGRESS_BAR_IMAGE_PADDING_SIZE_INC  0 0
 
-#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 128 128 128 255
-#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   28
-#define NOCONTENT_MIDDLE_PADDING_INC         38
-#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
-#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     288 288
+#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC "#FAFAFA"
+#define NOCONTENT_HELP_TEXT_BLOCK_STYLE_COLOR_INC "#6E6F76"
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   36
+#define NOCONTENT_HELP_TEXT_BLOCK_TEXT_SIZE_INC 32
+#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     244 244
 #define NOCONTENT_BG_COLOR_INC               0 0 0 0
-#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 76
-#define NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC  76
-#define NOCONTENT_IMAGE_COLOR_INC            128 128 128 255
+#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 68
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
+#define NOCONTENT_PORTRAIT_HELP_TEXT_STYLE_BG_MIN_INC 580 152
+#define NOCONTENT_LANDSCAPE_HELP_TEXT_STYLE_BG_MIN_INC 920 78
+#define NOCONTENT_IMAGE_COLOR_INC            250 250 250 255
+#define NOCONTENT_BASE_BOTTOM_PADDING_MIN_INC    40 112
+#define NOCONTENT_PORTRAIT_SWALLOW_AREA_MIN_INC    580 74
+#define NOCONTENT_LANDSCAPE_SWALLOW_AREA_MIN_INC   920 74
+#define NOCONTENT_PORTRAIT_AFTER_HELP_TEXT_PADDING_INC 0 50
+#define NOCONTENT_LANDSCAPE_AFTER_HELP_TEXT_PADDING_INC 0 18
+#define NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC    0 96
+#define NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC    0 11
+#define NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC 312 312
+#define NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC 720 1280
+#define NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC 1280 720
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#FAFAFA"
 #define ENTRY_PREEDIT_SUB2_COLOR_INC "#9962C3"
 #define ENTRY_PREEDIT_SUB3_COLOR_INC "#76DE37"
 #define ENTRY_PREEDIT_SUB4_COLOR_INC "#999999"
-#define ENTRY_SELECTION_BG_COLOR 183 212 247 255
+#define ENTRY_SELECTION_BG_COLOR 19 106 144 255
 #define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 51 79
 #define ENTRY_SELECTION_EDGE_COLOR 59 115 182 255
 #define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 4
 #define MAGNIFIER_HEIGHT_FILL 182
-#define MAGNIFIER_HEIGHT_FIXED 134
-#define MAGNIFIER_WIDTH_FIXED 312
+#define MAGNIFIER_HEIGHT_FIXED 164
+#define MAGNIFIER_WIDTH_FIXED 325
 
 #define ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC "#485D93"
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
 #define ENTRY_BUBBLE_STATUS_TIME_PAD_REL_INC 0.0 1.0
 #define ENTRY_BUBBLE_READ_STATUS_TIME_PAD_REL_INC 1.0 1.0
 #define ENTRY_BUBBLE_STATUS_TIME_SIZE_INC 22
-#define ENTRY_BUBBLE_SENT_STATUS_TIME_COLOR_INC 139 139 139 255
-#define ENTRY_BUBBLE_READ_STATUS_TIME_COLOR_INC 139 139 139 255
+#define ENTRY_BUBBLE_SENT_STATUS_TIME_COLOR_INC 110 111 118 255
+#define ENTRY_BUBBLE_READ_STATUS_TIME_COLOR_INC 110 111 118 255
 #define ENTRY_BUBBLE_GROUPCHAT_SIZE_INC 24
-#define ENTRY_BUBBLE_GROUPCHAT_COLOR_INC 139 139 139 255
+#define ENTRY_BUBBLE_GROUPCHAT_COLOR_INC 110 111 118 255
 #define ENTRY_BUBBLE_GROUPCHART_ENABLE_INC 1
 #define ENTRY_BUBBLE_GROUPCHART_PAD 36 30
 #define ENTRY_BUBBLE_GROUPCHART_WITH_CALLERID_PAD 158 30
 #define ENTRY_BUBBLE_READ_STATUS_REL_INC 1.0 0.0
 #define ENTRY_BUBBLE_READ_TIME_REL_INC 1.0 1.0
 
+#define ENTRY_SEARCH_ICON_MIN_MAX_INC 45 45
+#define ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
+#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 153
+#define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 6
+#define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 16
+
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      250 250 250 255
 #define SLIDER_INDICATOR_TEXT_PRESSED_COLOR_INC      250 250 250 255
-#define SLIDER_UNITS_TEXT_COLOR_INC      250 250 250 128
+#define SLIDER_UNITS_TEXT_COLOR_INC      250 250 250 158
 #define SLIDER_UNITS_TEXT_SIZE_INC  30
 #define SLIDER_INDICATOR_TEXT_SIZE_INC  42
 #define SLIDER_BASE_HEIGHT_INC  34
 #define SLIDER_INDICATOR_POPUP_LEFT_BG_BORDER_INC 16 0 0 0
 #define SLIDER_INDICATOR_POPUP_RIGHT_BG_BORDER_INC 0 16 0 0
 
-#define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#ffffff"
-#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#ffffff"
-
-#define DATETIME_FIELD_MIN_SIZE_INC                48 112
-#define DATETIME_SEPARATOR_MIN_SIZE_INC            22 112
-#define DATETIME_LEFT_PADDING_SIZE_INC             27 112
-#define DATETIME_TEXT_FONT_SIZE_INC                34
-#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC      36
-#define DATETIME_TEXT_NORMAL_COLOR_INC             0 0 0 255
-#define DATETIME_SEPARATOR_TEXT_COLOR_INC          0 0 0 255
+#define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#FAFAFA"
+#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#FFFFFF"
+
+#define DATETIME_WIDGET_HEIGHT                     74
+#define DATETIME_FIELD_LEFT_PADDING_SIZE_INC       5 74
+#define DATETIME_FIELD_RIGHT_PADDING_SIZE_INC      5 74
+#define DATETIME_FIELD_PICKER_PADDING_SIZE_INC     30 74
+#define DATETIME_FIELD_MIN_SIZE_INC                0 74
+#define DATETIME_SEPARATOR_MIN_SIZE_INC            10 74
+#define DATETIME_WIDGET_PADDING_SIZE_INC           20 74
+#define DATETIME_TEXT_FONT_SIZE_INC                44
+#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC      44
+#define DATETIME_TEXT_NORMAL_COLOR_INC             250 250 250 255
+#define DATETIME_SEPARATOR_TEXT_COLOR_INC          250 250 250 255
 #define DATETIME_TEXT_SELECTED_COLOR_INC           255 255 255 255
+#define DATETIME_BG_IMAGE_BORDER_INC               13 13 9 9
+#define DATETIME_PICKER_BG_COLOR_INC               67 69 77 255
+#define DATETIME_LEFT_PADDING_SIZE_INC             27 112
 
-#define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC  0 0 0 255
-#define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC  255 255 255 255
+#define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC  250 250 250 255
+#define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC  250 250 250 255
 #define DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC   8 8 21 22
 #define DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC   104
 #define DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC   69
 #define COLORSELECTOR_LANDSCAPE_VER_PAD_INC "0"
 #define COLORSELECTOR_PALETTE_BORDER_INC 13 13 13 13
 
-#define CTXPOPUP_ENTRY_CENTER_IMAGE_BORDER 12 12 9 9
-#define CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 12
-#define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
-#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 68 68 68 255
-#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 0 0 0 255
-#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
-#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 50
-#define CTXPOPUP_ENTRY_ITEM_HEIGHT 74
-#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 14
-#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 28
-#define CTXPOPUP_ENTRY_ICON_SIZE 58
-#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 240
-#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
-#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
-#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 18
-#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 29
-
+#define TICKERNOTI_TEXT_COLOR_INC 250 250 250 255
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_TOTAL_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 8 8 8 8
 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_BOTTOM_BORDER 10 10 0 10
 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER 0 10 10 10
 
-#define TOOLBAR_ITEM_SEPARATOR_LEFT_COLOR_INC 53 53 53 255
-#define TOOLBAR_ITEM_SEPARATOR_MIDDLE_COLOR_INC 0 0 0 255
-#define TOOLBAR_ITEM_SEPARATOR_RIGHT_COLOR_INC 25 25 25 255
 #define TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 8 8
 #define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 8 8 8 8
-#define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#fafafa"
-#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#f0f0f0"
-#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#f0f0f0"
+#define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#FAFAFA"
+#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#F0F0F0"
+#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#F0F0F0"
 #define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9
 #define TABBAR_ITEM_BG_DEFAULT_VISIBLE_INC 0
-#define TABBAR_ITEM_BG_DEFAULT_COLOR_INC 255 255 255 0
 #define TABBAR_DEFAULT_HEIGHT_INC 126
 #define TABBAR_ICON_TEXT_HEIGHT_INC 126
 #define TABBAR_HORIZONTAL_HEIGHT_INC 75
 #define CONFORMANT_INDICATOR_BG_DEFAULT_COLOR_INC 30 30 30 255
 #define CONFORMANT_INDICATOR_BG_TRANSLUCENT_COLOR_INC 0 0 0 125
 #define CONFORMANT_INDICATOR_BG_TRANSPARENT_COLOR_INC 0 0 0 0
+
+#define TTS_FOCUS_BORDER 9 9 9 9
index ed33dda..88cc1d6 100755 (executable)
 #define LAYOUT_INDICATOR_HEIGHT_INC 60
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_TEXT_BG_H_INC 82
-#define NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC 72
-#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255
-#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255
-#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32
-#define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC 0 15
-#define NAVIFRAME_TITLE_TOP_PADDING2_INC 0 18
-#define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING2_INC 0 11
-#define NAVIFRAME_TITLE_RIGHT_PADDING_INC 17 0
-#define NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC 0 32
-#define NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC 0 7
+#define NAVIFRAME_TITLE_TEXT_BG_H_INC 88
+#define NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC 76
 #define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 2 2
-#define NAVIFRAME_TITLE_H_INC 111
+#define NAVIFRAME_TITLE_H_INC 96
 #define NAVIFRAME_LANDSCAPE_TITLE_H_INC 91
 #define NAVIFRAME_TAB_TITLE_H_INC 165
-#define NAVIFRAME_TAB_TITLE_TOP_PADDING_INC 0 18
 #define NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC 145
 #define NAVIFRAME_TAB_TITLE_H2_INC 126
-#define NAVIFRAME_LANDSCAPE_TAB_TITLE_TOP_PADDING_INC 0 17
 #define NAVIFRAME_TOOLBAR_HEIGHT_INC 98
 #define NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC 85
-#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 85 111
-#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 85 91
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 183 96
+#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 183 91
 #define NAVIFRAME_PREV_FUNC_BTN_SIZE_INC 85 98
 #define NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC 85 85
-#define NAVIFRAME_TITLE_TAB_H_INC 63
+#define NAVIFRAME_TITLE_TAB_H_INC 75
 #define NAVIFRAME_TITLE_TAB_FONT_SIZE_INC 44
 #define NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC 38
-#define NAVIFRAME_TITLE_TAB_TEXT_H_INC 60
-#define NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC 60
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 56
+#define NAVIFRAME_TITLE_TAB_TEXT_H_INC 90
+#define NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC 70
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 50
 #define NAVIFRAME_TITLE_FONT_MIN_SIZE_INC 46
 #define NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC 50
-#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 44
+#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 42
 #define NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC 38
-#define NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC 50
-#define NAVIFRAME_DUAL_TITLE1_MIN_W_INC 188
-#define NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_ONE_BUTTON_INC 280
-#define NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_TWO_BUTTON_INC 237
 #define NAVIFRAME_ICON_SIZE_INC 45 45
-#define NAVIFRAME_PADDING_INC 16 0
-#define NAVIFRAME_LANDSCAPE_PADDING_INC 34 0
-#define NAVIFRAME_PADDING2_INC 9 0
-#define NAVIFRAME_PADDING3_INC 8 0
-#define NAVIFRAME_MIDDLE_PADDING_INC 0 12
-#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11
-#define NAVIFRAME_LANDSCAPE_BOTTOM_TEXT_PADDING_INC 0 8
-#define NAVIFRAME_BOTTOM_PADDING_INC 0 12
-#define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
-#define NAVIFRAME_BADGE_PADDING_INC 85 0
-#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 54
-#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
+#define NAVIFRAME_PADDING_INC 26 0
+#define NAVIFRAME_PADDING2_INC 16 0
+#define NAVIFRAME_BADGE_PADDING_INC 92 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
+#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 10
 #define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
-#define NAVIFRAME_BADGE_TEXT_H_INC 26
+#define NAVIFRAME_BADGE_TEXT_H_INC 34
 #define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
 #define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 54
-#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
+#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 26 26 0 0
 #define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
-#define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 16
-#define NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 20
 #define NAVIFRAME_ICON_PADDING_INC 77 0
-#define NAVIFRAME_TITLE_TEXT_COLOR_INC 59 115 182 255
-#define NAVIFRAME_TITLE_STYLE_COLOR_INC "#3B73B6"
-#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 59 115 182 255
-#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
+#define NAVIFRAME_TITLE_TEXT_COLOR_INC 37 37 37 255
+#define NAVIFRAME_TITLE_STYLE_COLOR_INC "#252525"
+#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 37 37 37 255
+#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 30
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28
-#define NAVIFRAME_SUBTITLE_H_INC 34
+#define NAVIFRAME_SUBTITLE_H_INC 37
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC 30
-#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 6
+#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 2
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC 4
-#define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
-#define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
-#define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255
-#define NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC 255 255 255 255
-#define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82
+#define NAVIFRAME_BADGE_TEXT_COLOR_INC 250 250 250 255;
+#define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 138 138 138 82
+#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC 63 27
+#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC 0 0 13 12
 
 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
 #define CTXPOPUP_MORE_TEXT_MAX_INC 599
 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26
 #define CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER 26 26 25 0
-#define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255
 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8
 #define CTXPOPUP_SHADOW_LEFT_PADDING 14
 #define CTXPOPUP_SHADOW_RIGHT_PADDING 14
 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
 #define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18
-#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 255 255 255 255
-#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 255 255 255 76
-#define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255
-#define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76
-#define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
-#define CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC 255 255 255 255
-#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76
-#define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
+#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 250 250 250 255
+#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 250 250 250 76
+#define CTXPOPUP_MAIN_TEXT_COLOR_INC 250 250 250 255
+#define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 250 250 250 76
+#define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 250 250 250 255
+#define CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC 250 250 250 255
+#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 250 250 250 76
+#define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 250 250 250 255
 #define CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC 1
 #define CTXPOPUP_SEPARATOR_PADDING_INC 20
-#define CTXPOPUP_SEPARATOR_COLOR_INC 29 38 60 255
-#define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255
+#define CTXPOPUP_SEPARATOR_COLOR_INC 45 45 45 255
+#define CTXPOPUP_SEPARATOR2_COLOR_INC 91 91 91 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 45 45 45 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 91 91 91 255
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 96
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 96
 #define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
 #define GENGRID_PART_BACKGROUND_COLOR_INC 0 0 0 0
 #define GENGRID_EDIT_MODE_CHECK_TOP_RIGHT_INC 6 6
 #define GENGRID_EDIT_MODE_CHECK_SIZE_INC 63 63
-#define GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC 0 0 0 154
 #define GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC 6 6
 
 #define GENGRID_DEFAULT_LEFT_TOP_PADDING_INC 2 2
 #define BUBBLE_DISCLIP_COLOR                        255 255 255 102 // opacity 40%
 
 // List bg color
+#define GENLIST_LIST_BG_POPUP_COLOR                 248 246 239 255
 #define GENLIST_LIST_BG_COLOR                       248 246 239 255
 #define GENLIST_LIST_PRESS_COLOR                    87 135 194 255
 #define GENLIST_LIST_DIM_COLOR                      248 246 239 255
 #define GENLIST_LIST_LINE1_COLOR                    211 209 203 255
-#define GENLIST_LIST_LINE2_COLOR                    255 255 255 255
-#define GENLIST_LIST_DIVIDER1_COLOR                 185 184 178 255
-#define GENLIST_LIST_DIVIDER2_COLOR                 255 255 255 255
-#define GENLIST_LIST_CENTERLINE1_COLOR              206 205 202 255
-#define GENLIST_SELECT_ALL_BG_COLOR                 220 218 211 255
-
+#define GENLIST_LIST_LINE2_COLOR                    250 250 250 255
+#define GENLIST_LIST_DIVIDER1_COLOR                 211 209 203 255
+#define GENLIST_LIST_DIVIDER2_COLOR                 250 250 250 255
+#define GENLIST_SELECT_ALL_BG_COLOR                 189 187 181 255
 
 // Group Index
 #define GENLIST_GROUPINDEX_LIST_SIZE                     32
-#define GENLIST_GROUPINDEX_LIST_COLOR                    59 115 182 255
-#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR              255 255 255 255
-#define GENLIST_GROUPINDEX_LIST_COLOR_STYLE              "#3B73B6FF"
-#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR_STYLE        "#FFFFFFFF"
+#define GENLIST_GROUPINDEX_LIST_COLOR                    14 104 173 255
+#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR              250 250 250 255
+#define GENLIST_GROUPINDEX_LIST_COLOR_STYLE              "#0E68ADFF"
+#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR_STYLE        "#FAFAFAFF"
 
 #define GENLIST_GROUPINDEX_LIST_BG_COLOR                 248 246 239 255
-#define GENLIST_GROUPINDEX_LIST_PRESS_COLOR              132 162 198 255
-#define GENLIST_GROUPINDEX_LINE_COLOR                    59 115 182 255
-#define GENLIST_GROUPINDEX_LINE_FOCUS_COLOR              255 255 255 255
+#define GENLIST_GROUPINDEX_LIST_PRESS_COLOR              87 135 194 255
+#define GENLIST_GROUPINDEX_LINE_COLOR                    14 104 173 255
+#define GENLIST_GROUPINDEX_LINE_FOCUS_COLOR              250 250 250 255
 
 // Genlist Text
 #define GENLIST_LIST_MAIN_TEXT_SIZE                         44
 #define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR                 0 0 0 255
 #define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE           "#000000FF"
-#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR             0 0 0 102
-#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE       "#00000066"
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR             0 0 0 128
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE       "#00000080"
 #define GENLIST_LIST_MAIN_TEXT_READ_COLOR                   128 128 128 255
-#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR               128 128 128 204
+#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR               128 128 128 128
 #define GENLIST_LIST_TEXT_FOCUS_COLOR                       255 255 255 255
 #define GENLIST_LIST_TEXT_FOCUS_COLOR_STYLE                 "#FFFFFFFF"
 
 #define GENLIST_LIST_SUB_TEXT_SIZE                          32
-#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR                 128 128 128 255
-#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE           "#808080FF"
-#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR             128 128 128 204
-#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE       "#808080CC"
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR                 79 79 79 255
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE           "#4F4F4FFF"
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR             79 79 79 128
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE       "#4F4F4F7F"
 #define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR                59 115 182 255
 #define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE          "#3B73B6FF"
-#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR            59 115 182 76
-#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE      "#3B73B64C"
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR            59 115 182 128
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE      "#3B73B680"
 
 #define GENLIST_LIST_SUB_TEXT_02_SIZE                       24
-#define GENLIST_LIST_SUB_TEXT_02_COLOR                      194 71 71 255
+#define GENLIST_LIST_SUB_TEXT_02_COLOR                      209 0 0 255
 
 #define GENLIST_CONTENTS_TEXT_SIZE                          28
 #define GENLIST_CONTENTS_TEXT_COLOR                         128 128 128 255
 #define GENLIST_LIST_BUBBLE_TEXT_COLOR                      249 249 249 255
 #define GENLIST_LIST_BUBBLE_TEXT_FOCUS_COLOR                87 135 194 255
 #define GENLIST_LIST_BUBBLE_COLOR                           87 135 194 255
-#define GENLIST_LIST_BUBBLE_PRESS_COLOR                     255 255 255 255
+#define GENLIST_LIST_BUBBLE_PRESS_COLOR                     250 250 250 255
 
 #define GENLIST_PROGRESS_MAIN_TEXT_SIZE                     32
 
 #define GENLIST_DIALOGUE_GROUP_TITLE_COLOR          59 115 182 255
 
 #define GENLIST_APPS_NAME_SIZE                          30
-#define GENLIST_APPS_NAME_COLOR                         128 128 128 255
+#define GENLIST_APPS_NAME_COLOR                         79 79 79 255
 #define GENLIST_APPS_INC_SIZE                           30
 #define GENLIST_APPS_INC_COLOR                          0 0 0 255
 #define GENLIST_APPS_RATING_SIZE                        24
-#define GENLIST_APPS_RATING_COLOR                       128 128 128 255
+#define GENLIST_APPS_RATING_COLOR                       79 79 79 255
 #define GENLIST_APPS_PRICE_SIZE                         24
-#define GENLIST_APPS_PRICE_ORIGINAL_COLOR               59 115 182 255
-#define GENLIST_APPS_PRICE_SALE_COLOR                   229 33 52 255
-#define GENLIST_APPS_PRICE_FREE_COLOR                   59 115 182 255
-
-#define GENLIST_ENTRY_RENAME_COLOR                      177 177 177 255
+#define GENLIST_APPS_PRICE_ORIGINAL_COLOR               93 131 255 255
+#define GENLIST_APPS_PRICE_SALE_COLOR                   209 0 0 255
+#define GENLIST_APPS_PRICE_FREE_COLOR                   93 131 255 255
 
 #define DIALOGUE_PASSWORD_TITLE_SIZE                    32
-#define DIALOGUE_PASSWORD_TITLE_COLOR                   128 128 128 255
+#define DIALOGUE_PASSWORD_TITLE_COLOR                   0 0 0 255
 
 #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE           32
 #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE    "#808080FF"
 #define GENLIST_PART_MATCH_TAG_COLOR                    "+ color=#1382FF"
 
-#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define GENLIST_EXPANDABLE_ARROW_CLIP_COLOR             101 101 101 255
+#define GENLIST_EXPANDABLE_ARROW_DIM_COLOR               101 101 101 127
+#define GENLIST_EXPANDABLE_ARROW_PRESS_COLOR            250 250 250 255
+
+#define GENLIST_EMAIL_TEXT_FOCUS_COLOR                  250 250 250 255
+#define GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE            "#FAFAFAFF"
+
+#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_COLOR_STYLE      "#000000FF"
+#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE  "#0000007F"
+#define GENLIST_EMAIL_MAIN_TEXT_READ_COLOR_STYLE        "#686866FF"
+#define GENLIST_EMAIL_MAIN_TEXT_READ_DIM_COLOR_STYLE    "#686866CC"
+
+#define GENLIST_EMAIL_SUB_TEXT_UNREAD_COLOR_STYLE       "#4F4F4FFF"
+#define GENLIST_EMAIL_SUB_TEXT_READ_COLOR_STYLE         "#686866FF"
+
+#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR           59 115 182 255
+#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR_STYLE     "#3B73B6FF"
+#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR             104 104 102 255
+#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR_STYLE       "#686866FF"
+
+#define GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE         "#4F4F4FFF"
 
-#define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#000000C0"
-#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FFFFFFFF"
-#define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
+#define GENLIST_EMAIL_MATCH_TAG_COLOR                   "+ color=#1382FF"
 
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 163
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163
+#define GENLIST_LIST_READ_BG_COLOR                      224 221 216 255
+#define GENLIST_LIST_UNREAD_BG_COLOR                    250 247 242 255
 
-#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#FFFFFFA3"
-#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000A3"
+#define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000FF"
 
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 #define BUTTON_TICKER_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
 
-#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_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
-#define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#FAFAFA80"
+#define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#3A3A3A80"
 
 #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_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76
-#define BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163
-
-#define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 255 255 255 76
-#define BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC 0 0 0 163
-
-#define BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC 255 255 255 76
-#define BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC 0 0 0 163
+#define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 58 58 58 128
+
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
+
+#define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC 0 0 0 255
+
+#define BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC 0 0 0 255
 
 #define BUTTON_SEND_BUBBLE_TEXT_NORMAL_COLOR_INC 58 58 58 255
 #define BUTTON_SEND_BUBBLE_TEXT_PRESSED_COLOR_INC 58 58 58 255
 #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_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 58 58 58 128
 
-#define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
-#define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
-
-#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_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A80"
 
-#define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#000000FF"
+#define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
-#define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#00000080"
-
-#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAC0"
-#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
-
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
+#define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A80"
 
-#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
-#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
+#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000FF"
 
-#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_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_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 58 58 58 128
 
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
-
-#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A80"
 
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
 
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 115 115 115 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 64 127 247 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 101 101 101 76
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000FF"
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000FF"
 
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_DISABLED_COLOR_INC 58 58 58 76
-
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_PRESSED_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C"
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 101 101 101 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 0 123 218 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 101 101 101 128
 
 #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_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 101 101 101 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_DISABLED_COLOR_INC 101 101 101 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_DISABLED_COLOR_INC 255 255 255 128
 
 #define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC 58 58 58 76
+#define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC 58 58 58 128
 
 #define BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_NORMAL_COLOR_INC 255 255 255 255
 #define BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_DATETIME_AMPM_BG_MIN_INC 95 60
 #define BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC 34
 
-#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 13 13
+#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 15 15
 #define BUTTON_SEARCH_BUTTON_BG_MIN_INC 100 66
 #define BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC 148 66
 #define BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC 66 66
 #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
 #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
 #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
 #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
 
 #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
 #define BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC 85 85
 #define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 63 63
 
-#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 249 249 249 255
-#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 58 58 58 255
+#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 58 58 58 255
 
-#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 85 111
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 85 91
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 115 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 115 91
 #define BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC 63 63
-#define BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC 0 34
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC 0 17
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC 124 96
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC 124 96
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC 124 91
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC 124 91
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC 0 96
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC 183 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC 0 91
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC 183 91
 #define BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 16
 #define BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MIN_INC 0 96
 #define BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MAX_INC 151 96
 #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MIN_INC 0 91
 #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MAX_INC 151 91
 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 8 8 8 8
-#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 38
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_TITLE_TEXT_MIN_FONT_SIZE_INC 32
-#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC "#FAFAFA"
-#define BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC "#000000"
-
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC 182 72
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC 496 72
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC 126 70
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_PRESSED_BORDER_INC 35 35 35 35
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC 28 5
-#define BUTTON_NAVIFRAME_TOOLBAR_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255
-
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC 330 72
-#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1012 72
-#define BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC 274 70
+#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC "#252525"
+#define BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC "#FAFAFA"
 
 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98
 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85
 #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 45 45
 
 #define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74
-#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 13 13
+#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 15 15
 #define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 12 5
 #define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 45 45
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 128
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
-#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 135 133 128 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
-#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 135 133 128 128
 
-#define BUTTON_JUMP_STYLE_BG_MIN_INC 72 72
+#define BUTTON_JUMP_STYLE_BG_MIN_INC 74 74
 #define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_JUMP_ICON_PRESSED_COLOR_INC 248 246 239 255
-#define BUTTON_JUMP_ICON_DIM_COLOR_INC 58 58 58 77
+#define BUTTON_JUMP_ICON_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_JUMP_ICON_DIM_COLOR_INC 58 58 58 128
 #define BUTTON_JUMP_TOP_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18
 #define BUTTON_JUMP_LEFT_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18
 
 #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
 #define INDEX_ITEM_HEIGHT_INC 33
 #define INDEX_ROLLOVER_TEXT_SIZE_INC 26
 #define INDEX_POPUP_BG_NINEPATCH_INC 22 22 22 22
-#define INDEX_POPUP_TEXT_COLOR_INC 255 255 255 255
+#define INDEX_POPUP_TEXT_COLOR_INC 250 250 250 255
 #define INDEX_POPUP_TEXT_SIZE_INC 136
 #define INDEX_ROLLOVER_TEXT_COLOR_INC 160 159 154 255
 #define INDEX_ROLLOVER_ACTIVE_TEXT_COLOR_INC 59 115 182 255
-#define INDEX_DIVIDER_COLOR_INC 226 223 213 255
+#define INDEX_DIVIDER_COLOR_INC 209 207 201 255
 #define INDEX_BOTTOM_LINE_WIDTH_INC 1
-#define INDEX_LEFT_LINE_COLOR_INC 65 119 184 255
+#define INDEX_LEFT_LINE_COLOR_INC 59 115 182 255
 #define INDEX_LEFT_LINE_WIDTH_INC 3
 #define INDEX_POPUP_TOP_PADDING_SIZE_INC 10
 #define INDEX_POPUP_BOTTOM_PADDING_SIZE_INC 10
 #define RADIO_STYLE_DEFAULT_BG_MIN_MAX_INC 63 63
 #define RADIO_STYLE_DEFAULT_FONT_SIZE_INC 36
 
-#define PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC 60
-#define PANES_STYLE_DEFAULT_PADDING_LEFT_SIZE_INC 25
-#define PANES_STYLE_DEFAULT_PADDING_RIGHT_SIZE_INC 22
+#define PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC 65
+#define PANES_STYLE_DEFAULT_PADDING_LEFT_SIZE_INC 26
+#define PANES_STYLE_DEFAULT_PADDING_RIGHT_SIZE_INC 26
 #define PANES_STYLE_DEFAULT_MIDDLE_SIZE_INC 26
-#define PANES_STYLE_DEFAULT_FIXED_SIZE_INC 52
+#define PANES_STYLE_DEFAULT_FIXED_SIZE_INC 57
 
 #define SEGMENT_CONTROL_DEFAULT_ITEM_TEXT_COLOR_NORMAL_INC 153 153 153 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 59 115 182 255
 #define SEGMENT_CONTROL_BADGE_TEXT_FONT_SIZE_INC 26;
 
 #define EDITFIELD_TITLE_SIZE_INC 32
-#define EDITFIELD_TITLE_COLOR_INC 59 115 182 255
-#define EDITFIELD_GUIDE_TEXT_COLOR_INC 121 131 138 255
+#define EDITFIELD_TITLE_COLOR_INC 79 79 79 255
+#define EDITFIELD_GUIDE_TEXT_COLOR_INC 144 169 199 255
 #define EDITFIELD_DEFAULT_ERASER_MINW_INC 48
 #define EDITFIELD_DEFAULT_ERASER_MINH_INC 48
 #define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 48
 #define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 70
-#define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38
-#define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38
-#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC 38
-#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINH_INC 50
 #define EDITFIELD_DEFAULT_MINH_INC 112
 #define EDITFIELD_TITLE_MINH_INC 128
-#define EDITFIELD_SEARCHBAR_MINH_INC 50
 #define EDITFIELD_DEFAULT_TOP1_SINGLE_INC 27
 #define EDITFIELD_DEFAULT_TOP1_MULTI_INC 56
 #define EDITFIELD_DEFAULT_TOP2_INC 8
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
-#define EDITFIELD_DEFAULT_LEFT3_INC 1
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 56
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
 #define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 25
 #define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 8
-#define EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC 32
 #define EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC 12
-#define EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC 85
-#define EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC 60
-#define EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC 6
-#define EDITFIELD_SEARCHBAR_TOP1_MULTI_INC 10
-#define EDITFIELD_SEARCHBAR_TOP2_INC 10
-#define EDITFIELD_SEARCHBAR_LEFT1_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT2_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT3_INC 1
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 56
-#define EDITFIELD_SEARCHBAR_RIGHT2_INC 0
-#define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
-#define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2
-#define EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC 16
-#define EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC 2
-#define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 50
-#define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 #define EDITFIELD_ERASER_DEFAULT_COLOR_INC 128 128 128 255
 #define EDITFIELD_ERASER_PRESSED_COLOR_INC 59 115 182 255
 
 #define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      225 215 215 76
 
 #define BUTTON_DISCLIP_NORMAL_COLOR_INC           255 255 255 255
-#define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 76
+#define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 128
 
-#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        "#3A3A3AFF"
-#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      "#3A3A3A7F"
+#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        "#000000FF"
+#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      "#00000080"
 #define CHECK_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
-#define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
+#define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 128
 
-#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        "#3A3A3AFF"
-#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      "#3A3A3A7F"
+#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        "#000000FF"
+#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      "#0000007F"
 #define RADIO_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
-#define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
+#define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 128
 
 #define CONTROLBAR_LARGE_HEIGHT_INC 122
-#define CONTROLBAR_SMALL_HEIGHT_INC 114
-#define CONTROLBAR_WIDTH_INC 122
-#define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 23 34 38 255
-#define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 58 68 74 255
 
 #define MULTIBUTTONENTRY_WIDTH_PAD_INC 26
 #define MULTIBUTTONENTRY_HEIGHT_PAD_INC 16
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC "#808080"
 #define MULTIBUTTONENTRY_GUIDE_HEIGHT_INC 66 // same as button
 #define MULTIBUTTONENTRY_GUIDE_TEXT_SIZE_INC 36
-#define MULTIBUTTONENTRY_GUIDE_TEXT_COLOR_INC "#79838A" //same as editfield
+#define MULTIBUTTONENTRY_GUIDE_TEXT_COLOR_INC "#90A9C7" //same as editfield
 #define MULTIBUTTONENTRY_BUTTON_HEIGHT_INC 66
 #define MULTIBUTTONENTRY_BUTTON_PAD_INC 12
 #define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 8 8 17 17
 #define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 32
-#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FAFAFA"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_NORMAL_SHADOW_COLOR_INC "#00000000"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_PRESSED_SHADOW_COLOR_INC "#00000000"
 #define MULTIBUTTONENTRY_NUMBER_TEXT_COLOR_INC 128 128 128 255 // same as multibuttonentry label
 #define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 64
 
 #define SEARCHBAR_BOTTOM_PADDING_INC 10
 #define SEARCHBAR_HEIGHT_INC 66
 #define SEARCHBAR_WIDTH_INC 120
-#define SEARCHBAR_LEFT_PADDING_INC 26
-#define SEARCHBAR_RIGHT_PADDING_INC 26
+#define SEARCHBAR_LEFT_PADDING_INC 16
+#define SEARCHBAR_RIGHT_PADDING_INC 16
 #define SEARCHBAR_INPUTFIELD_BORDER_INC 12 13 12 13
 #define SEARCHBAR_LEFT_ICON_PADDING_INC 0
 #define SEARCHBAR_ICON_MIN_W_INC 44
 #define SEARCHBAR_H_INC 86
 #define SEARCHBAR_ICON_COLOR_INC 135 133 128 255
 
-#define SELECTION_INFO_BACKGROUND_COLOR_INC          68 68 68 255
-#define SELECTION_INFO_TEXT_COLOR_INC                255 255 255 255
+#define SELECTION_INFO_BACKGROUND_COLOR_INC          189 187 181 255
+#define SELECTION_INFO_TEXT_COLOR_INC                65 65 65 255
 #define SELECTION_INFO_MIN_VER_W_INC                 720
 #define SELECTION_INFO_MIN_HORZ_W_INC                1280
 #define SELECTION_INFO_VER_PADDING_INC               48
 #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
 
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_W 580
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_H 300
+
 #define POPUP_ITEM_BG_DEFAULT_MIN_INC 620 112
 #define POPUP_ITEM_LEFT_MIN_PADDING_INC 26 0
 #define POPUP_ITEM_RIGHT_MIN_PADDING_INC 26 0
 #define POPUP_ITEM_ICON_TEXT_PADDING_INC 16 0
-#define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 128 128 128 255
-#define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 128 128 128 255
+#define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 0 0 0 128
+#define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 0 0 0 128
 
 #define POPUP_ITEM_BG_LANDCAPE_MIN_INC 800 112
 
-#define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC "#3b73b6"
-#define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#ffffff"
+#define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC "#252525"
+#define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#FAFAFA"
 #define POPUP_DEFAULT_TITLE_TEXT_SHADOW_STYLE "far_shadow,bottom"
 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#000000"
 #define POPUP_DIM_BG_DEFAULT_COLOR_INC 0 0 0 0
-#define POPUP_DIM_BG_COLOR_INC 0 0 0 178
-#define POPUP_DIM_BG_CLICKED_COLOR_INC 0 0 0 127
+#define POPUP_DIM_BG_COLOR_INC 0 0 0 128
+#define POPUP_DIM_BG_CLICKED_COLOR_INC 0 0 0 220
 #define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0
 #define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50
 
 #define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 800 78
 #define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
-#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 0
-#define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 0
-#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96
+#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 300
+#define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 300
+#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96
 
 #define POPUP_DESC_LEFT_PADDING 16
 #define POPUP_DESC_RIGHT_PADDING 16
 #define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 96
 #define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 78
 
-#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 568 296
+#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 596 296
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10
 #define POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT "296"
 #define POPUP_CONTENT_MINSTYLE_RIGHT_PADDING_MIN_INC 16
 #define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 568 0
 #define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 0
-#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 596 134
-#define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 596 250
+#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 648 300
+#define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 648 250
 #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134
 
 #define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96"
 #define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 36
 #define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 36
 #define PROGRESSBAR_PROGRESS_CIRCLE_BG_SIZE_INC 126 126
-#define PROGRESS_BG_IMAGE_BORDER_INC  17 17 17 17
-#define PROGRESS_BAR_IMAGE_BORDER_INC  8 8 15 18
-#define PROGRESS_BAR_IMAGE_PADDING_SIZE_INC  9 0
-
-#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 128 128 128 255
-#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   28
-#define NOCONTENT_MIDDLE_PADDING_INC         38
-#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
-#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     288 288
+#define PROGRESS_BG_IMAGE_BORDER_INC  17 17 0 0
+#define PROGRESS_BAR_IMAGE_BORDER_INC  17 17 0 0
+#define PROGRESS_BAR_IMAGE_PADDING_SIZE_INC  0 0
+
+#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC "#6E6F76"
+#define NOCONTENT_HELP_TEXT_BLOCK_STYLE_COLOR_INC "#808080"
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   36
+#define NOCONTENT_HELP_TEXT_BLOCK_TEXT_SIZE_INC 32
+#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     244 244
 #define NOCONTENT_BG_COLOR_INC               0 0 0 0
-#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 76
-#define NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC  76
+#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 68
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
+#define NOCONTENT_PORTRAIT_HELP_TEXT_STYLE_BG_MIN_INC 580 152
+#define NOCONTENT_LANDSCAPE_HELP_TEXT_STYLE_BG_MIN_INC 920 78
 #define NOCONTENT_IMAGE_COLOR_INC            128 128 128 255
+#define NOCONTENT_BASE_BOTTOM_PADDING_MIN_INC    40 112
+#define NOCONTENT_PORTRAIT_SWALLOW_AREA_MIN_INC    580 74
+#define NOCONTENT_LANDSCAPE_SWALLOW_AREA_MIN_INC   920 74
+#define NOCONTENT_PORTRAIT_AFTER_HELP_TEXT_PADDING_INC 0 50
+#define NOCONTENT_LANDSCAPE_AFTER_HELP_TEXT_PADDING_INC 0 18
+#define NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC    0 96
+#define NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC    0 11
+#define NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC 312 312
+#define NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC 720 1280
+#define NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC 1280 720
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#000000"
 #define ENTRY_DISABLED_TEXT_COLOR_INC "#00000080"
-#define ENTRY_GUIDE_TEXT_COLOR_INC "#90A9C7"
-#define ENTRY_CURSOR_COLOR_INC 59 115 182 255
+#define ENTRY_GUIDE_TEXT_COLOR_INC "#878580"
+#define ENTRY_CURSOR_COLOR_INC 64 147 247 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
-#define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"
+#define ENTRY_PREEDIT_TEXT_COLOR_INC "#FAFAFA"
 #define ENTRY_PREEDIT_UNDERLINE_COLOR_INC "#000000"
 #define ENTRY_PREEDIT_SUB1_COLOR_INC "#2EA8E1"
 #define ENTRY_PREEDIT_SUB2_COLOR_INC "#9962C3"
 #define ENTRY_SELECTION_EDGE_COLOR 59 115 182 255
 #define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 4
 #define MAGNIFIER_HEIGHT_FILL 182
-#define MAGNIFIER_HEIGHT_FIXED 134
-#define MAGNIFIER_WIDTH_FIXED 312
+#define MAGNIFIER_HEIGHT_FIXED 164
+#define MAGNIFIER_WIDTH_FIXED 325
 
 #define ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC "#90A9C7"
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
 #define ENTRY_BUBBLE_READ_STATUS_REL_INC 1.0 0.0
 #define ENTRY_BUBBLE_READ_TIME_REL_INC 1.0 1.0
 
+#define ENTRY_SEARCH_ICON_MIN_MAX_INC 45 45
+#define ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
+#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 128
+#define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 6
+#define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 16
+
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      59 115 182 255
-#define SLIDER_INDICATOR_TEXT_PRESSED_COLOR_INC      255 255 255 255
+#define SLIDER_INDICATOR_TEXT_PRESSED_COLOR_INC      250 250 250 255
 #define SLIDER_UNITS_TEXT_COLOR_INC      0 0 0 255
 #define SLIDER_UNITS_TEXT_SIZE_INC  30
-#define SLIDER_INDICATOR_TEXT_SIZE_INC  40
+#define SLIDER_INDICATOR_TEXT_SIZE_INC  42
 #define SLIDER_BASE_HEIGHT_INC  34
 #define SLIDER_BASE_MIN_WIDTH_INC 375
 #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC  72
 #define SLIDER_INDICATOR_WIDTH_INC 48
 #define SLIDER_INDICATOR_HEIGHT_INC 72
 
-#define SLIDER_INDICATOR_POPUP_TEXT_COLOR_INC 255 255 255 255
+#define SLIDER_INDICATOR_POPUP_TEXT_COLOR_INC 250 250 250 255
 #define SLIDER_INDICATOR_POPUP_TEXT_SIZE_INC 72
-#define SLIDER_INDICATOR_POPUP_HEIGHT_INC 108
+#define SLIDER_INDICATOR_POPUP_HEIGHT_INC 99
 #define SLIDER_INDICATOR_POPUP_MIN_WIDTH_INC 90
 #define SLIDER_INDICATOR_POPUP_BG_IMAGE_WIDTH_INC 35
-#define SLIDER_INDICATOR_POPUP_BG_CENTER_IMAGE_SIZE_INC 20 108
+#define SLIDER_INDICATOR_POPUP_BG_CENTER_IMAGE_SIZE_INC 18 99
 #define SLIDER_INDICATOR_POPUP_PADDING_MIN_SIZE_INC 12 0
-#define SLIDER_INDICATOR_POPUP_LEFT_BG_BORDER_INC 33 0 0 0
-#define SLIDER_INDICATOR_POPUP_RIGHT_BG_BORDER_INC 0 33 0 0
-
-#define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#ffffff"
-#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#ffffff"
-
-#define DATETIME_FIELD_MIN_SIZE_INC                48 112
-#define DATETIME_SEPARATOR_MIN_SIZE_INC            22 112
-#define DATETIME_LEFT_PADDING_SIZE_INC             27 112
-#define DATETIME_TEXT_FONT_SIZE_INC                34
-#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC      36
+#define SLIDER_INDICATOR_POPUP_LEFT_BG_BORDER_INC 16 0 0 0
+#define SLIDER_INDICATOR_POPUP_RIGHT_BG_BORDER_INC 0 16 0 0
+
+#define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#FAFAFA"
+#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#FAFAFA"
+
+#define DATETIME_WIDGET_HEIGHT                     74
+#define DATETIME_FIELD_LEFT_PADDING_SIZE_INC       5 74
+#define DATETIME_FIELD_RIGHT_PADDING_SIZE_INC      5 74
+#define DATETIME_FIELD_PICKER_PADDING_SIZE_INC     30 74
+#define DATETIME_FIELD_MIN_SIZE_INC                0 74
+#define DATETIME_SEPARATOR_MIN_SIZE_INC            10 74
+#define DATETIME_WIDGET_PADDING_SIZE_INC           20 74
+#define DATETIME_TEXT_FONT_SIZE_INC                44
+#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC      44
 #define DATETIME_TEXT_NORMAL_COLOR_INC             0 0 0 255
 #define DATETIME_SEPARATOR_TEXT_COLOR_INC          0 0 0 255
-#define DATETIME_TEXT_SELECTED_COLOR_INC           255 255 255 255
+#define DATETIME_TEXT_SELECTED_COLOR_INC           0 0 0 255
+#define DATETIME_BG_IMAGE_BORDER_INC               13 13 9 9
+#define DATETIME_PICKER_BG_COLOR_INC               67 69 77 255
+#define DATETIME_LEFT_PADDING_SIZE_INC             27 112
 
 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC  0 0 0 255
-#define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC  255 255 255 255
+#define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC  250 250 250 255
 #define DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC   8 8 21 22
 #define DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC   104
 #define DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC   69
 #define DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 24
 #define DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 160
 #define DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC 64
-#define DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC 250 250 250 255
+#define DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC 0 0 0 255
 
 #define DATETIME_POPUP_ENTRY_HEIGHT_INC 100
 #define DATETIME_POPUP_ENTRY_MIN_WIDTH_INC 84
 #define DATETIME_POPUP_ENTRY_TEXT_SIZE_INC 64
-#define DATETIME_POPUP_ENTRY_TEXT_COLOR_INC 250 250 250 255;
+#define DATETIME_POPUP_ENTRY_TEXT_COLOR_INC 0 0 0 255;
 
 #define SPINNER_UP_DOWN_IMAGE_SIZE_INC 84 58
 #define SPINNER_UP_DOWN_IMAGE_BORDER_SIZE_INC 13 13 15 15
 #define COLORSELECTOR_LANDSCAPE_VER_PAD_INC "0"
 #define COLORSELECTOR_PALETTE_BORDER_INC 13 13 13 13
 
-#define CTXPOPUP_ENTRY_CENTER_IMAGE_BORDER 12 12 9 9
-#define CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 12
-#define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
-#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 68 68 68 255
-#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 0 0 0 255
-#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
-#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 50
-#define CTXPOPUP_ENTRY_ITEM_HEIGHT 74
-#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 14
-#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 28
-#define CTXPOPUP_ENTRY_ICON_SIZE 58
-#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 240
-#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
-#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
-#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 18
-#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 29
-
+#define TICKERNOTI_TEXT_COLOR_INC 250 250 250 255
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_TOTAL_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 8 8 8 8
 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_BOTTOM_BORDER 10 10 0 10
 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER 0 10 10 10
 
-#define TOOLBAR_ITEM_SEPARATOR_LEFT_COLOR_INC 53 53 53 255
-#define TOOLBAR_ITEM_SEPARATOR_MIDDLE_COLOR_INC 0 0 0 255
-#define TOOLBAR_ITEM_SEPARATOR_RIGHT_COLOR_INC 25 25 25 255
-#define TOOLBAR_ITEM_BG_REL1_OFFSET_INC 4 4
-#define TOOLBAR_ITEM_BG_REL2_OFFSET_INC -5 -5
 #define TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 8 8
-#define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 3 3 3 3
-#define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#fafafa"
-#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#999999"
-#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#3b73b6"
+#define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 8 8 8 8
+#define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#3A3A3A"
+#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#555555"
+#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#0E68AD"
 #define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9
 #define TABBAR_ITEM_BG_DEFAULT_VISIBLE_INC 0
-#define TABBAR_ITEM_BG_DEFAULT_COLOR_INC 255 255 255 0
-#define TABBAR_DEFAULT_HEIGHT_INC 111
-#define TABBAR_ICON_TEXT_HEIGHT_INC 111
-#define TABBAR_HORIZONTAL_HEIGHT_INC 91
-#define TABBAR_HORIZONTAL_ICON_TEXT_HEIGHT_INC 91
-#define TABBAR_ITEM_ICON_SIZE_INC 68 68
-#define TABBAR_ITEM_SMALL_ICON_SIZE_INC 44 44
-#define TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC 211 209 203 255
-#define TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 255 255 255 255
+#define TABBAR_DEFAULT_HEIGHT_INC 126
+#define TABBAR_ICON_TEXT_HEIGHT_INC 126
+#define TABBAR_HORIZONTAL_HEIGHT_INC 75
+#define TABBAR_HORIZONTAL_ICON_TEXT_HEIGHT_INC 75
+#define TABBAR_ITEM_ICON_SIZE_INC 63 63
+#define TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC 138 138 138 255
+#define TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 138 138 138 255
 
 #define CONFORMANT_INDICATOR_BG_DEFAULT_COLOR_INC 52 52 50 255
 #define CONFORMANT_INDICATOR_BG_TRANSLUCENT_COLOR_INC 0 0 0 125
 #define CONFORMANT_INDICATOR_BG_TRANSPARENT_COLOR_INC 0 0 0 0
+
+#define TTS_FOCUS_BORDER 6 6 6 6
index 188763d..a0d9305 100644 (file)
@@ -78,7 +78,6 @@ collections {
 #include "widgets/ctxpopup.edc"
 #include "widgets/datetime.edc"
 #include "widgets/diskselector.edc"
-#include "widgets/editfield.edc"
 #include "widgets/entry.edc"
 #include "widgets/gengrid.edc"
 #include "widgets/scroller.edc"
index a012f3b..6c550aa 100644 (file)
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/access/base/default";
       images {
-         image: "access_glow.png" COMP;
+         image: "B16-8_TTS_focus.png" COMP;
       }
       parts {
          part { name: "base";
             mouse_events:  0;
             description { state: "default" 0.0;
               image {
-                normal: "access_glow.png";
-                border: 6 6 6 6;
+                normal: "B16-8_TTS_focus.png";
+                border: TTS_FOCUS_BORDER;
                 border_scale: 1;
               }
             }
index df9502f..536b2a1 100644 (file)
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_style1_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
          part { name: "over2";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
    group { name: "elm/button/base/search_button/text";
       alias: "elm/button/base/searchbar/default";
       inherit: "elm/button/base/style1";
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_press.png" COMP;
+      styles{
+         style { name: "btn_base_search";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
          part { name: "bg";
             type: RECT;
             scale: 1;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
-               }
-               color: BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC;
+               } 
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_popup_button_dim";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_popup_button_focus";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_popup_button_dim";
+               }
                min: BUTTON_POPUP_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_popup_button_dim";
+                  min: 0 0;
+               }
             }
          }
          part { name: "over2";
@@ -3517,6 +3563,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_default_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_default_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3688,15 +3746,19 @@ 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;
                visible: 1;
+               text {
+                  style: "btn_base_default_dim";
+               }
                min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_default_focus";
+                  min: 0 0;
+               }
             }
          }
          part { name: "over2";
@@ -4224,6 +4286,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          image: "00_contacts_button.png" COMP;
          image: "00_contacts_button_press.png" COMP;
          image: "00_contacts_button_focus.png" COMP;
+         image: "00_contacts_button_dim.png" COMP;
       }
       styles{
          style { name: "btn_base_multibuttonentry";
@@ -4238,6 +4301,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_multibuttonentry_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_multibuttonentry_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -4267,6 +4342,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_contacts_button_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
@@ -4352,15 +4428,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: 1 1;
+               text {
+                  style: "btn_base_multibuttonentry_dim";
+                  min: 1 1;
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_multibuttonentry_focus";
+                  min: 1 1;
+               }
             }
          }
          part { name: "over1";
@@ -4731,81 +4811,27 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       }
    }
 
-//////////////////////////////////////////////////////////////
-/*   group { name: "elm/button/base/naviframe/toolbar/default";
-      alias: "elm/button/base/naviframe/title/default";
+////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/title_icon";
       data {
          item: "focus_highlight" "on";
       }
       images {
-         image: "00_toolbar_button.png" COMP;
-         image: "00_toolbar_button_press.png" COMP;
-         image: "00_toolbar_button_dim.png" COMP;
-         image: "00_toolbar_button_focus.png" COMP;
-      }
-      styles{
-         style { name: "btn_naviframe_toolbar";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_naviframe_toolbar_pressed";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_PRESSED_COLOR_INC" style=shadow,top shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_naviframe_toolbar_disabled";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-         public landscape_state = BUTTON_LANDSCAPE_DISABLED;
+         image: "00_icon_focus.png" COMP;
       }
       parts {
-         part { name: "button_bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
-            }
-         }
          part { name: "button_image";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "button_bg";
-               rel2.to: "button_bg";
-               image {
-                  normal: "00_toolbar_button.png";
-                  border: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_PRESSED_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_dim.png";
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
+            description { state: "landscape" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
             }
          }
          part { name: "focus_image";
@@ -4817,8 +4843,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                rel1.to : "button_image";
                rel2.to : "button_image";
                image {
-                  normal: "00_toolbar_button_focus.png";
-                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  normal: "00_icon_focus.png";
                   border_scale: 1;
                }
             }
@@ -4827,722 +4852,44 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                visible: 1;
             }
          }
-         part { name: "padding_left_top";
-            type: RECT;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
-            mouse_events: 0;
+            clip_to: "elm.icon.clipper";
             description { state: "default" 0.0;
                visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
+               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
+               align: 0.5 0.5;
+               rel1 { to: "button_image"; }
+               rel2 { to: "button_image"; }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_right_bottom";
+         part { name: "elm.icon.clipper";
             type: RECT;
-            scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
-         part { name: "padding_text_left_top";
+         part { name: "over2";
             type: RECT;
-            scale: 1;
-            mouse_events: 0;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "elm.text";
-               }
-               align: 1.0 1.0;
+               color: 0 0 0 0;
             }
          }
-         part { name: "padding_text_right_bottom";
+         part { name: "over3";
             type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "elm.text";
-               }
-               rel2.to: "elm.text";
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  align: 0.5 0.54;
-                  style: "btn_naviframe_toolbar";
-               }
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "landscape_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_clicked" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "landscape_disabled" 0.0;
-               inherit: "landscape" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "landscape_disabled_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_focused" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            script {
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                  set_state(PART:"elm.text", "landscape_clicked", 0.0);
-               else
-                  set_state(PART:"elm.text", "clicked", 0.0);
-               set_state(PART:"button_image", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_clicked") || !strcmp(st, "landscape_focused"))
-                      {
-                         emit("elm,action,default,text,set", "");
-                         set_state(PART:"elm.text", "landscape_visible", 0.0);
-                      }
-                 }
-               else
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                      {
-                         emit("elm,action,default,text,set", "");
-                         set_state(PART:"elm.text", "visible", 0.0);
-                      }
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 {
-                    if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                      set_state(PART:"elm.text", "landscape_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               else
-                 {
-                    if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                      set_state(PART:"elm.text", "landscape_disabled_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "disabled_visible", 0.0);
-                 }
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 set_state(PART:"elm.text", "landscape", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_visible"))
-                      set_state(PART:"elm.text", "landscape_disabled_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "landscape_disabled", 0.0);
-                 }
-               else
-                 {
-                    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);
-                 }
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_disabled"))
-                      set_state(PART:"elm.text", "landscape", 0.0);
-                    else
-                      set_state(PART:"elm.text", "landscape_visible", 0.0);
-                 }
-               else
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "disabled"))
-                      set_state(PART:"elm.text", "default", 0.0);
-                    else
-                      set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               set_int(landscape_state, BUTTON_LANDSCAPE_ENABLED);
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "default"))
-                 set_state(PART:"elm.text", "landscape", 0.0);
-               else if (!strcmp(st, "clicked"))
-                 set_state(PART:"elm.text", "landscape_clicked", 0.0);
-               else if (!strcmp(st, "disabled"))
-                 set_state(PART:"elm.text", "landscape_disabled", 0.0);
-               else if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "landscape_disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "landscape_visible", 0.0);
-               set_state(PART:"button_bg", "landscape", 0.0);
-            }
-         }
-         program { name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               set_int(landscape_state, BUTTON_LANDSCAPE_DISABLED);
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "landscape"))
-                 set_state(PART:"elm.text", "default", 0.0);
-               else if (!strcmp(st, "landscape_clicked"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-               else if (!strcmp(st, "landscape_disabled"))
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               else if (!strcmp(st, "landscape_disabled_visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "visible", 0.0);
-               set_state(PART:"button_bg", "default", 0.0);
-            }
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
-            source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "portrait_mode2";
-            source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-//////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/toolbar/left";
-      inherit: "elm/button/base/naviframe/toolbar/default";
-      parts {
-         part { name: "button_bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-               align: 1.0 0.5;
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               align: 1.0 0.5;
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  align: 0.5 0.54;
-                  style: "btn_naviframe_toolbar";
-               }
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "landscape_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_clicked" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "landscape_disabled" 0.0;
-               inherit: "landscape" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "landscape_disabled_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_focused" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-         }
-      }
-   }
-
-//////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/toolbar/right";
-      inherit: "elm/button/base/naviframe/toolbar/default";
-      parts {
-         part { name: "button_bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-               align: 0.0 0.5;
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  align: 0.5 0.54;
-                  style: "btn_naviframe_toolbar";
-               }
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "landscape_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_clicked" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "landscape_disabled" 0.0;
-               inherit: "landscape" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "landscape_disabled_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_focused" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-         }
-      }
-   }
-*/
-////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/title_icon";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_icon_focus.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-            }
-            description { state: "landscape" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_icon_focus.png";
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "elm.icon.clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
-               align: 0.5 0.5;
-               rel1 { to: "button_image"; }
-               rel2 { to: "button_image"; }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.icon.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
@@ -5677,7 +5024,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       }
       styles{
          style { name: "btn_naviframe_title_text";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -6541,6 +5888,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_exapandable_number_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_exapandable_number_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -6692,11 +6051,15 @@ 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;
+               text {
+                  style: "btn_base_exapandable_number_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_exapandable_number_focus";
+               }
             }
          }
          part { name: "icon_clipper";
index 13c9a2a..acc9a13 100644 (file)
@@ -53,6 +53,7 @@
          image: "00_check_bg.png" COMP; \
          image: "00_check_dim_bg.png" COMP; \
          image: "00_check_activated_dim.png" COMP; \
+         image: "00_check_activated_press.png" COMP; \
          image: "00_check_activated.png" COMP; \
          image: "00_check_press_bg.png" COMP; \
          image: "00_check_focus.png" COMP; \
@@ -90,6 +91,7 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
+               image.normal: "00_check_press_bg.png"; \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
             } \
             description { state: "pressed" 0.0; \
                inherit: "visible" 0.0; \
-            } \
-         } \
-         part { name: "pressed_effect"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "bg"; \
-               rel2.to: "bg"; \
-               visible: 0; \
-               image.normal: "00_check_press_bg.png"; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
+               image.normal: "00_check_activated_press.png"; \
             } \
          } \
          part { name: "sequence_clip"; \
             action: STATE_SET "default" 0.0; \
             target: "bg"; \
             target: "check"; \
-            target: "pressed_effect"; \
          } \
          program { name: "pressed"; \
             signal: "mouse,down,1"; \
             action: STATE_SET "pressed" 0.0; \
             target: "bg"; \
             target: "check"; \
-            target: "pressed_effect"; \
          } \
          program { name: "mouse,out"; \
             signal: "mouse,out"; \
@@ -457,9 +444,11 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
       images { \
          image: "00_check_bg.png" COMP; \
          image: "00_check_dim_bg.png" COMP; \
-         image: "00_check_press_bg.png" COMP; \
          image: "00_check_activated_dim.png" COMP; \
+         image: "00_check_activated_press.png" COMP; \
          image: "00_check_activated.png" COMP; \
+         image: "00_check_press_bg.png" COMP; \
+         image: "00_check_focus.png" COMP; \
       } \
       script { \
          public check_state = CHECK_STATE_DEFAULT; \
@@ -494,6 +483,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
+               image.normal: "00_check_press_bg.png"; \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
@@ -524,20 +514,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
             } \
             description { state: "pressed" 0.0; \
                inherit: "visible" 0.0; \
-            } \
-         } \
-         part { name: "pressed_effect"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "bg"; \
-               rel2.to: "bg"; \
-               visible: 0; \
-               image.normal: "00_check_press_bg.png"; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
+               image.normal: "00_check_activated_press.png"; \
             } \
          } \
          part { name: "sequence_clip"; \
@@ -676,7 +653,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                     set_state(PART:"check", "default", 0.0); \
                  } \
                set_state(PART:"bg", "default", 0.0); \
-               set_state(PART:"pressed_effect", "default", 0.0); \
             } \
          } \
          program { name: "pressed"; \
@@ -689,7 +665,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                     set_state(PART:"check", "pressed", 0.0); \
                  } \
                set_state(PART:"bg", "pressed", 0.0); \
-               set_state(PART:"pressed_effect", "pressed", 0.0); \
             } \
          } \
          program { name: "mouse,out"; \
@@ -2020,8 +1995,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
          image: "00_check_bg.png" COMP;
          image: "00_check_dim_bg.png" COMP;
          image: "00_check_activated_dim.png" COMP;
+         image: "00_check_activated_press.png" COMP;
          image: "00_check_activated.png" COMP;
          image: "00_check_press_bg.png" COMP;
+         image: "00_check_focus.png" COMP;
       }
       script {
          public check_state = CHECK_STATE_DEFAULT;
@@ -2074,6 +2051,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
             }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_check_press_bg.png";
+            }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                image.normal: "00_check_dim_bg.png";
@@ -2097,6 +2078,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             }
             description { state: "pressed" 0.0;
                inherit: "visible" 0.0;
+               image.normal: "00_check_activated_press.png";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
@@ -2104,20 +2086,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                image.normal: "00_check_activated_dim.png";
             }
          }
-         part { name: "pressed_effect";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "bg2";
-               rel2.to: "bg2";
-               visible: 0;
-               image.normal: "00_check_press_bg.png";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
          part { name: "sequence_clip";
             type: RECT;
             mouse_events: 0;
@@ -2257,7 +2225,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             signal: "mouse,up,1";
             source: "events";
             action: STATE_SET "default" 0.0;
-            target: "pressed_effect";
+            target: "bg2";
          }
          program { name: "pressed";
             signal: "mouse,down,1";
@@ -2269,9 +2237,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"check", "pressed", 0.0);
-                    set_state(PART:"bg2", "visible", 0.0);
                  }
-              set_state(PART:"pressed_effect", "pressed", 0.0);
+               set_state(PART:"bg2", "pressed", 0.0);
             }
          }
          program { name: "mouse,out";
@@ -2290,7 +2257,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                     set_state(PART:"sequence_clip", "default", 0.0);
                     set_state(PART:"bg2", "default", 0.0);
                  }
-              set_state(PART:"pressed_effect", "default", 0.0);
             }
          }
          program { name: "check_on";
index 784587a..f3a5de3 100644 (file)
@@ -35,7 +35,7 @@
 group {
    name: "elm/ctxpopup/layout/default";
    alias: "elm/ctxpopup/layout/copypaste";
-   max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12));
+   max: CTXPOPUP_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7.5)+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*14));
    parts {
       part {
          name:"top_padding";
@@ -361,7 +361,7 @@ group {
 group {
    name: "elm/ctxpopup/layout/landscape/default";
    inherit: "elm/ctxpopup/layout/default";
-   max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8));
+   max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5.5)+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*10));
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
@@ -691,7 +691,7 @@ group {
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/layout/more/default";
-   max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12));
+   max: (CTXPOPUP_MORE_WIDTH_MAX_INC-(CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING)) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7.5)+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*14));
    parts {
       part {
          name:"top_padding";
@@ -1017,7 +1017,7 @@ group {
 group {
    name: "elm/ctxpopup/layout/landscape/more/default";
    inherit: "elm/ctxpopup/layout/landscape/default";
-   max: CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8));
+   max: (CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC-(CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING)) ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5.5)+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*10));
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
index 0665a46..04a6ce9 100644 (file)
 // datetime
 ///////////////////////////////////////////////////////////////////////////////
 
-#define DATETIME_FIELD(_pos, _after) \
+#define DATETIME_FIELD(_pos, prev_part) \
+   part {\
+      name: "picker.padding"#_pos; \
+      type: RECT; \
+      scale: 1;\
+      clip_to: "clipper";\
+      description { state: "default" 0.0; \
+         color: 0 0 0 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: prev_part;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: prev_part;\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         min: DATETIME_FIELD_PICKER_PADDING_SIZE_INC;\
+      }\
+   }\
+   part {\
+      name: "field"#_pos".bg"; \
+      type: RECT; \
+      scale: 1;\
+      clip_to: "clipper";\
+      description { state: "default" 0.0; \
+         visible: 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding"#_pos;\
+         }\
+         color: DATETIME_PICKER_BG_COLOR_INC;\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+      }\
+   }\
+   part {\
+      name: "left.padding"#_pos; \
+      type: RECT; \
+      scale: 1;\
+      clip_to: "clipper";\
+      description { state: "default" 0.0; \
+         color: 0 0 0 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: "picker.padding"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "picker.padding"#_pos;\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         min: DATETIME_FIELD_LEFT_PADDING_SIZE_INC;\
+      }\
+   }\
+   part {\
+      name: "field"#_pos; \
+      type: SWALLOW; \
+      scale: 1;\
+      clip_to: "clipper";\
+      repeat_events: 1;\
+      description { state: "default" 0.0; \
+         visible: 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: "left.padding"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "left.padding"#_pos;\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         min: DATETIME_FIELD_MIN_SIZE_INC;\
+      }\
+   }\
+   part {\
+      name: "separator"#_pos; \
+      type: TEXT;\
+      scale: 1;\
+      clip_to: "clipper";\
+      description {\
+         state: "default" 0.0;\
+         visible: 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: "field"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "field"#_pos;\
+         }\
+         color: DATETIME_SEPARATOR_TEXT_COLOR_INC;\
+         text {\
+            font: "Tizen:style=Regular";\
+            size: DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC;\
+            min: 1 0; \
+            text_class: "tizen";\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         min: DATETIME_SEPARATOR_MIN_SIZE_INC;\
+      }\
+   }\
+   part {\
+      name: "right.padding"#_pos; \
+      type: RECT;\
+      scale: 1;\
+      clip_to: "clipper";\
+      description {\
+         state: "default" 0.0;\
+         color: 0 0 0 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: "separator"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "separator"#_pos;\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         min: DATETIME_FIELD_RIGHT_PADDING_SIZE_INC;\
+      }\
+   }\
+   programs{\
+      program {\
+         name: "field_"#_pos"enabled";\
+         signal: "field"#_pos",enable";\
+         source: "elm";\
+         action: STATE_SET "enable" 0.0;\
+         target: "field"#_pos;\
+         target: "left.padding"#_pos;\
+         target: "right.padding"#_pos;\
+         target: "field"#_pos".bg";\
+      }\
+      program {\
+         name: "field_"#_pos"disabled";\
+         signal: "field"#_pos",disable";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "field"#_pos;\
+         target: "left.padding"#_pos;\
+         target: "right.padding"#_pos;\
+         target: "field"#_pos".bg";\
+      }\
+      program {\
+         name: "separator"#_pos",enabled";\
+         signal: "field"#_pos",separator,enable";\
+         source: "elm";\
+         action: STATE_SET "enable" 0.0;\
+         target: "separator"#_pos;\
+      }\
+      program {\
+         name: "separator"#_pos",disabled";\
+         signal: "field"#_pos",separator,disable";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "separator"#_pos;\
+      }\
+   }
+
+#define DATETIME_DATEPICKER_BG \
+   part {\
+      name: "date.picker.bg"; \
+      scale: 1;\
+      clip_to: "clipper";\
+      description { state: "default" 0.0; \
+         min: 0 0;\
+         visible: 0;\
+         fixed: 1 0;\
+         image {\
+            normal: "00_button_01.png";\
+            border: DATETIME_BG_IMAGE_BORDER_INC;\
+            border_scale: 1;\
+         }\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding0";\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding2";\
+         }\
+      }\
+      description { state: "datefirst" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+      }\
+      description { state: "timefirst" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding3";\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding5";\
+         }\
+      }\
+      description { state: "timefirst24hr" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding2";\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding4";\
+         }\
+      }\
+   }\
+   programs{\
+      program {\
+         name: "datepicker_starting_field0";\
+         signal: "datepicker,starting,field0";\
+         source: "elm";\
+         action: STATE_SET "datefirst" 0.0;\
+         target: "date.picker.bg";\
+      }\
+      program {\
+         name: "datepicker_starting_field3";\
+         signal: "datepicker,starting,field3";\
+         source: "elm";\
+         action: STATE_SET "timefirst" 0.0;\
+         target: "date.picker.bg";\
+      }\
+      program {\
+         name: "datepicker_starting_field2";\
+         signal: "datepicker,starting,field3";\
+         source: "elm";\
+         action: STATE_SET "timefirst24hr" 0.0;\
+         target: "date.picker.bg";\
+      }\
+      program {\
+         name: "datepicker_starting_field1";\
+         signal: "datepicker,starting,field1";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "date.picker.bg";\
+      }\
+      program {\
+         name: "datepicker_starting_field4";\
+         signal: "datepicker,starting,field4";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "date.picker.bg";\
+      }\
+      program {\
+         name: "datepicker_starting_field5";\
+         signal: "datepicker,starting,field5";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "date.picker.bg";\
+      }\
+   }
+
+#define DATETIME_TIMEPICKER_BG \
+   part {\
+      name: "time.picker.bg"; \
+      scale: 1;\
+      clip_to: "clipper";\
+      description { state: "default" 0.0; \
+         min: 0 0;\
+         visible: 0;\
+         fixed: 1 0;\
+         image {\
+            normal: "00_button_01.png";\
+            border: DATETIME_BG_IMAGE_BORDER_INC;\
+            border_scale: 1;\
+         }\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding3";\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding5";\
+         }\
+      }\
+      description { state: "datefirst" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+      }\
+      description { state: "timefirst" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding0";\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding2";\
+         }\
+      }\
+      description { state: "timefirst24hr" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         rel1 {\
+            relative: 0.0 0.0;\
+            to: "left.padding0";\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "right.padding1";\
+         }\
+      }\
+   }\
+   programs{\
+      program {\
+         name: "timepicker_starting_field3";\
+         signal: "timepicker,starting,field3";\
+         source: "elm";\
+         action: STATE_SET "datefirst" 0.0;\
+         target: "time.picker.bg";\
+      }\
+      program {\
+         name: "timepicker_starting_field0";\
+         signal: "timepicker,starting,field0";\
+         source: "elm";\
+         script {\
+            new st[31];\
+            new Float:vl;\
+            get_state(PART:"date.picker.bg", st, 30, vl);\
+            if (!strcmp(st, "timefirst24hr"))\
+              set_state(PART:"time.picker.bg", "timefirst24hr", 0.0);\
+            else\
+              set_state(PART:"time.picker.bg", "timefirst", 0.0);\
+         }\
+      }\
+      program {\
+         name: "timepicker_starting_field1";\
+         signal: "timepicker,starting,field1";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "time.picker.bg";\
+      }\
+      program {\
+         name: "timepicker_starting_field2";\
+         signal: "timepicker,starting,field2";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "time.picker.bg";\
+      }\
+      program {\
+         name: "timepicker_starting_field4";\
+         signal: "timepicker,starting,field4";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "time.picker.bg";\
+      }\
+      program {\
+         name: "timepicker_starting_field5";\
+         signal: "timepicker,starting,field5";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "time.picker.bg";\
+      }\
+   }
+
+#define DATETIME_PICKER_BG_PROGRAMS \
+      program {\
+         name: "datepicker_starting_field2_bg";\
+         signal: "datepicker,starting,field2";\
+         source: "elm";\
+         script {\
+            set_state(PART:"picker.padding2", "enable", 0.0);\
+            set_state(PART:"picker.padding3", "default", 0.0);\
+         }\
+      }\
+      program {\
+         name: "datepicker_starting_field3_bg";\
+         signal: "datepicker,starting,field3";\
+         source: "elm";\
+         script {\
+            set_state(PART:"picker.padding3", "enable", 0.0);\
+            set_state(PART:"picker.padding2", "default", 0.0);\
+         }\
+      }\
+      program {\
+         name: "timepicker_starting_field3_bg";\
+         signal: "timepicker,starting,field3";\
+         source: "elm";\
+         script {\
+            set_state(PART:"picker.padding3", "enable", 0.0);\
+            set_state(PART:"picker.padding2", "default", 0.0);\
+         }\
+      }\
+      program {\
+         name: "timepicker_starting_field0_bg";\
+         signal: "timepicker,starting,field0";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "picker.padding0";\
+      }\
+      program {\
+         name: "datepicker_starting_field1_bg";\
+         signal: "datepicker,starting,field1";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "picker.padding0";\
+         target: "picker.padding2";\
+         target: "picker.padding3";\
+      }\
+      program {\
+         name: "datepicker_starting_field4_bg";\
+         signal: "datepicker,starting,field4";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "picker.padding0";\
+         target: "picker.padding2";\
+         target: "picker.padding3";\
+      }
+
+group { name: "elm/datetime/base/default";
+   images {
+      image: "00_button_01.png" COMP;
+      image: "00_button_01_press.png" COMP;
+   }
+   parts {
+      part {
+         name: "bg";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+            min: 0 DATETIME_WIDGET_HEIGHT;
+            max: -1 DATETIME_WIDGET_HEIGHT;
+         }
+      }
+      part {
+         name: "left.padding";
+         type: RECT;
+         scale: 1;
+         clip_to: "clipper";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: DATETIME_WIDGET_PADDING_SIZE_INC;
+            align: 0.0 0.5;
+            fixed: 1 1;
+            rel1.to: "bg";
+            rel2 {
+               relative: 0.0 1.0;
+               to: "bg";
+            }
+         }
+      }
+      part {
+         name: "right.padding";
+         type: RECT;
+         scale: 1;
+         clip_to: "clipper";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: DATETIME_WIDGET_PADDING_SIZE_INC;
+            align: 1.0 0.5;
+            fixed: 1 1;
+            rel2 {
+               relative: 1.0 0.0;
+               to: "bg";
+            }
+            rel2.to: "bg";
+         }
+      }
+
+      //DATETIME_DATEPICKER_BG
+      //DATETIME_TIMEPICKER_BG
+
+      DATETIME_FIELD(0, "left.padding")
+      DATETIME_FIELD(1, "right.padding0")
+      DATETIME_FIELD(2, "right.padding1")
+      DATETIME_FIELD(3, "right.padding2")
+      DATETIME_FIELD(4, "right.padding3")
+      DATETIME_FIELD(5, "right.padding4")
+
+      part {
+         name: "clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 102;
+         }
+      }
+      part {
+         name: "disabler";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "disble_datetime";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "disabler";
+         target: "clipper";
+      }
+      program {
+         name: "enable_datetime";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "disabler";
+         target: "clipper";
+      }
+      DATETIME_PICKER_BG_PROGRAMS
+   }
+}
+
+#define DATETIME_FIELD_STYLE1(_pos, _after) \
    part {\
       name: "field"#_pos; \
       type: SWALLOW; \
       }\
     }
 
-#define DATETIME_SEPARATOR(_pos) \
+#define DATETIME_SEPARATOR_STYLE1(_pos) \
    part {\
       name: "separator"#_pos; \
       type: TEXT;\
    }
 
 
-group { name: "elm/datetime/base/default";
+group { name: "elm/datetime/base/style1";
    parts {
       part {
          name: "bg";
@@ -194,17 +755,17 @@ group { name: "elm/datetime/base/default";
             min: DATETIME_FIELD_MIN_SIZE_INC;
          }
       }
-      DATETIME_SEPARATOR(0)
-      DATETIME_FIELD(1, 0)
-      DATETIME_SEPARATOR(1)
-      DATETIME_FIELD(2, 1)
-      DATETIME_SEPARATOR(2)
-      DATETIME_FIELD(3, 2)
-      DATETIME_SEPARATOR(3)
-      DATETIME_FIELD(4, 3)
-      DATETIME_SEPARATOR(4)
-      DATETIME_FIELD(5, 4)
-      DATETIME_SEPARATOR(5)
+      DATETIME_SEPARATOR_STYLE1(0)
+      DATETIME_FIELD_STYLE1(1, 0)
+      DATETIME_SEPARATOR_STYLE1(1)
+      DATETIME_FIELD_STYLE1(2, 1)
+      DATETIME_SEPARATOR_STYLE1(2)
+      DATETIME_FIELD_STYLE1(3, 2)
+      DATETIME_SEPARATOR_STYLE1(3)
+      DATETIME_FIELD_STYLE1(4, 3)
+      DATETIME_SEPARATOR_STYLE1(4)
+      DATETIME_FIELD_STYLE1(5, 4)
+      DATETIME_SEPARATOR_STYLE1(5)
       part {
          name: "right.padding";
          type: RECT;
@@ -292,8 +853,6 @@ group { name: "elm/spinner/base/default";
    images {
       image: "00_picker_arrow_down.png" COMP;
       image: "00_picker_arrow_up.png" COMP;
-      image: "00_picker_arrow_down_press_web.png" COMP;
-      image: "00_picker_arrow_up_press_web.png" COMP;
       image: "00_button_01.png" COMP;
       image: "00_button_01_press.png" COMP;
    }
@@ -333,7 +892,7 @@ group { name: "elm/spinner/base/default";
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            image.normal: "00_picker_arrow_up_press_web.png";
+            image.normal: "00_picker_arrow_up.png";
          }
       }
       part { name: "down.image";
@@ -364,7 +923,7 @@ group { name: "elm/spinner/base/default";
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            image.normal: "00_picker_arrow_down_press_web.png";
+            image.normal: "00_picker_arrow_down.png";
          }
       }
       part { name: "elm.text";
diff --git a/themes/widgets/editfield.edc b/themes/widgets/editfield.edc
deleted file mode 100644 (file)
index f73d2ae..0000000
+++ /dev/null
@@ -1,2426 +0,0 @@
-/*
- * efl-theme-tizen
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-group { name: "elm/editfield/base/default";
-   images {
-      image: "00_edit_field_clear.png" COMP;
-   }
-   styles {
-      style { name: "editfield_content_singleline_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed ellipsis=1 text_class=tizen";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=Tizen:style=Oblique";
-         tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=Tizen:style=Bold";
-      }
-      style { name: "editfield_content_multiline_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed text_class=tizen";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=Tizen:style=Oblique";
-         tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=Tizen:style=Bold";
-      }
-      style { name: "editfield_content_password_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none ellipsis=1 text_class=tizen";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=Tizen:style=Oblique";
-         tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=Tizen:style=Bold";
-      }
-   }
-   script {
-      public single_line = 0;
-      public password_mode = 0;
-
-      public set_multi_line() {
-         set_int(single_line, 0);
-      }
-      public set_single_line() {
-         set_int(single_line, 1);
-      }
-      public set_password() {
-         set_int(password_mode, 1);
-      }
-      public unset_password() {
-         set_int(password_mode, 0);
-      }
-      public no_edit() {
-         if(get_int(single_line) == 1) {
-            if(get_int(password_mode) == 0) {
-               set_state(PART:"elm.content.single", "no_edit", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "default", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-            else {
-               set_state(PART:"elm.content.single", "default", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "no_edit", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-         }
-         else if(get_int(single_line) == 0) {
-            set_state(PART:"elm.content.single", "default", 0.0);
-            set_state(PART:"elm.content.multi", "no_edit", 0.0);
-            set_state(PART:"elm.content.password", "default", 0.0);
-         }
-         set_state(PART:"over", "default", 0.0);
-         set_state(PART:"top2", "default", 0.0);
-      }
-   }
-   parts {
-      part {
-         name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_MINH_INC;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_TOP1_SINGLE_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_TOP1_MULTI_INC;
-         }
-      }
-      part {
-         name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_TOP2_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-         }
-      }
-      part {
-         name: "left1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_LEFT1_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "left2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_LEFT2_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "right1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "right2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_RIGHT2_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "bottom1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC;
-            fixed: 1 1;
-            align: 0 1;
-            rel1.relative: 0.0 1.0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom3";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            align: 0.0 0.0;
-            min: 0 34;
-            fixed: 1 1;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            color: EDITFIELD_TITLE_COLOR_INC;
-            text {
-               font: "Tizen:style=Medium";
-               size: EDITFIELD_TITLE_SIZE_INC;
-               min: 1 1;
-               align: 0.0 0.0;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "elm.guidetext";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
-            text {
-               font: "Tizen:style=Roman";
-               size: ENTRY_TEXT_SIZE_INC;
-               min: 0 0;
-               align: 0.0 0.5;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.single";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_singleline_style";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.multi";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_multiline_style";
-               min: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.password";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         entry_mode: PASSWORD;
-         multiline: 0;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_password_style";
-               repch: "*";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 40;
-            rel1 {
-               relative : 1.0 1.0;
-               to_x: "left1";
-               to_y: "top1";
-            }
-            rel2 {
-               relative : 0.0 0.0;
-               to_x: "right1";
-               to_y: "bottom1";
-            }
-            align: 0.0 0.5;
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "over";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 0 0 0 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "eraser_image";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_ERASER_MINW_INC EDITFIELD_DEFAULT_ERASER_MINH_INC;
-            fixed: 1 1;
-            align: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            rel2 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            image {
-               normal: "00_edit_field_clear.png";
-               border: 10 10 10 10;
-               border_scale: 1;
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "eraser";
-         type: RECT;
-         mouse_events: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "eraser_image";
-               to_y : "bottom3";
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "guidetext_show";
-         signal: "elm,state,guidetext,visible";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "guidetext_hide";
-         signal: "elm,state,guidetext,hidden";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "eraser_show";
-         signal: "elm,state,eraser,show";
-         source: "elm";
-         action: STATE_SET "elm.eraser.show" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "eraser_hide";
-         signal: "elm,state,eraser,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "multiline_set";
-         signal: "elm,state,text,multiline";
-         source: "elm";
-         script {
-            set_multi_line();
-         }
-      }
-      program {
-         name: "singleline_set";
-         signal: "elm,state,text,singleline";
-         source: "elm";
-         script {
-            set_single_line();
-         }
-      }
-      program {
-         name: "password_set";
-         signal: "elm,state,password,set";
-         source: "elm";
-         script {
-            set_password();
-         }
-      }
-      program {
-         name: "password_unset";
-         signal: "elm,state,password,unset";
-         source: "elm";
-         script {
-            unset_password();
-         }
-      }
-      program {
-         name: "editing";
-         signal: "elm,state,over,hide";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.password";
-         target: "elm.content.multi";
-         target: "elm.content.single";
-         target: "over";
-         target: "top2";
-      }
-      program {
-         name: "no_editing";
-         signal: "elm,state,over,show";
-         source: "elm";
-         script {
-            no_edit();
-         }
-      }
-      program {
-         name: "label_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         action: STATE_SET "elm.text.show" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "label_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "entry_show";
-         signal: "elm,state,entry,show";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.multi";
-      }
-   }
-}
-
-group { name: "elm/editfield/base/searchbar";
-   alias: "elm/editfield/base/searchbar/default";
-   images {
-      image: "00_field_btn_clear.png" COMP;
-   }
-   script {
-      public single_line = 0;
-      public password_mode = 0;
-
-      public set_multi_line() {
-         set_int(single_line, 0);
-      }
-      public set_single_line() {
-         set_int(single_line, 1);
-      }
-      public set_password() {
-         set_int(password_mode, 1);
-      }
-      public unset_password() {
-         set_int(password_mode, 0);
-      }
-      public no_edit() {
-         if(get_int(single_line) == 1) {
-            if(get_int(password_mode) == 0) {
-               set_state(PART:"elm.content.single", "no_edit", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "default", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-            else {
-               set_state(PART:"elm.content.single", "default", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "no_edit", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-         }
-         else if(get_int(single_line) == 0) {
-            set_state(PART:"elm.content.single", "default", 0.0);
-            set_state(PART:"elm.content.multi", "no_edit", 0.0);
-            set_state(PART:"elm.content.password", "default", 0.0);
-         }
-         set_state(PART:"over", "default", 0.0);
-         set_state(PART:"top2", "default", 0.0);
-      }
-   }
-   parts {
-      part {
-         name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_MINH_INC;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_MULTI_INC;
-         }
-      }
-      part {
-         name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP2_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-         }
-      }
-      part {
-         name: "left1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT1_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "left2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT2_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "right1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "right2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT2_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "bottom1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC;
-            fixed: 1 1;
-            align: 0 1;
-            rel1.relative: 0.0 1.0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom3";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            align: 0.0 0.0;
-            min: 0 30;
-            fixed: 1 1;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            color: EDITFIELD_TITLE_COLOR_INC;
-            text {
-               font: "Tizen:style=Medium";
-               size: EDITFIELD_TITLE_SIZE_INC;
-               min: 1 1;
-               align: 0.0 0.0;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "elm.guidetext";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
-            text {
-               font: "Tizen:style=Roman";
-               size: ENTRY_TEXT_SIZE_INC;
-               min: 0 0;
-               align: 0.0 0.5;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.single";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_singleline_style";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.multi";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_multiline_style";
-               min: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.password";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         entry_mode: PASSWORD;
-         multiline: 0;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_password_style";
-               repch: "*";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 40;
-            rel1 {
-               relative : 1.0 1.0;
-               to_x: "left1";
-               to_y: "top1";
-            }
-            rel2 {
-               relative : 0.0 0.0;
-               to_x: "right1";
-               to_y: "bottom1";
-            }
-            align: 0.0 0.5;
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "over";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 0 0 0 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "eraser_image";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC;
-            fixed: 1 1;
-            align: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            rel2 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            image {
-               normal: "00_field_btn_clear.png";
-               border: 4 4 4 4 ;
-               border_scale: 1;
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "eraser";
-         type: RECT;
-         mouse_events: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "eraser_image";
-               to_y : "bottom3";
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "guidetext_show";
-         signal: "elm,state,guidetext,visible";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "guidetext_hide";
-         signal: "elm,state,guidetext,hidden";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "eraser_show";
-         signal: "elm,state,eraser,show";
-         source: "elm";
-         action: STATE_SET "elm.eraser.show" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "eraser_hide";
-         signal: "elm,state,eraser,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "multiline_set";
-         signal: "elm,state,text,multiline";
-         source: "elm";
-         script {
-            set_multi_line();
-         }
-      }
-      program {
-         name: "singleline_set";
-         signal: "elm,state,text,singleline";
-         source: "elm";
-         script {
-            set_single_line();
-         }
-      }
-      program {
-         name: "password_set";
-         signal: "elm,state,password,set";
-         source: "elm";
-         script {
-            set_password();
-         }
-      }
-      program {
-         name: "password_unset";
-         signal: "elm,state,password,unset";
-         source: "elm";
-         script {
-            unset_password();
-         }
-      }
-      program {
-         name: "editing";
-         signal: "elm,state,over,hide";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.password";
-         target: "elm.content.multi";
-         target: "elm.content.single";
-         target: "over";
-         target: "top2";
-      }
-      program {
-         name: "no_editing";
-         signal: "elm,state,over,show";
-         source: "elm";
-         script {
-            no_edit();
-         }
-      }
-      program {
-         name: "label_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         action: STATE_SET "elm.text.show" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "label_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "entry_show";
-         signal: "elm,state,entry,show";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.multi";
-      }
-   }
-}
-
-group { name: "elm/editfield/base/font_color_black";
-   images {
-      image: "00_edit_field_clear.png" COMP;
-   }
-   styles {
-      style { name: "editfield_content_singleline_black_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed ellipsis=1 text_class=tizen";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=Tizen:style=Oblique";
-         tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=Tizen:style=Bold";
-      }
-      style { name: "editfield_content_multiline_black_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed text_class=tizen";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=Tizen:style=Oblique";
-         tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=Tizen:style=Bold";
-      }
-      style { name: "editfield_content_password_black_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none ellipsis=1 text_class=tizen";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=Tizen:style=Oblique";
-         tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=Tizen:style=Bold";
-      }
-   }
-   script {
-      public single_line = 0;
-      public password_mode = 0;
-
-      public set_multi_line() {
-         set_int(single_line, 0);
-      }
-      public set_single_line() {
-         set_int(single_line, 1);
-      }
-      public set_password() {
-         set_int(password_mode, 1);
-      }
-      public unset_password() {
-         set_int(password_mode, 0);
-      }
-      public no_edit() {
-         if(get_int(single_line) == 1) {
-            if(get_int(password_mode) == 0) {
-               set_state(PART:"elm.content.single", "no_edit", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "default", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-            else {
-               set_state(PART:"elm.content.single", "default", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "no_edit", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-         }
-         else if(get_int(single_line) == 0) {
-            set_state(PART:"elm.content.single", "default", 0.0);
-            set_state(PART:"elm.content.multi", "no_edit", 0.0);
-            set_state(PART:"elm.content.password", "default", 0.0);
-         }
-         set_state(PART:"over", "default", 0.0);
-         set_state(PART:"top2", "default", 0.0);
-      }
-   }
-   parts {
-      part {
-         name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_MINH_INC;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_TOP1_SINGLE_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_TOP1_MULTI_INC;
-         }
-      }
-      part {
-         name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_TOP2_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-         }
-      }
-      part {
-         name: "left1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_LEFT1_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "left2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_LEFT2_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "right1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "right2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_RIGHT2_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "bottom1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC;
-            fixed: 1 1;
-            align: 0 1;
-            rel1.relative: 0.0 1.0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom3";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            align: 0.0 0.0;
-            min: 0 34;
-            fixed: 1 1;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            color: 0 0 0 255;
-            text {
-               font: "Tizen:style=Medium";
-               size: EDITFIELD_TITLE_SIZE_INC;
-               min: 1 1;
-               align: 0.0 0.0;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "elm.guidetext";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
-            text {
-               font: "Tizen:style=Roman";
-               size: ENTRY_TEXT_SIZE_INC;
-               min: 0 0;
-               align: 0.0 0.5;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.single";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_singleline_black_style";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.multi";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_multiline_black_style";
-               min: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.password";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         entry_mode: PASSWORD;
-         multiline: 0;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_password_black_style";
-               repch: "*";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 40;
-            rel1 {
-               relative : 1.0 1.0;
-               to_x: "left1";
-               to_y: "top1";
-            }
-            rel2 {
-               relative : 0.0 0.0;
-               to_x: "right1";
-               to_y: "bottom1";
-            }
-            align: 0.0 0.5;
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "over";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 0 0 0 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "eraser_image";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_DEFAULT_ERASER_MINW_INC EDITFIELD_DEFAULT_ERASER_MINH_INC;
-            fixed: 1 1;
-            align: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            rel2 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            image {
-               normal: "00_edit_field_clear.png";
-               border: 10 10 10 10;
-               border_scale: 1;
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "eraser";
-         type: RECT;
-         mouse_events: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "eraser_image";
-               to_y : "bottom3";
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "guidetext_show";
-         signal: "elm,state,guidetext,visible";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "guidetext_hide";
-         signal: "elm,state,guidetext,hidden";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "eraser_show";
-         signal: "elm,state,eraser,show";
-         source: "elm";
-         action: STATE_SET "elm.eraser.show" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "eraser_hide";
-         signal: "elm,state,eraser,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "multiline_set";
-         signal: "elm,state,text,multiline";
-         source: "elm";
-         script {
-            set_multi_line();
-         }
-      }
-      program {
-         name: "singleline_set";
-         signal: "elm,state,text,singleline";
-         source: "elm";
-         script {
-            set_single_line();
-         }
-      }
-      program {
-         name: "password_set";
-         signal: "elm,state,password,set";
-         source: "elm";
-         script {
-            set_password();
-         }
-      }
-      program {
-         name: "password_unset";
-         signal: "elm,state,password,unset";
-         source: "elm";
-         script {
-            unset_password();
-         }
-      }
-      program {
-         name: "editing";
-         signal: "elm,state,over,hide";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.password";
-         target: "elm.content.multi";
-         target: "elm.content.single";
-         target: "over";
-         target: "top2";
-      }
-      program {
-         name: "no_editing";
-         signal: "elm,state,over,show";
-         source: "elm";
-         script {
-            no_edit();
-         }
-      }
-      program {
-         name: "label_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         action: STATE_SET "elm.text.show" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "label_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "entry_show";
-         signal: "elm,state,entry,show";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.multi";
-      }
-   }
-}
-
-group { name: "elm/editfield/base/searchbar/font_color_black";
-   images {
-      image: "00_field_btn_clear.png" COMP;
-   }
-   script {
-      public single_line = 0;
-      public password_mode = 0;
-
-      public set_multi_line() {
-         set_int(single_line, 0);
-      }
-      public set_single_line() {
-         set_int(single_line, 1);
-      }
-      public set_password() {
-         set_int(password_mode, 1);
-      }
-      public unset_password() {
-         set_int(password_mode, 0);
-      }
-      public no_edit() {
-         if(get_int(single_line) == 1) {
-            if(get_int(password_mode) == 0) {
-               set_state(PART:"elm.content.single", "no_edit", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "default", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-            else {
-               set_state(PART:"elm.content.single", "default", 0.0);
-               set_state(PART:"elm.content.multi", "default", 0.0);
-               set_state(PART:"elm.content.password", "no_edit", 0.0);
-               set_state(PART:"elm.swallow.content", "no_edit", 0.0);
-            }
-         }
-         else if(get_int(single_line) == 0) {
-            set_state(PART:"elm.content.single", "default", 0.0);
-            set_state(PART:"elm.content.multi", "no_edit", 0.0);
-            set_state(PART:"elm.content.password", "default", 0.0);
-         }
-         set_state(PART:"over", "default", 0.0);
-         set_state(PART:"top2", "default", 0.0);
-      }
-   }
-   parts {
-      part {
-         name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_MINH_INC;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_MULTI_INC;
-         }
-      }
-      part {
-         name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP2_INC;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-         }
-      }
-      part {
-         name: "left1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT1_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "left2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT2_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part {
-         name: "right1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "right2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT2_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part {
-         name: "bottom1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC;
-            fixed: 1 1;
-            align: 0 1;
-            rel1.relative: 0.0 1.0;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC;
-         }
-      }
-      part {
-         name: "bottom3";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC;
-            fixed: 0 1;
-            rel1.relative: 0.0 1.0;
-            align: 0 1;
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            align: 0.0 0.0;
-            min: 0 30;
-            fixed: 1 1;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            color: EDITFIELD_TITLE_COLOR_INC;
-            text {
-               font: "Tizen:style=Medium";
-               size: EDITFIELD_TITLE_SIZE_INC;
-               min: 1 1;
-               align: 0.0 0.0;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "elm.guidetext";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
-            text {
-               font: "Tizen:style=Roman";
-               size: ENTRY_TEXT_SIZE_INC;
-               min: 0 0;
-               align: 0.0 0.5;
-               text_class: "tizen";
-            }
-         }
-         description {
-            state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.single";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_singleline_black_style";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.multi";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_multiline_black_style";
-               min: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.content.password";
-         type: TEXTBLOCK;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         entry_mode: PASSWORD;
-         multiline: 0;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: EDITFIELD_DEFAULT_LEFT3_INC 0;
-            }
-            rel2.to: "elm.swallow.content";
-            text {
-               style: "editfield_content_password_black_style";
-               repch: "*";
-               min: 0 0;
-               max: 0 1;
-            }
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 40;
-            rel1 {
-               relative : 1.0 1.0;
-               to_x: "left1";
-               to_y: "top1";
-            }
-            rel2 {
-               relative : 0.0 0.0;
-               to_x: "right1";
-               to_y: "bottom1";
-            }
-            align: 0.0 0.5;
-         }
-         description {
-            state: "no_edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "over";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 0 0 0 0;
-         }
-         description {
-            state: "edit" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part {
-         name: "eraser_image";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC;
-            fixed: 1 1;
-            align: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            rel2 {
-               relative: 0.0 0.0;
-               to_x : "right2";
-               to_y : "bottom2";
-            }
-            image {
-               normal: "00_field_btn_clear.png";
-               border: 4 4 4 4 ;
-               border_scale: 1;
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "eraser";
-         type: RECT;
-         mouse_events: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to_x : "eraser_image";
-               to_y : "bottom3";
-            }
-         }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "guidetext_show";
-         signal: "elm,state,guidetext,visible";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "guidetext_hide";
-         signal: "elm,state,guidetext,hidden";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "eraser_show";
-         signal: "elm,state,eraser,show";
-         source: "elm";
-         action: STATE_SET "elm.eraser.show" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "eraser_hide";
-         signal: "elm,state,eraser,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "eraser_image";
-         target: "eraser";
-      }
-      program {
-         name: "multiline_set";
-         signal: "elm,state,text,multiline";
-         source: "elm";
-         script {
-            set_multi_line();
-         }
-      }
-      program {
-         name: "singleline_set";
-         signal: "elm,state,text,singleline";
-         source: "elm";
-         script {
-            set_single_line();
-         }
-      }
-      program {
-         name: "password_set";
-         signal: "elm,state,password,set";
-         source: "elm";
-         script {
-            set_password();
-         }
-      }
-      program {
-         name: "password_unset";
-         signal: "elm,state,password,unset";
-         source: "elm";
-         script {
-            unset_password();
-         }
-      }
-      program {
-         name: "editing";
-         signal: "elm,state,over,hide";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.password";
-         target: "elm.content.multi";
-         target: "elm.content.single";
-         target: "over";
-         target: "top2";
-      }
-      program {
-         name: "no_editing";
-         signal: "elm,state,over,show";
-         source: "elm";
-         script {
-            no_edit();
-         }
-      }
-      program {
-         name: "label_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         action: STATE_SET "elm.text.show" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "label_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "entry_show";
-         signal: "elm,state,entry,show";
-         source: "elm";
-         action: STATE_SET "edit" 0.0;
-         target: "elm.swallow.content";
-         target: "elm.content.multi";
-      }
-   }
-}
index bae7276..993c9ec 100644 (file)
@@ -2650,7 +2650,7 @@ group { name: "elm/entry/base-password/popup";
        group { name: "elm/entry/magnifier/fixed-size";
                data.item: "height" MAGNIFIER_HEIGHT_FIXED;
                data.item: "scale" MAGNIFIER_SCALE;
-               data.item: "arrow" 24;
+               data.item: "arrow" 30;
                images {
                  image: "copy&paste_Magnifier_left.png" COMP;
                  image: "copy&paste_Magnifier_middle.png" COMP;
@@ -2674,7 +2674,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                type: RECT;
                                description { state: "default" 0.0;
-                                       min: 20 134;
+                                       min: 20 MAGNIFIER_HEIGHT_FIXED;
                                        max: 20 -1;
                                        align: 1.0 0.0;
                                        rel2 { relative: 0.5 1.0; to: "bg"; }
@@ -2687,7 +2687,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                type: RECT;
                                description { state: "default" 0.0;
-                                       min: 20 134;
+                                       min: 20 MAGNIFIER_HEIGHT_FIXED;
                                        max: 20 -1;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.5 0.0; to: "bg"; }
@@ -2700,7 +2700,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                description { state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: 136 134;
+                                       min: 142 MAGNIFIER_HEIGHT_FIXED;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 0.0; to: "bg"; }
                                        rel2 { relative: 0.0 1.0; to: "bg_middle_left"; }
@@ -2732,7 +2732,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                description { state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: 136 134;
+                                       min: 142 MAGNIFIER_HEIGHT_FIXED;
                                        rel1 { relative: 1.0 0.0; to: "bg_middle_right"; }
                                        rel2.to: "bg";
                                        image {
@@ -6166,6 +6166,83 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
+         part { name: "search_icon_left_padding";
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC;
+               max: ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "search_icon";
+            type: IMAGE;
+            mouse_events: 0;
+            repeat_events: 1;
+            clip_to: "search_icon.clipper";
+            description { state: "default" 0.0;
+               min: ENTRY_SEARCH_ICON_MIN_MAX_INC;
+               max: ENTRY_SEARCH_ICON_MIN_MAX_INC;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               image.normal: "00_search_icon.png";
+               rel1 {
+                  to_x: "search_icon_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon_left_padding";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "search_icon_right_padding";
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC;
+               max: ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "search_icon";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "search_icon.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "search_icon_disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.to: "search_icon";
+               rel2.to: "search_icon";
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "focus_image";
             scale: 1;
             mouse_events: 0;
@@ -6205,6 +6282,56 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
+         part { name: "icon_padding";
+            type: SPACER;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               min: 0 0;
+               max: 0 0;
+               fixed: 1 1;
+               rel1 {
+                  to_x: "search_icon_right_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon_right_padding";
+                  to_y: "bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 70 0;
+               max: 70 0;
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               rel1 {
+                  to_x: "search_icon_right_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon_right_padding";
+                  to_y: "bg";
+                  relative: 1.0 1.0;
+               }
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
       }
       programs {
          program { name: "action_focus";
index 4ed6cb6..4f250f0 100755 (executable)
 // So to adjust this extra space the padding is reduced from 19 to 10.
 // This means padding will be 10 pixel and extra space before the checkbox will be 9
 // So it will again get to 19 pixel as gap before the checkbox as per GUI
-#define GENLIST_EMAIL_PADDING_SIZE_LEFT               10
-#define GENLIST_EMAIL_PADDING_SIZE_TOP_3LINE          8
-#define GENLIST_EMAIL_PADDING_SIZE_BOTTOM_3LINE       8
-#define GENLIST_EMAIL_PADDING_SIZE_SUB_TEXT_BOTTOM       3
-#define GENLIST_EMAIL_PADDING_SIZE_DEFAULT            10
 
-#define GENLIST_EMAIL_ICON_CHECK_RADIO_SIZE     45
 
-#define GENLIST_EMAIL_TEXT_FOCUS_COLOR                      255 255 255 255
-#define GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE                "#FFFFFFFF"
+#define GENLIST_EMAIL_PADDING_SIZE_LEFT                 10
+#define GENLIST_EMAIL_PADDING_SIZE_TOP_3LINE            8
+#define GENLIST_EMAIL_PADDING_SIZE_BOTTOM_3LINE         8
+#define GENLIST_EMAIL_PADDING_SIZE_SUB_TEXT_BOTTOM      3
+#define GENLIST_EMAIL_PADDING_SIZE_DEFAULT              10
 
-#define GENLIST_EMAIL_MAIN_TEXT_SIZE                        38
-#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_COLOR_STYLE          "#000000FF"
-#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE      "#00000066"
-#define GENLIST_EMAIL_MAIN_TEXT_READ_COLOR_STYLE            "#808080FF"
-#define GENLIST_EMAIL_MAIN_TEXT_READ_DIM_COLOR_STYLE      "#808080CC"
+#define GENLIST_EMAIL_ICON_CHECK_RADIO_SIZE             45
 
-#define GENLIST_EMAIL_SUB_TEXT_SIZE                         30
-#define GENLIST_EMAIL_SUB_TEXT_COLOR_STYLE                  "#808080FF"
-
-#define GENLIST_EMAIL_COUNT_TEXT_SIZE                       28
-#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR               59 115 182 255
-#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR_STYLE         "#3B73B6FF"
-#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR                 128 128 128 255
-#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR_STYLE           "#808080FF"
-
-#define GENLIST_EMAIL_CONTENTS_TEXT_SIZE                    26
-#define GENLIST_EMAIL_CONTENTS_TIME_TEXT_SIZE               24
- // 128 128 128
-#define GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE             "#808080FF"
-
- // 19 130 255
-#define GENLIST_EMAIL_MATCH_TAG_COLOR                       "+ color=#1382FF"
-
-#define GENLIST_LIST_READ_BG_COLOR                   223 221 215 255
-#define GENLIST_LIST_UNREAD_BG_COLOR                248 246 239 255
+#define GENLIST_EMAIL_MAIN_TEXT_SIZE                    38
+#define GENLIST_EMAIL_SUB_TEXT_SIZE                     30
+#define GENLIST_EMAIL_COUNT_TEXT_SIZE                   28
+#define GENLIST_EMAIL_CONTENTS_TEXT_SIZE                26
+#define GENLIST_EMAIL_CONTENTS_TIME_TEXT_SIZE           24
 
 #define STYLE_TAG \
       tag:  "br" "\n";\
          STYLE_TAG
          STYLE_TAG_MATCH_EMAIL_FOCUS
       }
-      style { name: "email_style_sub";
-         base: "font=Tizen:style=Bold font_size="GENLIST_EMAIL_SUB_TEXT_SIZE" color="GENLIST_EMAIL_SUB_TEXT_COLOR_STYLE" text_class=tizen ellipsis=1.0";
+      style { name: "email_style_sub_unread";
+         base: "font=Tizen:style=Bold font_size="GENLIST_EMAIL_SUB_TEXT_SIZE" color="GENLIST_EMAIL_SUB_TEXT_UNREAD_COLOR_STYLE" text_class=tizen ellipsis=1.0";
+         STYLE_TAG
+         STYLE_TAG_MATCH_EMAIL
+      }
+      style { name: "email_style_sub_read";
+         base: "font=Tizen:style=Bold font_size="GENLIST_EMAIL_SUB_TEXT_SIZE" color="GENLIST_EMAIL_SUB_TEXT_READ_COLOR_STYLE" text_class=tizen ellipsis=1.0";
          STYLE_TAG
          STYLE_TAG_MATCH_EMAIL
       }
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      style: "email_style_sub"; \
+      style: "email_style_sub_unread"; \
    }
 
 #define DESCRIPTION_EMAIL_SUB_OTHERS \
+   description { state: "read" 0.0; \
+      inherit: "default" 0.0; \
+      text.style: "email_style_sub_read"; \
+   } \
    description { state: "selected" 0.0; \
       inherit: "default" 0.0; \
       text.style: "email_style_sub_focus"; \
index c2bb7ba..e09f491 100755 (executable)
          }
 
 #define GENLIST_PROGRAM_BG_DIALOGUE \
-         program { name: "bg_default"; \
-            signal: "elm,state,default"; \
-            source: "*"; \
-            script { \
-               new st[31]; \
-               new Float:vl; \
-               get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
-                  set_state(PART:"bg_dialogue", "2depth", 0.0); \
-               else \
-                  set_state(PART:"bg_dialogue", "default", 0.0); \
-            } \
-         } \
          program { name: "bg_top"; \
             signal: "elm,state,top"; \
             source: "*"; \
             script { \
                new st[31]; \
                new Float:vl; \
+               new st2[31]; \
+               new Float:vl2; \
                get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
+               get_state(PART:"bg_dialogue", st2, 30, vl2); \
+               if (!strcmp(st2, "selected") || \
+                  !strcmp(st2, "top_selected") || \
+                  !strcmp(st2, "center_selected") ||  \
+                  !strcmp(st2, "bottom_selected")) \
+                  set_state(PART:"bg_dialogue", "top_selected", 0.0); \
+               else if (!strcmp(st, "2depth")) \
                   set_state(PART:"bg_dialogue", "2depth_top", 0.0); \
                else \
                   set_state(PART:"bg_dialogue", "top", 0.0); \
             script { \
                new st[31]; \
                new Float:vl; \
+               new st2[31]; \
+               new Float:vl2; \
                get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
+               get_state(PART:"bg_dialogue", st2, 30, vl2); \
+               if (!strcmp(st2, "selected") || \
+                  !strcmp(st2, "top_selected") || \
+                  !strcmp(st2, "center_selected") ||  \
+                  !strcmp(st2, "bottom_selected")) \
+                  set_state(PART:"bg_dialogue", "center_selected", 0.0); \
+               else if (!strcmp(st, "2depth")) \
                   set_state(PART:"bg_dialogue", "2depth_center", 0.0); \
                else \
                   set_state(PART:"bg_dialogue", "center", 0.0); \
             script { \
                new st[31]; \
                new Float:vl; \
+               new st2[31]; \
+               new Float:vl2; \
                get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
+               get_state(PART:"bg_dialogue", st2, 30, vl2); \
+               if (!strcmp(st2, "selected") || \
+                  !strcmp(st2, "top_selected") || \
+                  !strcmp(st2, "center_selected") ||  \
+                  !strcmp(st2, "bottom_selected")) \
+                  set_state(PART:"bg_dialogue", "bottom_selected", 0.0); \
+               else if (!strcmp(st, "2depth")) \
                   set_state(PART:"bg_dialogue", "2depth_bottom", 0.0); \
                else \
                   set_state(PART:"bg_dialogue", "bottom", 0.0); \
          target: "bg_dialogue"; \
          target: "elm.padding.left"; \
          target: "elm.padding.right"; \
+         target: "elm.padding.right.edit"; \
+         target: "elm.icon.edit"; \
+         target: "bg_dialogue_right"; \
       ) \
       GENLIST_PROGRAM_DISABLED( TARGET ) \
       GENLIST_PROGRAM_FOCUS_DIALOGUE \
          ) \
          GENLIST_PART_RECT("arrow_clip", \
             GENLIST_DESCRIPTION_ENVELOP("arrow", \
-               color: 250 250 250 255; \
+               color: GENLIST_EXPANDABLE_ARROW_CLIP_COLOR; \
             ) \
             description { state: "disabled" 0.0; \
-               color: 250 250 250 76; \
+               color: GENLIST_EXPANDABLE_ARROW_DIM_COLOR; \
             } \
             description { state: "expand_opened_press" 0.0; \
-               color: 250 250 250 255; \
+               color: GENLIST_EXPANDABLE_ARROW_PRESS_COLOR; \
             } \
             description { state: "default_press" 0.0; \
-               color: 250 250 250 255; \
+               color: GENLIST_EXPANDABLE_ARROW_PRESS_COLOR; \
             } \
          ) \
          GENLIST_PART_IMAGE("arrow", \
             action: PLAY_SAMPLE "touch_sound" 1.0; \
          }
 #endif
+
+#define GENLIST_POPUP_STYLE(NAME) \
+   group { GENLIST_NAME(NAME"/popup/default") \
+      inherit: "elm/genlist/item/"NAME"/default"; \
+      parts { \
+         GENLIST_PART_RECT("bg",  \
+            description { state: "default" 0.0; \
+               color: GENLIST_LIST_BG_POPUP_COLOR; \
+            } \
+         ) \
+      } \
+   }
index 9ea750d..86108f7 100644 (file)
                fixed: 1 0;
             )
          )
-         GENLIST_PART_FLIP
          GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; )
       )
       GENLIST_PROGRAMS_THUMB
    }
+
+// ----------------------------------------------------------------------
+// Pop Up Style ---------------------------------------------------------
+// ----------------------------------------------------------------------
+GENLIST_POPUP_STYLE("default")
+GENLIST_POPUP_STYLE("editfield")
+GENLIST_POPUP_STYLE("editfield/title")
+GENLIST_POPUP_STYLE("1icon")
+GENLIST_POPUP_STYLE("1icon/with_no_line")
+GENLIST_POPUP_STYLE("1icon/no_padding")
+GENLIST_POPUP_STYLE("1icon/no_padding_line")
+GENLIST_POPUP_STYLE("1text")
+GENLIST_POPUP_STYLE("1text.tb")
+GENLIST_POPUP_STYLE("2text")
+GENLIST_POPUP_STYLE("1text.1icon")
+GENLIST_POPUP_STYLE("1text.1icon.6")
+GENLIST_POPUP_STYLE("1text.1icon.7")
+GENLIST_POPUP_STYLE("1text.1icon.5")
+GENLIST_POPUP_STYLE("1text.1icon.5.thumb.circle")
+GENLIST_POPUP_STYLE("1text.1icon.5.thumb.square")
+GENLIST_POPUP_STYLE("1text.2icon.3")
+GENLIST_POPUP_STYLE("1text.2icon.3.tb")
+GENLIST_POPUP_STYLE("1text.1icon.2")
+GENLIST_POPUP_STYLE("1text.1icon.2.tb")
+GENLIST_POPUP_STYLE("2text.1icon")
+GENLIST_POPUP_STYLE("1text.2icon")
+GENLIST_POPUP_STYLE("1text.2icon.tb")
+GENLIST_POPUP_STYLE("1text.2icon.6")
+GENLIST_POPUP_STYLE("1text.2icon.6.tb")
+GENLIST_POPUP_STYLE("1text.1icon.3")
+GENLIST_POPUP_STYLE("1text.1icon.3.tb")
+GENLIST_POPUP_STYLE("1text.2icon.4")
+GENLIST_POPUP_STYLE("1text.2icon.2")
+GENLIST_POPUP_STYLE("1text.3icon")
+GENLIST_POPUP_STYLE("1text.2icon.9")
+GENLIST_POPUP_STYLE("1text.3icon.2")
+GENLIST_POPUP_STYLE("2text.1icon.divider")
+GENLIST_POPUP_STYLE("1text.2icon.divider")
+GENLIST_POPUP_STYLE("2text.2")
+GENLIST_POPUP_STYLE("2text.2.tb")
+GENLIST_POPUP_STYLE("2text.3")
+GENLIST_POPUP_STYLE("3text")
+GENLIST_POPUP_STYLE("3text.tb")
+GENLIST_POPUP_STYLE("2text.1icon.2")
+GENLIST_POPUP_STYLE("2text.1icon.2.tb")
+GENLIST_POPUP_STYLE("2text.1icon.10")
+GENLIST_POPUP_STYLE("2text.1icon.10.tb")
+GENLIST_POPUP_STYLE("3text.1icon")
+GENLIST_POPUP_STYLE("3text.1icon.tb")
+GENLIST_POPUP_STYLE("2text.2icon")
+GENLIST_POPUP_STYLE("2text.1icon.4")
+GENLIST_POPUP_STYLE("2text.1icon.4.thumb.circle")
+GENLIST_POPUP_STYLE("2text.1icon.4.thumb.square")
+GENLIST_POPUP_STYLE("2text.1icon.4.tb")
+GENLIST_POPUP_STYLE("3text.1icon.2")
+GENLIST_POPUP_STYLE("2text.2icon.4")
+GENLIST_POPUP_STYLE("2text.2icon.4.tb")
+GENLIST_POPUP_STYLE("2text.2icon.6")
+GENLIST_POPUP_STYLE("2text.2icon.6.tb")
+GENLIST_POPUP_STYLE("2text.2icon.8")
+GENLIST_POPUP_STYLE("2text.2icon.8.tb")
+GENLIST_POPUP_STYLE("2text.2icon.progress")
+GENLIST_POPUP_STYLE("3text.3icon.progress")
+GENLIST_POPUP_STYLE("2text.1icon.12")
+GENLIST_POPUP_STYLE("2text.1icon.12.tb")
+GENLIST_POPUP_STYLE("2text.1icon.7")
+GENLIST_POPUP_STYLE("2text.2icon.5")
+GENLIST_POPUP_STYLE("2text.3icon.4")
+GENLIST_POPUP_STYLE("4text.1icon.1")
+GENLIST_POPUP_STYLE("4text.1icon.1.tb")
+GENLIST_POPUP_STYLE("4text.1icon.2")
+GENLIST_POPUP_STYLE("4text.1icon.2.tb")
+GENLIST_POPUP_STYLE("4text.1")
+GENLIST_POPUP_STYLE("4text.1.tb")
+GENLIST_POPUP_STYLE("4text.2")
+GENLIST_POPUP_STYLE("3text.1icon.3")
+GENLIST_POPUP_STYLE("3text.1icon.3.tb")
+GENLIST_POPUP_STYLE("4text.1icon.3")
+GENLIST_POPUP_STYLE("3text.1icon.1")
+GENLIST_POPUP_STYLE("2text.2icon.1")
+GENLIST_POPUP_STYLE("2text.1icon.1")
index a31fdf6..01e4578 100644 (file)
@@ -1171,9 +1171,8 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT
          }
       }
 
-   group { name: "elm/label/base/datetime/year/default";
-      alias: "elm/label/base/datetime/month/default";
-      alias: "elm/label/base/datetime";
+   group { name: "elm/label/base/datetime/year/style1";
+      alias: "elm/label/base/datetime/month/style1";
          images {
             image: "00_picker_button_bg.png" COMP;
             image: "00_picker_button_bg_press.png" COMP;
@@ -1272,10 +1271,10 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT
          }
       }
 
-      group { name: "elm/label/base/datetime/hour/default";
-         alias: "elm/label/base/datetime/minute/default";
-         alias: "elm/label/base/datetime/date/default";
-         inherit: "elm/label/base/datetime/year/default";
+      group { name: "elm/label/base/datetime/hour/style1";
+         alias: "elm/label/base/datetime/minute/style1";
+         alias: "elm/label/base/datetime/date/style1";
+         inherit: "elm/label/base/datetime/year/style1";
          parts {
             part { name: "bg";
                type: RECT;
@@ -1318,3 +1317,91 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT
             }
          }
       }
+   group { name: "elm/label/base/datetime";
+      alias: "elm/label/base/datetime/year/default";
+      alias: "elm/label/base/datetime/month/default";
+      alias: "elm/label/base/datetime/date/default";
+      alias: "elm/label/base/datetime/hour/default";
+      alias: "elm/label/base/datetime/minute/default";
+      alias: "elm/label/base/datetime/ampm/default";
+         parts {
+            part { name: "bg";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  color: 0 0 0 0;
+                  min: 0 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC;
+                  max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC;
+               }
+            }
+            part { name: "label.text.clip";
+               type: RECT;
+               description { state: "default" 0.0;
+               }
+            }
+            part { name: "bg.img";
+               type: RECT;
+               scale: 1;
+               clip_to: "label.text.clip";
+               description { state: "default" 0.0;
+                  rel1 {
+                     relative: 0.0 0.0;
+                     to_x: "elm.text";
+                  }
+                  rel2 {
+                     relative: 1.0 1.0;
+                     to_x: "elm.text";
+                  }
+                  fixed: 1 1;
+                  color: 0 0 0 0;
+                  min: DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC DATETIME_LABEL_DATE_FIELD_HEIGHT_INC;
+                  max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC;
+               }
+               description { state: "selected" 0.0;
+                  inherit: "default" 0.0;
+               }
+            }
+            part { name: "elm.text";
+               type: TEXT;
+               scale: 1;
+               clip_to: "label.text.clip";
+               description { state: "default" 0.0;
+                  color: DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC;
+                  text {
+                     font: "Tizen:style=Regular";
+                     size: DATETIME_TEXT_FONT_SIZE_INC;
+                     text_class: "tizen";
+                     min: 1 0;
+                     max: 1 1;
+                  }
+               }
+               description { state: "selected" 0.0;
+                  inherit: "default" 0.0;
+                  color: DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC;
+                  text {
+                     font: "Tizen:style=Bold";
+                     size: DATETIME_TEXT_FONT_SIZE_INC;
+                     text_class: "tizen";
+                     min: 1 0;
+                     max: 1 1;
+                  }
+               }
+            }
+         }
+         programs {
+            program { name: "label_select";
+               signal: "elm,state,select";
+               source: "elm";
+               action: STATE_SET "selected" 0.0;
+               target: "elm.text";
+               target: "bg.img";
+            }
+            program { name: "label_unselect";
+               signal: "elm,state,unselect";
+               source: "elm";
+               action: STATE_SET "default" 0.0;
+               target: "elm.text";
+               target: "bg.img";
+            }
+         }
+      }
index 729cda4..c230e09 100644 (file)
@@ -1419,12 +1419,19 @@ group {
    alias: "elm/nocontents/base/default";
    styles{
       style { name: "nocontent_style";
-         base: "font=Tizen:style=Regular font_size="NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0 text_class=tizen";
+         base: "font=Tizen:style=Bold font_size="NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC" align=center color="NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC" wrap=mixed ellipsis=1.0 text_class=tizen";
          tag:  "br" "\n";
          tag:  "hilight" "+ font=Tizen:style=Bold";
          tag:  "b" "+ font=Tizen:style=Bold";
          tag:  "tab" "\t";
       }
+      style { name: "nocontent_help_text";
+         base: "font=Tizen:style=Regular font_size="NOCONTENT_HELP_TEXT_BLOCK_TEXT_SIZE_INC" align=left color="NOCONTENT_HELP_TEXT_BLOCK_STYLE_COLOR_INC" wrap=mixed ellipsis=1.0 text_class=tizen";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font=Tizen:style=Regular";
+         tag:  "b" "+ font=Tizen:style=Regular";
+         tag:  "tab" "\t";
+      }
    }
    images {
       image: "00_nocontents_picture.png" COMP;
@@ -1435,24 +1442,44 @@ group {
          scale: 1;
          description { state: "default" 0.0;
             color: NOCONTENT_BG_COLOR_INC;
+            align: 0.5 1.0;
+            fixed: 0 1;
+            min: NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC;
+            rel1.relative: 0.0 1.0;
+         }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC;
+         }
+      }
+      part { name: "base";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            min: NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC;
+            rel1 {
+               relative: 0.5 0.5;
+               to_y: "bg";
+            }
             rel2 {
-               relative: 1.0 1.0;
-               to_y: "pad_b";
+               relative: 0.5 0.5;
+               to_y: "bg";
             }
          }
       }
       part { name: "nocontents.image";
-         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: NOCONTENT_IMAGE_WIDTH_HEIGHT_INC;
+            align: 0.5 0.0;
             rel1 {
-               relative: 0.5 0.5;
-               to: "bg";
+               relative: 0.5 0.0;
+               to: "base";
             }
             rel2 {
-               relative: 0.5 0.5;
-               to: "bg";
+               relative: 0.5 0.0;
+               to: "base";
             }
             image {
                normal: "00_nocontents_picture.png";
@@ -1462,61 +1489,159 @@ group {
             aspect_preference: BOTH;
          }
       }
-      part { name: "middle.padding";
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         description { state: "default" 0.0;
+            min: NOCONTENT_TEXT_STYLE_BG_MIN_INC;
+            align: 0.5 1.0;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "base";
+            }
+            text {
+               style: "nocontent_style";
+               min: 0 1;
+               max: 0 1;
+            }
+         }
+      }
+      part { name: "padding_after_text";
+         mouse_events: 0;
          type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
-            min: 0 NOCONTENT_MIDDLE_PADDING_INC;
             align: 0.5 0.0;
+            min: NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC;
+            visible: 0;
             fixed: 0 1;
             rel1 {
                relative: 0.0 1.0;
-               to: "nocontents.image";
+               to: "elm.text";
             }
             rel2 {
                relative: 1.0 1.0;
-               to: "nocontents.image";
+               to: "elm.text";
             }
          }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC;
+         }
       }
-      part { name: "elm.text";
+      part { name: "elm.help.text";
          type: TEXTBLOCK;
-         scale: 1;
          description { state: "default" 0.0;
-            min: NOCONTENT_TEXT_STYLE_BG_MIN_INC;
-            max: 9999 NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC;
+            align: 0.5 0.0;
+            min: NOCONTENT_PORTRAIT_HELP_TEXT_STYLE_BG_MIN_INC;
             fixed: 1 1;
             rel1 {
-               relative: 0.14 1.0;
-               to_x: "bg";
-               to_y: "middle.padding";
+               relative: 0.5 1.0;
+               to: "padding_after_text";
             }
             rel2 {
-               relative: 0.86 1.0;
-               to_x: "bg";
-               to_y: "middle.padding";
+               relative: 0.5 1.0;
+               to: "padding_after_text";
             }
-            color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
             text {
-               style: "nocontent_style";
+               style: "nocontent_help_text";
+               align: 0.0 0.5;
                min: 0 1;
                max: 0 1;
             }
          }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_HELP_TEXT_STYLE_BG_MIN_INC;
+         }
       }
-      part { name: "pad_b";
-         scale : 1;
+      part { name: "pad_after_help_text";
          mouse_events: 0;
          type: RECT;
          description { state: "default" 0.0;
-            align: 0.0 1.0;
-            min: 0 0;
             visible: 0;
+            align: 0.5 0.0;
+            min: NOCONTENT_PORTRAIT_AFTER_HELP_TEXT_PADDING_INC;
             fixed: 0 1;
-            rel1.relative: 0.0 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "elm.help.text";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "elm.help.text";
+            }
+         }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_AFTER_HELP_TEXT_PADDING_INC;
          }
       }
+      part { name: "swallow_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            min: NOCONTENT_PORTRAIT_SWALLOW_AREA_MIN_INC;
+            fixed: 1 1;
+            align: 0.5 0.0;
+            rel1 {
+               relative: 0.5 1.0;
+               to: "pad_after_help_text";
+            }
+            rel2 {
+               relative: 0.5 1.0;
+               to: "pad_after_help_text";
+            }
+         }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_SWALLOW_AREA_MIN_INC;
+         }
+      }
+   }
+   programs {
+      program { name: "landscape_mode";
+         source: "elm";
+         signal: "elm,state,orient,90";
+         action: STATE_SET "landscape" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
+      program { name: "landscape_mode2";
+         source: "elm";
+         signal: "elm,state,orient,270";
+         action: STATE_SET "landscape" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
+      program { name: "portrait_mode";
+         source: "elm";
+         signal: "elm,state,orient,0";
+         action: STATE_SET "default" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
+      program { name: "portrait_mode2";
+         source: "elm";
+         signal: "elm,state,orient,180";
+         action: STATE_SET "default" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
    }
 }
 
@@ -1593,65 +1718,54 @@ group {
 }
 
 group {
-   name: "elm/layout/nocontents/search";
-   alias: "elm/nocontents/base/search";
+   name: "elm/layout/nocontents/album";
+   alias: "elm/nocontents/base/album";
+   inherit: "elm/layout/nocontents/full";
+   images {
+      image: "00_nocontents_album.png" COMP;
+   }
    parts {
-      part { name: "bg";
-         mouse_events: 0;
-         type: RECT;
+      part { name: "nocontents.image";
          description { state: "default" 0.0;
-            visible: 1;
-            rel1 {
-               relative: 0.0 0.0;
-            }
-            rel2 {
-               relative: 1.0 1.0;
+            image {
+               normal: "00_nocontents_album.png";
             }
-            color: 0 0 0 0;
          }
       }
-      part { name: "top_padding";
-         mouse_events: 0;
+   }
+}
+
+group {
+   name: "elm/layout/nocontents/search";
+   alias: "elm/nocontents/base/search";
+   parts {
+      part { name: "bg";
          type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 NOCONTENT_BASE_SEARCH_PADDING_INC;
-            fixed: 0 1;
-            align: 0 0;
-            visible: 1;
-            rel1 {
-               relative: 0.0 0.0;
-            }
-            rel2 {
-               relative: 1.0 0.0;
-            }
-            color: 0 0 0 0;
+            visible: 0;
          }
       }
       part { name: "elm.text";
          mouse_events: 0;
-         type: TEXT;
+         type: TEXTBLOCK;
          scale: 1;
          description { state: "default" 0.0;
-            //min: 0 30;
             fixed: 0 1;
-            align: 0 0;
-            visible: 1;
+            align: 0.5 0.5;
+            min: NOCONTENT_TEXT_STYLE_BG_MIN_INC;
             rel1 {
-               relative: 0.0 1.0;
-               to:"top_padding";
+               relative: 0.0 0.5;
+               to:"bg";
             }
             rel2 {
-               relative: 1.0 1.0;
-               to:"top_padding";
+               relative: 1.0 0.5;
+               to:"bg";
             }
-            color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
             text {
-               font: "Tizen:style=Roman";
-               size: 30;
-               text: "";
-               align: 0.5 0.5;
-               text_class: "tizen";
+               style: "nocontent_style";
+               min: 0 1;
+               max: 0 1;
             }
          }
       }
@@ -1662,7 +1776,7 @@ group {
          description { state: "default" 0.0;
             min: 0 NOCONTENT_BASE_SEARCH_PADDING_INC;
             fixed: 0 1;
-            align: 0 0;
+            align: 0.5 0.0;
             visible: 0;
             rel1 {
                relative: 0.0 1.0;
@@ -1679,9 +1793,8 @@ group {
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 0;
             fixed: 0 1;
-            align: 0 0;
+            align: 0.5 0.0;
             visible: 1;
             rel1 {
                relative: 0.0 1.0;
index a7decfd..201c514 100644 (file)
@@ -147,17 +147,26 @@ group {
    styles {
       style {
          name: "multibuttonentry_btn_text_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" text_class=tizen";
+         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" style=far_shadow, bottom shadow_color="MULTIBUTTONENTRY_BUTTON_TEXT_NORMAL_SHADOW_COLOR_INC" text_class=tizen";
+      }
+      style {
+         name: "multibuttonentry_btn_text_pressed_style";
+         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" style=far_shadow, top shadow_color="MULTIBUTTONENTRY_BUTTON_TEXT_PRESSED_SHADOW_COLOR_INC" text_class=tizen";
       }
       style {
          name: "multibuttonentry_btn_text_ellipsis_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" ellipsis=1 text_class=tizen";
+         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" style=far_shadow, bottom shadow_color="MULTIBUTTONENTRY_BUTTON_TEXT_NORMAL_SHADOW_COLOR_INC" ellipsis=1 text_class=tizen";
+      }
+      style {
+         name: "multibuttonentry_btn_text_ellipsis_pressed_style";
+         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" style=far_shadow, top shadow_color="MULTIBUTTONENTRY_BUTTON_TEXT_PRESSED_SHADOW_COLOR_INC" ellipsis=1 text_class=tizen";
       }
    }
 
    images {
       image: "00_contacts_button.png" COMP;
       image: "00_contacts_button_press.png" COMP;
+      image: "00_contacts_button_dim.png" COMP;
    }
 
    data.item: "button_left_pad" MULTIBUTTONENTRY_BUTTON_PAD_INC;
@@ -183,6 +192,11 @@ group {
             inherit: "default" 0.0;
             image.normal: "00_contacts_button_press.png";
          }
+         description {
+            state: "out_of_focus" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "00_contacts_button_dim.png";
+         }
       }
       part {
          name: "left.padding";
@@ -234,6 +248,11 @@ group {
             }
          }
          description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text.style: "multibuttonentry_btn_text_pressed_style";
+         }
+         description {
             state: "ellipsis" 0.0;
             inherit: "default" 0.0;
             text {
@@ -241,6 +260,11 @@ group {
                min: 0 0;
             }
          }
+         description {
+            state: "ellipsis_focused" 0.0;
+            inherit: "ellipsis" 0.0;
+            text.style: "multibuttonentry_btn_text_ellipsis_pressed_style";
+         }
       }
       part { name: "events";
          type: RECT;
@@ -263,16 +287,50 @@ group {
          name: "focused";
          signal: "focused";
          source: "";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.btn.bg";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.btn.text", st, 30, vl);
+            if (!strcmp(st, "default"))
+              set_state(PART:"elm.btn.text", "focused", 0.0);
+            else
+              set_state(PART:"elm.btn.text", "ellipsis_focused", 0.0);
+
+            set_state(PART:"elm.btn.bg", "focused", 0.0);
+         }
          after: "selected";
       }
       program {
          name: "unfocused";
          signal: "default";
          source: "";
-         action: STATE_SET "default" 0.0;
-         target: "elm.btn.bg";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.btn.text", st, 30, vl);
+            if (!strcmp(st, "focused"))
+              set_state(PART:"elm.btn.text", "default", 0.0);
+            else
+              set_state(PART:"elm.btn.text", "ellipsis", 0.0);
+
+            set_state(PART:"elm.btn.bg", "default", 0.0);
+         }
+      }
+      program {
+         name: "mbe_lose_focus";
+         signal: "lose_focus";
+         source: "";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.btn.text", st, 30, vl);
+            if (!strcmp(st, "focused"))
+              set_state(PART:"elm.btn.text", "default", 0.0);
+            else
+              set_state(PART:"elm.btn.text", "ellipsis", 0.0);
+
+            set_state(PART:"elm.btn.bg", "out_of_focus", 0.0);
+         }
       }
       program {
          name: "clicked";
index 9c46293..1f22611 100644 (file)
@@ -27,6 +27,8 @@
       images {
          image: "00_title_bg.png" COMP;
          image: "00_badge_bg.png" COMP;
+         image: "00_effect_title_text_dim_left.png" COMP;
+         image: "00_effect_title_text_dim_right.png" COMP;
       }
       script {
          public tbar_bg = 0;     //Toolbar BG Show call count
          public start_slide(val) {
             new Float:len;
             new buf[128];
+            new st[31];
+            new Float:vl;
+            get_state(PART:"title_bg", st, 30, vl);
+            if (!strcmp(st, "hide"))
+               return;
 
             // Title Text
             if (val == 0) {
                      return;
                   }
 
+                  set_state(PART:"title_text_slide_effect_left", "visible", 0.0);
+                  set_state(PART:"title_text_slide_effect_right", "visible", 0.0);
+
                   len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP;
                   set_float(title_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
 
                      return;
                   }
 
+                  set_state(PART:"subtitle_text_slide_effect_left", "visible", 0.0);
+                  set_state(PART:"subtitle_text_slide_effect_right", "visible", 0.0);
+
                   len = get_int(subtitle_text_w) + NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP;
                   if (!get_int(landscape))
                     set_float(subtitle_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
 
                set_state(PART:"title_text_clip", "default", 0.0);
                set_state(PART:"slide_title_text_clip", "default", 0.0);
+
+               set_state(PART:"title_text_slide_effect_left", "default", 0.0);
+               set_state(PART:"title_text_slide_effect_right", "default", 0.0);
             }
             // Subtitle Text
             else {
 
                set_state(PART:"subtitle_text_clip", "default", 0.0);
                set_state(PART:"slide_subtitle_text_clip", "default", 0.0);
+
+               set_state(PART:"subtitle_text_slide_effect_left", "default", 0.0);
+               set_state(PART:"subtitle_text_slide_effect_right", "default", 0.0);
             }
          }
       }
             scale: 1;
             description { state: "default" 0.0;
                min: NAVIFRAME_PADDING_INC;
-               fixed: 1 0;
+               fixed: 1 1;
                align: 1.0 0.0;
                rel1 { relative: 1.0 0.0; to: "divider2"; }
                rel2 { relative: 1.0 1.0; to: "divider2"; }
             mouse_events: 0;
             description { state: "default" 0.0;
                min: NAVIFRAME_PADDING_INC;
-               fixed: 1 0;
+               fixed: 1 1;
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; to: "title_bg"; }
                rel2 { relative: 0.0 1.0; to: "title_bg"; }
                visible: 0;
                min: 0 NAVIFRAME_TITLE_TEXT_BG_H_INC;
                max: -1 NAVIFRAME_TITLE_TEXT_BG_H_INC;
-               fixed: 0 1;
+               fixed: 1 1;
                rel1 { relative: 1.0 0.0; to_x: "title_left_padding"; to_y: "title_bg"; }
                rel2 { relative: 0.0 1.0; to_x: "title_right_padding"; to_y: "title_bg"; }
             }
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "maintitle_text_bg";
                rel2.to: "maintitle_text_bg";
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "maintitle_text_bg"; }
                rel2 { relative: 0.0 1.0; to: "maintitle_text_bg"; }
                text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC;
             }
          }
+         part { name: "title_text_slide_effect_left_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_PADDING_INC;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
+            }
+         }
+         part { name: "title_text_slide_effect_left";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 0.0 0.0; to: "title_text_slide_effect_left_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_text_slide_effect_left_bg"; }
+               image {
+                  normal: "00_effect_title_text_dim_left.png";
+                  border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.text.full_title";
             type: TEXT;
             scale: 1;
                   align: 0.0 0.5;
                   text_class: "tizen";
                }
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "maintitle_text_bg";
                rel2.to: "maintitle_text_bg";
                   align: 0.0 0.5;
                   text_class: "tizen";
                }
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "maintitle_text_bg";
                rel2.to: "maintitle_text_bg";
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "maintitle_text_bg";
                rel2.to: "maintitle_text_bg";
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 1.0 0.0; to: "slide_text_gap2"; }
                rel2 { relative: 1.0 1.0; to: "slide_text_gap2"; }
                text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC;
             }
          }
+         part { name: "title_text_slide_effect_right_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_PADDING_INC;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 1.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 1.0 1.0; to: "elm.text.title"; }
+            }
+         }
+         part { name: "title_text_slide_effect_right";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 1.0 0.0; to: "title_text_slide_effect_right_bg"; }
+               rel2 { relative: 1.0 1.0; to: "title_text_slide_effect_right_bg"; }
+               image {
+                  normal: "00_effect_title_text_dim_right.png";
+                  border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "subtitle_top_padding";
             type: RECT;
             scale: 1;
                   text_class: "tizen";
                }
                color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "subtitle_text_bg";
                rel2.to: "subtitle_text_bg";
                rel2 { relative: 0.0 1.0; to: "slide_subtitle_divider1"; }
             }
          }
+         part { name: "subtitle_text_slide_effect_left";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 0.0 0.0; to_x: "title_text_slide_effect_left_bg"; to_y: "subtitle_text_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "title_text_slide_effect_left_bg"; to_y: "subtitle_text_bg"; }
+               image {
+                  normal: "00_effect_title_text_dim_left.png";
+                  border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.text.full_subtitle";
             type: TEXT;
             scale: 1;
                   align: 0.0 0.5;
                   text_class: "tizen";
                }
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "subtitle_text_bg";
                rel2.to: "subtitle_text_bg";
                   text_class: "tizen";
                }
                color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "subtitle_text_bg";
                rel2.to: "subtitle_text_bg";
                rel2.relative: 0.0 1.0;
             }
          }
+         part { name: "subtitle_text_slide_effect_right_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_PADDING_INC;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 1.0 0.0; to: "elm.text.subtitle"; }
+               rel2 { relative: 1.0 1.0; to: "elm.text.subtitle"; }
+            }
+         }
+         part { name: "subtitle_text_slide_effect_right";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 1.0 0.0; to: "subtitle_text_slide_effect_right_bg"; }
+               rel2 { relative: 1.0 1.0; to: "subtitle_text_slide_effect_right_bg"; }
+               image {
+                  normal: "00_effect_title_text_dim_right.png";
+                  border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
-               align: 1.0 0.5;
                fixed: 1 1;
+               align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_bg"; }
                rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
             source: "click_event_area";
             script {
                emit("elm,action,title,clicked", "");
-               emit("elm,action,title,slide", "");
             }
          }
          program {
    group { name: "elm/naviframe/item/tabbar/default";
       images {
          image: "00_title_bg.png" COMP;
+         image: "00_effect_title_text_dim_left.png" COMP;
+         image: "00_effect_title_text_dim_right.png" COMP;
       }
       script {
          public tbar_bg = 0;     //Controlbar BG Show call count
          public start_slide(val) {
             new Float:len;
             new buf[128];
+            new st[31];
+            new Float:vl;
+            get_state(PART:"title_bg", st, 30, vl);
+            if (!strcmp(st, "hide"))
+               return;
 
             set_int(title_slide_count, get_int(title_slide_count) + 1);
 
                   return;
                }
 
+               set_state(PART:"title_text_slide_effect_left", "visible", 0.0);
+               set_state(PART:"title_text_slide_effect_right", "visible", 0.0);
+
                len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP;
 
                if (get_int(landscape))
 
             set_state(PART:"title_text_clip", "default", 0.0);
             set_state(PART:"slide_title_text_clip", "default", 0.0);
+
+            set_state(PART:"title_text_slide_effect_left", "default", 0.0);
+            set_state(PART:"title_text_slide_effect_right", "default", 0.0);
          }
       }
 
                visible: 0;
                min: 0 NAVIFRAME_TITLE_TAB_TEXT_H_INC;
                max: -1 NAVIFRAME_TITLE_TAB_TEXT_H_INC;
-               fixed: 0 1;
+               fixed: 1 1;
                align: 0.5 0.0;
                rel1 { relative: 1.0 0.0; to_x: "title_left_padding"; to_y: "title_bg"; }
                rel2 { relative: 0.0 0.0; to_x: "title_right_padding"; to_y: "title_bg"; }
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "title_text_bg";
                rel2.to: "title_text_bg";
                text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC;
             }
          }
+         part { name: "title_text_slide_effect_left_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_PADDING_INC;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
+            }
+         }
+         part { name: "title_text_slide_effect_left";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 0.0 0.0; to: "title_text_slide_effect_left_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_text_slide_effect_left_bg"; }
+               image {
+                  normal: "00_effect_title_text_dim_left.png";
+                  border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.text.full_title";
             type: TEXT;
             scale: 1;
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "title_text_bg";
                rel2.to: "title_text_bg";
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                color3: 0 0 0 255;
+               fixed: 1 0;
                align: 0.0 0.5;
                rel1.to: "title_text_bg";
                rel2.to: "title_text_bg";
                text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC;
             }
          }
+         part { name: "title_text_slide_effect_right_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_PADDING_INC;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 1.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 1.0 1.0; to: "elm.text.title"; }
+            }
+         }
+         part { name: "title_text_slide_effect_right";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               visible: 0;
+               rel1 { relative: 1.0 0.0; to: "title_text_slide_effect_right_bg"; }
+               rel2 { relative: 1.0 1.0; to: "title_text_slide_effect_right_bg"; }
+               image {
+                  normal: "00_effect_title_text_dim_right.png";
+                  border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "click_event_area";
              type: RECT;
              ignore_flags: ON_HOLD;
             source: "click_event_area";
             script {
                emit("elm,action,title,clicked", "");
-               emit("elm,action,title,slide", "");
             }
          }
          program {
index e727baf..739099a 100644 (file)
@@ -163,6 +163,7 @@ group { name: "elm/notify/center/transparent";
    alias: "elm/notify/center/volumebarstyle_transparent";
    alias: "elm/notify/center/volumebarstyle_text_transparent";
    alias: "elm/notify/center/content_expand_transparent";
+   alias: "elm/notify/center/content_no_vhpad_transparent";
    parts {
       part { name: "elm.swallow.content";
          type: SWALLOW;
@@ -313,6 +314,7 @@ group { name: "elm/notify/block_events/transparent";
    alias: "elm/notify/block_events/volumebarstyle_transparent";
    alias: "elm/notify/block_events/volumebarstyle_text_transparent";
    alias: "elm/notify/block_events/content_expand_transparent";
+   alias: "elm/notify/block_events/content_no_vhpad_transparent";
    parts {
       part {name: "popup_indicator";
          type: RECT;
@@ -1014,6 +1016,7 @@ group { name: "elm/popup/base/verticalbuttonstyle";
 group { name: "elm/popup/base/content_no_vhpad";
    inherit: "elm/popup/base/default";
    alias: "elm/popup/base/min_menustyle";
+   alias: "elm/popup/base/content_no_vhpad_transparent";
    parts {
       part { name: "label_top_padding";
          type: SPACER;
@@ -1139,6 +1142,7 @@ group { name: "elm/popup/content/default";
 group { name: "elm/popup/content/content_no_vhpad";
    inherit: "elm/popup/content/default";
    alias: "elm/popup/content/min_menustyle";
+   alias: "elm/popup/content/content_no_vhpad_transparent";
    parts {
       part { name: "pad_t";
          type: SPACER;
index 80b73c0..6878fa4 100644 (file)
          }
       }
    }
-
-#define CIRCLE_PROGRESSING_DELAY       0.03
-#define PROGRESS_CIRCLE_TOTAL_STATES   50
-
-#define PROGRESS_CIRCLE_BG_DESC( param_num ) \
-   description { state: "progress" 0.#param_num; \
-      inherit: "default" 0.0; \
-      image { \
-         normal: "00_progress_circle_bg_"#param_num".png"; \
-      } \
-   }
-
-   group { name: "elm/progressbar/horizontal/progress_circle";
-      images {
-         image: "00_progress_circle_bg.png" COMP;
-         image: "00_progress_circle_bg_01.png" COMP;
-         image: "00_progress_circle_bg_02.png" COMP;
-         image: "00_progress_circle_bg_03.png" COMP;
-         image: "00_progress_circle_bg_04.png" COMP;
-         image: "00_progress_circle_bg_05.png" COMP;
-         image: "00_progress_circle_bg_06.png" COMP;
-         image: "00_progress_circle_bg_07.png" COMP;
-         image: "00_progress_circle_bg_08.png" COMP;
-         image: "00_progress_circle_bg_09.png" COMP;
-         image: "00_progress_circle_bg_10.png" COMP;
-         image: "00_progress_circle_bg_11.png" COMP;
-         image: "00_progress_circle_bg_12.png" COMP;
-         image: "00_progress_circle_bg_13.png" COMP;
-         image: "00_progress_circle_bg_14.png" COMP;
-         image: "00_progress_circle_bg_15.png" COMP;
-         image: "00_progress_circle_bg_16.png" COMP;
-         image: "00_progress_circle_bg_17.png" COMP;
-         image: "00_progress_circle_bg_18.png" COMP;
-         image: "00_progress_circle_bg_19.png" COMP;
-         image: "00_progress_circle_bg_20.png" COMP;
-         image: "00_progress_circle_bg_21.png" COMP;
-         image: "00_progress_circle_bg_22.png" COMP;
-         image: "00_progress_circle_bg_23.png" COMP;
-         image: "00_progress_circle_bg_24.png" COMP;
-         image: "00_progress_circle_bg_25.png" COMP;
-         image: "00_progress_circle_bg_26.png" COMP;
-         image: "00_progress_circle_bg_27.png" COMP;
-         image: "00_progress_circle_bg_28.png" COMP;
-         image: "00_progress_circle_bg_29.png" COMP;
-         image: "00_progress_circle_bg_30.png" COMP;
-         image: "00_progress_circle_bg_31.png" COMP;
-         image: "00_progress_circle_bg_32.png" COMP;
-         image: "00_progress_circle_bg_33.png" COMP;
-         image: "00_progress_circle_bg_34.png" COMP;
-         image: "00_progress_circle_bg_35.png" COMP;
-         image: "00_progress_circle_bg_36.png" COMP;
-         image: "00_progress_circle_bg_37.png" COMP;
-         image: "00_progress_circle_bg_38.png" COMP;
-         image: "00_progress_circle_bg_39.png" COMP;
-         image: "00_progress_circle_bg_40.png" COMP;
-         image: "00_progress_circle_bg_41.png" COMP;
-         image: "00_progress_circle_bg_42.png" COMP;
-         image: "00_progress_circle_bg_43.png" COMP;
-         image: "00_progress_circle_bg_44.png" COMP;
-         image: "00_progress_circle_bg_45.png" COMP;
-         image: "00_progress_circle_bg_46.png" COMP;
-         image: "00_progress_circle_bg_47.png" COMP;
-         image: "00_progress_circle_bg_48.png" COMP;
-         image: "00_progress_circle_bg_49.png" COMP;
-         image: "00_progress_circle_bg_50.png" COMP;
-      }
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            type: RECT;
-            description {
-               state: "default" 0.0;
-            }
-         }
-         part { name: "elm.swallow.bar";
-            mouse_events: 0;
-            scale: 1;
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.cur.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            dragable {
-               confine: "background";
-               x: 1 1 1;
-               y: 0 0 0;
-            }
-            description { state: "default" 0.0;
-               min: 1 1;
-               fixed: 1 1;
-               visible: 0;
-               rel1.to: "background";
-               rel2.to: "background";
-           }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "elm.background.progressbar";
-            description {
-               state: "default" 0.0;
-               min: PROGRESSBAR_PROGRESS_CIRCLE_BG_SIZE_INC;
-               max: PROGRESSBAR_PROGRESS_CIRCLE_BG_SIZE_INC;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "00_progress_circle_bg.png";
-               }
-            }
-         }
-         part { name: "progress_circle_img";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "elm.background.progressbar";
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "background";
-               }
-               rel2 {
-                  to: "background";
-               }
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "00_progress_circle_bg.png";
-               }
-            }
-            description { state: "progress" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_progress_circle_bg.png";
-               }
-            }
-            PROGRESS_CIRCLE_BG_DESC( 01 )
-            PROGRESS_CIRCLE_BG_DESC( 02 )
-            PROGRESS_CIRCLE_BG_DESC( 03 )
-            PROGRESS_CIRCLE_BG_DESC( 04 )
-            PROGRESS_CIRCLE_BG_DESC( 05 )
-            PROGRESS_CIRCLE_BG_DESC( 06 )
-            PROGRESS_CIRCLE_BG_DESC( 07 )
-            PROGRESS_CIRCLE_BG_DESC( 08 )
-            PROGRESS_CIRCLE_BG_DESC( 09 )
-            PROGRESS_CIRCLE_BG_DESC( 10 )
-            PROGRESS_CIRCLE_BG_DESC( 11 )
-            PROGRESS_CIRCLE_BG_DESC( 12 )
-            PROGRESS_CIRCLE_BG_DESC( 13 )
-            PROGRESS_CIRCLE_BG_DESC( 14 )
-            PROGRESS_CIRCLE_BG_DESC( 15 )
-            PROGRESS_CIRCLE_BG_DESC( 16 )
-            PROGRESS_CIRCLE_BG_DESC( 17 )
-            PROGRESS_CIRCLE_BG_DESC( 18 )
-            PROGRESS_CIRCLE_BG_DESC( 19 )
-            PROGRESS_CIRCLE_BG_DESC( 20 )
-            PROGRESS_CIRCLE_BG_DESC( 21 )
-            PROGRESS_CIRCLE_BG_DESC( 22 )
-            PROGRESS_CIRCLE_BG_DESC( 23 )
-            PROGRESS_CIRCLE_BG_DESC( 24 )
-            PROGRESS_CIRCLE_BG_DESC( 25 )
-            PROGRESS_CIRCLE_BG_DESC( 26 )
-            PROGRESS_CIRCLE_BG_DESC( 27 )
-            PROGRESS_CIRCLE_BG_DESC( 28 )
-            PROGRESS_CIRCLE_BG_DESC( 29 )
-            PROGRESS_CIRCLE_BG_DESC( 30 )
-            PROGRESS_CIRCLE_BG_DESC( 31 )
-            PROGRESS_CIRCLE_BG_DESC( 32 )
-            PROGRESS_CIRCLE_BG_DESC( 33 )
-            PROGRESS_CIRCLE_BG_DESC( 34 )
-            PROGRESS_CIRCLE_BG_DESC( 35 )
-            PROGRESS_CIRCLE_BG_DESC( 36 )
-            PROGRESS_CIRCLE_BG_DESC( 37 )
-            PROGRESS_CIRCLE_BG_DESC( 38 )
-            PROGRESS_CIRCLE_BG_DESC( 39 )
-            PROGRESS_CIRCLE_BG_DESC( 40 )
-            PROGRESS_CIRCLE_BG_DESC( 41 )
-            PROGRESS_CIRCLE_BG_DESC( 42 )
-            PROGRESS_CIRCLE_BG_DESC( 43 )
-            PROGRESS_CIRCLE_BG_DESC( 44 )
-            PROGRESS_CIRCLE_BG_DESC( 45 )
-            PROGRESS_CIRCLE_BG_DESC( 46 )
-            PROGRESS_CIRCLE_BG_DESC( 47 )
-            PROGRESS_CIRCLE_BG_DESC( 48 )
-            PROGRESS_CIRCLE_BG_DESC( 49 )
-            PROGRESS_CIRCLE_BG_DESC( 50 )
-         }
-      }
-      programs {
-         script {
-            public curr_state = 0;
-            public final_state = 0;
-            public prev_state = 0;
-            public max_state = 0;    // maximum possible state, a normalized value
-            public circle_zero_cross = 0;   // whether circle crosses its Zero state or not.
-
-            public progress_circle_state_change(){
-            new Float:x, Float:y, Float:final, Float:max;
-            max = PROGRESS_CIRCLE_TOTAL_STATES / 100.0;
-            set_float(max_state, max);
-            get_drag(PART:"elm.cur.progressbar", x, y);
-            final = x * max;   // calculate final state as per the set drag value
-            set_float(final_state, final);
-            if( final < get_float(prev_state) )
-               set_int(circle_zero_cross, 1);  // high value to low value, crosses zero state.
-            else
-               set_int(circle_zero_cross, 0);  // low value to high value, no need for zero state crossing.
-            }
-         }
-         program { name: "circle_progress";
-            script {
-               new Float:curr, Float:final, Float:max;
-               new zero_cross;
-               zero_cross = get_int(circle_zero_cross);
-               max = get_float(max_state);
-               curr = get_float(curr_state);
-               set_state(PART:"progress_circle_img", "progress", curr);
-               curr += 0.01;   // for next immediate state.
-               if( (curr > max) && (zero_cross == 1) )
-               {
-                  curr = 0.00;   // once it crosses Zero state, reset its state.
-                  set_int(circle_zero_cross, 0);
-               }
-               else if( curr > max ) return;
-
-               final = get_float(final_state);
-               zero_cross = get_int(circle_zero_cross);
-               if( (curr > final) && (zero_cross == 0) )
-               {
-                  set_float(prev_state, get_float(curr_state));
-                  return;
-               }
-               set_float(curr_state, curr);
-            }
-            after: "delay";
-         }
-         program { name: "delay";
-            action: STATE_SET "progress" 0.10;
-            target: "progress_circle_img";
-            in: CIRCLE_PROGRESSING_DELAY 0.0;
-            after: "circle_progress";
-         }
-         program { name: "circle_start";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-            script {
-               set_float(curr_state, 0.0);
-            }
-            after: "circle_progress";
-         }
-         program { name: "circle_stop";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "circle_progress";
-            target: "delay";
-            target: "circle_start";
-         }
-         program { name: "circle_state_change";
-            signal: "elm,state,change";
-            source: "elm";
-            script {
-               progress_circle_state_change()
-            }
-            after: "circle_progress";
-         }
-      }
-   }
index 38d1e03..1910abd 100644 (file)
@@ -45,6 +45,7 @@
       images { \
          image: "00_button_radio_activated_dim.png" COMP; \
          image: "00_button_radio_activated.png" COMP; \
+         image: "00_button_radio_activated_press.png" COMP; \
          image: "00_button_radio_bg.png" COMP; \
          image: "00_button_radio_dim_bg.png" COMP; \
          image: "00_button_radio_press_bg.png" COMP; \
@@ -82,6 +83,7 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
+               image.normal: "00_button_radio_press_bg.png"; \
             } \
          } \
          part { name: "radio"; \
             } \
             description { state: "pressed" 0.0; \
                inherit: "visible" 0.0; \
+               image.normal: "00_button_radio_activated_press.png"; \
             } \
          } \
          part { name: "opacity_clip"; \
                color: 255 255 255 255; \
             } \
          } \
-         part { name: "pressed_bg"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "bg"; \
-               rel2.to: "bg"; \
-               image.normal: "00_button_radio_press_bg.png"; \
-               visible: 0; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
          part { name: "elm.swallow.content"; \
             type: SWALLOW; \
             clip_to: "disclip"; \
                   set_state(PART:"radio", "visible", 0.0); \
                else \
                   set_state(PART:"radio", "default", 0.0); \
-               set_state(PART:"pressed_bg", "default", 0.0); \
+               set_state(PART:"bg", "default", 0.0); \
             } \
          } \
          program { name: "pressed"; \
                   set_state(PART:"radio", "pressed", 0.0); \
                else \
                   set_state(PART:"radio", "default", 0.0); \
-               set_state(PART:"pressed_bg", "pressed", 0.0); \
+               set_state(PART:"bg", "pressed", 0.0); \
             } \
          } \
          program { name: "mouse,out"; \
index bf852e8..4428ba9 100644 (file)
                   relative: 1.0 1.0;
                   to: "bg";
                }
-               color: SELECTION_INFO_TEXT_COLOR_INC;
+               color: TICKERNOTI_TEXT_COLOR_INC;
                text {
                   font: "Tizen:style=Roman";
                   size: TICKERNOTI_INFO_TEXT_FONT_SIZE_INC;
index 84db30b..47f479b 100644 (file)
@@ -134,7 +134,7 @@ group { name: "elm/toolbar/item/default";
       image: "00_tab_focus.png" COMP;
    }
 
-   data.item: "transition_animation_on" "1";
+   data.item: "transition_animation_on" "0";
    script {
       public item_state = ITEM_STATE_ENABLED;
       public items_number = 0;
@@ -834,7 +834,7 @@ group { name: "elm/toolbar/item/tabbar";
       image: "00_effect_tab_text_dim_right.png" COMP;
    }
 
-   data.item: "transition_animation_on" "1";
+   data.item: "transition_animation_on" "0";
    script {
       public item_state = ITEM_STATE_ENABLED;
       public items_number = 0;