From: Jinkun Jang Date: Fri, 15 Mar 2013 16:19:18 +0000 (+0900) Subject: merge with master X-Git-Tag: accepted/tizen/20131029.210118~538 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8e1fbd14839dadae6b16bf6ab4817dea54bd8ef;p=profile%2Fivi%2Fefl-theme-tizen.git merge with master --- diff --git a/packaging/efl-theme-tizen-hd.spec b/packaging/efl-theme-tizen-hd.spec index 8bd2222..fb52764 100644 --- a/packaging/efl-theme-tizen-hd.spec +++ b/packaging/efl-theme-tizen-hd.spec @@ -1,6 +1,6 @@ Name: efl-theme-tizen-hd Summary: Tizen theme files -Version: 1.0.112r05 +Version: 1.0.142r01 Release: 1 Group: TO_BE/FILLED_IN License: APLv2 diff --git a/themes/images/tizen-hd/00_EditField_clear.png b/themes/images/tizen-hd/00_EditField_clear.png index 0244344..ef5945d 100644 Binary files a/themes/images/tizen-hd/00_EditField_clear.png and b/themes/images/tizen-hd/00_EditField_clear.png differ diff --git a/themes/images/tizen-hd/00_EditField_clear_press.png b/themes/images/tizen-hd/00_EditField_rename.png similarity index 81% rename from themes/images/tizen-hd/00_EditField_clear_press.png rename to themes/images/tizen-hd/00_EditField_rename.png index fe9d9cc..27c42e9 100755 Binary files a/themes/images/tizen-hd/00_EditField_clear_press.png and b/themes/images/tizen-hd/00_EditField_rename.png differ diff --git a/themes/images/tizen-hd/00_MessageBubble_BG_receive.png b/themes/images/tizen-hd/00_MessageBubble_BG_receive.png old mode 100644 new mode 100755 index bf98eae..caf8c8b Binary files a/themes/images/tizen-hd/00_MessageBubble_BG_receive.png and b/themes/images/tizen-hd/00_MessageBubble_BG_receive.png differ diff --git a/themes/images/tizen-hd/00_MessageBubble_BG_send.png b/themes/images/tizen-hd/00_MessageBubble_BG_send.png old mode 100644 new mode 100755 index 799910b..e1ab153 Binary files a/themes/images/tizen-hd/00_MessageBubble_BG_send.png and b/themes/images/tizen-hd/00_MessageBubble_BG_send.png differ diff --git a/themes/images/tizen-hd/00_Nocontents_devices.png b/themes/images/tizen-hd/00_Nocontents_devices.png index 1e62557..a46caea 100755 Binary files a/themes/images/tizen-hd/00_Nocontents_devices.png and b/themes/images/tizen-hd/00_Nocontents_devices.png differ diff --git a/themes/images/tizen-hd/00_Nocontents_multimedia.png b/themes/images/tizen-hd/00_Nocontents_multimedia.png index a2c758a..04e2e11 100755 Binary files a/themes/images/tizen-hd/00_Nocontents_multimedia.png and b/themes/images/tizen-hd/00_Nocontents_multimedia.png differ diff --git a/themes/images/tizen-hd/00_Nocontents_picture.png b/themes/images/tizen-hd/00_Nocontents_picture.png index 23b8881..7677efc 100755 Binary files a/themes/images/tizen-hd/00_Nocontents_picture.png and b/themes/images/tizen-hd/00_Nocontents_picture.png differ diff --git a/themes/images/tizen-hd/00_Nocontents_text.png b/themes/images/tizen-hd/00_Nocontents_text.png index 55b7329..86e3ae0 100755 Binary files a/themes/images/tizen-hd/00_Nocontents_text.png and b/themes/images/tizen-hd/00_Nocontents_text.png differ diff --git a/themes/images/tizen-hd/00_Nocontents_unnamed.png b/themes/images/tizen-hd/00_Nocontents_unnamed.png index 87e6683..2312869 100755 Binary files a/themes/images/tizen-hd/00_Nocontents_unnamed.png and b/themes/images/tizen-hd/00_Nocontents_unnamed.png differ diff --git a/themes/images/tizen-hd/00_arrow_expand.png b/themes/images/tizen-hd/00_arrow_expand.png index 79fdf3a..4c3b1f4 100755 Binary files a/themes/images/tizen-hd/00_arrow_expand.png and b/themes/images/tizen-hd/00_arrow_expand.png differ diff --git a/themes/images/tizen-hd/00_badge_bg.png b/themes/images/tizen-hd/00_badge_bg.png old mode 100755 new mode 100644 index 6dda2a8..a04eed3 Binary files a/themes/images/tizen-hd/00_badge_bg.png and b/themes/images/tizen-hd/00_badge_bg.png differ diff --git a/themes/images/tizen-hd/00_bottom_popup_shadow.png b/themes/images/tizen-hd/00_bottom_popup_shadow.png index 8228a43..74fe293 100644 Binary files a/themes/images/tizen-hd/00_bottom_popup_shadow.png and b/themes/images/tizen-hd/00_bottom_popup_shadow.png differ diff --git a/themes/images/tizen-hd/00_button_01.png b/themes/images/tizen-hd/00_button_01.png index fe5d7a6..fe39033 100755 Binary files a/themes/images/tizen-hd/00_button_01.png and b/themes/images/tizen-hd/00_button_01.png differ diff --git a/themes/images/tizen-hd/00_button_03_cancel_dim.png b/themes/images/tizen-hd/00_button_01_Delete.png similarity index 60% rename from themes/images/tizen-hd/00_button_03_cancel_dim.png rename to themes/images/tizen-hd/00_button_01_Delete.png index c7fd0b8..6ae4cf2 100755 Binary files a/themes/images/tizen-hd/00_button_03_cancel_dim.png and b/themes/images/tizen-hd/00_button_01_Delete.png differ diff --git a/themes/images/tizen-hd/00_button_01_Delete_dim.png b/themes/images/tizen-hd/00_button_01_Delete_dim.png new file mode 100755 index 0000000..8f9c53d Binary files /dev/null and b/themes/images/tizen-hd/00_button_01_Delete_dim.png differ diff --git a/themes/images/tizen-hd/00_button_03_cancel.png b/themes/images/tizen-hd/00_button_01_Delete_press.png similarity index 59% rename from themes/images/tizen-hd/00_button_03_cancel.png rename to themes/images/tizen-hd/00_button_01_Delete_press.png index afa40a7..03f0fdc 100755 Binary files a/themes/images/tizen-hd/00_button_03_cancel.png and b/themes/images/tizen-hd/00_button_01_Delete_press.png differ diff --git a/themes/images/tizen-hd/00_button_01_dim.png b/themes/images/tizen-hd/00_button_01_dim.png index fe5d7a6..fe39033 100755 Binary files a/themes/images/tizen-hd/00_button_01_dim.png and b/themes/images/tizen-hd/00_button_01_dim.png differ diff --git a/themes/images/tizen-hd/00_button_01_press.png b/themes/images/tizen-hd/00_button_01_press.png index 01efa58..7a99f6c 100755 Binary files a/themes/images/tizen-hd/00_button_01_press.png and b/themes/images/tizen-hd/00_button_01_press.png differ diff --git a/themes/images/tizen-hd/00_button_delete_dim.png b/themes/images/tizen-hd/00_button_01_send.png similarity index 60% rename from themes/images/tizen-hd/00_button_delete_dim.png rename to themes/images/tizen-hd/00_button_01_send.png index a35d8c8..edc82c1 100755 Binary files a/themes/images/tizen-hd/00_button_delete_dim.png and b/themes/images/tizen-hd/00_button_01_send.png differ diff --git a/themes/images/tizen-hd/00_button_01_send_dim.png b/themes/images/tizen-hd/00_button_01_send_dim.png new file mode 100755 index 0000000..edc82c1 Binary files /dev/null and b/themes/images/tizen-hd/00_button_01_send_dim.png differ diff --git a/themes/images/tizen-hd/00_button_01_send_press.png b/themes/images/tizen-hd/00_button_01_send_press.png new file mode 100755 index 0000000..7a99f6c Binary files /dev/null and b/themes/images/tizen-hd/00_button_01_send_press.png differ diff --git a/themes/images/tizen-hd/00_button_02.png b/themes/images/tizen-hd/00_button_02.png index c18a83b..7a8375a 100755 Binary files a/themes/images/tizen-hd/00_button_02.png and b/themes/images/tizen-hd/00_button_02.png differ diff --git a/themes/images/tizen-hd/00_button_02_dim.png b/themes/images/tizen-hd/00_button_02_dim.png index c18a83b..7a8375a 100755 Binary files a/themes/images/tizen-hd/00_button_02_dim.png and b/themes/images/tizen-hd/00_button_02_dim.png differ diff --git a/themes/images/tizen-hd/00_button_02_press.png b/themes/images/tizen-hd/00_button_02_press.png index 674d467..8bb27a7 100755 Binary files a/themes/images/tizen-hd/00_button_02_press.png and b/themes/images/tizen-hd/00_button_02_press.png differ diff --git a/themes/images/tizen-hd/00_button_03_cancel_press.png b/themes/images/tizen-hd/00_button_03_cancel_press.png deleted file mode 100755 index cea9b7c..0000000 Binary files a/themes/images/tizen-hd/00_button_03_cancel_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_03_dim.png b/themes/images/tizen-hd/00_button_03_dim.png deleted file mode 100755 index b0a47b2..0000000 Binary files a/themes/images/tizen-hd/00_button_03_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_03_press.png b/themes/images/tizen-hd/00_button_03_press.png deleted file mode 100755 index fa71dcd..0000000 Binary files a/themes/images/tizen-hd/00_button_03_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_03_send.png b/themes/images/tizen-hd/00_button_03_send.png deleted file mode 100755 index 0626821..0000000 Binary files a/themes/images/tizen-hd/00_button_03_send.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_03_send_dim.png b/themes/images/tizen-hd/00_button_03_send_dim.png deleted file mode 100755 index 0626821..0000000 Binary files a/themes/images/tizen-hd/00_button_03_send_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_03_send_press.png b/themes/images/tizen-hd/00_button_03_send_press.png deleted file mode 100755 index fa71dcd..0000000 Binary files a/themes/images/tizen-hd/00_button_03_send_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_call.png b/themes/images/tizen-hd/00_button_call.png index 0171458..031c445 100755 Binary files a/themes/images/tizen-hd/00_button_call.png and b/themes/images/tizen-hd/00_button_call.png differ diff --git a/themes/images/tizen-hd/00_button_call_press.png b/themes/images/tizen-hd/00_button_call_press.png index 84fb671..2f71a3b 100755 Binary files a/themes/images/tizen-hd/00_button_call_press.png and b/themes/images/tizen-hd/00_button_call_press.png differ diff --git a/themes/images/tizen-hd/00_button_delete.png b/themes/images/tizen-hd/00_button_delete.png deleted file mode 100755 index bef4688..0000000 Binary files a/themes/images/tizen-hd/00_button_delete.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_delete_press.png b/themes/images/tizen-hd/00_button_delete_press.png deleted file mode 100755 index 24d8292..0000000 Binary files a/themes/images/tizen-hd/00_button_delete_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_button_expand_cancel.png b/themes/images/tizen-hd/00_button_expand_cancel.png index cd39ee5..f401863 100755 Binary files a/themes/images/tizen-hd/00_button_expand_cancel.png and b/themes/images/tizen-hd/00_button_expand_cancel.png differ diff --git a/themes/images/tizen-hd/00_button_expand_cancel_press.png b/themes/images/tizen-hd/00_button_expand_cancel_press.png index 7922166..2570325 100755 Binary files a/themes/images/tizen-hd/00_button_expand_cancel_press.png and b/themes/images/tizen-hd/00_button_expand_cancel_press.png differ diff --git a/themes/images/tizen-hd/00_button_expand_closed.png b/themes/images/tizen-hd/00_button_expand_closed.png index 35a20f9..6f45318 100755 Binary files a/themes/images/tizen-hd/00_button_expand_closed.png and b/themes/images/tizen-hd/00_button_expand_closed.png differ diff --git a/themes/images/tizen-hd/00_button_expand_closed_press.png b/themes/images/tizen-hd/00_button_expand_closed_press.png index 372af70..769edd2 100755 Binary files a/themes/images/tizen-hd/00_button_expand_closed_press.png and b/themes/images/tizen-hd/00_button_expand_closed_press.png differ diff --git a/themes/images/tizen-hd/00_button_expand_minus.png b/themes/images/tizen-hd/00_button_expand_minus.png index 320f380..dce60fe 100755 Binary files a/themes/images/tizen-hd/00_button_expand_minus.png and b/themes/images/tizen-hd/00_button_expand_minus.png differ diff --git a/themes/images/tizen-hd/00_button_expand_minus_press.png b/themes/images/tizen-hd/00_button_expand_minus_press.png index 9a85015..7f7edfb 100755 Binary files a/themes/images/tizen-hd/00_button_expand_minus_press.png and b/themes/images/tizen-hd/00_button_expand_minus_press.png differ diff --git a/themes/images/tizen-hd/00_button_expand_opened.png b/themes/images/tizen-hd/00_button_expand_opened.png index d44d28f..3209796 100755 Binary files a/themes/images/tizen-hd/00_button_expand_opened.png and b/themes/images/tizen-hd/00_button_expand_opened.png differ diff --git a/themes/images/tizen-hd/00_button_expand_opened_press.png b/themes/images/tizen-hd/00_button_expand_opened_press.png index 271415c..f8a8208 100755 Binary files a/themes/images/tizen-hd/00_button_expand_opened_press.png and b/themes/images/tizen-hd/00_button_expand_opened_press.png differ diff --git a/themes/images/tizen-hd/00_button_expand_send.png b/themes/images/tizen-hd/00_button_expand_send.png index aa0c6d3..4d5e8ff 100755 Binary files a/themes/images/tizen-hd/00_button_expand_send.png and b/themes/images/tizen-hd/00_button_expand_send.png differ diff --git a/themes/images/tizen-hd/00_button_expand_send_press.png b/themes/images/tizen-hd/00_button_expand_send_press.png index d0d6d2b..644674b 100755 Binary files a/themes/images/tizen-hd/00_button_expand_send_press.png and b/themes/images/tizen-hd/00_button_expand_send_press.png differ diff --git a/themes/images/tizen-hd/00_popup_scroll.9.png b/themes/images/tizen-hd/00_button_icon_arrow.png old mode 100644 new mode 100755 similarity index 91% rename from themes/images/tizen-hd/00_popup_scroll.9.png rename to themes/images/tizen-hd/00_button_icon_arrow.png index 59fa0ff..3449098 Binary files a/themes/images/tizen-hd/00_popup_scroll.9.png and b/themes/images/tizen-hd/00_button_icon_arrow.png differ diff --git a/themes/images/tizen-hd/00_button_on_01.png b/themes/images/tizen-hd/00_button_icon_arrow_press.png old mode 100644 new mode 100755 similarity index 75% rename from themes/images/tizen-hd/00_button_on_01.png rename to themes/images/tizen-hd/00_button_icon_arrow_press.png index e1e2dac..5503468 Binary files a/themes/images/tizen-hd/00_button_on_01.png and b/themes/images/tizen-hd/00_button_icon_arrow_press.png differ diff --git a/themes/images/tizen-hd/00_button_info.png b/themes/images/tizen-hd/00_button_info.png index 2c7b0eb..d0e0eae 100755 Binary files a/themes/images/tizen-hd/00_button_info.png and b/themes/images/tizen-hd/00_button_info.png differ diff --git a/themes/images/tizen-hd/00_button_info_press.png b/themes/images/tizen-hd/00_button_info_press.png index 576658a..ad2bf68 100755 Binary files a/themes/images/tizen-hd/00_button_info_press.png and b/themes/images/tizen-hd/00_button_info_press.png differ diff --git a/themes/images/tizen-hd/00_button_left.png b/themes/images/tizen-hd/00_button_left.png index 9ba2a29..81ca308 100755 Binary files a/themes/images/tizen-hd/00_button_left.png and b/themes/images/tizen-hd/00_button_left.png differ diff --git a/themes/images/tizen-hd/00_button_left_press.png b/themes/images/tizen-hd/00_button_left_press.png index 42cca62..e411713 100755 Binary files a/themes/images/tizen-hd/00_button_left_press.png and b/themes/images/tizen-hd/00_button_left_press.png differ diff --git a/themes/images/tizen-hd/00_button_off.png b/themes/images/tizen-hd/00_button_off.png index da82063..ad2bd67 100644 Binary files a/themes/images/tizen-hd/00_button_off.png and b/themes/images/tizen-hd/00_button_off.png differ diff --git a/themes/images/tizen-hd/00_button_off_dim.png b/themes/images/tizen-hd/00_button_off_dim.png index 9d41976..99e90d4 100644 Binary files a/themes/images/tizen-hd/00_button_off_dim.png and b/themes/images/tizen-hd/00_button_off_dim.png differ diff --git a/themes/images/tizen-hd/00_button_on.png b/themes/images/tizen-hd/00_button_on.png index 7ad2614..e366b46 100644 Binary files a/themes/images/tizen-hd/00_button_on.png and b/themes/images/tizen-hd/00_button_on.png differ diff --git a/themes/images/tizen-hd/00_button_on_dim.png b/themes/images/tizen-hd/00_button_on_dim.png index 4886f4b..d72d257 100644 Binary files a/themes/images/tizen-hd/00_button_on_dim.png and b/themes/images/tizen-hd/00_button_on_dim.png differ diff --git a/themes/images/tizen-hd/00_button_on_off_handler.png b/themes/images/tizen-hd/00_button_on_off_handler.png index d17f283..725bb67 100644 Binary files a/themes/images/tizen-hd/00_button_on_off_handler.png and b/themes/images/tizen-hd/00_button_on_off_handler.png differ diff --git a/themes/images/tizen-hd/00_button_on_off_handler_dim.png b/themes/images/tizen-hd/00_button_on_off_handler_dim.png index 41595d2..f23fc4a 100644 Binary files a/themes/images/tizen-hd/00_button_on_off_handler_dim.png and b/themes/images/tizen-hd/00_button_on_off_handler_dim.png differ diff --git a/themes/images/tizen-hd/00_button_plus.png b/themes/images/tizen-hd/00_button_plus.png index 3690ab5..59a765c 100755 Binary files a/themes/images/tizen-hd/00_button_plus.png and b/themes/images/tizen-hd/00_button_plus.png differ diff --git a/themes/images/tizen-hd/00_button_plus_press.png b/themes/images/tizen-hd/00_button_plus_press.png index adf0f35..50eb4f0 100755 Binary files a/themes/images/tizen-hd/00_button_plus_press.png and b/themes/images/tizen-hd/00_button_plus_press.png differ diff --git a/themes/images/tizen-hd/00_button_radio.png b/themes/images/tizen-hd/00_button_radio.png index 83a1a54..3ae8001 100755 Binary files a/themes/images/tizen-hd/00_button_radio.png and b/themes/images/tizen-hd/00_button_radio.png differ diff --git a/themes/images/tizen-hd/00_button_radio_dim.png b/themes/images/tizen-hd/00_button_radio_dim.png index ee90464..4e5c72f 100755 Binary files a/themes/images/tizen-hd/00_button_radio_dim.png and b/themes/images/tizen-hd/00_button_radio_dim.png differ diff --git a/themes/images/tizen-hd/00_button_radio_press.png b/themes/images/tizen-hd/00_button_radio_press.png index 8cbfcb3..5ce7984 100755 Binary files a/themes/images/tizen-hd/00_button_radio_press.png and b/themes/images/tizen-hd/00_button_radio_press.png differ diff --git a/themes/images/tizen-hd/00_button_radio_select.png b/themes/images/tizen-hd/00_button_radio_select.png index 8b8ad9d..304d61b 100755 Binary files a/themes/images/tizen-hd/00_button_radio_select.png and b/themes/images/tizen-hd/00_button_radio_select.png differ diff --git a/themes/images/tizen-hd/00_button_radio_select_dim.png b/themes/images/tizen-hd/00_button_radio_select_dim.png index a89c569..8e71cc0 100755 Binary files a/themes/images/tizen-hd/00_button_radio_select_dim.png and b/themes/images/tizen-hd/00_button_radio_select_dim.png differ diff --git a/themes/images/tizen-hd/00_button_rename.png b/themes/images/tizen-hd/00_button_rename.png index 8b05721..27e896b 100755 Binary files a/themes/images/tizen-hd/00_button_rename.png and b/themes/images/tizen-hd/00_button_rename.png differ diff --git a/themes/images/tizen-hd/00_button_rename_press.png b/themes/images/tizen-hd/00_button_rename_press.png index c0968ee..c14a939 100755 Binary files a/themes/images/tizen-hd/00_button_rename_press.png and b/themes/images/tizen-hd/00_button_rename_press.png differ diff --git a/themes/images/tizen-hd/00_button_right.png b/themes/images/tizen-hd/00_button_right.png index 2df2d17..0266eb8 100755 Binary files a/themes/images/tizen-hd/00_button_right.png and b/themes/images/tizen-hd/00_button_right.png differ diff --git a/themes/images/tizen-hd/00_button_right_press.png b/themes/images/tizen-hd/00_button_right_press.png index f9e50d3..5dd84b5 100755 Binary files a/themes/images/tizen-hd/00_button_right_press.png and b/themes/images/tizen-hd/00_button_right_press.png differ diff --git a/themes/images/tizen-hd/00_button_warning.png b/themes/images/tizen-hd/00_button_warning.png index db944e5..0f491ae 100755 Binary files a/themes/images/tizen-hd/00_button_warning.png and b/themes/images/tizen-hd/00_button_warning.png differ diff --git a/themes/images/tizen-hd/00_button_warning_press.png b/themes/images/tizen-hd/00_button_warning_press.png index db944e5..0f491ae 100755 Binary files a/themes/images/tizen-hd/00_button_warning_press.png and b/themes/images/tizen-hd/00_button_warning_press.png differ diff --git a/themes/images/tizen-hd/00_check_bg.png b/themes/images/tizen-hd/00_check_bg.png index 1f60e1b..80398ed 100755 Binary files a/themes/images/tizen-hd/00_check_bg.png and b/themes/images/tizen-hd/00_check_bg.png differ diff --git a/themes/images/tizen-hd/00_check_bg_dim.png b/themes/images/tizen-hd/00_check_bg_dim.png index ba7ac60..72ced60 100755 Binary files a/themes/images/tizen-hd/00_check_bg_dim.png and b/themes/images/tizen-hd/00_check_bg_dim.png differ diff --git a/themes/images/tizen-hd/00_check_bg_press.png b/themes/images/tizen-hd/00_check_bg_press.png index bf665af..834918e 100755 Binary files a/themes/images/tizen-hd/00_check_bg_press.png and b/themes/images/tizen-hd/00_check_bg_press.png differ diff --git a/themes/images/tizen-hd/00_check_checking.png b/themes/images/tizen-hd/00_check_checking.png index 4c64b01..eae81d5 100755 Binary files a/themes/images/tizen-hd/00_check_checking.png and b/themes/images/tizen-hd/00_check_checking.png differ diff --git a/themes/images/tizen-hd/00_check_checking_dim.png b/themes/images/tizen-hd/00_check_checking_dim.png index e54f8b2..4d5c284 100755 Binary files a/themes/images/tizen-hd/00_check_checking_dim.png and b/themes/images/tizen-hd/00_check_checking_dim.png differ diff --git a/themes/images/tizen-hd/00_circle_button.png b/themes/images/tizen-hd/00_circle_button.png index e300309..cb91a99 100755 Binary files a/themes/images/tizen-hd/00_circle_button.png and b/themes/images/tizen-hd/00_circle_button.png differ diff --git a/themes/images/tizen-hd/00_circle_button_delete.png b/themes/images/tizen-hd/00_circle_button_delete.png new file mode 100755 index 0000000..794397c Binary files /dev/null and b/themes/images/tizen-hd/00_circle_button_delete.png differ diff --git a/themes/images/tizen-hd/00_circle_button_delete_dim.png b/themes/images/tizen-hd/00_circle_button_delete_dim.png new file mode 100755 index 0000000..794397c Binary files /dev/null and b/themes/images/tizen-hd/00_circle_button_delete_dim.png differ diff --git a/themes/images/tizen-hd/00_circle_button_delete_press.png b/themes/images/tizen-hd/00_circle_button_delete_press.png new file mode 100755 index 0000000..d58cef6 Binary files /dev/null and b/themes/images/tizen-hd/00_circle_button_delete_press.png differ diff --git a/themes/images/tizen-hd/00_circle_button_dim.png b/themes/images/tizen-hd/00_circle_button_dim.png index e300309..cb91a99 100755 Binary files a/themes/images/tizen-hd/00_circle_button_dim.png and b/themes/images/tizen-hd/00_circle_button_dim.png differ diff --git a/themes/images/tizen-hd/00_circle_button_press.png b/themes/images/tizen-hd/00_circle_button_press.png index 41de1ed..cb12641 100755 Binary files a/themes/images/tizen-hd/00_circle_button_press.png and b/themes/images/tizen-hd/00_circle_button_press.png differ diff --git a/themes/images/tizen-hd/00_circle_delete_button.png b/themes/images/tizen-hd/00_circle_delete_button.png deleted file mode 100755 index dd2fe07..0000000 Binary files a/themes/images/tizen-hd/00_circle_delete_button.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_circle_delete_button_dim.png b/themes/images/tizen-hd/00_circle_delete_button_dim.png deleted file mode 100755 index 4515a42..0000000 Binary files a/themes/images/tizen-hd/00_circle_delete_button_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_circle_delete_button_press.png b/themes/images/tizen-hd/00_circle_delete_button_press.png deleted file mode 100755 index e2b27e2..0000000 Binary files a/themes/images/tizen-hd/00_circle_delete_button_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_color_picker_brightness.png b/themes/images/tizen-hd/00_color_picker_brightness.png index 7ee7500..507c217 100644 Binary files a/themes/images/tizen-hd/00_color_picker_brightness.png and b/themes/images/tizen-hd/00_color_picker_brightness.png differ diff --git a/themes/images/tizen-hd/00_color_picker_color.png b/themes/images/tizen-hd/00_color_picker_color.png index ad24cac..b14670b 100644 Binary files a/themes/images/tizen-hd/00_color_picker_color.png and b/themes/images/tizen-hd/00_color_picker_color.png differ diff --git a/themes/images/tizen-hd/00_color_picker_focus.png b/themes/images/tizen-hd/00_color_picker_focus.png index 45a1350..bbaa7e7 100644 Binary files a/themes/images/tizen-hd/00_color_picker_focus.png and b/themes/images/tizen-hd/00_color_picker_focus.png differ diff --git a/themes/images/tizen-hd/00_color_picker_opacity.png b/themes/images/tizen-hd/00_color_picker_opacity.png deleted file mode 100644 index 8edd433..0000000 Binary files a/themes/images/tizen-hd/00_color_picker_opacity.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_color_picker_palette_bg.png b/themes/images/tizen-hd/00_color_picker_palette_bg.png index f94ea6b..462be08 100644 Binary files a/themes/images/tizen-hd/00_color_picker_palette_bg.png and b/themes/images/tizen-hd/00_color_picker_palette_bg.png differ diff --git a/themes/images/tizen-hd/00_color_picker_palette_focus.png b/themes/images/tizen-hd/00_color_picker_palette_focus.png index 65d99c0..11bf712 100644 Binary files a/themes/images/tizen-hd/00_color_picker_palette_focus.png and b/themes/images/tizen-hd/00_color_picker_palette_focus.png differ diff --git a/themes/images/tizen-hd/00_color_picker_saturation.png b/themes/images/tizen-hd/00_color_picker_saturation.png new file mode 100644 index 0000000..505ab1e Binary files /dev/null and b/themes/images/tizen-hd/00_color_picker_saturation.png differ diff --git a/themes/images/tizen-hd/00_contacts_button.png b/themes/images/tizen-hd/00_contacts_button.png old mode 100644 new mode 100755 index 635763c..75de25e Binary files a/themes/images/tizen-hd/00_contacts_button.png and b/themes/images/tizen-hd/00_contacts_button.png differ diff --git a/themes/images/tizen-hd/00_contacts_button_press.png b/themes/images/tizen-hd/00_contacts_button_press.png old mode 100644 new mode 100755 index 6e32030..72f50f6 Binary files a/themes/images/tizen-hd/00_contacts_button_press.png and b/themes/images/tizen-hd/00_contacts_button_press.png differ diff --git a/themes/images/tizen-hd/00_effect_tab_bounce_left.png b/themes/images/tizen-hd/00_effect_tab_bounce_left.png new file mode 100755 index 0000000..c1e3afb Binary files /dev/null and b/themes/images/tizen-hd/00_effect_tab_bounce_left.png differ diff --git a/themes/images/tizen-hd/00_effect_tab_bounce_right.png b/themes/images/tizen-hd/00_effect_tab_bounce_right.png new file mode 100755 index 0000000..691ec73 Binary files /dev/null and b/themes/images/tizen-hd/00_effect_tab_bounce_right.png differ diff --git a/themes/images/tizen-hd/00_fast_scroll_popup_bg.png b/themes/images/tizen-hd/00_fast_scroll_popup_bg.png index 158b6b1..d56a80c 100755 Binary files a/themes/images/tizen-hd/00_fast_scroll_popup_bg.png and b/themes/images/tizen-hd/00_fast_scroll_popup_bg.png differ diff --git a/themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus_bg.png b/themes/images/tizen-hd/00_fast_scroll_rollover_bg.png old mode 100644 new mode 100755 similarity index 95% rename from themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus_bg.png rename to themes/images/tizen-hd/00_fast_scroll_rollover_bg.png index 3589ce5..3085573 Binary files a/themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus_bg.png and b/themes/images/tizen-hd/00_fast_scroll_rollover_bg.png differ diff --git a/themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus.png b/themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus.png index e711212..53da3ed 100755 Binary files a/themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus.png and b/themes/images/tizen-hd/00_fast_scroll_rollover_bg_focus.png differ diff --git a/themes/images/tizen-hd/00_fast_scroll_rollover_bg_line_focus.png b/themes/images/tizen-hd/00_fast_scroll_rollover_bg_line_focus.png new file mode 100755 index 0000000..0c411c3 Binary files /dev/null and b/themes/images/tizen-hd/00_fast_scroll_rollover_bg_line_focus.png differ diff --git a/themes/images/tizen-hd/00_icon_Back.png b/themes/images/tizen-hd/00_icon_Back.png old mode 100755 new mode 100644 index e217a0a..42b300e Binary files a/themes/images/tizen-hd/00_icon_Back.png and b/themes/images/tizen-hd/00_icon_Back.png differ diff --git a/themes/images/tizen-hd/00_icon_Back_dim.png b/themes/images/tizen-hd/00_icon_Back_dim.png deleted file mode 100755 index fa16303..0000000 Binary files a/themes/images/tizen-hd/00_icon_Back_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_Back_press.png b/themes/images/tizen-hd/00_icon_Back_press.png deleted file mode 100755 index 344e209..0000000 Binary files a/themes/images/tizen-hd/00_icon_Back_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_favorite_off_72x72.png b/themes/images/tizen-hd/00_icon_favorite_off_72x72.png new file mode 100644 index 0000000..4bdaa5d Binary files /dev/null and b/themes/images/tizen-hd/00_icon_favorite_off_72x72.png differ diff --git a/themes/images/tizen-hd/00_icon_favorite_off_72x72_dim.png b/themes/images/tizen-hd/00_icon_favorite_off_72x72_dim.png new file mode 100644 index 0000000..5b62b49 Binary files /dev/null and b/themes/images/tizen-hd/00_icon_favorite_off_72x72_dim.png differ diff --git a/themes/images/tizen-hd/00_icon_favorite_off_74x74.png b/themes/images/tizen-hd/00_icon_favorite_off_74x74.png deleted file mode 100755 index 85a8fd8..0000000 Binary files a/themes/images/tizen-hd/00_icon_favorite_off_74x74.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_favorite_off_74x74_dim.png b/themes/images/tizen-hd/00_icon_favorite_off_74x74_dim.png deleted file mode 100755 index 6ac64c2..0000000 Binary files a/themes/images/tizen-hd/00_icon_favorite_off_74x74_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_favorite_on_72x72.png b/themes/images/tizen-hd/00_icon_favorite_on_72x72.png new file mode 100644 index 0000000..44f1db8 Binary files /dev/null and b/themes/images/tizen-hd/00_icon_favorite_on_72x72.png differ diff --git a/themes/images/tizen-hd/00_button_03.png b/themes/images/tizen-hd/00_icon_favorite_on_72x72_dim.png old mode 100755 new mode 100644 similarity index 59% rename from themes/images/tizen-hd/00_button_03.png rename to themes/images/tizen-hd/00_icon_favorite_on_72x72_dim.png index b0a47b2..ee43394 Binary files a/themes/images/tizen-hd/00_button_03.png and b/themes/images/tizen-hd/00_icon_favorite_on_72x72_dim.png differ diff --git a/themes/images/tizen-hd/00_icon_favorite_on_74x74.png b/themes/images/tizen-hd/00_icon_favorite_on_74x74.png deleted file mode 100755 index d02e41f..0000000 Binary files a/themes/images/tizen-hd/00_icon_favorite_on_74x74.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_favorite_on_74x74_dim.png b/themes/images/tizen-hd/00_icon_favorite_on_74x74_dim.png deleted file mode 100755 index 64f4524..0000000 Binary files a/themes/images/tizen-hd/00_icon_favorite_on_74x74_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_jump.png b/themes/images/tizen-hd/00_icon_jump.png new file mode 100644 index 0000000..9f69cba Binary files /dev/null and b/themes/images/tizen-hd/00_icon_jump.png differ diff --git a/themes/images/tizen-hd/00_icon_jump_left.png b/themes/images/tizen-hd/00_icon_jump_left.png new file mode 100644 index 0000000..031353c Binary files /dev/null and b/themes/images/tizen-hd/00_icon_jump_left.png differ diff --git a/themes/images/tizen-hd/00_icon_more.png b/themes/images/tizen-hd/00_icon_more.png old mode 100755 new mode 100644 index 49a6d06..2367834 Binary files a/themes/images/tizen-hd/00_icon_more.png and b/themes/images/tizen-hd/00_icon_more.png differ diff --git a/themes/images/tizen-hd/00_icon_more_dim.png b/themes/images/tizen-hd/00_icon_more_dim.png deleted file mode 100755 index adc28b2..0000000 Binary files a/themes/images/tizen-hd/00_icon_more_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_icon_more_press.png b/themes/images/tizen-hd/00_icon_more_press.png deleted file mode 100755 index 3a13509..0000000 Binary files a/themes/images/tizen-hd/00_icon_more_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_list_group_bg.png b/themes/images/tizen-hd/00_list_group_bg.png index b7e0b83..a925ce4 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg.png and b/themes/images/tizen-hd/00_list_group_bg.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_bottom.png b/themes/images/tizen-hd/00_list_group_bg_bottom.png index 9b3805d..09109f2 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_bottom.png and b/themes/images/tizen-hd/00_list_group_bg_bottom.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_bottom_press.png b/themes/images/tizen-hd/00_list_group_bg_bottom_press.png index 9044647..efc5a41 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_bottom_press.png and b/themes/images/tizen-hd/00_list_group_bg_bottom_press.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_center.png b/themes/images/tizen-hd/00_list_group_bg_center.png index b49bf40..72413b8 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_center.png and b/themes/images/tizen-hd/00_list_group_bg_center.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_center_press.png b/themes/images/tizen-hd/00_list_group_bg_center_press.png index aa08d3c..b64a79a 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_center_press.png and b/themes/images/tizen-hd/00_list_group_bg_center_press.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_press.png b/themes/images/tizen-hd/00_list_group_bg_press.png index a2c7669..d152cea 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_press.png and b/themes/images/tizen-hd/00_list_group_bg_press.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_top.png b/themes/images/tizen-hd/00_list_group_bg_top.png index 24e71fc..965403a 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_top.png and b/themes/images/tizen-hd/00_list_group_bg_top.png differ diff --git a/themes/images/tizen-hd/00_list_group_bg_top_press.png b/themes/images/tizen-hd/00_list_group_bg_top_press.png index 529a531..f372bca 100644 Binary files a/themes/images/tizen-hd/00_list_group_bg_top_press.png and b/themes/images/tizen-hd/00_list_group_bg_top_press.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_button_receive.png b/themes/images/tizen-hd/00_messagebubble_button_receive.png index 8a7e5a9..9cdb75a 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_button_receive.png and b/themes/images/tizen-hd/00_messagebubble_button_receive.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_button_receive_dim.png b/themes/images/tizen-hd/00_messagebubble_button_receive_dim.png index 8a7e5a9..9cdb75a 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_button_receive_dim.png and b/themes/images/tizen-hd/00_messagebubble_button_receive_dim.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_button_receive_press.png b/themes/images/tizen-hd/00_messagebubble_button_receive_press.png index fb2cf61..8bbdc9b 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_button_receive_press.png and b/themes/images/tizen-hd/00_messagebubble_button_receive_press.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_button_sent.png b/themes/images/tizen-hd/00_messagebubble_button_sent.png index d79403d..4c1d409 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_button_sent.png and b/themes/images/tizen-hd/00_messagebubble_button_sent.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_button_sent_dim.png b/themes/images/tizen-hd/00_messagebubble_button_sent_dim.png index d79403d..4c1d409 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_button_sent_dim.png and b/themes/images/tizen-hd/00_messagebubble_button_sent_dim.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_button_sent_press.png b/themes/images/tizen-hd/00_messagebubble_button_sent_press.png index 4747121..3426842 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_button_sent_press.png and b/themes/images/tizen-hd/00_messagebubble_button_sent_press.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_circle_receive.png b/themes/images/tizen-hd/00_messagebubble_circle_receive.png index b784986..605774a 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_circle_receive.png and b/themes/images/tizen-hd/00_messagebubble_circle_receive.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_circle_receive_dim.png b/themes/images/tizen-hd/00_messagebubble_circle_receive_dim.png new file mode 100755 index 0000000..605774a Binary files /dev/null and b/themes/images/tizen-hd/00_messagebubble_circle_receive_dim.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_circle_receive_press.png b/themes/images/tizen-hd/00_messagebubble_circle_receive_press.png index b004197..f95f7d5 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_circle_receive_press.png and b/themes/images/tizen-hd/00_messagebubble_circle_receive_press.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_circle_sent.png b/themes/images/tizen-hd/00_messagebubble_circle_sent.png index 5da6151..5887d3d 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_circle_sent.png and b/themes/images/tizen-hd/00_messagebubble_circle_sent.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_circle_sent_dim.png b/themes/images/tizen-hd/00_messagebubble_circle_sent_dim.png new file mode 100755 index 0000000..5887d3d Binary files /dev/null and b/themes/images/tizen-hd/00_messagebubble_circle_sent_dim.png differ diff --git a/themes/images/tizen-hd/00_messagebubble_circle_sent_press.png b/themes/images/tizen-hd/00_messagebubble_circle_sent_press.png index a4b2c56..7d9cf99 100755 Binary files a/themes/images/tizen-hd/00_messagebubble_circle_sent_press.png and b/themes/images/tizen-hd/00_messagebubble_circle_sent_press.png differ diff --git a/themes/images/tizen-hd/00_notification_bg.png b/themes/images/tizen-hd/00_notification_bg.png old mode 100755 new mode 100644 index b4bf5f5..6eac0f7 Binary files a/themes/images/tizen-hd/00_notification_bg.png and b/themes/images/tizen-hd/00_notification_bg.png differ diff --git a/themes/images/tizen-hd/00_notification_button_bg.png b/themes/images/tizen-hd/00_notification_button_bg.png index 6fd08ca..db95c38 100755 Binary files a/themes/images/tizen-hd/00_notification_button_bg.png and b/themes/images/tizen-hd/00_notification_button_bg.png differ diff --git a/themes/images/tizen-hd/00_notification_button_bg_dim.png b/themes/images/tizen-hd/00_notification_button_bg_dim.png index 6fd08ca..db95c38 100755 Binary files a/themes/images/tizen-hd/00_notification_button_bg_dim.png and b/themes/images/tizen-hd/00_notification_button_bg_dim.png differ diff --git a/themes/images/tizen-hd/00_notification_button_bg_press.png b/themes/images/tizen-hd/00_notification_button_bg_press.png index eaac45f..ef9768d 100755 Binary files a/themes/images/tizen-hd/00_notification_button_bg_press.png and b/themes/images/tizen-hd/00_notification_button_bg_press.png differ diff --git a/themes/images/tizen-hd/00_overscrolling_bottom.png b/themes/images/tizen-hd/00_overscrolling_bottom.png old mode 100755 new mode 100644 index d0f0762..f50977e Binary files a/themes/images/tizen-hd/00_overscrolling_bottom.png and b/themes/images/tizen-hd/00_overscrolling_bottom.png differ diff --git a/themes/images/tizen-hd/00_overscrolling_left.png b/themes/images/tizen-hd/00_overscrolling_left.png old mode 100755 new mode 100644 index 3dad856..b7da1ad Binary files a/themes/images/tizen-hd/00_overscrolling_left.png and b/themes/images/tizen-hd/00_overscrolling_left.png differ diff --git a/themes/images/tizen-hd/00_overscrolling_right.png b/themes/images/tizen-hd/00_overscrolling_right.png old mode 100755 new mode 100644 index 9e8ba8e..ce5a939 Binary files a/themes/images/tizen-hd/00_overscrolling_right.png and b/themes/images/tizen-hd/00_overscrolling_right.png differ diff --git a/themes/images/tizen-hd/00_overscrolling_top.png b/themes/images/tizen-hd/00_overscrolling_top.png old mode 100755 new mode 100644 index 6ffa0d6..17a64f2 Binary files a/themes/images/tizen-hd/00_overscrolling_top.png and b/themes/images/tizen-hd/00_overscrolling_top.png differ diff --git a/themes/images/tizen-hd/00_page_indicator_01.png b/themes/images/tizen-hd/00_page_indicator_01.png index c950e3b..e089a87 100755 Binary files a/themes/images/tizen-hd/00_page_indicator_01.png and b/themes/images/tizen-hd/00_page_indicator_01.png differ diff --git a/themes/images/tizen-hd/00_page_indicator_02.png b/themes/images/tizen-hd/00_page_indicator_02.png index 0533e9d..113ad48 100755 Binary files a/themes/images/tizen-hd/00_page_indicator_02.png and b/themes/images/tizen-hd/00_page_indicator_02.png differ diff --git a/themes/images/tizen-hd/00_popup_bg.png b/themes/images/tizen-hd/00_popup_bg.png index 3a5ede1..cb9f7d8 100644 Binary files a/themes/images/tizen-hd/00_popup_bg.png and b/themes/images/tizen-hd/00_popup_bg.png differ diff --git a/themes/images/tizen-hd/00_popup_bubble_bg.png b/themes/images/tizen-hd/00_popup_bubble_bg.png old mode 100644 new mode 100755 index 14b0d9b..805cdfd Binary files a/themes/images/tizen-hd/00_popup_bubble_bg.png and b/themes/images/tizen-hd/00_popup_bubble_bg.png differ diff --git a/themes/images/tizen-hd/00_popup_bubble_tail_bottom.png b/themes/images/tizen-hd/00_popup_bubble_tail_bottom.png old mode 100644 new mode 100755 index 0d71853..84c3649 Binary files a/themes/images/tizen-hd/00_popup_bubble_tail_bottom.png and b/themes/images/tizen-hd/00_popup_bubble_tail_bottom.png differ diff --git a/themes/images/tizen-hd/00_popup_bubble_tail_left.png b/themes/images/tizen-hd/00_popup_bubble_tail_left.png old mode 100644 new mode 100755 index 0fc21fb..4f463b0 Binary files a/themes/images/tizen-hd/00_popup_bubble_tail_left.png and b/themes/images/tizen-hd/00_popup_bubble_tail_left.png differ diff --git a/themes/images/tizen-hd/00_popup_bubble_tail_right.png b/themes/images/tizen-hd/00_popup_bubble_tail_right.png old mode 100644 new mode 100755 index 6c4d112..c8bd138 Binary files a/themes/images/tizen-hd/00_popup_bubble_tail_right.png and b/themes/images/tizen-hd/00_popup_bubble_tail_right.png differ diff --git a/themes/images/tizen-hd/00_popup_bubble_tail_top.png b/themes/images/tizen-hd/00_popup_bubble_tail_top.png old mode 100644 new mode 100755 index 80a22ef..e439a19 Binary files a/themes/images/tizen-hd/00_popup_bubble_tail_top.png and b/themes/images/tizen-hd/00_popup_bubble_tail_top.png differ diff --git a/themes/images/tizen-hd/00_popup_dim_lighting.png b/themes/images/tizen-hd/00_popup_dim_lighting.png new file mode 100644 index 0000000..586ccba Binary files /dev/null and b/themes/images/tizen-hd/00_popup_dim_lighting.png differ diff --git a/themes/images/tizen-hd/00_popup_scroll.png b/themes/images/tizen-hd/00_popup_scroll.png new file mode 100755 index 0000000..525a7f4 Binary files /dev/null and b/themes/images/tizen-hd/00_popup_scroll.png differ diff --git a/themes/images/tizen-hd/00_progress_bar.png b/themes/images/tizen-hd/00_progress_bar.png index 4517aac..c9eb59b 100644 Binary files a/themes/images/tizen-hd/00_progress_bar.png and b/themes/images/tizen-hd/00_progress_bar.png differ diff --git a/themes/images/tizen-hd/00_progress_bar_dim.png b/themes/images/tizen-hd/00_progress_bar_dim.png new file mode 100644 index 0000000..19e1fe6 Binary files /dev/null and b/themes/images/tizen-hd/00_progress_bar_dim.png differ diff --git a/themes/images/tizen-hd/00_progress_bg.png b/themes/images/tizen-hd/00_progress_bg.png index af9728d..f294ea3 100644 Binary files a/themes/images/tizen-hd/00_progress_bg.png and b/themes/images/tizen-hd/00_progress_bg.png differ diff --git a/themes/images/tizen-hd/00_progress_bg_dim.png b/themes/images/tizen-hd/00_progress_bg_dim.png new file mode 100644 index 0000000..d6e31e2 Binary files /dev/null and b/themes/images/tizen-hd/00_progress_bg_dim.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg.png b/themes/images/tizen-hd/00_progress_circle_bg.png index 4806e2a..52486a2 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg.png and b/themes/images/tizen-hd/00_progress_circle_bg.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_01.png b/themes/images/tizen-hd/00_progress_circle_bg_01.png index b89db2f..64e8380 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_01.png and b/themes/images/tizen-hd/00_progress_circle_bg_01.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_02.png b/themes/images/tizen-hd/00_progress_circle_bg_02.png index 40fd6c9..d719200 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_02.png and b/themes/images/tizen-hd/00_progress_circle_bg_02.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_03.png b/themes/images/tizen-hd/00_progress_circle_bg_03.png index c391768..61d56ca 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_03.png and b/themes/images/tizen-hd/00_progress_circle_bg_03.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_04.png b/themes/images/tizen-hd/00_progress_circle_bg_04.png index 4c8e854..0693a6f 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_04.png and b/themes/images/tizen-hd/00_progress_circle_bg_04.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_05.png b/themes/images/tizen-hd/00_progress_circle_bg_05.png index 6d0ce5b..818c50b 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_05.png and b/themes/images/tizen-hd/00_progress_circle_bg_05.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_06.png b/themes/images/tizen-hd/00_progress_circle_bg_06.png index 3651fb8..d09870d 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_06.png and b/themes/images/tizen-hd/00_progress_circle_bg_06.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_07.png b/themes/images/tizen-hd/00_progress_circle_bg_07.png index 7a03bd5..d4bfe3d 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_07.png and b/themes/images/tizen-hd/00_progress_circle_bg_07.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_08.png b/themes/images/tizen-hd/00_progress_circle_bg_08.png index 480a284..9f1b445 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_08.png and b/themes/images/tizen-hd/00_progress_circle_bg_08.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_09.png b/themes/images/tizen-hd/00_progress_circle_bg_09.png index 888b79c..51be405 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_09.png and b/themes/images/tizen-hd/00_progress_circle_bg_09.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_10.png b/themes/images/tizen-hd/00_progress_circle_bg_10.png index 9f5e95d..0d9baba 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_10.png and b/themes/images/tizen-hd/00_progress_circle_bg_10.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_11.png b/themes/images/tizen-hd/00_progress_circle_bg_11.png index 32ee294..3d01f4d 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_11.png and b/themes/images/tizen-hd/00_progress_circle_bg_11.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_12.png b/themes/images/tizen-hd/00_progress_circle_bg_12.png index 98461cf..675b322 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_12.png and b/themes/images/tizen-hd/00_progress_circle_bg_12.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_13.png b/themes/images/tizen-hd/00_progress_circle_bg_13.png index 1cd8132..ac13700 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_13.png and b/themes/images/tizen-hd/00_progress_circle_bg_13.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_14.png b/themes/images/tizen-hd/00_progress_circle_bg_14.png index 2ded2c6..9f30d1a 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_14.png and b/themes/images/tizen-hd/00_progress_circle_bg_14.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_15.png b/themes/images/tizen-hd/00_progress_circle_bg_15.png index e826eb4..74c7225 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_15.png and b/themes/images/tizen-hd/00_progress_circle_bg_15.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_16.png b/themes/images/tizen-hd/00_progress_circle_bg_16.png index 701e320..044d8bc 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_16.png and b/themes/images/tizen-hd/00_progress_circle_bg_16.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_17.png b/themes/images/tizen-hd/00_progress_circle_bg_17.png index 029f96b..747e110 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_17.png and b/themes/images/tizen-hd/00_progress_circle_bg_17.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_18.png b/themes/images/tizen-hd/00_progress_circle_bg_18.png index d5f15b5..a9ad232 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_18.png and b/themes/images/tizen-hd/00_progress_circle_bg_18.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_19.png b/themes/images/tizen-hd/00_progress_circle_bg_19.png index cec633a..c969b5b 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_19.png and b/themes/images/tizen-hd/00_progress_circle_bg_19.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_20.png b/themes/images/tizen-hd/00_progress_circle_bg_20.png index 40c5a08..25fe0f1 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_20.png and b/themes/images/tizen-hd/00_progress_circle_bg_20.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_21.png b/themes/images/tizen-hd/00_progress_circle_bg_21.png index 1e02180..18efc19 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_21.png and b/themes/images/tizen-hd/00_progress_circle_bg_21.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_22.png b/themes/images/tizen-hd/00_progress_circle_bg_22.png index aaaee72..3e729e7 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_22.png and b/themes/images/tizen-hd/00_progress_circle_bg_22.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_23.png b/themes/images/tizen-hd/00_progress_circle_bg_23.png index 9116de1..df2401f 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_23.png and b/themes/images/tizen-hd/00_progress_circle_bg_23.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_24.png b/themes/images/tizen-hd/00_progress_circle_bg_24.png index 231d0dc..d72581f 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_24.png and b/themes/images/tizen-hd/00_progress_circle_bg_24.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_25.png b/themes/images/tizen-hd/00_progress_circle_bg_25.png index 0f6e346..d3ecd55 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_25.png and b/themes/images/tizen-hd/00_progress_circle_bg_25.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_26.png b/themes/images/tizen-hd/00_progress_circle_bg_26.png index b1ee876..6930a91 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_26.png and b/themes/images/tizen-hd/00_progress_circle_bg_26.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_27.png b/themes/images/tizen-hd/00_progress_circle_bg_27.png index c640f08..f475bec 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_27.png and b/themes/images/tizen-hd/00_progress_circle_bg_27.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_28.png b/themes/images/tizen-hd/00_progress_circle_bg_28.png index 13d0693..6d4e0eb 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_28.png and b/themes/images/tizen-hd/00_progress_circle_bg_28.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_29.png b/themes/images/tizen-hd/00_progress_circle_bg_29.png index bc0b8a5..3cc7ec4 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_29.png and b/themes/images/tizen-hd/00_progress_circle_bg_29.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_30.png b/themes/images/tizen-hd/00_progress_circle_bg_30.png index 0785290..eec0f7d 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_30.png and b/themes/images/tizen-hd/00_progress_circle_bg_30.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_31.png b/themes/images/tizen-hd/00_progress_circle_bg_31.png index 603ae7b..7615348 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_31.png and b/themes/images/tizen-hd/00_progress_circle_bg_31.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_32.png b/themes/images/tizen-hd/00_progress_circle_bg_32.png index 4b05148..e856a58 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_32.png and b/themes/images/tizen-hd/00_progress_circle_bg_32.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_33.png b/themes/images/tizen-hd/00_progress_circle_bg_33.png index 9a44a87..53493f0 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_33.png and b/themes/images/tizen-hd/00_progress_circle_bg_33.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_34.png b/themes/images/tizen-hd/00_progress_circle_bg_34.png index 6c5d143..697008a 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_34.png and b/themes/images/tizen-hd/00_progress_circle_bg_34.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_35.png b/themes/images/tizen-hd/00_progress_circle_bg_35.png index 524b607..4e8b92e 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_35.png and b/themes/images/tizen-hd/00_progress_circle_bg_35.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_36.png b/themes/images/tizen-hd/00_progress_circle_bg_36.png index 63f9227..5945a8d 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_36.png and b/themes/images/tizen-hd/00_progress_circle_bg_36.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_37.png b/themes/images/tizen-hd/00_progress_circle_bg_37.png index df245f4..4737242 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_37.png and b/themes/images/tizen-hd/00_progress_circle_bg_37.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_38.png b/themes/images/tizen-hd/00_progress_circle_bg_38.png index 87d8074..e4939b8 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_38.png and b/themes/images/tizen-hd/00_progress_circle_bg_38.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_39.png b/themes/images/tizen-hd/00_progress_circle_bg_39.png index 7b02536..7426128 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_39.png and b/themes/images/tizen-hd/00_progress_circle_bg_39.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_40.png b/themes/images/tizen-hd/00_progress_circle_bg_40.png index eb5fd7f..c0ca872 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_40.png and b/themes/images/tizen-hd/00_progress_circle_bg_40.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_41.png b/themes/images/tizen-hd/00_progress_circle_bg_41.png index f40c9a1..de5a812 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_41.png and b/themes/images/tizen-hd/00_progress_circle_bg_41.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_42.png b/themes/images/tizen-hd/00_progress_circle_bg_42.png index 6de11f7..57609fb 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_42.png and b/themes/images/tizen-hd/00_progress_circle_bg_42.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_43.png b/themes/images/tizen-hd/00_progress_circle_bg_43.png index c76d290..1980fbb 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_43.png and b/themes/images/tizen-hd/00_progress_circle_bg_43.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_44.png b/themes/images/tizen-hd/00_progress_circle_bg_44.png index 50d9d13..f1a5d22 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_44.png and b/themes/images/tizen-hd/00_progress_circle_bg_44.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_45.png b/themes/images/tizen-hd/00_progress_circle_bg_45.png index 3839248..aff8034 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_45.png and b/themes/images/tizen-hd/00_progress_circle_bg_45.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_46.png b/themes/images/tizen-hd/00_progress_circle_bg_46.png index 7fb1d82..44c0273 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_46.png and b/themes/images/tizen-hd/00_progress_circle_bg_46.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_47.png b/themes/images/tizen-hd/00_progress_circle_bg_47.png index 911ca3d..0e60cac 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_47.png and b/themes/images/tizen-hd/00_progress_circle_bg_47.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_48.png b/themes/images/tizen-hd/00_progress_circle_bg_48.png index a298def..344341d 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_48.png and b/themes/images/tizen-hd/00_progress_circle_bg_48.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_49.png b/themes/images/tizen-hd/00_progress_circle_bg_49.png index 23a9058..401ac91 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_49.png and b/themes/images/tizen-hd/00_progress_circle_bg_49.png differ diff --git a/themes/images/tizen-hd/00_progress_circle_bg_50.png b/themes/images/tizen-hd/00_progress_circle_bg_50.png index fc0a1d0..1aa6483 100644 Binary files a/themes/images/tizen-hd/00_progress_circle_bg_50.png and b/themes/images/tizen-hd/00_progress_circle_bg_50.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_01.png b/themes/images/tizen-hd/00_progress_pending_01.png index a7bfcb2..491c45e 100644 Binary files a/themes/images/tizen-hd/00_progress_pending_01.png and b/themes/images/tizen-hd/00_progress_pending_01.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_01_bg.png b/themes/images/tizen-hd/00_progress_pending_01_bg.png new file mode 100644 index 0000000..ebbb25f Binary files /dev/null and b/themes/images/tizen-hd/00_progress_pending_01_bg.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_01_bg_dim.png b/themes/images/tizen-hd/00_progress_pending_01_bg_dim.png new file mode 100644 index 0000000..99acc90 Binary files /dev/null and b/themes/images/tizen-hd/00_progress_pending_01_bg_dim.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_01_bg_h.png b/themes/images/tizen-hd/00_progress_pending_01_bg_h.png new file mode 100644 index 0000000..77420e3 Binary files /dev/null and b/themes/images/tizen-hd/00_progress_pending_01_bg_h.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_02.png b/themes/images/tizen-hd/00_progress_pending_02.png index a4abed4..b56dc99 100644 Binary files a/themes/images/tizen-hd/00_progress_pending_02.png and b/themes/images/tizen-hd/00_progress_pending_02.png differ diff --git a/themes/images/tizen-hd/00_button_off_01.png b/themes/images/tizen-hd/00_progress_pending_02_bg.png similarity index 65% rename from themes/images/tizen-hd/00_button_off_01.png rename to themes/images/tizen-hd/00_progress_pending_02_bg.png index 33d0dc3..21f8ecc 100644 Binary files a/themes/images/tizen-hd/00_button_off_01.png and b/themes/images/tizen-hd/00_progress_pending_02_bg.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_02_bg_dim.png b/themes/images/tizen-hd/00_progress_pending_02_bg_dim.png new file mode 100644 index 0000000..c732adc Binary files /dev/null and b/themes/images/tizen-hd/00_progress_pending_02_bg_dim.png differ diff --git a/themes/images/tizen-hd/00_progress_pending_02_bg_h.png b/themes/images/tizen-hd/00_progress_pending_02_bg_h.png new file mode 100644 index 0000000..0e5b0af Binary files /dev/null and b/themes/images/tizen-hd/00_progress_pending_02_bg_h.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_h.png b/themes/images/tizen-hd/00_scroll_bar_h.png new file mode 100644 index 0000000..5f00760 Binary files /dev/null and b/themes/images/tizen-hd/00_scroll_bar_h.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_handler_bottom.png b/themes/images/tizen-hd/00_scroll_bar_handler_bottom.png index 9fa991d..6432ed2 100644 Binary files a/themes/images/tizen-hd/00_scroll_bar_handler_bottom.png and b/themes/images/tizen-hd/00_scroll_bar_handler_bottom.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_handler_hor.png b/themes/images/tizen-hd/00_scroll_bar_handler_hor.png index b943068..01b8db6 100644 Binary files a/themes/images/tizen-hd/00_scroll_bar_handler_hor.png and b/themes/images/tizen-hd/00_scroll_bar_handler_hor.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_handler_left.png b/themes/images/tizen-hd/00_scroll_bar_handler_left.png index 0375ec9..c2186f6 100644 Binary files a/themes/images/tizen-hd/00_scroll_bar_handler_left.png and b/themes/images/tizen-hd/00_scroll_bar_handler_left.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_handler_middle.png b/themes/images/tizen-hd/00_scroll_bar_handler_middle.png index 55df578..e22d4fc 100644 Binary files a/themes/images/tizen-hd/00_scroll_bar_handler_middle.png and b/themes/images/tizen-hd/00_scroll_bar_handler_middle.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_handler_right.png b/themes/images/tizen-hd/00_scroll_bar_handler_right.png index ed6af03..935edaf 100644 Binary files a/themes/images/tizen-hd/00_scroll_bar_handler_right.png and b/themes/images/tizen-hd/00_scroll_bar_handler_right.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_handler_top.png b/themes/images/tizen-hd/00_scroll_bar_handler_top.png index 6daffc9..cef5284 100644 Binary files a/themes/images/tizen-hd/00_scroll_bar_handler_top.png and b/themes/images/tizen-hd/00_scroll_bar_handler_top.png differ diff --git a/themes/images/tizen-hd/00_scroll_bar_v.png b/themes/images/tizen-hd/00_scroll_bar_v.png new file mode 100644 index 0000000..a777740 Binary files /dev/null and b/themes/images/tizen-hd/00_scroll_bar_v.png differ diff --git a/themes/images/tizen-hd/00_search_edit_field_bg.png b/themes/images/tizen-hd/00_search_edit_field_bg.png index c7837fa..6c671f4 100644 Binary files a/themes/images/tizen-hd/00_search_edit_field_bg.png and b/themes/images/tizen-hd/00_search_edit_field_bg.png differ diff --git a/themes/images/tizen-hd/00_search_edit_field_bg_02.png b/themes/images/tizen-hd/00_search_edit_field_bg_02.png index f53a8b5..8f0e69b 100644 Binary files a/themes/images/tizen-hd/00_search_edit_field_bg_02.png and b/themes/images/tizen-hd/00_search_edit_field_bg_02.png differ diff --git a/themes/images/tizen-hd/00_search_edit_field_bg_focus.png b/themes/images/tizen-hd/00_search_edit_field_bg_focus.png new file mode 100644 index 0000000..d147537 Binary files /dev/null and b/themes/images/tizen-hd/00_search_edit_field_bg_focus.png differ diff --git a/themes/images/tizen-hd/00_search_icon.png b/themes/images/tizen-hd/00_search_icon.png index c55a23b..b9bc477 100644 Binary files a/themes/images/tizen-hd/00_search_icon.png and b/themes/images/tizen-hd/00_search_icon.png differ diff --git a/themes/images/tizen-hd/00_slider_handle.png b/themes/images/tizen-hd/00_slider_handle.png index d81b935..1952507 100644 Binary files a/themes/images/tizen-hd/00_slider_handle.png and b/themes/images/tizen-hd/00_slider_handle.png differ diff --git a/themes/images/tizen-hd/00_slider_handle_dim.png b/themes/images/tizen-hd/00_slider_handle_dim.png index 83600a8..e8b2e80 100644 Binary files a/themes/images/tizen-hd/00_slider_handle_dim.png and b/themes/images/tizen-hd/00_slider_handle_dim.png differ diff --git a/themes/images/tizen-hd/00_slider_handle_focus.png b/themes/images/tizen-hd/00_slider_handle_focus.png new file mode 100644 index 0000000..7789cce Binary files /dev/null and b/themes/images/tizen-hd/00_slider_handle_focus.png differ diff --git a/themes/images/tizen-hd/00_slider_handle_press.png b/themes/images/tizen-hd/00_slider_handle_press.png index 7e9485f..60bacb8 100644 Binary files a/themes/images/tizen-hd/00_slider_handle_press.png and b/themes/images/tizen-hd/00_slider_handle_press.png differ diff --git a/themes/images/tizen-hd/00_button_on_01_dim.png b/themes/images/tizen-hd/00_slider_popup.png similarity index 73% rename from themes/images/tizen-hd/00_button_on_01_dim.png rename to themes/images/tizen-hd/00_slider_popup.png index 9035605..2308c68 100644 Binary files a/themes/images/tizen-hd/00_button_on_01_dim.png and b/themes/images/tizen-hd/00_slider_popup.png differ diff --git a/themes/images/tizen-hd/00_splite_handler_bg_h.png b/themes/images/tizen-hd/00_splite_handler_bg_h.png index e5f1bfb..23d92c0 100644 Binary files a/themes/images/tizen-hd/00_splite_handler_bg_h.png and b/themes/images/tizen-hd/00_splite_handler_bg_h.png differ diff --git a/themes/images/tizen-hd/00_splite_handler_bg_press.png b/themes/images/tizen-hd/00_splite_handler_bg_press.png index ead2aa6..5846bfa 100644 Binary files a/themes/images/tizen-hd/00_splite_handler_bg_press.png and b/themes/images/tizen-hd/00_splite_handler_bg_press.png differ diff --git a/themes/images/tizen-hd/00_splite_handler_bg_v.png b/themes/images/tizen-hd/00_splite_handler_bg_v.png index 8761449..abea638 100644 Binary files a/themes/images/tizen-hd/00_splite_handler_bg_v.png and b/themes/images/tizen-hd/00_splite_handler_bg_v.png differ diff --git a/themes/images/tizen-hd/00_splite_handler_h.png b/themes/images/tizen-hd/00_splite_handler_h.png index f6f2c97..48686ba 100644 Binary files a/themes/images/tizen-hd/00_splite_handler_h.png and b/themes/images/tizen-hd/00_splite_handler_h.png differ diff --git a/themes/images/tizen-hd/00_splite_handler_v.png b/themes/images/tizen-hd/00_splite_handler_v.png index d0cf6bb..b0e0747 100644 Binary files a/themes/images/tizen-hd/00_splite_handler_v.png and b/themes/images/tizen-hd/00_splite_handler_v.png differ diff --git a/themes/images/tizen-hd/00_tab_press.png b/themes/images/tizen-hd/00_tab_press.png index c1bc73a..6e2104d 100755 Binary files a/themes/images/tizen-hd/00_tab_press.png and b/themes/images/tizen-hd/00_tab_press.png differ diff --git a/themes/images/tizen-hd/00_thumbs_bg_focus.png b/themes/images/tizen-hd/00_thumbs_bg_focus.png old mode 100755 new mode 100644 diff --git a/themes/images/tizen-hd/00_thumbs_line_bg.png b/themes/images/tizen-hd/00_thumbs_line_bg.png old mode 100755 new mode 100644 diff --git a/themes/images/tizen-hd/00_thumbs_loading_bg.png b/themes/images/tizen-hd/00_thumbs_loading_bg.png old mode 100755 new mode 100644 diff --git a/themes/images/tizen-hd/00_toolbar_button.png b/themes/images/tizen-hd/00_toolbar_button.png index 5f0306c..9349f2a 100755 Binary files a/themes/images/tizen-hd/00_toolbar_button.png and b/themes/images/tizen-hd/00_toolbar_button.png differ diff --git a/themes/images/tizen-hd/00_toolbar_button_dim.png b/themes/images/tizen-hd/00_toolbar_button_dim.png index 5f0306c..9349f2a 100755 Binary files a/themes/images/tizen-hd/00_toolbar_button_dim.png and b/themes/images/tizen-hd/00_toolbar_button_dim.png differ diff --git a/themes/images/tizen-hd/00_toolbar_button_press.png b/themes/images/tizen-hd/00_toolbar_button_press.png index 8073a2c..2458078 100755 Binary files a/themes/images/tizen-hd/00_toolbar_button_press.png and b/themes/images/tizen-hd/00_toolbar_button_press.png differ diff --git a/themes/images/tizen-hd/00_winset_list_process_01.png b/themes/images/tizen-hd/00_winset_list_process_01.png deleted file mode 100644 index 5c8fbb4..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_01.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_01_32x32.png b/themes/images/tizen-hd/00_winset_list_process_01_32x32.png deleted file mode 100644 index 92d3686..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_01_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_02.png b/themes/images/tizen-hd/00_winset_list_process_02.png deleted file mode 100644 index eeec62e..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_02.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_02_32x32.png b/themes/images/tizen-hd/00_winset_list_process_02_32x32.png deleted file mode 100644 index 3cba306..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_02_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_03.png b/themes/images/tizen-hd/00_winset_list_process_03.png deleted file mode 100644 index 45f82b9..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_03.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_03_32x32.png b/themes/images/tizen-hd/00_winset_list_process_03_32x32.png deleted file mode 100644 index 9babc31..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_03_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_04.png b/themes/images/tizen-hd/00_winset_list_process_04.png deleted file mode 100644 index 251e3ba..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_04.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_04_32x32.png b/themes/images/tizen-hd/00_winset_list_process_04_32x32.png deleted file mode 100644 index 3c72df5..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_04_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_05.png b/themes/images/tizen-hd/00_winset_list_process_05.png deleted file mode 100644 index e278217..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_05.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_05_32x32.png b/themes/images/tizen-hd/00_winset_list_process_05_32x32.png deleted file mode 100644 index bbb14cd..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_05_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_06.png b/themes/images/tizen-hd/00_winset_list_process_06.png deleted file mode 100644 index 1e47db8..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_06.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_06_32x32.png b/themes/images/tizen-hd/00_winset_list_process_06_32x32.png deleted file mode 100644 index 3719b53..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_06_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_07.png b/themes/images/tizen-hd/00_winset_list_process_07.png deleted file mode 100644 index 18d5db9..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_07.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_07_32x32.png b/themes/images/tizen-hd/00_winset_list_process_07_32x32.png deleted file mode 100644 index 009b81f..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_07_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_08.png b/themes/images/tizen-hd/00_winset_list_process_08.png deleted file mode 100644 index 0cabf18..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_08.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_08_32x32.png b/themes/images/tizen-hd/00_winset_list_process_08_32x32.png deleted file mode 100644 index 4a32e15..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_08_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_09.png b/themes/images/tizen-hd/00_winset_list_process_09.png deleted file mode 100644 index 94bba2b..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_09.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_09_32x32.png b/themes/images/tizen-hd/00_winset_list_process_09_32x32.png deleted file mode 100644 index aed8bf2..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_09_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_10.png b/themes/images/tizen-hd/00_winset_list_process_10.png deleted file mode 100644 index 2e5b2b7..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_10.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_10_32x32.png b/themes/images/tizen-hd/00_winset_list_process_10_32x32.png deleted file mode 100644 index f6f3194..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_10_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_11.png b/themes/images/tizen-hd/00_winset_list_process_11.png deleted file mode 100644 index 264e6b5..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_11.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_11_32x32.png b/themes/images/tizen-hd/00_winset_list_process_11_32x32.png deleted file mode 100644 index 54db6c9..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_11_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_12.png b/themes/images/tizen-hd/00_winset_list_process_12.png deleted file mode 100644 index c49841e..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_12.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_12_32x32.png b/themes/images/tizen-hd/00_winset_list_process_12_32x32.png deleted file mode 100644 index 284b090..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_12_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_13.png b/themes/images/tizen-hd/00_winset_list_process_13.png deleted file mode 100644 index cdec394..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_13.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_13_32x32.png b/themes/images/tizen-hd/00_winset_list_process_13_32x32.png deleted file mode 100644 index 09c9aa9..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_13_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_14.png b/themes/images/tizen-hd/00_winset_list_process_14.png deleted file mode 100644 index aeb2852..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_14.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_14_32x32.png b/themes/images/tizen-hd/00_winset_list_process_14_32x32.png deleted file mode 100644 index cd075b3..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_14_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_15.png b/themes/images/tizen-hd/00_winset_list_process_15.png deleted file mode 100644 index b37ee4a..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_15.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_15_32x32.png b/themes/images/tizen-hd/00_winset_list_process_15_32x32.png deleted file mode 100644 index 885030c..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_15_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_16.png b/themes/images/tizen-hd/00_winset_list_process_16.png deleted file mode 100644 index 5bb072b..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_16.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_16_32x32.png b/themes/images/tizen-hd/00_winset_list_process_16_32x32.png deleted file mode 100644 index 26a877a..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_16_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_17.png b/themes/images/tizen-hd/00_winset_list_process_17.png deleted file mode 100644 index b7e6eb6..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_17.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_17_32x32.png b/themes/images/tizen-hd/00_winset_list_process_17_32x32.png deleted file mode 100644 index ff746b7..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_17_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_18.png b/themes/images/tizen-hd/00_winset_list_process_18.png deleted file mode 100644 index e5ce36b..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_18.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_18_32x32.png b/themes/images/tizen-hd/00_winset_list_process_18_32x32.png deleted file mode 100644 index 07aeffd..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_18_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_19.png b/themes/images/tizen-hd/00_winset_list_process_19.png deleted file mode 100644 index 40b4e7d..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_19.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_19_32x32.png b/themes/images/tizen-hd/00_winset_list_process_19_32x32.png deleted file mode 100644 index 16a9e1b..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_19_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_20.png b/themes/images/tizen-hd/00_winset_list_process_20.png deleted file mode 100644 index b50abde..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_20.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_20_32x32.png b/themes/images/tizen-hd/00_winset_list_process_20_32x32.png deleted file mode 100644 index b409b03..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_20_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_21.png b/themes/images/tizen-hd/00_winset_list_process_21.png deleted file mode 100644 index e7cc057..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_21.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_21_32x32.png b/themes/images/tizen-hd/00_winset_list_process_21_32x32.png deleted file mode 100644 index d5de1fb..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_21_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_22.png b/themes/images/tizen-hd/00_winset_list_process_22.png deleted file mode 100644 index 35e93e3..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_22.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_22_32x32.png b/themes/images/tizen-hd/00_winset_list_process_22_32x32.png deleted file mode 100644 index fae4ddd..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_22_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_23.png b/themes/images/tizen-hd/00_winset_list_process_23.png deleted file mode 100644 index 50990db..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_23.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_23_32x32.png b/themes/images/tizen-hd/00_winset_list_process_23_32x32.png deleted file mode 100644 index 02d9314..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_23_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_24.png b/themes/images/tizen-hd/00_winset_list_process_24.png deleted file mode 100644 index 3dfea10..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_24.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_24_32x32.png b/themes/images/tizen-hd/00_winset_list_process_24_32x32.png deleted file mode 100644 index ff35805..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_24_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_25.png b/themes/images/tizen-hd/00_winset_list_process_25.png deleted file mode 100644 index 4878a78..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_25.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_25_32x32.png b/themes/images/tizen-hd/00_winset_list_process_25_32x32.png deleted file mode 100644 index e027879..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_25_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_26.png b/themes/images/tizen-hd/00_winset_list_process_26.png deleted file mode 100644 index b57750f..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_26.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_26_32x32.png b/themes/images/tizen-hd/00_winset_list_process_26_32x32.png deleted file mode 100644 index bb86e11..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_26_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_27.png b/themes/images/tizen-hd/00_winset_list_process_27.png deleted file mode 100644 index c8cee33..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_27.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_27_32x32.png b/themes/images/tizen-hd/00_winset_list_process_27_32x32.png deleted file mode 100644 index f2c2e5b..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_27_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_28.png b/themes/images/tizen-hd/00_winset_list_process_28.png deleted file mode 100644 index db51809..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_28.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_28_32x32.png b/themes/images/tizen-hd/00_winset_list_process_28_32x32.png deleted file mode 100644 index 759af64..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_28_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_29.png b/themes/images/tizen-hd/00_winset_list_process_29.png deleted file mode 100644 index 2fb304e..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_29.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_29_32x32.png b/themes/images/tizen-hd/00_winset_list_process_29_32x32.png deleted file mode 100644 index 42d4c29..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_29_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_30.png b/themes/images/tizen-hd/00_winset_list_process_30.png deleted file mode 100644 index 9868089..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_30.png and /dev/null differ diff --git a/themes/images/tizen-hd/00_winset_list_process_30_32x32.png b/themes/images/tizen-hd/00_winset_list_process_30_32x32.png deleted file mode 100644 index e78bff4..0000000 Binary files a/themes/images/tizen-hd/00_winset_list_process_30_32x32.png and /dev/null differ diff --git a/themes/images/tizen-hd/imageeditor_bar_press.png b/themes/images/tizen-hd/imageeditor_bar_press.png deleted file mode 100644 index add7d96..0000000 Binary files a/themes/images/tizen-hd/imageeditor_bar_press.png and /dev/null differ diff --git a/themes/images/tizen-hd/imageeditor_bg.png b/themes/images/tizen-hd/imageeditor_bg.png deleted file mode 100644 index f8a9704..0000000 Binary files a/themes/images/tizen-hd/imageeditor_bg.png and /dev/null differ diff --git a/themes/images/tizen-hd/imageeditor_bottom_arrow.png b/themes/images/tizen-hd/imageeditor_bottom_arrow.png deleted file mode 100644 index cdbe2de..0000000 Binary files a/themes/images/tizen-hd/imageeditor_bottom_arrow.png and /dev/null differ diff --git a/themes/images/tizen-hd/imageeditor_left_arrow.png b/themes/images/tizen-hd/imageeditor_left_arrow.png deleted file mode 100644 index c495228..0000000 Binary files a/themes/images/tizen-hd/imageeditor_left_arrow.png and /dev/null differ diff --git a/themes/images/tizen-hd/imageeditor_right_arrow.png b/themes/images/tizen-hd/imageeditor_right_arrow.png deleted file mode 100644 index b088213..0000000 Binary files a/themes/images/tizen-hd/imageeditor_right_arrow.png and /dev/null differ diff --git a/themes/images/tizen-hd/imageeditor_top_arrow.png b/themes/images/tizen-hd/imageeditor_top_arrow.png deleted file mode 100644 index f7016a3..0000000 Binary files a/themes/images/tizen-hd/imageeditor_top_arrow.png and /dev/null differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_01.png b/themes/images/tizen-hd/process/36x36/00_list_process_01.png new file mode 100644 index 0000000..e708d15 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_01.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_02.png b/themes/images/tizen-hd/process/36x36/00_list_process_02.png new file mode 100644 index 0000000..1664288 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_02.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_03.png b/themes/images/tizen-hd/process/36x36/00_list_process_03.png new file mode 100644 index 0000000..8a48448 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_03.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_04.png b/themes/images/tizen-hd/process/36x36/00_list_process_04.png new file mode 100644 index 0000000..1e93c72 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_04.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_05.png b/themes/images/tizen-hd/process/36x36/00_list_process_05.png new file mode 100644 index 0000000..b95b2b0 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_05.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_06.png b/themes/images/tizen-hd/process/36x36/00_list_process_06.png new file mode 100644 index 0000000..dfe7152 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_06.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_07.png b/themes/images/tizen-hd/process/36x36/00_list_process_07.png new file mode 100644 index 0000000..a8bba7d Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_07.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_08.png b/themes/images/tizen-hd/process/36x36/00_list_process_08.png new file mode 100644 index 0000000..f72bc98 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_08.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_09.png b/themes/images/tizen-hd/process/36x36/00_list_process_09.png new file mode 100644 index 0000000..f835fd4 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_09.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_10.png b/themes/images/tizen-hd/process/36x36/00_list_process_10.png new file mode 100644 index 0000000..16b8c3f Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_10.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_11.png b/themes/images/tizen-hd/process/36x36/00_list_process_11.png new file mode 100644 index 0000000..e65b8d2 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_11.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_12.png b/themes/images/tizen-hd/process/36x36/00_list_process_12.png new file mode 100644 index 0000000..f731487 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_12.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_13.png b/themes/images/tizen-hd/process/36x36/00_list_process_13.png new file mode 100644 index 0000000..2a6bd90 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_13.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_14.png b/themes/images/tizen-hd/process/36x36/00_list_process_14.png new file mode 100644 index 0000000..89fc0b3 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_14.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_15.png b/themes/images/tizen-hd/process/36x36/00_list_process_15.png new file mode 100644 index 0000000..be2ee3a Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_15.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_16.png b/themes/images/tizen-hd/process/36x36/00_list_process_16.png new file mode 100644 index 0000000..b5a2bf0 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_16.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_17.png b/themes/images/tizen-hd/process/36x36/00_list_process_17.png new file mode 100644 index 0000000..5cc2229 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_17.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_18.png b/themes/images/tizen-hd/process/36x36/00_list_process_18.png new file mode 100644 index 0000000..b3dc51b Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_18.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_19.png b/themes/images/tizen-hd/process/36x36/00_list_process_19.png new file mode 100644 index 0000000..643af2b Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_19.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_20.png b/themes/images/tizen-hd/process/36x36/00_list_process_20.png new file mode 100644 index 0000000..e081091 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_20.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_21.png b/themes/images/tizen-hd/process/36x36/00_list_process_21.png new file mode 100644 index 0000000..56223f0 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_21.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_22.png b/themes/images/tizen-hd/process/36x36/00_list_process_22.png new file mode 100644 index 0000000..1916c4a Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_22.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_23.png b/themes/images/tizen-hd/process/36x36/00_list_process_23.png new file mode 100644 index 0000000..51f1fa7 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_23.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_24.png b/themes/images/tizen-hd/process/36x36/00_list_process_24.png new file mode 100644 index 0000000..5149c40 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_24.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_25.png b/themes/images/tizen-hd/process/36x36/00_list_process_25.png new file mode 100644 index 0000000..1261fef Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_25.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_26.png b/themes/images/tizen-hd/process/36x36/00_list_process_26.png new file mode 100644 index 0000000..37d3eae Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_26.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_27.png b/themes/images/tizen-hd/process/36x36/00_list_process_27.png new file mode 100644 index 0000000..16915f4 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_27.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_28.png b/themes/images/tizen-hd/process/36x36/00_list_process_28.png new file mode 100644 index 0000000..0a60fa0 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_28.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_29.png b/themes/images/tizen-hd/process/36x36/00_list_process_29.png new file mode 100644 index 0000000..f20d4f1 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_29.png differ diff --git a/themes/images/tizen-hd/process/36x36/00_list_process_30.png b/themes/images/tizen-hd/process/36x36/00_list_process_30.png new file mode 100644 index 0000000..0598b24 Binary files /dev/null and b/themes/images/tizen-hd/process/36x36/00_list_process_30.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_01.png b/themes/images/tizen-hd/process/54x54/00_list_process_01.png new file mode 100644 index 0000000..8f4df99 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_01.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_02.png b/themes/images/tizen-hd/process/54x54/00_list_process_02.png new file mode 100644 index 0000000..0184f3f Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_02.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_03.png b/themes/images/tizen-hd/process/54x54/00_list_process_03.png new file mode 100644 index 0000000..914dc3f Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_03.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_04.png b/themes/images/tizen-hd/process/54x54/00_list_process_04.png new file mode 100644 index 0000000..6ac2715 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_04.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_05.png b/themes/images/tizen-hd/process/54x54/00_list_process_05.png new file mode 100644 index 0000000..b8b7650 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_05.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_06.png b/themes/images/tizen-hd/process/54x54/00_list_process_06.png new file mode 100644 index 0000000..eec505e Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_06.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_07.png b/themes/images/tizen-hd/process/54x54/00_list_process_07.png new file mode 100644 index 0000000..e8c9ab9 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_07.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_08.png b/themes/images/tizen-hd/process/54x54/00_list_process_08.png new file mode 100644 index 0000000..8f8c78e Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_08.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_09.png b/themes/images/tizen-hd/process/54x54/00_list_process_09.png new file mode 100644 index 0000000..515606b Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_09.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_10.png b/themes/images/tizen-hd/process/54x54/00_list_process_10.png new file mode 100644 index 0000000..b36425d Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_10.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_11.png b/themes/images/tizen-hd/process/54x54/00_list_process_11.png new file mode 100644 index 0000000..aa89834 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_11.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_12.png b/themes/images/tizen-hd/process/54x54/00_list_process_12.png new file mode 100644 index 0000000..ebb5d09 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_12.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_13.png b/themes/images/tizen-hd/process/54x54/00_list_process_13.png new file mode 100644 index 0000000..1a00e59 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_13.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_14.png b/themes/images/tizen-hd/process/54x54/00_list_process_14.png new file mode 100644 index 0000000..3cd3f57 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_14.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_15.png b/themes/images/tizen-hd/process/54x54/00_list_process_15.png new file mode 100644 index 0000000..8071142 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_15.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_16.png b/themes/images/tizen-hd/process/54x54/00_list_process_16.png new file mode 100644 index 0000000..49ecc99 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_16.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_17.png b/themes/images/tizen-hd/process/54x54/00_list_process_17.png new file mode 100644 index 0000000..7447c7e Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_17.png differ diff --git a/themes/images/tizen-hd/00_contacts_circle_bg.png b/themes/images/tizen-hd/process/54x54/00_list_process_18.png similarity index 73% rename from themes/images/tizen-hd/00_contacts_circle_bg.png rename to themes/images/tizen-hd/process/54x54/00_list_process_18.png index 133e187..b3066e8 100644 Binary files a/themes/images/tizen-hd/00_contacts_circle_bg.png and b/themes/images/tizen-hd/process/54x54/00_list_process_18.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_19.png b/themes/images/tizen-hd/process/54x54/00_list_process_19.png new file mode 100644 index 0000000..c35c7a6 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_19.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_20.png b/themes/images/tizen-hd/process/54x54/00_list_process_20.png new file mode 100644 index 0000000..e23ce62 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_20.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_21.png b/themes/images/tizen-hd/process/54x54/00_list_process_21.png new file mode 100644 index 0000000..23355f8 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_21.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_22.png b/themes/images/tizen-hd/process/54x54/00_list_process_22.png new file mode 100644 index 0000000..353e0fb Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_22.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_23.png b/themes/images/tizen-hd/process/54x54/00_list_process_23.png new file mode 100644 index 0000000..92c7e5d Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_23.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_24.png b/themes/images/tizen-hd/process/54x54/00_list_process_24.png new file mode 100644 index 0000000..eb6c31b Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_24.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_25.png b/themes/images/tizen-hd/process/54x54/00_list_process_25.png new file mode 100644 index 0000000..9b80964 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_25.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_26.png b/themes/images/tizen-hd/process/54x54/00_list_process_26.png new file mode 100644 index 0000000..2c44971 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_26.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_27.png b/themes/images/tizen-hd/process/54x54/00_list_process_27.png new file mode 100644 index 0000000..5ccd245 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_27.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_28.png b/themes/images/tizen-hd/process/54x54/00_list_process_28.png new file mode 100644 index 0000000..9fcc4c2 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_28.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_29.png b/themes/images/tizen-hd/process/54x54/00_list_process_29.png new file mode 100644 index 0000000..6bb8925 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_29.png differ diff --git a/themes/images/tizen-hd/process/54x54/00_list_process_30.png b/themes/images/tizen-hd/process/54x54/00_list_process_30.png new file mode 100644 index 0000000..81601f7 Binary files /dev/null and b/themes/images/tizen-hd/process/54x54/00_list_process_30.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_01.png b/themes/images/tizen-hd/process/63x63/00_list_process_01.png new file mode 100644 index 0000000..26cff47 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_01.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_02.png b/themes/images/tizen-hd/process/63x63/00_list_process_02.png new file mode 100644 index 0000000..83c5938 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_02.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_03.png b/themes/images/tizen-hd/process/63x63/00_list_process_03.png new file mode 100644 index 0000000..76aac6d Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_03.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_04.png b/themes/images/tizen-hd/process/63x63/00_list_process_04.png new file mode 100644 index 0000000..581ddf0 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_04.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_05.png b/themes/images/tizen-hd/process/63x63/00_list_process_05.png new file mode 100644 index 0000000..764fb5c Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_05.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_06.png b/themes/images/tizen-hd/process/63x63/00_list_process_06.png new file mode 100644 index 0000000..9a9d096 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_06.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_07.png b/themes/images/tizen-hd/process/63x63/00_list_process_07.png new file mode 100644 index 0000000..38789a4 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_07.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_08.png b/themes/images/tizen-hd/process/63x63/00_list_process_08.png new file mode 100644 index 0000000..d51739d Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_08.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_09.png b/themes/images/tizen-hd/process/63x63/00_list_process_09.png new file mode 100644 index 0000000..454bc9c Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_09.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_10.png b/themes/images/tizen-hd/process/63x63/00_list_process_10.png new file mode 100644 index 0000000..3a7d9e3 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_10.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_11.png b/themes/images/tizen-hd/process/63x63/00_list_process_11.png new file mode 100644 index 0000000..4e87dc3 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_11.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_12.png b/themes/images/tizen-hd/process/63x63/00_list_process_12.png new file mode 100644 index 0000000..0868478 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_12.png differ diff --git a/themes/images/tizen-hd/00_button_off_01_dim.png b/themes/images/tizen-hd/process/63x63/00_list_process_13.png similarity index 68% rename from themes/images/tizen-hd/00_button_off_01_dim.png rename to themes/images/tizen-hd/process/63x63/00_list_process_13.png index 5f26001..a52184a 100644 Binary files a/themes/images/tizen-hd/00_button_off_01_dim.png and b/themes/images/tizen-hd/process/63x63/00_list_process_13.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_14.png b/themes/images/tizen-hd/process/63x63/00_list_process_14.png new file mode 100644 index 0000000..7f7e443 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_14.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_15.png b/themes/images/tizen-hd/process/63x63/00_list_process_15.png new file mode 100644 index 0000000..143ea82 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_15.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_16.png b/themes/images/tizen-hd/process/63x63/00_list_process_16.png new file mode 100644 index 0000000..6eac4d1 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_16.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_17.png b/themes/images/tizen-hd/process/63x63/00_list_process_17.png new file mode 100644 index 0000000..8eaac31 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_17.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_18.png b/themes/images/tizen-hd/process/63x63/00_list_process_18.png new file mode 100644 index 0000000..2fcbf85 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_18.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_19.png b/themes/images/tizen-hd/process/63x63/00_list_process_19.png new file mode 100644 index 0000000..3276803 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_19.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_20.png b/themes/images/tizen-hd/process/63x63/00_list_process_20.png new file mode 100644 index 0000000..cbfeee0 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_20.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_21.png b/themes/images/tizen-hd/process/63x63/00_list_process_21.png new file mode 100644 index 0000000..37b620b Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_21.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_22.png b/themes/images/tizen-hd/process/63x63/00_list_process_22.png new file mode 100644 index 0000000..dbd11f3 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_22.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_23.png b/themes/images/tizen-hd/process/63x63/00_list_process_23.png new file mode 100644 index 0000000..201677a Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_23.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_24.png b/themes/images/tizen-hd/process/63x63/00_list_process_24.png new file mode 100644 index 0000000..0623da7 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_24.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_25.png b/themes/images/tizen-hd/process/63x63/00_list_process_25.png new file mode 100644 index 0000000..686a07a Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_25.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_26.png b/themes/images/tizen-hd/process/63x63/00_list_process_26.png new file mode 100644 index 0000000..bc23a85 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_26.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_27.png b/themes/images/tizen-hd/process/63x63/00_list_process_27.png new file mode 100644 index 0000000..464f59e Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_27.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_28.png b/themes/images/tizen-hd/process/63x63/00_list_process_28.png new file mode 100644 index 0000000..a8f706e Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_28.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_29.png b/themes/images/tizen-hd/process/63x63/00_list_process_29.png new file mode 100644 index 0000000..19f2026 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_29.png differ diff --git a/themes/images/tizen-hd/process/63x63/00_list_process_30.png b/themes/images/tizen-hd/process/63x63/00_list_process_30.png new file mode 100644 index 0000000..6566bf3 Binary files /dev/null and b/themes/images/tizen-hd/process/63x63/00_list_process_30.png differ diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index d832194..af3ec27 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -31,65 +31,74 @@ #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 33 -#define NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC 0 8 +#define NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC 0 32 +#define NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC 0 7 #define NAVIFRAME_TITLE_H_INC 111 +#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_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 86 111 +#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 86 91 #define NAVIFRAME_PREV_FUNC_BTN_SIZE_INC 86 98 -#define NAVIFRAME_TITLE_TAB_H_INC 68 +#define NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC 86 85 +#define NAVIFRAME_TITLE_TAB_H_INC 63 #define NAVIFRAME_TITLE_TAB_LARGE_H_INC 111 #define NAVIFRAME_TITLE_TAB_FONT_SIZE_INC 44 -#define NAVIFRAME_TITLE_TAB_TEXT_H_INC 87 +#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_FONT_MIN_SIZE_INC 46 +#define NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC 50 #define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 44 +#define NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC 38 +#define NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC 50 #define NAVIFRAME_ICON_SIZE_INC 38 38 #define NAVIFRAME_PADDING_INC 16 0 -#define NAVIFRAME_PADDING2_INC 2 0 +#define NAVIFRAME_LANDSCAPE_PADDING_INC 34 0 +#define NAVIFRAME_PADDING2_INC 9 0 +#define NAVIFRAME_PADDING_BADGE_INC 2 0 #define NAVIFRAME_PADDING3_INC 8 0 +#define NAVIFRAME_MIDDLE_PADDING_INC 0 12 #define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11 -#define NAVIFRAME_BOTTOM_PADDING_INC 0 10 +#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_TOP_PADDING_INC 0 6 +#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3 #define NAVIFRAME_BADGE_LEFT_TEXT_PADDING_INC 10 0 #define NAVIFRAME_BADGE_TEXT_H_INC 26 #define NAVIFRAME_BADGE_TEXT_W_INC 42 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 48 #define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0 -#define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 115 0 -#define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 15 +#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 70 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_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28 +#define NAVIFRAME_SUBTITLE_HEIGHT_INC 0 34 +#define NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC 0 30 +#define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255; #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 -#define POPUP_ITEM_BG_DEFAULT_MIN_INC 648 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_DEFAULT_TITLE_TEXT_COLOR_INC "#3b73b6" -#define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#ffffff" -#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 127 -#define POPUP_DIM_BG_CLICKED_COLOR_INC 0 0 0 127 -#define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0 -#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50 - #define CTXPOPUP_WIDTH_MIN_INC 386 #define CTXPOPUP_WIDTH_MAX_INC 620 -#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 24 24 22 30 +#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30 #define CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER 10 10 10 10 #define CTXPOPUP_SHADOW_LEFT_PADDING 10 #define CTXPOPUP_SHADOW_RIGHT_PADDING 10 @@ -97,8 +106,8 @@ #define CTXPOPUP_SHADOW_BOTTOM_PADDING 16 #define CTXPOPUP_CONTENT_PADDING 4 #define CTXPOPUP_SCROLLER_PADDING 8 -#define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 12 -#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 20 +#define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 18 +#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22 #define CTXPOPUP_BG_COLOR_INC 0 0 0 0 #define CTXPOPUP_BG_PRESS_COLOR_INC 42 137 194 255 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255 @@ -124,32 +133,24 @@ #define CTXPOPUP_TEXT_ITEM_HORIZONTAL_WIDTH_INC 128 #define CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC 112 #define CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC 96 -#define CTXPOPUP_ICON_WIDTH_INC 64 -#define CTXPOPUP_ICON_HEIGHT_INC 64 -#define CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC 48 -#define CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC 48 -#define CTXPOPUP_ARROW_SIZE_INC 48 48 -#define CTXPOPUP_VERTICAL_ARROW_SIZE_INC 40 30 -#define CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC 30 40 +#define CTXPOPUP_ICON_WIDTH_INC 45 +#define CTXPOPUP_ICON_HEIGHT_INC 45 +#define CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC 45 +#define CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC 45 +#define CTXPOPUP_ARROW_SIZE_INC 36 36 #define CTXPOPUP_ITEM_TEXT_PADDING_INC 20 #define CTXPOPUP_ITEM_ICON_PADDING_INC 16 -#define CTXPOPUP_IE_ARROW_SIZE_INC 52 -#define CTXPOPUP_IE_FONT_SIZE_INC 40 -#define CTXPOPUP_IE_ITEM_PADDING_INC 22 -#define CTXPOPUP_IE_ITEM_HEIGHT_INC 75 -#define CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC 720 -#define CTXPOPUP_IE_ICON_WIDTH_INC 60 -#define CTXPOPUP_IE_ICON_HEIGHT_INC 60 #define CTXPOPUP_TP_ARROW_SIZE_INC 30 #define CTXPOPUP_TP_HEIGHT_INC 106 #define CTXPOPUP_MORE_WIDTH_INC 502 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16 #define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110 #define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130 -#define CTXPOPUP_MORE_ICON_WIDTH_INC 64 -#define CTXPOPUP_MORE_ICON_HEIGHT_INC 64 +#define CTXPOPUP_MORE_ICON_WIDTH_INC 45 +#define CTXPOPUP_MORE_ICON_HEIGHT_INC 45 #define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40 #define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20 +#define CTXPOPUP_MORE_MOVE_INC 40 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC 336 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC 90 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC 130 @@ -269,6 +270,8 @@ #define GENLIST_LIST_BUBBLE_TEXT_SIZE 32 #define GENLIST_LIST_BUBBLE_TEXT_COLOR 249 249 249 255 +#define GENLIST_PROGRESS_MAIN_TEXT_SIZE 32 + // Dialogue group #define GENLIST_DIALOGUE_GROUP_TITLE_SIZE 32 #define GENLIST_DIALOGUE_GROUP_TITLE_COLOR 59 115 182 255 @@ -284,6 +287,8 @@ #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 DIALOGUE_PASSWORD_TITLE_SIZE 32 #define DIALOGUE_PASSWORD_TITLE_COLOR 128 128 128 255 @@ -301,27 +306,31 @@ #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 -#define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 50 50 50 255 -#define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 248 246 239 255 -#define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 50 50 50 76 +#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_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 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 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 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 248 246 239 76 +#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 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC 248 246 239 255 -#define BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC 248 246 239 76 +#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_SEND_BUBBLE_TEXT_NORMAL_COLOR_INC 58 58 58 255 @@ -330,20 +339,20 @@ #define BUTTON_SEND_BUBBLE_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define BUTTON_SEND_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 153 -#define BUTTON_RECEIVE_BUBBLE_TEXT_NORMAL_COLOR_INC 248 246 239 255 -#define BUTTON_RECEIVE_BUBBLE_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC 248 246 239 255 -#define BUTTON_RECEIVE_BUBBLE_TEXT_DISABLED_COLOR_INC 248 246 239 76 +#define BUTTON_RECEIVE_BUBBLE_TEXT_NORMAL_COLOR_INC 255 255 255 255 +#define BUTTON_RECEIVE_BUBBLE_TEXT_PRESSED_COLOR_INC 255 255 255 255 +#define BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC 255 255 255 255 +#define BUTTON_RECEIVE_BUBBLE_TEXT_DISABLED_COLOR_INC 255 255 255 76 #define BUTTON_RECEIVE_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 153 #define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 248 246 239 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_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 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_EXPAND_BUTTON_NORMAL_COLOR_INC 249 249 249 255 @@ -351,20 +360,20 @@ #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 248 246 239 255 -#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255 -#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 248 246 239 76 +#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_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 -#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 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 50 50 50 255 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255 -#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 50 50 50 255 +#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_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 @@ -373,95 +382,123 @@ #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 101 101 101 255 -#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 64 147 247 255 +#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 77 143 222 255 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 101 101 101 76 -#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 77 77 77 255 -#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 248 246 239 255 +#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 255 255 255 255 +#define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 255 255 255 255 #define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 58 58 58 76 +#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_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_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_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_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_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_BUBBLE_CIRCLE_RECEIVE_ICON_DISABLED_COLOR_INC 255 255 255 76 + +#define BUTTON_BUBBLE_CIRCLE_SENT_ICON_NORMAL_COLOR_INC 101 101 101 255 +#define BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC 255 255 255 255 +#define BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC 101 101 101 76 + #define BUTTON_DATETIME_AMPM_BG_MIN_INC 106 56 -#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 12 12 12 12 +#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 13 13 #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_SEARCH_BUTTON_TEXT_FONT_SIZE_INC 30 -#define BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC 74 74 -#define BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC 74 74 -#define BUTTON_BUBBLE_CIRCLE_MIN_WIDTH_INC 74 -#define BUTTON_BUBBLE_CIRCLE_MIN_HEIGHT_INC 74 +#define BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC 72 72 +#define BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC 72 72 +#define BUTTON_BUBBLE_CIRCLE_MIN_WIDTH_INC 72 +#define BUTTON_BUBBLE_CIRCLE_MIN_HEIGHT_INC 72 -#define BUTTON_SENT_BUBBLE_BG_BORDER_INC 12 12 12 12 +#define BUTTON_SENT_BUBBLE_BG_BORDER_INC 13 13 13 13 #define BUTTON_SENT_BUBBLE_TEXT_FONT_SIZE_INC 36 #define BUTTON_SENT_BUBBLE_TEXT_MULTILINE_FONT_SIZE_INC 28 -#define BUTTON_RECEIVE_BUBBLE_BG_BORDER_INC 12 12 12 12 +#define BUTTON_RECEIVE_BUBBLE_BG_BORDER_INC 13 13 13 13 #define BUTTON_RECEIVE_BUBBLE_TEXT_FONT_SIZE_INC 36 #define BUTTON_RECEIVE_BUBBLE_TEXT_MULTILINE_FONT_SIZE_INC 28 #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 12 12 12 12 +#define BUTTON_TEXT_STYLE1_BG_BORDER_INC 13 13 13 13 #define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 12 0 -#define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44 +#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_STYLE1_VISIBLE_ICON_MIN_MAX_INC 44 44 -#define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 44 44 +#define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 45 45 +#define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 45 45 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 36 -#define BUTTON_TEXT_STYLE2_BG_MIN_INC 100 66 -#define BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC 148 66 -#define BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC 74 66 -#define BUTTON_TEXT_STYLE2_BG_BORDER_INC 12 12 12 12 +#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_PADDING_MIN_INC 12 0 -#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44 +#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_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 44 44 -#define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 44 44 +#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 45 45 +#define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 45 45 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 36 -#define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 74 74 -#define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 74 74 -#define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 44 44 +#define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 72 72 +#define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 72 72 +#define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 45 45 -#define BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC 74 -#define BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC 74 +#define BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC 72 +#define BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC 72 #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 12 12 12 12 +#define BUTTON_POPUP_BG_BORDER_INC 13 13 13 13 #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 44 44 +#define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 45 45 #define BUTTON_POPUP_TEXT_MIN_INC 64 20 #define BUTTON_POPUP_TEXT_FONT_SIZE_INC 36 -#define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74 -#define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 74 74 +#define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 72 72 +#define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 72 72 -#define BUTTON_EDIT_NORMAL_MIN_WIDTH_INC 74 -#define BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC 74 +#define BUTTON_EDIT_NORMAL_MIN_WIDTH_INC 72 +#define BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC 72 #define BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC 90 #define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 90 #define BUTTON_SWEEP_BG_NORMAL_MIN_INC 74 74 -#define BUTTON_SWEEP_BG_BORDER_INC 12 12 12 12 +#define BUTTON_SWEEP_BG_BORDER_INC 13 13 13 13 #define BUTTON_SWEEP_PADDING_MIN_INC 12 0 -#define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 44 +#define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 45 #define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0 -#define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 44 44 +#define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 45 45 #define BUTTON_SWEEP_TEXT_MIN_INC 50 26 #define BUTTON_SWEEP_FONT_SIZE_INC 26 #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 12 12 12 12 +#define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 13 13 13 13 #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 @@ -484,26 +521,30 @@ #define BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC 0 0 0 128 #endif -#define BUTTON_CONTACT_BG_MIN_INC 12 66 -#define BUTTON_CONTACT_BG_BORDER_INC 6 6 6 6 +#define BUTTON_CONTACT_BG_MIN_INC 18 66 +#define BUTTON_CONTACT_BG_BORDER_INC 8 8 8 8 #define BUTTON_CONTACT_LEFT_PADDING_MIN_INC 12 0 #define BUTTON_CONTACT_RIGHT_PADDING_MIN_INC 12 0 #define BUTTON_CONTACT_FONT_SIZE_INC 32 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 86 98 -#define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 60 60 +#define BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC 86 85 +#define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 63 63 +#define BUTTON_NAVIFRAME_BACK_BUTTON_BOTTOM_PADDING_INC 0 12 #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_TITLE_ICON_BG_MIN_MAX_INC 86 111 -#define BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC 68 68 -#define BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC 0 32 +#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 86 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_NORMAL_MIN_INC 182 70 -#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 9999 70 +#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 182 72 +#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 9999 72 #define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC 126 70 -#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 36 36 0 0 +#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 35 35 35 35 #define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 28 5 #define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 32 #define BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44 @@ -511,54 +552,82 @@ #define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255 -#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 82 -#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 60 60 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 32 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 70 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC 9999 70 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC 35 35 35 35 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC 28 5 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC 30 5 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 16 16 + +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 58 58 58 255 +#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 248 246 239 255 + +#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 86 98 +#define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 86 85 +#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63 +#define BUTTON_NAVIFRAME_MORE_BOTTOM_PADDING_INC 0 12 #define BUTTON_TICKERNOTI_BG_MIN_MAX_INC 154 74 -#define BUTTON_TICKERNOTI_BG_BORDER_INC 12 12 12 12 +#define BUTTON_TICKERNOTI_BG_BORDER_INC 13 13 12 12 #define BUTTON_TICKERNOTI_PADDING_MIN_INC 12 0 -#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44 +#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45 #define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0 -#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 44 44 -#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 44 44 +#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 45 45 +#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 45 45 #define BUTTON_TICKERNOTI_FONT_SIZE_INC 36 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74 -#define BUTTON_COLORSELECTOR_BG_BORDER_INC 12 12 12 12 +#define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 13 13 #define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74 #define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74 -#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 12 12 12 12 +#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 13 13 #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 44 44 +#define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 45 45 #define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 36 #define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 36 #define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80 #define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0 +#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_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45 + +#define BUTTON_JUMP_STYLE_BG_MIN_INC 72 72 +#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_TOP_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18 +#define BUTTON_JUMP_LEFT_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18 + #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 249 249 249 255 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 249 249 249 255 #define CHECK_DEFAULT_TEXT_FONT_SIZE_INC 36 -#define CHECK_ONOFF_BG_NORMAL_MIN_MAX_INC 132 70 +#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 64 64 +#define CHECK_ONOFF_HANDLER_MIN_MAX_INC 63 63 -#define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 74 -#define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 74 +#define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 72 +#define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 72 #define CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 100 #define CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 100 -#define CHECK_STYLE_FAVORITE_BG_NORMAL_MIN_MAX_INC 74 74 +#define CHECK_STYLE_FAVORITE_BG_NORMAL_MIN_MAX_INC 72 72 -#define CHECK_STYLE_DEFAULT_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 64 -#define CHECK_STYLE_DEFAULT_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 64 +#define CHECK_STYLE_DEFAULT_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 63 +#define CHECK_STYLE_DEFAULT_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 63 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 75 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 91 -#define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 64 64 +#define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 63 63 #define CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC 74 74 #define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 124 74 @@ -566,38 +635,43 @@ #define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 32 #define INDEX_BG_NINEPATCH_INC 8 8 8 8 -#define INDEX_ITEM_WIDTH_INC 49 +#define INDEX_ITEM_WIDTH_INC 52 #define INDEX_ITEM_HEIGHT_INC 33 -#define INDEX_LEVEL_PADDING_INC 70 -#define INDEX_1ST_LEVEL_POPUP_WIDTH_INC 188 -#define INDEX_2ND_LEVEL_POPUP_WIDTH_INC 188 -#define INDEX_POPUP_HEIGHT_INC 180 #define INDEX_ROLLOVER_TEXT_SIZE_INC 26 -#define INDEX_POPUP_BG_NINEPATCH_INC 20 20 20 20 +#define INDEX_POPUP_BG_NINEPATCH_INC 22 22 22 22 +#define INDEX_POPUP_TEXT_COLOR_INC 255 255 255 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_POPUP_TEXT_COLOR_INC 255 255 255 255 -#define INDEX_SCROLL_BG_COLOR_INC 230 227 216 255 #define INDEX_BOTTOM_LINE_COLOR_INC 197 194 183 255 +#define INDEX_BOTTOM_LINE_WIDTH_INC 1 #define INDEX_LEFT_LINE_COLOR_INC 65 119 184 255 - -#define INDEX_PAGECONTROL_IND_INC 10 9 +#define INDEX_LEFT_LINE_WIDTH_INC 3 +#define INDEX_POPUP_TOP_PADDING_SIZE_INC 10 +#define INDEX_POPUP_BOTTOM_PADDING_SIZE_INC 10 +#define INDEX_POPUP_LEFT_PADDING_SIZE_INC 34 +#define INDEX_POPUP_RIGHT_PADDING_SIZE_INC 34 +#define INDEX_POPUP_TEXT_WIDTH_INC 128 +#define INDEX_POPUP_TEXT_HEIGHT_INC 180 +#define INDEX_PADDING_SIZE_INC 18 +#define INDEX_ITEM_PADDING_SIZE_INC 2 + +#define INDEX_PAGECONTROL_IND_INC 52 9 #define INDEX_PAGECONTROL_IND_MIN_INC 10 9 #define INDEX_PAGECONTROL_FONT_SIZE_INC 28 #define INDEX_PAGECONTROL_FONT_COLOR_INC 120 120 120 -#define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 64 -#define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 64 +#define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 63 +#define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 63 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 76 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 76 -#define RADIO_STYLE_DEFAULT_BG_MIN_MAX_INC 64 64 +#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_MIDDLE_SIZE_INC 26 +#define PANES_STYLE_DEFAULT_MIDDLE_SIZE_INC 27 #define PANES_STYLE_DEFAULT_FIXED_SIZE_INC 52 #define SEGMENT_CONTROL_DEFAULT_ITEM_TEXT_COLOR_NORMAL_INC 153 153 153 255 @@ -658,23 +732,25 @@ #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_NORMAL_COLOR_INC 225 215 215 255 -#define BUTTON_TICKERNOTI_PRESSED_COLOR_INC 248 246 239 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 CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC 50 50 50 255 -#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC 50 50 50 76 +#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC 255 255 255 255 +#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define CHECK_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 #define CHECK_DISCLIP_DISABLED_COLOR_INC 255 255 255 76 -#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC 50 50 50 255 -#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC 248 246 239 255 -#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC 50 50 50 76 +#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC 255 255 255 255 +#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define RADIO_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 #define RADIO_DISCLIP_DISABLED_COLOR_INC 255 255 255 76 @@ -688,7 +764,7 @@ #define MULTIBUTTONENTRY_HEIGHT_PAD_INC 16 #define MULTIBUTTONENTRY_BOX_HORIZONTAL_PAD_INC 8 #define MULTIBUTTONENTRY_BOX_VERTICAL_PAD_INC 16 -#define MULTIBUTTONENTRY_LABEL_HEIGHT_INC 66 // same as button +#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" @@ -697,12 +773,13 @@ #define MULTIBUTTONENTRY_GUIDE_TEXT_COLOR_INC "#79838A" //same as editfield #define MULTIBUTTONENTRY_BUTTON_HEIGHT_INC 66 #define MULTIBUTTONENTRY_BUTTON_PAD_INC 12 -#define MULTIBUTTONENTRY_BUTTON_MAX_INC 324 +#define MULTIBUTTONENTRY_BUTTON_MAX_INC 492 +#define MULTIBUTTONENTRY_BUTTON_TEXT_MAX_INC 480 #define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 5 5 0 0 #define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 32 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC 255 255 255 255 -#define MULTIBUTTONENTRY_BUTTON_TEXT_MAX_INC 300 #define MULTIBUTTONENTRY_NUMBER_TEXT_COLOR_INC 128 128 128 255 // same as multibuttonentry label +#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 64 #define SEARCHBAR_CANCEL_BUTTON_W_INC 136 #define SEARCHBAR_CANCEL_BUTTON_WITH_DOUBLE_PADDING_W_INC 166 @@ -712,7 +789,7 @@ #define SEARCHBAR_HEIGHT_INC 66 #define SEARCHBAR_LEFT_PADDING_INC 26 #define SEARCHBAR_RIGHT_PADDING_INC 26 -#define SEARCHBAR_INPUTFIELD_BORDER_INC 9 9 9 9 +#define SEARCHBAR_INPUTFIELD_BORDER_INC 12 13 12 13 #define SEARCHBAR_LEFT_ICON_PADDING_INC 16 #define SEARCHBAR_ICON_MIN_W_INC 44 #define SEARCHBAR_ICON_MIN_H_INC 44 @@ -720,6 +797,7 @@ #define SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 8 #define SEARCHBAR_SEARCH_TEXTFIELD_H_INC 60 #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 @@ -729,41 +807,66 @@ #define SELECTION_INFO_LEFT_PADDING_INC 16 #define SELECTION_INFO_TEXT_FONT_SIZE_INC 32 #define SELECTION_INFO_SHADOW_VER_W_INC 720 -#define SELECTION_INFO_SHADOW_VER_H_INC 10 +#define SELECTION_INFO_SHADOW_VER_H_INC 9 #define SELECTION_INFO_SHADOW_HORZ_W_INC 1280 -#define SELECTION_INFO_SHADOW_HORZ_H_INC 10 +#define SELECTION_INFO_SHADOW_HORZ_H_INC 9 #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 648 300 -#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 42 + +#define POPUP_ITEM_BG_DEFAULT_MIN_INC 648 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_DEFAULT_TITLE_TEXT_COLOR_INC "#3b73b6" +#define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#ffffff" +#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_TRANS_COLOR_INC 0 0 0 0 +#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50 + + +#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 38 #define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 720 0 #define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 720 1120 -#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 18 18 32 52 -#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 648 80 -#define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 720 68 -#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 16 0 +#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0 +#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 720 +#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 27 27 32 47 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 630 80 +#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 810 80 +#define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 30 0 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64 -#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 648 300 +#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 648 114 -#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50 -#define POPUP_DESC_LEFT_PADDING 0 -#define POPUP_DESC_RIGHT_PADDING 0 +#define POPUP_DESC_LEFT_PADDING 16 +#define POPUP_DESC_RIGHT_PADDING 16 #define POPUP_DESC_TOP_PADDING 14 #define POPUP_DESC_BOTTOM_PADDING 34 #define POPUP_LABEL_DESC_TOP_PADDING 39 #define POPUP_LABEL_DESC_BOTTOM_PADDING 39 +#define POPUP_ACTION_DESC_TOP_PADDING 12 #define POPUP_TITLE_TOP_PADDING 18 #define POPUP_TITLE_BOTTOM_PADDING 0 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0 #define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 20 -#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 36 -#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 36 +#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 45 +#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 45 #define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 20 -#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 648 0 +#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 630 0 +#define POPUP_CONTENT_DEFAULT_CONTENT_LANDSCAPE_MIN_INC 810 0 #define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 114 #define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 80 @@ -772,29 +875,29 @@ #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 20 #define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "294" -#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 394 74 +#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 395 74 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 16 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16 -#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3 -#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 300 -#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 0 0 +#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 17 20 +#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 408 +#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 17 0 -#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 720 0 -#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 668 300 -#define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 668 250 -#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 668 134 +#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 686 0 +#define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 0 +#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 "114" -#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 394 74 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 395 74 #define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 648 74 #define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 74 -#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 270 74 -#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 20 74 +#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 74 +#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 74 #define POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 36 #define POPUP_BUTTON3_DEFAULT_HEIGHT_INC 74 -#define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 202 74 -#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 20 74 +#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 74 #define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 36 #define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC 128 128 128 255 @@ -807,20 +910,26 @@ #define PROGRESSBAR_LIST_PROCESS_SMALL_INC 35 #define PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE "32x32" #define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 36 -#define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 34 -#define PROGRESSBAR_PROGRESS_CIRCLE_BG_SIZE_INC 128 128 +#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 PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC 0 9 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 128 128 128 255 -#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC 32 +#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 280 280 +#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC 288 288 #define NOCONTENT_BG_COLOR_INC 0 0 0 0 -#define NOCONTENT_TEXT_STYLE_BG_MIN_INC 0 76 -#define NOCONTENT_IMAGE_BG_COLOR_INC 128 128 128 255 +#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 ENTRY_TEXT_SIZE_INC 44 #define ENTRY_TEXT_COLOR_INC "#000000" +#define ENTRY_GUIDE_TEXT_COLOR_INC "#90A9C7" #define ENTRY_CURSOR_COLOR_INC 59 115 182 255 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000" #define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF" @@ -840,9 +949,10 @@ #define ENTRY_BUBBLE_IX_PAD 20 #define ENTRY_BUBBLE_Y_PAD 15 #define ENTRY_BUBBLE_BOTTOM_PAD 24 +#define ENTRY_BUBBLE_MIDDLE_PAD 14 #define ENTRY_BUBBLE_CALLERID_PAD 16 -#define ENTRY_BUBBLE_CALLERID_WIDTH 104 -#define ENTRY_BUBBLE_CALLERID_HEIGHT 104 +#define ENTRY_BUBBLE_CALLERID_WIDTH 108 +#define ENTRY_BUBBLE_CALLERID_HEIGHT 108 #define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 26 #define ENTRY_BUBBLE_TEXT_SIZE 38 @@ -852,8 +962,8 @@ #define ENTRY_BUBBLE_RECEV_TEXT_COLOR "#FFFFFF" #define ENTRY_BUBBLE_RECEV_TEXT_SHADOW_STYLE "far_shadow,top" #define ENTRY_BUBBLE_RECEV_TEXT_SHADOW_COLOR "#0000009f" -#define ENTRY_BUBBLE_RECEV_BG_BORDER_INC 58 24 62 20 -#define ENTRY_BUBBLE_SENT_BG_BORDER_INC 24 58 62 20 +#define ENTRY_BUBBLE_RECEV_BG_BORDER_INC 55 24 59 20 +#define ENTRY_BUBBLE_SENT_BG_BORDER_INC 24 55 59 20 #define ENTRY_BUBBLE_CALLERID_RELATIVE_INC 0.0 0.0 #define ENTRY_BUBBLE_RECEV_CALLERID_REL_INC 1.0 0.0 #define ENTRY_BUBBLE_BOTTOMRIGHT_PAD 120 @@ -927,10 +1037,10 @@ #define COLORSELECTOR_BUTTON_TOP_PADDING 19 #define COLORSELECTOR_ARROW_BG_LEFT_PADDING 120 #define COLORSELECTOR_ARROW_BG_RIGHT_PADDING 120 -#define COLORSELECTOR_ARROW_MIN_WIDTH 22 -#define COLORSELECTOR_ARROW_MIN_HEIGHT 70 -#define COLORSELECTOR_ARROW_REL1_OFFSET 0 5 -#define COLORSELECTOR_ARROW_REL2_OFFSET 0 5 +#define COLORSELECTOR_ARROW_MIN_WIDTH 27 +#define COLORSELECTOR_ARROW_MIN_HEIGHT 72 +#define COLORSELECTOR_ARROW_REL1_OFFSET 0 4 +#define COLORSELECTOR_ARROW_REL2_OFFSET 0 3 #define COLORSELECTOR_DRAGGABLE_EVENT_AREA 80 80 #define COLORSELECTOR_BUTTON_LEFT_PADDING 32 #define COLORSELECTOR_BUTTON_RIGHT_PADDING 32 @@ -947,7 +1057,7 @@ #define COLORSELECTOR_PORTRAIT_VER_PAD_INC "20" #define COLORSELECTOR_LANDSCAPE_HOR_PAD_INC "36" #define COLORSELECTOR_LANDSCAPE_VER_PAD_INC "0" -#define COLORSELECTOR_PALETTE_BORDER_INC 11 11 11 11 +#define COLORSELECTOR_PALETTE_BORDER_INC 13 13 13 13 #define CALENDAR_DAY_FONT_SIZE_INC 24 #define CALENDAR_DATE_FONT_SIZE_INC 32 @@ -987,7 +1097,7 @@ #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 100 #define TICKERNOTI_DEFAULT_BG_TOTAL_MIN_HEIGHT_INC 112 -#define TICKERNOTI_DEFAULT_BG_BORDER_INC 2 2 2 14 +#define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 35 35 #define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 16 18 #define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 16 18 #define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 16 0 @@ -1005,14 +1115,14 @@ #define TICKERNOTI_INFO_TEXT_FONT_SIZE_INC 28 #define TICKERNOTI_TEXT_ONLY_TEXT_MIN_INC 0 64 -#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_IMAGE "00_scroll_bar.png" -#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_IMAGE "00_scroll_bar.png" -#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_IMAGE_BORDER 5 10 5 10 -#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_IMAGE_BORDER 5 10 5 10 -#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC 16 238 -#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC 16 99999 -#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC 208 16 -#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 16 +#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_IMAGE "00_scroll_bar_v.png" +#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_IMAGE "00_scroll_bar_h.png" +#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_IMAGE_BORDER 0 0 12 14 +#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_IMAGE_BORDER 12 14 0 0 +#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC 18 72 +#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC 18 99999 +#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC 72 18 +#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 18 #define SCROLLER_DEFAULT_SCROLLBAR_VBAR_PADDING_SIZE 6 #define SCROLLER_DEFAULT_SCROLLBAR_HBAR_PADDING_SIZE 6 #define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_IMAGE "00_scroll_bar.png" @@ -1048,11 +1158,10 @@ #define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_OVER2 6 6 6 0 #define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_OVER1 6 6 6 0 #define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_OVER2 6 6 6 0 -#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC 54 220 -#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC 220 54 -#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 54 26 -#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 26 54 -#define SCROLLER_HANDLER_SCROLLBAR_PADDING_INC 4 +#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC 36 234 +#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC 234 36 +#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 36 37 +#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 37 36 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_BOTTOM_BORDER 10 10 0 10 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER 0 10 10 10 @@ -1073,6 +1182,8 @@ #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 CONFORMANT_INDICATOR_BG_DEFAULT_COLOR_INC 52 52 50 255 #define CONFORMANT_INDICATOR_BG_TRANSLUCENT_COLOR_INC 0 0 0 125 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index ef9bc06..4287955 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -327,6 +327,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -636,31 +641,31 @@ group { name: "elm/button/base/style1/delete"; inherit: "elm/button/base/style1"; images { - image: "00_button_delete.png" COMP; - image: "00_button_delete_dim.png" COMP; - image: "00_button_delete_press.png" COMP; + image: "00_button_01_Delete.png" COMP; + image: "00_button_01_Delete_dim.png" COMP; + image: "00_button_01_Delete_press.png" COMP; } parts { part { name: "button_image"; scale: 1; description { state: "default" 0.0; image { - normal: "00_button_delete.png"; + normal: "00_button_01_Delete.png"; border: BUTTON_TEXT_STYLE1_BG_BORDER_INC; border_scale: 1; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "00_button_delete_press.png"; + image.normal: "00_button_01_Delete_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_button_delete_dim.png"; + image.normal: "00_button_01_Delete_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_button_delete_press.png"; + image.normal: "00_button_01_Delete_press.png"; } } part { name: "elm.text"; @@ -723,31 +728,31 @@ alias: "elm/button/base/searchbar/default"; inherit: "elm/button/base/style1"; images { - image: "00_button_03.png" COMP; - image: "00_button_03_dim.png" COMP; - image: "00_button_03_press.png" COMP; + image: "00_button_01.png" COMP; + image: "00_button_01_dim.png" COMP; + image: "00_button_01_press.png" COMP; } parts { part { name: "button_image"; scale: 1; description { state: "default" 0.0; image { - normal: "00_button_03.png"; + 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_03_press.png"; + image.normal: "00_button_01_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_dim.png"; + image.normal: "00_button_01_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_press.png"; + image.normal: "00_button_01_press.png"; } } part { name: "bg"; @@ -824,31 +829,31 @@ group { name: "elm/button/base/search_button/send"; inherit: "elm/button/base/style1"; images { - image: "00_button_03_send.png" COMP; - image: "00_button_03_send_dim.png" COMP; - image: "00_button_03_send_press.png" COMP; + image: "00_button_01_send.png" COMP; + image: "00_button_01_send_dim.png" COMP; + image: "00_button_01_send_press.png" COMP; } parts { part { name: "button_image"; scale: 1; description { state: "default" 0.0; image { - normal: "00_button_03_send.png"; + normal: "00_button_01_send.png"; border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC; border_scale: 1; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_send_press.png"; + image.normal: "00_button_01_send_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_send_dim.png"; + image.normal: "00_button_01_send_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_send_press.png"; + image.normal: "00_button_01_send_press.png"; } } part { name: "bg"; @@ -925,31 +930,31 @@ group { name: "elm/button/base/search_button/cancel"; inherit: "elm/button/base/style1"; images { - image: "00_button_03_cancel.png" COMP; - image: "00_button_03_cancel_dim.png" COMP; - image: "00_button_03_cancel_press.png" COMP; + image: "00_button_01_Delete.png" COMP; + image: "00_button_01_Delete_dim.png" COMP; + image: "00_button_01_Delete_press.png" COMP; } parts { part { name: "button_image"; scale: 1; description { state: "default" 0.0; image { - normal: "00_button_03_cancel.png"; + normal: "00_button_01_Delete.png"; border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC; border_scale: 1; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_cancel_press.png"; + image.normal: "00_button_01_Delete_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_cancel_dim.png"; + image.normal: "00_button_01_Delete_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_button_03_cancel_press.png"; + image.normal: "00_button_01_Delete_press.png"; } } part { name: "bg"; @@ -1027,9 +1032,9 @@ alias: "elm/button/base/text_only/style2"; alias: "elm/button/base/style2/multiline"; images { - image: "00_button_03.png" COMP; - image: "00_button_03_press.png" COMP; - image: "00_button_03_dim.png" COMP; + image: "00_button_01.png" COMP; + image: "00_button_01_press.png" COMP; + image: "00_button_01_dim.png" COMP; } script { public button_state = BUTTON_STATE_ENABLED; @@ -1319,6 +1324,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -1736,6 +1746,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -1892,9 +1907,9 @@ inherit: "elm/button/base/sweep"; alias: "elm/button/base/sweep/delete/multiline"; images { - image: "00_button_delete_press.png" COMP; - image: "00_button_delete.png" COMP; - image: "00_button_delete_dim.png" COMP; + image: "00_button_01_Delete_press.png" COMP; + image: "00_button_01_Delete.png" COMP; + image: "00_button_01_Delete_dim.png" COMP; } styles{ style { name: "btn_sweep_delete_multiline"; @@ -1910,22 +1925,22 @@ description { state: "default" 0.0; min: BUTTON_SWEEP_BG_NORMAL_MIN_INC; image { - normal: "00_button_delete.png"; + normal: "00_button_01_Delete.png"; border: BUTTON_SWEEP_BG_BORDER_INC; border_scale: 1; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "00_button_delete_press.png"; + image.normal: "00_button_01_Delete_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_button_delete_dim.png"; + image.normal: "00_button_01_Delete_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_button_delete_press.png"; + image.normal: "00_button_01_Delete_press.png"; } } part { name: "elm.text"; @@ -2215,6 +2230,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -2415,13 +2435,13 @@ type: RECT; \ scale: 1; \ description { state: "default" 0.0; \ - color: 101 101 101 255; \ + color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC; \ } \ description { state: "clicked" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC; \ } \ description { state: "disabled" 0.0; \ - color: 101 101 101 76; \ + color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; \ } \ } \ part { name: "over1"; \ @@ -2433,6 +2453,7 @@ } \ } \ part { name: "over2"; \ + type: RECT; \ repeat_events: 1; \ description { state: "default" 0.0; \ color: 0 0 0 0; \ @@ -2463,6 +2484,11 @@ target: "button_center_part"; \ target: "icon_clipper"; \ } \ + program { name: "button_double_click"; \ + signal: "mouse,down,1,double"; \ + source: "over1"; \ + after: "button_click_anim"; \ + } \ program { name: "button_unclick"; \ signal: "mouse,up,1"; \ source: "over2"; \ @@ -2571,9 +2597,9 @@ group { name: "elm/button/base/"style_name; \ inherit: "elm/button/base/info"; \ images { \ - image: "00_circle_delete_button.png" COMP; \ - image: "00_circle_delete_button_press.png" COMP; \ - image: "00_circle_delete_button_dim.png" COMP; \ + image: "00_circle_button_delete.png" COMP; \ + image: "00_circle_button_delete_press.png" COMP; \ + image: "00_circle_button_delete_dim.png" COMP; \ image: "00_button_warning.png" COMP; \ image: "00_button_warning_press.png" COMP; \ } \ @@ -2581,17 +2607,17 @@ part { name: "button_image"; \ scale: 1; \ description { state: "default" 0.0; \ - image.normal: "00_circle_delete_button.png"; \ + image.normal: "00_circle_button_delete.png"; \ } \ description { \ state: "clicked" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_circle_delete_button_press.png"; \ + image.normal: "00_circle_button_delete_press.png"; \ } \ description { \ state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_circle_delete_button_dim.png"; \ + image.normal: "00_circle_button_delete_dim.png"; \ } \ } \ part { name: "button_center_part"; \ @@ -2612,13 +2638,13 @@ type: RECT; \ scale: 1; \ description { state: "default" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC; \ } \ description { state: "clicked" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC; \ } \ description { state: "disabled" 0.0; \ - color: 248 246 239 76; \ + color: BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC; \ } \ } \ part { name: "over1"; \ @@ -2682,13 +2708,13 @@ type: RECT; scale: 1; description { state: "default" 0.0; - color: 101 101 101 255; + color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC; } description { state: "clicked" 0.0; - color: 248 246 239 255; + color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; - color: 101 101 101 76; + color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; } } part { name: "over1"; @@ -2699,6 +2725,7 @@ } } part { name: "over2"; + type: RECT; repeat_events: 1; description { state: "default" 0.0; color: 0 0 0 0; @@ -2728,6 +2755,11 @@ target: "button_image"; target: "icon_clipper"; } + program { name: "button_double_click"; + signal: "mouse,down,1,double"; + source: "over1"; + after: "button_click_anim"; + } program { name: "touch_snd"; signal: "mouse,clicked,1"; source: "over1"; @@ -2829,13 +2861,13 @@ scale: 1; \ type: RECT; \ description { state: "default" 0.0; \ - color: 101 101 101 255; \ + color: BUTTON_EDIT_STYLE_NORMAL_COLOR_INC; \ } \ description { state: "clicked" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_EDIT_STYLE_PRESSED_COLOR_INC; \ } \ description { state: "disabled" 0.0; \ - color: 101 101 101 76; \ + color: BUTTON_EDIT_STYLE_DISABLED_COLOR_INC; \ } \ } \ part { name: "over1"; \ @@ -2848,6 +2880,7 @@ } \ } \ part { name: "over2"; \ + type: RECT; \ repeat_events: 1; \ description { state: "default" 0.0; \ color: 0 0 0 0; \ @@ -2878,6 +2911,11 @@ target: "button_center_part"; \ target: "icon_clipper"; \ } \ + program { name: "button_double_click"; \ + signal: "mouse,down,1,double"; \ + source: "over1"; \ + after: "button_click_anim"; \ + } \ program { name: "button_unclick"; \ signal: "mouse,up,1"; \ source: "over2"; \ @@ -2944,9 +2982,9 @@ alias: "elm/button/base/"style_name; \ inherit: "elm/button/base/contacts/icon_plus"; \ images { \ - image: "00_circle_delete_button.png" COMP; \ - image: "00_circle_delete_button_press.png" COMP; \ - image: "00_circle_delete_button_dim.png" COMP; \ + image: "00_circle_button_delete.png" COMP; \ + image: "00_circle_button_delete_press.png" COMP; \ + image: "00_circle_button_delete_dim.png" COMP; \ image: "00_button_expand_minus.png" COMP; \ image: "00_button_expand_minus_press.png" COMP; \ } \ @@ -2954,15 +2992,15 @@ part { name: "button_image"; \ scale: 1; \ description { state: "default" 0.0; \ - image.normal: "00_circle_delete_button.png"; \ + image.normal: "00_circle_button_delete.png"; \ } \ description { state: "clicked" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_circle_delete_button_press.png"; \ + image.normal: "00_circle_button_delete_press.png"; \ } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_circle_delete_button_dim.png"; \ + image.normal: "00_circle_button_delete_dim.png"; \ } \ } \ part { name: "button_center_part"; \ @@ -2985,13 +3023,13 @@ scale: 1; \ type: RECT; \ description { state: "default" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC; \ } \ description { state: "clicked" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC; \ } \ description { state: "disabled" 0.0; \ - color: 248 246 239 76; \ + color: BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC; \ } \ } \ part { name: "over1"; \ @@ -3012,6 +3050,153 @@ /////////////////////////////////////////////////////////////////////////////////////// BUTTON_EDIT_MINUS_STYLES("icon_minus/extended", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC) +/////////////////////////////////////////////////////////////////////////////////////// +#define BUTTON_SCROLL_JUMPTO(style_name, image_normal)\ + group { name: "elm/button/base/"style_name; \ + images { \ + image: "00_button_01.png" COMP; \ + image: "00_button_01_press.png" COMP; \ + image: "00_button_01_dim.png" COMP; \ + image: image_normal COMP; \ + }\ + parts { \ + part { name: "button_image";\ + type: IMAGE; \ + scale: 1; \ + description { state: "default" 0.0; \ + min: BUTTON_JUMP_STYLE_BG_MIN_INC; \ + image { \ + normal: "00_button_01.png"; \ + border: BUTTON_DEFAULT_STYLE_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"; \ + } \ + } \ + part { name: "padding_left_top"; \ + type: SPACER; \ + scale: 1; \ + description { state: "default" 0.0; \ + align: 0.0 0.0; \ + rel2.relative: 0.0 0.0; \ + min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC; \ + fixed: 1 1; \ + } \ + } \ + part { name: "padding_right_bottom"; \ + type: SPACER; \ + scale: 1; \ + description { state: "default" 0.0; \ + align: 1.0 1.0; \ + rel1.relative: 1.0 1.0; \ + min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC; \ + fixed: 1 1; \ + } \ + } \ + part { name: "jump_image"; \ + type: IMAGE; \ + scale: 1; \ + description { state: "default" 0.0; \ + min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \ + max: 45 45; \ + rel1 { \ + relative: 1.0 0.0; \ + to_x: "padding_left_top"; \ + } \ + rel2 { \ + relative: 0.0 1.0; \ + to_x: "padding_right_bottom"; \ + } \ + image.normal: image_normal; \ + aspect: 1.0 1.0; \ + aspect_preference: VERTICAL; \ + color: BUTTON_JUMP_ICON_NORMAL_COLOR_INC; \ + } \ + description { state: "clicked" 0.0; \ + inherit: "default" 0.0; \ + color: BUTTON_JUMP_ICON_PRESSED_COLOR_INC; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + color: BUTTON_JUMP_ICON_DIM_COLOR_INC; \ + } \ + } \ + part { name: "over1"; \ + type: RECT; \ + repeat_events: 1; \ + ignore_flags: ON_HOLD; \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 1.0 1.0; \ + } \ + } \ + } \ + programs { \ + program { name: "button_click"; \ + signal: "mouse,down,1"; \ + source: "over1"; \ + action: SIGNAL_EMIT "elm,action,press" ""; \ + after: "button_click_anim"; \ + } \ + program { name: "button_click_anim"; \ + action: STATE_SET "clicked" 0.0; \ + target: "button_image"; \ + target: "jump_image"; \ + } \ + program { name: "button_double_click"; \ + signal: "mouse,down,1,double"; \ + source: "over1"; \ + after: "button_click_anim"; \ + } \ + program { name: "button_unclick"; \ + signal: "mouse,up,1"; \ + source: "over1"; \ + action: SIGNAL_EMIT "elm,action,unpress" ""; \ + after: "button_unclick_anim"; \ + } \ + program { name: "button_unclick_anim"; \ + action: STATE_SET "default" 0.0; \ + target: "button_image"; \ + target: "jump_image"; \ + } \ + program { name: "touch_snd"; \ + signal: "mouse,clicked,1"; \ + source: "over1"; \ + action: PLAY_SAMPLE "touch_sound" 1.0; \ + after: button_unclick3; \ + } \ + program { name: "button_unclick3"; \ + action: SIGNAL_EMIT "elm,action,click" ""; \ + } \ + program { name: "disable"; \ + signal: "elm,state,disabled"; \ + source: "elm"; \ + action: STATE_SET "disabled" 0.0; \ + target: "button_image"; \ + target: "jump_image"; \ + } \ + program { name: "enable"; \ + signal: "elm,state,enabled"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "button_image"; \ + target: "jump_image"; \ + } \ + } \ + } + +//////////////////////////////////////////////////////////////////////// +BUTTON_SCROLL_JUMPTO("jumpto_top", "00_icon_jump.png") +//////////////////////////////////////////////////////////////////////// +BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") //////////////////////////////////////////////////////////////////////// group { name: "elm/button/base/default"; @@ -3137,7 +3322,7 @@ mouse_events: 0; scale: 1; clip_to: "disclip"; - effect: FAR_SHADOW BOTTOM; + effect: SHADOW BOTTOM; description { state: "default" 0.0; visible: 0; align: 0.0 0.5; @@ -3245,6 +3430,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -3567,13 +3757,13 @@ type: RECT; \ scale: 1; \ description { state: "default" 0.0; \ - color: 50 50 50 255; \ + color: BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC; \ } \ description { state: "clicked" 0.0; \ - color: 248 246 239 255; \ + color: BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC; \ } \ description { state: "disabled" 0.0; \ - color: 50 50 50 76; \ + color: BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC; \ } \ } \ part { name: "over1"; \ @@ -3584,6 +3774,7 @@ } \ } \ part { name: "over2"; \ + type: RECT; \ repeat_events: 1; \ description { state: "default" 0.0; \ color: 0 0 0 0; \ @@ -3614,6 +3805,11 @@ target: "button_center_part"; \ target: ""icon_clipper""; \ } \ + program { name: "button_double_click"; \ + signal: "mouse,down,1,double"; \ + source: "over1"; \ + after: "button_click_anim"; \ + } \ program { name: "button_unclick"; \ signal: "mouse,up,1"; \ source: "over2"; \ @@ -3774,20 +3970,25 @@ } } part { name: "over1"; + type: RECT; mouse_events: 0; description { state: "default" 0.0; rel2.relative: 1.0 0.5; + color: 0 0 0 0; } } 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"; @@ -3821,6 +4022,11 @@ target: "button_image"; target: "elm.text"; } + 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" ""; } @@ -3930,8 +4136,6 @@ alias: "elm/button/base/naviframe/end_btn/default"; images { image: "00_icon_Back.png" COMP; - image: "00_icon_Back_press.png" COMP; - image: "00_icon_Back_dim.png" COMP; } parts { part { name: "button_image"; @@ -3942,33 +4146,54 @@ max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC; visible: 0; } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + description { state: "landscape" 0.0; + min: BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC; + max: BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC; + visible: 0; } - description { state: "focused" 0.0; - inherit: "default" 0.0; + } + part { name: "bottom_padding"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_BACK_BUTTON_BOTTOM_PADDING_INC; + fixed: 0 1; + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "button_image"; } + rel2.to: "button_image"; + visible: 0; } } part { name: "back_button"; scale: 1; mouse_events: 0; + clip_to: "back_button.clipper"; description { state: "default" 0.0; min: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC; max: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC; + fixed: 1 1; rel1.to: "button_image"; rel2.to: "button_image"; image.normal: "00_icon_Back.png"; } - description { state: "clicked" 0.0; + description { state: "title_button" 0.0; inherit: "default" 0.0; - image.normal: "00_icon_Back_press.png"; + align: 0.5 1.0; + rel1 { relative: 0.0 1.0; to: "bottom_padding"; } + rel2.to: "bottom_padding"; + } + } + part { name: "back_button.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; - inherit: "default" 0.0; - image.normal: "00_icon_Back_dim.png"; + color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC; } } part { name: "over2"; @@ -4005,9 +4230,14 @@ after: "button_click_anim"; } program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "back_button"; + script { + set_state(PART:"back_button.clipper", "clicked", 0.0); + } + } + program { name: "button_double_click"; + signal: "mouse,down,1,double"; + source: "over2"; + after: "button_click_anim"; } program { name: "button_unclick"; signal: "mouse,up,1"; @@ -4016,9 +4246,9 @@ after: "button_unclick_anim"; } program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "back_button"; + script { + set_state(PART:"back_button.clipper", "default", 0.0); + } } program { name: "touch_snd"; signal: "mouse,clicked,1"; @@ -4032,18 +4262,48 @@ program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button_image"; - target: "disabler"; - target: "back_button"; + script { + set_state(PART:"back_button.clipper", "disabled", 0.0); + } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; + script { + set_state(PART:"back_button.clipper", "default", 0.0); + } + } + program { name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + action: STATE_SET "landscape" 0.0; + target: "button_image"; + } + program { name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; action: STATE_SET "default" 0.0; target: "button_image"; - target: "disabler"; - target: "back_button"; + } + 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"; } } } @@ -4257,6 +4517,11 @@ target: "button_image"; target: "elm.text"; } + 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" ""; } @@ -4535,34 +4800,416 @@ } //////////////////////////////////////////////////////////////////// - group { name: "elm/button/base/naviframe/title_icon"; + group { name: "elm/button/base/toolbar/segmentedcontrol"; + images { + image: "00_toolbar_button.png" COMP; + image: "00_toolbar_button_press.png" COMP; + image: "00_toolbar_button_dim.png" COMP; + image: "00_button_icon_arrow.png" COMP; + image: "00_button_icon_arrow_press.png" COMP; + } + styles{ + style { name: "btn_toolbar_segmentedcontrol"; + base: "font=Tizen:style=Bold font_size="BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC" align=center color=#ffffff ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } + script { + public button_state = BUTTON_STATE_ENABLED; + } 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; + min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC; + max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC; + fixed: 1 1; + rel1.to: "padding_text_left_top"; + rel2.to: "padding_text_right_bottom"; + image { + normal: "00_toolbar_button.png"; + border: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_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"; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + image.normal: "00_toolbar_button_press.png"; } } - part { name: "top_padding"; + part { name: "padding_left_top"; type: RECT; scale: 1; + mouse_events: 0; description { state: "default" 0.0; visible: 0; - min: BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC; - fixed: 0 1; - align: 0 0; - rel1 { relative: 0.0 0.0; to: "button_image"; } - rel2 { relative: 1.0 0.0; to: "button_image"; } - } + align: 0.0 0.0; + rel2.relative: 0.0 0.0; + min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC; + fixed: 1 1; + } + } + part { name: "padding_right_bottom"; + 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_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC; + fixed: 1 1; + visible: 0; + } + } + part { name: "padding_text_left_top"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC; + fixed: 1 1; + rel1.to: "elm.text"; + rel2 { + relative: 0.0 0.0; + to: "elm.text"; + } + align: 1.0 0.0; + } + } + part { name: "padding_text_right_bottom"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC; + fixed: 1 1; + visible: 0; + rel1 { + relative: 1.0 1.0; + to_x: "icon"; + to_y: "elm.text"; + } + rel2 { + relative: 1.0 1.0; + to_x: "icon"; + to_y: "elm.text"; + } + align: 0.0 0.0; + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + clip_to: "disclip"; + mouse_events: 0; + effect: FAR_SHADOW BOTTOM; + scale: 1; + description { state: "default" 0.0; + visible: 0; + fixed: 1 1; + min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC; + rel1 { + relative: 1.0 1.0; + to: "padding_left_top"; + } + rel2 { + relative: 0.0 0.0; + to: "padding_right_bottom"; + } + color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC; + color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC; + text { + min: 0 1; + max: 1 1; + style: "btn_toolbar_segmentedcontrol"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + visible: 1; + color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC; + color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC; + visible: 1; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC; + } + } + part { name: "icon_padding"; + scale: 1; + type: RECT; + description { state: "default" 0.0; + min: 6 5; + fixed: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to: "elm.text"; + } + visible: 0; + rel2.to: "elm.text"; + } + } + part { name: "icon"; + scale: 1; + clip_to: "icon_clipper"; + description { state: "default" 0.0; + min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC; + max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC; + fixed: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to_x: "icon_padding"; + to_y: "elm.text"; + offset: 0 6; + } + rel2 { + relative: 1.0 1.0; + to_x: "icon_padding"; + to_y: "elm.text"; + } + image.normal: "00_button_icon_arrow.png"; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + image.normal: "00_button_icon_arrow_press.png"; + } + } + part { name: "icon_clipper"; + type: RECT; + description { state: "default" 0.0; + color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC; + } + } + 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"; + action: STATE_SET "clicked" 0.0; + target: "button_image"; + target: "elm.text"; + target: "icon"; + target: "icon_clipper"; + } + 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; + 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); + set_state(PART:"icon", "default", 0.0); + set_state(PART:"icon_clipper", "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) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "disabled_visible", 0.0); + } + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } + 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; + 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; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + set_int(button_state, BUTTON_STATE_ENABLED); + } + } + program { name: "focused"; + //signal: "elm,action,focus"; + //source: "elm"; + action: STATE_SET "focused" 0.0; + target: "button_image"; + target: "elm.text"; + } + program { name: "unfocused"; + //signal: "elm,action,unfocus"; + //source: "elm"; + action: STATE_SET "default" 0.0; + target: "button_image"; + action: STATE_SET "visible" 0.0; + target: "elm.text"; + } + } + } + +//////////////////////////////////////////////////////////////////// + group { name: "elm/button/base/naviframe/title_icon"; + 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: "top_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC; + fixed: 0 1; + align: 0 0; + rel1 { relative: 0.0 0.0; to: "button_image"; } + rel2 { relative: 1.0 0.0; to: "button_image"; } + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC; + } } part { name: "elm.swallow.content"; type: SWALLOW; @@ -4651,10 +5298,15 @@ after: "button_click_anim"; } program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "elm.icon.clipper"; - target: "elm.icon.proxy.clipper"; + script { + set_state(PART:"elm.icon.clipper", "clicked", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "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" ""; @@ -4691,21 +5343,55 @@ program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button_image"; - target: "disabler"; - target: "elm.icon.clipper"; - target: "elm.icon.proxy.clipper"; + script { + set_state(PART:"disabler", "disabled", 0.0); + set_state(PART:"elm.icon.clipper", "disabled", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "disabled", 0.0); + } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; + script { + set_state(PART:"disabler", "default", 0.0); + set_state(PART:"elm.icon.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "default", 0.0); + } + } + program { name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + action: STATE_SET "landscape" 0.0; + target: "button_image"; + target: "top_padding"; + } + program { name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; action: STATE_SET "default" 0.0; target: "button_image"; - target: "elm.icon.clipper"; - target: "elm.icon.proxy.clipper"; - target: "disabler"; + target: "top_padding"; + } +/* 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"; + } */ } } @@ -4713,8 +5399,6 @@ group { name: "elm/button/base/naviframe/more/default"; images { image: "00_icon_more.png" COMP; - image: "00_icon_more_press.png" COMP; - image: "00_icon_more_dim.png" COMP; } parts { part { name: "button_image"; @@ -4725,33 +5409,54 @@ max: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC; visible: 0; } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + description { state: "landscape" 0.0; + min: BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC; + max: BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC; + visible: 0; } - description { state: "focused" 0.0; - inherit: "default" 0.0; + } + part { name: "bottom_padding"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_MORE_BOTTOM_PADDING_INC; + fixed: 0 1; + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "button_image"; } + rel2.to: "button_image"; + visible: 0; } } part { name: "more_image"; scale: 1; mouse_events: 0; + clip_to: "more_image.clipper"; description { state: "default" 0.0; min: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC; max: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC; + fixed: 1 1; rel1.to: "button_image"; rel2.to: "button_image"; image.normal: "00_icon_more.png"; } - description { state: "clicked" 0.0; + description { state: "title_button" 0.0; inherit: "default" 0.0; - image.normal: "00_icon_more_press.png"; + align: 0.5 1.0; + rel1 { relative: 0.0 1.0; to: "bottom_padding"; } + rel2.to: "bottom_padding"; + } + } + part { name: "more_image.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; - inherit: "default" 0.0; - image.normal: "00_icon_more_dim.png"; + color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC; } } part { name: "elm.text.badge.bg"; @@ -4882,9 +5587,14 @@ after: "button_click_anim"; } program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "more_image"; + script { + set_state(PART:"more_image.clipper", "clicked", 0.0); + } + } + program { name: "button_double_click"; + signal: "mouse,down,1,double"; + source: "over2"; + after: "button_click_anim"; } program { name: "button_unclick"; signal: "mouse,up,1"; @@ -4893,9 +5603,9 @@ after: "button_unclick_anim"; } program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "more_image"; + script { + set_state(PART:"more_image.clipper", "default", 0.0); + } } program { name: "touch_snd"; signal: "mouse,clicked,1"; @@ -4923,18 +5633,50 @@ program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disabler"; - target: "button_image"; - target: "more_image"; + script { + set_state(PART:"disabler", "disabled", 0.0); + set_state(PART:"more_image.clipper", "disabled", 0.0); + } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; + script { + set_state(PART:"disabler", "default", 0.0); + set_state(PART:"more_image.clipper", "default", 0.0); + } + } + program { name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + action: STATE_SET "landscape" 0.0; + target: "button_image"; + } + program { name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; action: STATE_SET "default" 0.0; - target: "disabler"; target: "button_image"; - target: "more_image"; + } + 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"; } } } @@ -5233,6 +5975,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -5398,9 +6145,9 @@ group { name: "elm/button/base/expandable_number"; alias: "elm/button/base/text_only/expandable_number"; images { - image: "00_button_02.png" COMP; - image: "00_button_02_press.png" COMP; - image: "00_button_02_dim.png" COMP; + image: "00_button_01.png" COMP; + image: "00_button_01_press.png" COMP; + image: "00_button_01_dim.png" COMP; image: "00_arrow_expand.png" COMP; } script { @@ -5413,22 +6160,22 @@ min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC; max: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC; image { - normal: "00_button_02.png"; + normal: "00_button_01.png"; border: BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC; border_scale: 1; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "00_button_02_press.png"; + image.normal: "00_button_01_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_button_02_dim.png"; + image.normal: "00_button_01_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_button_02_press.png"; + image.normal: "00_button_01_press.png"; } } part { name: "padding_left_top"; @@ -5544,13 +6291,13 @@ scale: 1; type: RECT; description { state: "default" 0.0; - color: 58 58 58 255; + color: BUTTON_NUMBER_ICON_NORMAL_COLOR_INC; } description { state: "clicked" 0.0; - color: 248 246 239 255; + color: BUTTON_NUMBER_ICON_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; - color: 58 58 58 76; + color: BUTTON_NUMBER_ICON_DISABLED_COLOR_INC; } } part { name: "over2"; @@ -5602,6 +6349,11 @@ set_state(PART:"elm.text", "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" ""; } @@ -6004,6 +6756,7 @@ group { name: "elm/button/base/bubble_circle/receive"; images { image: "00_messagebubble_circle_receive.png" COMP; image: "00_messagebubble_circle_receive_press.png" COMP; + image: "00_messagebubble_circle_receive_dim.png" COMP; image: "00_button_right.png" COMP; image: "00_button_right_press.png" COMP; } @@ -6023,6 +6776,7 @@ group { name: "elm/button/base/bubble_circle/receive"; description { state: "disabled" 0.0; inherit: "default" 0.0; + image.normal: "00_messagebubble_circle_receive_dim.png"; } } part { name: "image"; @@ -6047,13 +6801,13 @@ group { name: "elm/button/base/bubble_circle/receive"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 248 246 239 255; + color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_NORMAL_COLOR_INC; } description { state: "clicked" 0.0; - color: 248 246 239 255; + color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; - color: 248 246 239 76; + color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_DISABLED_COLOR_INC; } } part { name: "over1"; @@ -6064,6 +6818,7 @@ group { name: "elm/button/base/bubble_circle/receive"; } } part { name: "over2"; + type: RECT; repeat_events: 1; description { state: "default" 0.0; color: 0 0 0 0; @@ -6094,6 +6849,11 @@ group { name: "elm/button/base/bubble_circle/receive"; target: "image"; target: "icon_clipper"; } + program { name: "button_double_click"; + signal: "mouse,down,1,double"; + source: "over1"; + after: "button_click_anim"; + } program { name: "button_unclick"; signal: "mouse,up,1"; source: "over2"; @@ -6140,6 +6900,7 @@ group { name: "elm/button/base/bubble_circle/sent"; images { image: "00_messagebubble_circle_sent.png" COMP; image: "00_messagebubble_circle_sent_press.png" COMP; + image: "00_messagebubble_circle_sent_dim.png" COMP; image: "00_button_right.png" COMP; image: "00_button_right_press.png" COMP; } @@ -6159,6 +6920,7 @@ group { name: "elm/button/base/bubble_circle/sent"; description { state: "disabled" 0.0; inherit: "default" 0.0; + image.normal: "00_messagebubble_circle_sent_dim.png"; } } part { name: "image"; @@ -6183,13 +6945,13 @@ group { name: "elm/button/base/bubble_circle/sent"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 101 101 101 255; + color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_NORMAL_COLOR_INC; } description { state: "clicked" 0.0; - color: 248 246 239 255; + color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; - color: 101 101 101 76; + color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC; } } part { name: "over1"; @@ -6200,6 +6962,7 @@ group { name: "elm/button/base/bubble_circle/sent"; } } part { name: "over2"; + type: RECT; repeat_events: 1; description { state: "default" 0.0; color: 0 0 0 0; @@ -6230,6 +6993,11 @@ group { name: "elm/button/base/bubble_circle/sent"; target: "image"; target: "icon_clipper"; } + program { name: "button_double_click"; + signal: "mouse,down,1,double"; + source: "over1"; + after: "button_click_anim"; + } program { name: "button_unclick"; signal: "mouse,up,1"; source: "over2"; @@ -6270,6 +7038,153 @@ group { name: "elm/button/base/bubble_circle/sent"; } } +////////////////////////////////////////////////////////////////////////////////////// + group { name: "elm/button/base/editfield_clear"; + images { + image: "00_EditField_clear" COMP; + } + parts { + part { name: "button_image"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + } + } + part { name: "clear_button"; + scale: 1; + mouse_events: 0; + clip_to: "clear_button.clipper"; + description { state: "default" 0.0; + min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC; + max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC; + fixed: 1 1; + align: 0.0 0.5; + image.normal: "00_EditField_clear.png"; + } + } + part { name: "clear_button.clipper"; + type: RECT; + description { state: "default" 0.0; + color: BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC; + } + description { state: "clicked" 0.0; + color: BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC; + } + description { state: "disabled" 0.0; + color: BUTTON_EDITFIELD_CLEAR_BUTTON_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; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { name: "button_click"; + signal: "mouse,down,1"; + source: "over2"; + action: SIGNAL_EMIT "elm,action,press" ""; + after: "button_click_anim"; + } + program { name: "button_click_anim"; + action: STATE_SET "clicked" 0.0; + target: "button_image"; + target: "clear_button.clipper"; + } + program { name: "button_double_click"; + signal: "mouse,down,1,double"; + source: "over1"; + after: "button_click_anim"; + } + program { name: "button_unclick"; + signal: "mouse,up,1"; + source: "over3"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + after: "button_unclick_anim"; + } + program { name: "button_unclick_anim"; + action: STATE_SET "default" 0.0; + target: "button_image"; + target: "clear_button.clipper"; + } + 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: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "button_image"; + target: "disabler"; + target: "clear_button.clipper"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "button_image"; + target: "disabler"; + target: "clear_button.clipper"; + } + } + } + + group { name: "elm/button/base/search_clear"; + inherit: "elm/button/base/editfield_clear"; + parts { + part { name: "clear_button"; + scale: 1; + mouse_events: 0; + clip_to: "clear_button.clipper"; + description { state: "default" 0.0; + min: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC; + max: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC; + fixed: 1 1; + align: 0.0 0.5; + image.normal: "00_EditField_clear.png"; + } + } + } + } + + /////////////////////////////////////////////////////////////////////////////////////// #if 0 group { name: "elm/button/base/contacts/delete"; diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index e77b13e..7ec261c 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -1510,6 +1510,7 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ signal: "drag"; source: "button"; script { + if (!get_int(is_drag)) emit("elm,action,check,drag,start", ""); set_int(is_drag, 1); } } @@ -1543,6 +1544,7 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } set_int(was_drag, get_int(is_drag)); set_int(is_drag, 0); + emit("elm,action,check,drag,stop", ""); } } } @@ -1687,10 +1689,10 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ #define CHECK_STYLE_FAVORITE(style_name, min_width, min_height) \ group { name: "elm/check/base/"style_name; \ images { \ - image: "00_icon_favorite_on_74x74.png" COMP; \ - image: "00_icon_favorite_on_74x74_dim.png" COMP; \ - image: "00_icon_favorite_off_74x74.png" COMP; \ - image: "00_icon_favorite_off_74x74_dim.png" COMP; \ + image: "00_icon_favorite_on_72x72.png" COMP; \ + image: "00_icon_favorite_on_72x72_dim.png" COMP; \ + image: "00_icon_favorite_off_72x72.png" COMP; \ + image: "00_icon_favorite_off_72x72_dim.png" COMP; \ } \ parts { \ part { name: "back_bg"; \ @@ -1724,19 +1726,19 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ description { state: "default" 0.0; \ rel1.to: "bg"; \ rel2.to: "bg"; \ - image.normal: "00_icon_favorite_off_74x74.png"; \ + image.normal: "00_icon_favorite_off_72x72.png"; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_icon_favorite_on_74x74.png"; \ + image.normal: "00_icon_favorite_on_72x72.png"; \ } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_icon_favorite_off_74x74_dim.png"; \ + image.normal: "00_icon_favorite_off_72x72_dim.png"; \ } \ description { state: "disabled_visible" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_icon_favorite_on_74x74_dim.png"; \ + image.normal: "00_icon_favorite_on_72x72_dim.png"; \ } \ } \ part { name: "elm.swallow.content"; \ diff --git a/themes/widgets/colorselector.edc b/themes/widgets/colorselector.edc index 5c50e4c..6e8cf89 100644 --- a/themes/widgets/colorselector.edc +++ b/themes/widgets/colorselector.edc @@ -414,7 +414,7 @@ group{ description{ state: "default" 0.0; fixed: 1 1; - align: 0.5 0; + align: 0.5 0.5; rel1 { to: "elm.arrow"; offset: COLORSELECTOR_ARROW_REL1_OFFSET; @@ -537,7 +537,7 @@ group{ group{ name: "elm/colorselector/image/colorbar_1/default"; images{ - image: "00_color_picker_opacity.png" COMP; + image: "00_color_picker_saturation.png" COMP; } parts{ part{ @@ -562,7 +562,7 @@ group{ visible: 1; rel1 {relative: 0.0 0.0; offset: 0 0; to: "bg"; } rel2 {relative: 1.0 1.0; offset: -1 -1; to: "bg"; } - image.normal: "00_color_picker_opacity.png"; + image.normal: "00_color_picker_saturation.png"; } } } diff --git a/themes/widgets/conformant.edc b/themes/widgets/conformant.edc index f913e34..ff97a48 100644 --- a/themes/widgets/conformant.edc +++ b/themes/widgets/conformant.edc @@ -22,6 +22,12 @@ script { public indicator_visible = 0; //Indicator visible check public indicator_opacity = 0; //0=opaque, 1=translucent, 2=transparent + public indicator_overlap = 0; //check indicator overlap/nooverlap + public clipboard_disable = 0; //check clipboard enable/disable + public keypad_disable = 0; //check virtualkeypad enable/disable + public landscape = 0; //Landscape mode status + public portrait_overlap = 0; //save portrait_overlap mode + public portrait_opacity = 0; //save portrait_opacity } parts { part { name: "elm.swallow.bg"; @@ -33,21 +39,40 @@ part { name: "elm.swallow.content"; type: SWALLOW; scale: 1; - description { state: "default" 0.0; + description { state: "default" 0.0; //indi:nooverlap, clipboard: enable, keypad: enable/disable align: 0.5 0.5; rel1.relative: 0.0 1.0; rel1.to: "elm.swallow.indicator"; rel2.relative: 1.0 0.0; rel2.to: "elm.swallow.clipboard"; } - description { state: "disable_clipboard" 0.0; + description { state: "nooverlap_disable_clipboard_enable_keypad" 0.0; //indi:nooverlap, clipboard: disable, keypad: enable inherit: "default" 0.0; - align: 0.5 0.5; - rel1.relative: 0.0 1.0; + rel2.to: "elm.swallow.virtualkeypad"; + } + description { state: "nooverlap_disable_clipboard_disable_keypad" 0.0; //indi:nooverlap, clipboard: disable, keypad: disable + inherit: "default" 0.0; + rel2.relative: 1.0 1.0; + rel2.to: "elm.swallow.bg"; + } + description { state: "overlap_enable_clipboard" 0.0; //indi:overlap, clipboard: enable, keypad: enable/disable + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel1.to: "elm.swallow.indicator"; + } + description { state: "overlap_disable_clipboard_enable_keypad" 0.0; //indi:overlap, clipboard: disable, keypad: enable + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; rel1.to: "elm.swallow.indicator"; - rel2.relative: 1.0 0.0; rel2.to: "elm.swallow.virtualkeypad"; } + description { state: "overlap_disable_clipboard_disable_keypad" 0.0; //indi:overlap, clipboard: disable, keypad: enable + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel1.to: "elm.swallow.indicator"; + rel2.relative: 1.0 1.0; + rel2.to: "elm.swallow.bg"; + } } part { name: "elm.swallow.ug"; type: SWALLOW; @@ -141,6 +166,13 @@ rel2.relative: 1.0 0.0; rel2.to_y: "elm.swallow.virtualkeypad"; } + description { state: "disable_keypad" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 1.0; + rel1.to_y: "elm.swallow.bg"; + rel2.relative: 1.0 1.0; + rel2.to_y: "elm.swallow.bg"; + } } part { name: "elm.swallow.virtualkeypad"; type: SWALLOW; @@ -208,20 +240,124 @@ } } program { - name: "overlap_indicator"; - signal: "elm,state,indicator,overlap"; - source: ""; - script { - set_state(PART:"elm.swallow.ug", "overlap", 0.0); - } + name: "overlap_indicator"; + signal: "elm,state,indicator,overlap"; + source: ""; + script { + set_int(indicator_overlap, 1); + set_state(PART:"elm.swallow.ug", "overlap", 0.0); + if (get_int(clipboard_disable) == 0) + set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0); + else + { + if (get_int(keypad_disable) == 0) + set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_enable_keypad", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_disable_keypad", 0.0); + } + } } program { - name: "nooverlap_indicator"; - signal: "elm,state,indicator,nooverlap"; - source: ""; - script { - set_state(PART:"elm.swallow.ug", "default", 0.0); - } + name: "nooverlap_indicator"; + signal: "elm,state,indicator,nooverlap"; + source: ""; + script { + set_int(indicator_overlap, 0); + set_state(PART:"elm.swallow.ug", "default", 0.0); + if (get_int(clipboard_disable) == 0) + set_state(PART:"elm.swallow.content", "default", 0.0); + else + { + if (get_int(keypad_disable) == 0) + set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_enable_keypad", 0.0); + else + set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_disable_keypad", 0.0); + } + } + } + program { name: "enable_clipboard"; + signal: "elm,state,clipboard,enable"; + source: ""; + script { + set_int(clipboard_disable, 0); + //set content state + if (get_int(indicator_overlap) == 0) + set_state(PART:"elm.swallow.content", "default", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0); + //set clipboard state + if (get_int(keypad_disable) == 1) + set_state(PART:"elm.swallow.clipboard", "disable_keypad", 0.0); + else + set_state(PART:"elm.swallow.clipboard", "default", 0.0); + } + } + program { name: "disable_clipboard"; + signal: "elm,state,clipboard,disable"; + source: ""; + script { + set_int(clipboard_disable, 1); + set_state(PART:"elm.swallow.clipboard", "default", 0.0); + if (get_int(indicator_overlap) == 0) + { + if (get_int(keypad_disable) == 1) + set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_disable_keypad", 0.0); + else + set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_enable_keypad", 0.0); + } + else + { + if (get_int(keypad_disable) == 1) + set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_disable_keypad", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_enable_keypad", 0.0); + } + } + } + program { name: "enable_virtualkeypad"; + signal: "elm,state,virtualkeypad,enable"; + source: ""; + script { + set_int(keypad_disable, 0); + set_state(PART:"elm.swallow.clipboard", "default", 0.0); + if (get_int(clipboard_disable) == 1) + { + if (get_int(indicator_overlap) == 0) + set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_enable_keypad", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_enable_keypad", 0.0); + } + else + { + if (get_int(indicator_overlap) == 0) + set_state(PART:"elm.swallow.content", "default", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0); + } + } + } + program { name: "disable_virtualkeypad"; + signal: "elm,state,virtualkeypad,disable"; + source: ""; + script { + set_int(keypad_disable, 1); + if (get_int(clipboard_disable) == 1) + { + set_state(PART:"elm.swallow.clipboard", "default", 0.0); + if (get_int(indicator_overlap) == 0) + set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_disable_keypad", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_disable_keypad", 0.0); + } + else + { + set_state(PART:"elm.swallow.clipboard", "disable_keypad", 0.0); + if (get_int(indicator_overlap) == 0) + set_state(PART:"elm.swallow.content", "default", 0.0); + else + set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0); + } + } } program { name: "access_on"; signal: "elm,state,access,on"; @@ -235,17 +371,63 @@ action: STATE_SET "default" 0.0; target: "access"; } - program { name: "enable_clipboard"; - signal: "elm,state,clipboard,enable"; - source: ""; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + program { + name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + script { + if (get_int(landscape) == 0) { + set_int(portrait_overlap, get_int(indicator_overlap)); + set_int(landscape, 1); + set_int(portrait_opacity, get_int(indicator_visible)); + run_program(PROGRAM:"overlap_indicator"); + run_program(PROGRAM:"transparent_indicator"); + } + } + } + program { + name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + script { + if (get_int(landscape) == 1) { //content start (0, indicator height) + set_int(indicator_overlap, get_int(portrait_overlap)); + set_int(indicator_opacity, get_int(portrait_opacity)); + if (get_int(indicator_overlap) == 0) { //start (0,60) + run_program(PROGRAM:"nooverlap_indicator"); + } + else { //content start (0, 0) + run_program(PROGRAM:"overlap_indicator"); + } + if (get_int(portrait_opacity) == 2) //transparent + run_program(PROGRAM:"transparent_indicator"); + else if (get_int(portrait_opacity) == 1) //translucent + run_program(PROGRAM:"translucent_indicator"); + else + run_program(PROGRAM:"opaque_indicator"); + set_int(landscape, 0); + } + } + } + program { name: "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; } - program { name: "disable_clipboard"; - signal: "elm,state,clipboard,disable"; - source: ""; - action: STATE_SET "disable_clipboard" 0.0; - target: "elm.swallow.content"; + 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"; } } } diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index 22367ca..9b10a66 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -32,2006 +32,1972 @@ /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/scroller/base/ctxpopup"; - script { - public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; - public timer0(val) { - new v; - v = get_int(sbvis_v); - if (v) { - v = get_int(sbalways_v); - if(!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - v = get_int(sbvis_h); - if (v) { - v = get_int(sbalways_h); - if(!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - set_int(sbvis_timer, 0); - return 0; - } - } - images { - image: "00_popup_scroll.9.png" COMP; - image: "01_scroller.png" COMP; - } + name: "elm/ctxpopup/layout/default"; + max: CTXPOPUP_WIDTH_MAX_INC 802; parts { part { - name: "clipper"; + name:"top_padding"; type: RECT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; + min: 0 60; + visible: 0; + fixed: 0 1; + align: 0.5 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; } - } - part { - name: "elm.swallow.content"; - clip_to: "clipper"; - type: SWALLOW; - scale: 1; description { - state: "default" 0.0; - align: 0.5 0.5; + state: "show_up" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name: "sb_vbar_clip_master"; + name:"bottom_padding"; type: RECT; - mouse_events: 0; + scale: 0; description { state: "default" 0.0; + min: 0 60; + visible: 0; + fixed: 0 1; + align: 0.5 1.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; } description { - state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; + state: "show_down" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name: "sb_vbar_clip"; - clip_to:"sb_vbar_clip_master"; + name:"left_padding"; type: RECT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; - align: 0.0 0.0; - rel2{ to:"clipper"; relative: 1.0 1.0;} + min: 60 0; + visible: 0; + fixed: 1 0; + align: 0.0 0.5; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; } description { - state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; + state: "show_left" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name: "sb_vbar_padding"; + name:"right_padding"; type: RECT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; - fixed: 1 1; - min: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING) 0; + min: 60 0; visible: 0; - align: 1.0 0.0; - rel1 { to:"clipper"; relative: 1.0 0.0; } - rel2 { to:"clipper"; relative: 1.0 1.0; } + fixed: 1 0; + align: 1 0.5; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + } + description { + state: "show_right" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name: "sb_vbar"; - type: RECT; - mouse_events: 0; - scale: 1; + name: "swallow"; + type: SWALLOW; + clip_to: "layout_clip"; description { state: "default" 0.0; - fixed: 1 1; visible: 0; - align: 1.0 0.0; - rel1 { to_x:"sb_vbar_padding"; to_y:"clipper"; relative: 0.0 0.0; } - rel2 { to_x:"sb_vbar_padding"; to_y:"clipper"; relative: 0.0 1.0; } } - } - part { - name: "elm.dragable.vbar"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - scale: 1; - dragable { - x: 0 0 0; - y: 1 1 0; - confine: "sb_vbar"; + description { + state: "show_up" 0.0; + rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} + rel2 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} + align: 0.5 0.0; } description { - state: "default" 0.0; - fixed: 1 1; - min: CTXPOPUP_SCROLLER_MIN_SIZE_INC; - rel1 { - relative: 0.5 0.5; - to: "sb_vbar"; - } - rel2 { - relative: 0.5 0.5; - to: "sb_vbar"; - } - image { - normal: "00_popup_scroll.9.png"; - border: 0 0 5 5; - border_scale: 1; - } + state: "show_down" 0.0; + rel1 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} + rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} + align: 0.5 1.0; } - } - part { - name: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; description { - state: "default" 0.0; + state: "show_left" 0.0; + rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} + rel2 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} + align: 0.0 0.5; } description { - state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; + state: "show_right" 0.0; + rel1 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} + rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} + align: 1.0 0.5; } } part { - name: "sb_hbar_clip"; - clip_to: "sb_hbar_clip_master"; + name: "layout_clip"; type: RECT; - mouse_events: 0; - scale: 1; description { state: "default" 0.0; - align: 0.0 0.0; - rel2{ to:"clipper"; relative: 1.0 1.0;} + color: 255 255 255 127; + rel1 {to: "swallow"; relative: -0.2 -0.2; } + rel2 {to: "swallow"; relative: 1.2 1.2;} } description { - state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; + state: "show_up" 0.0; + inherit: "default" 0.0; } - } - part { - name: "sb_hbar"; - type: RECT; - mouse_events: 0; - scale: 1; description { - state: "default" 0.0; - fixed: 1 1; - visible: 0; - align: 0.0 1.0; - rel1 {to:"clipper"; relative: 0.0 1.0;} - rel2 {to:"clipper"; relative: 1.0 1.0;} + state: "show_down" 0.0; + inherit: "default" 0.0; } - } - part { - name: "elm.dragable.hbar"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "sb_hbar"; + description { + state: "show_left" 0.0; + inherit: "default" 0.0; } description { - state: "default" 0.0; - fixed: 1 1; - min: 32 12; - rel1 {relative: 0.5 0.5; to: "sb_hbar";} - rel2 {relative: 0.5 0.5; to: "sb_hbar";} - image { - normal: "01_scroller.png"; - border: 6 6 0 0; - border_scale: 1; - } + state: "show_right" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } } programs { program { - name: "load"; - signal: "load"; - source: ""; - script { - set_state(PART:"sb_vbar_clip", "hidden", 0.0); - set_state(PART:"sb_hbar_clip", "hidden", 0.0); - set_int(sbvis_v, 0); - set_int(sbvis_h, 0); - set_int(sbalways_v, 0); - set_int(sbalways_h, 0); - set_int(sbvis_timer, 0); - } + name: "showup"; + signal: "elm,state,show,up"; + source: "elm"; + action: STATE_SET "show_up" 0.0; + target: "swallow"; + target: "top_padding"; + target: "layout_clip"; + after: "showupend"; } program { - name: "vbar_show"; - signal: "elm,action,show,vbar"; + name: "showdown"; + signal: "elm,state,show,down"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_vbar_clip_master"; + action: STATE_SET "show_down" 0.0; + target: "swallow"; + target: "bottom_padding"; + target: "layout_clip"; + after: "showdownend"; } program { - name: "vbar_hide"; - signal: "elm,action,hide,vbar"; + name: "showleft"; + signal: "elm,state,show,left"; source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_vbar_clip_master"; + action: STATE_SET "show_left" 0.0; + target: "swallow"; + target: "left_padding"; + target: "layout_clip"; + after: "showleftend"; } program { - name: "vbar_show_always"; - signal: "elm,action,show_always,vbar"; + name: "showright"; + signal: "elm,state,show,right"; source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - set_int(sbalways_v, 1); - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - } + action: STATE_SET "show_right" 0.0; + target: "swallow"; + target: "right_padding"; + target: "layout_clip"; + after: "showrightend"; } program { - name: "vbar_show_notalways"; - signal: "elm,action,show_notalways,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_v); - if (v) { - set_int(sbalways_v, 0); - v = get_int(sbvis_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - } + name: "showupend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 0.6; + target: "top_padding"; + target: "layout_clip"; } program { - name: "sb_vbar_show"; - signal: "do-show-vbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 1.0; - target: "sb_vbar_clip"; + name: "showdownend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 0.6; + target: "bottom_padding"; + target: "layout_clip"; } program { - name: "sb_vbar_hide"; - signal: "do-hide-vbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 1.0; - target: "sb_vbar_clip"; + name: "showleftend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 0.6; + target: "left_padding"; + target: "layout_clip"; } program { - name: "hbar_show"; - signal: "elm,action,show,hbar"; + name: "showrightend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 0.6; + target: "right_padding"; + target: "layout_clip"; + } + program { + name: "hideup"; + signal: "elm,state,hide,up"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_hbar_clip_master"; + action: STATE_SET "show_up" 0.0; + target: "swallow"; + target: "top_padding"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; } program { - name: "hbar_hide"; - signal: "elm,action,hide,hbar"; + name: "hidedown"; + signal: "elm,state,hide,down"; source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_hbar_clip_master"; + action: STATE_SET "show_down" 0.0; + target: "swallow"; + target: "bottom_padding"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; } program { - name: "hbar_show_always"; - signal: "elm,action,show_always,hbar"; + name: "hideleft"; + signal: "elm,state,hide,left"; source: "elm"; - script { - new v; - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - set_int(sbalways_h, 1); - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - } + action: STATE_SET "show_left" 0.0; + target: "swallow"; + target: "left_padding"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; } program { - name: "hbar_show_notalways"; - signal: "elm,action,show_notalways,hbar"; + name: "hideright"; + signal: "elm,state,hide,right"; source: "elm"; - script { - new v; - v = get_int(sbalways_h); - if (v) { - set_int(sbalways_h, 0); - v = get_int(sbvis_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - } + action: STATE_SET "show_right" 0.0; + target: "swallow"; + target: "right_padding"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; } program { - name: "sb_hbar_show"; - signal: "do-show-hbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 1.0; - target: "sb_hbar_clip"; + name: "hideup_clip"; + signal: "elm,state,hide,up"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; } program { - name: "sb_hbar_hide"; - signal: "do-hide-hbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 1.0; - target: "sb_hbar_clip"; + name: "hidedown_clip"; + signal: "elm,state,hide,down"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; } program { - name: "scroll"; - signal: "elm,action,scroll"; + name: "hideleft_clip"; + signal: "elm,state,hide,left"; source: "elm"; - action: STATE_SET "default" 0.0; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if(!v) { - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - v = get_int(sbvis_timer); - if (v > 0) cancel_timer(v); - v = timer(2.0, "timer0", 0); - set_int(sbvis_timer, v); - } + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; + } + program { + name: "hideright_clip"; + signal: "elm,state,hide,right"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 0.6; + after: "hidefinished"; + } + program { + name: "hidefinished"; + action: SIGNAL_EMIT "elm,action,hide,finished" ""; } } } /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/bg/pass_event"; - alias: "elm/ctxpopup/bg/extended/entry/pass_event"; - alias: "elm/ctxpopup/bg/extended/entry"; - alias: "elm/ctxpopup/bg/timepicker"; - alias: "elm/ctxpopup/bg/datetime/default"; + name: "elm/ctxpopup/layout/datetime/default"; + alias: "elm/ctxpopup/layout/timepicker"; parts { part { - name: "bg"; + name:"top_padding"; type: RECT; - repeat_events: 1; + scale: 1; description { state: "default" 0.0; + min: 0 20; visible: 0; + fixed: 0 1; + align: 0.5 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + } + description { + state: "show_up" 0.0; + inherit: "default" 0.0; } description { state: "visible" 0.0; - color: 0 0 0 0; - visible: 1; + inherit: "default" 0.0; + min: 0 0; } } - } - programs { - program { - name: "clicked_event"; - signal: "mouse,clicked,1"; - source: "bg"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "show"; - signal: "elm,state,show"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "bg"; - } - program { - name: "hide"; - signal: "elm,state,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - } - } - } -/////////////////////////////////////////////////////////////////////////////// - group { - name: "elm/ctxpopup/bg/default"; - parts { part { - name: "bg"; + name:"bottom_padding"; type: RECT; - mouse_events: 1; + scale: 0; description { state: "default" 0.0; + min: 0 20; visible: 0; + fixed: 0 1; + align: 0.5 1.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + } + description { + state: "show_down" 0.0; + inherit: "default" 0.0; } description { state: "visible" 0.0; - color: 0 0 0 0; - visible: 1; + inherit: "default" 0.0; + min: 0 0; } } - } - programs { - program { - name: "clicked_event"; - signal: "mouse,clicked,1"; - source: "bg"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "show"; - signal: "elm,state,show"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "bg"; - } - program { - name: "hide"; - signal: "elm,state,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - } - } - } -/////////////////////////////////////////////////////////////////////////////// - group { - name: "elm/ctxpopup/base/no_bg_content"; - images { - image: "ctxpopup_bg.png" COMP; - image: "ctxpopup_shadow.png" COMP; - } - parts { part { - name:"frame_shadow_left_top_padding"; - type:RECT; + name:"left_padding"; + type: RECT; scale: 1; - mouse_events: 0; description { - min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - align: 0 0; - fixed: 1 1; + state: "default" 0.0; + min: 20 0; visible: 0; + fixed: 1 0; + align: 0.0 0.5; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { + state: "show_left" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name:"frame_shadow_right_bottom_padding"; - type:RECT; + name:"right_padding"; + type: RECT; scale: 1; - mouse_events: 0; description { - min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - rel1{relative: 1 1;} - align: 0 0; - fixed: 1 1; + state: "default" 0.0; + min: 20 0; visible: 0; + fixed: 1 0; + align: 1 0.5; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + } + description { + state: "show_right" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name: "frame_shadow"; - type: IMAGE; - scale: 1; - mouse_events: 0; + name: "swallow"; + type: SWALLOW; + clip_to: "layout_clip"; description { state: "default" 0.0; - rel1 {to:"frame_shadow_left_top_padding"; relative: 1 1;} - rel2 {to:"frame_shadow_right_bottom_padding";} - image { - normal: "ctxpopup_shadow.png"; - border: 10 10 10 10; - border_scale: 1; - } - color: 255 255 255 255; + visible: 0; } - } - part { - name: "ctxpopup_frame"; - type: IMAGE; - scale: 1; description { - image { - normal: "ctxpopup_bg.png"; - border: 10 10 10 10; - border_scale: 1; - } - rel1 {to:"content_left_top_padding"; relative: 1 1;} - rel2 {to:"content_right_bottom_padding"; relative: 0 0;} + state: "show_up" 0.0; + rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} + rel2 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} + align: 0.5 0.0; } - } - part { - name:"list_shadow_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; description { - min: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; - max: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; - align: 0 0; - fixed: 1 1; - visible: 0; - rel1 {to:"elm.swallow.content"; relative: 1 1;} + state: "show_down" 0.0; + rel1 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} + rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} + align: 0.5 1.0; } - } - part { - name:"content_left_top_padding"; - type:RECT; - scale: 1; - mouse_events: 0; description { - state: "default" 0.0; - min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - align: 0 0; - fixed: 1 1; - visible: 0; + state: "show_left" 0.0; + rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} + rel2 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} + align: 0.0 0.5; } - } - part { - name:"content_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; description { - min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - rel1 { relative: 1 1;} - rel2 { relative: 1 1;} - align: 1 1; - fixed: 1 1; - visible: 0; + state: "show_right" 0.0; + rel1 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} + rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} + align: 1.0 0.5; } } part { - name: "elm.swallow.content"; - type: SWALLOW; + name: "layout_clip"; + type: RECT; description { state: "default" 0.0; - rel1 {to:"content_left_top_padding"; relative: 1 1;} - rel2 {to:"content_right_bottom_padding"; relative: 0 0;} + color: 255 255 255 0; + rel1 {to: "swallow"; relative: -0.2 -0.2; } + rel2 {to: "swallow"; relative: 1.2 1.2;} + } + description { + state: "show_up" 0.0; + inherit: "default" 0.0; + } + description { + state: "show_down" 0.0; + inherit: "default" 0.0; + } + description { + state: "show_left" 0.0; + inherit: "default" 0.0; + } + description { + state: "show_right" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } } + programs { + program { + name: "showup"; + signal: "elm,state,show,up"; + source: "elm"; + action: STATE_SET "show_up" 0.0; + target: "swallow"; + target: "top_padding"; + target: "layout_clip"; + after: "showupend"; + } + program { + name: "showdown"; + signal: "elm,state,show,down"; + source: "elm"; + action: STATE_SET "show_down" 0.0; + target: "swallow"; + target: "bottom_padding"; + target: "layout_clip"; + after: "showdownend"; + } + program { + name: "showleft"; + signal: "elm,state,show,left"; + source: "elm"; + action: STATE_SET "show_left" 0.0; + target: "swallow"; + target: "left_padding"; + target: "layout_clip"; + after: "showleftend"; + } + program { + name: "showright"; + signal: "elm,state,show,right"; + source: "elm"; + action: STATE_SET "show_right" 0.0; + target: "swallow"; + target: "right_padding"; + target: "layout_clip"; + after: "showrightend"; + } + program { + name: "showupend"; + action: STATE_SET "visible" 0.0; + transition:LINEAR 0.25; + target: "top_padding"; + target: "layout_clip"; + } + program { + name: "showdownend"; + action: STATE_SET "visible" 0.0; + transition:LINEAR 0.25; + target: "bottom_padding"; + target: "layout_clip"; + } + program { + name: "showleftend"; + action: STATE_SET "visible" 0.0; + transition:LINEAR 0.25; + target: "left_padding"; + target: "layout_clip"; + } + program { + name: "showrightend"; + action: STATE_SET "visible" 0.0; + transition:LINEAR 0.25; + target: "right_padding"; + target: "layout_clip"; + } + program { + name: "hideup"; + signal: "elm,state,hide,up"; + source: "elm"; + action: STATE_SET "show_up" 0.0; + target: "swallow"; + target: "top_padding"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hidedown"; + signal: "elm,state,hide,down"; + source: "elm"; + action: STATE_SET "show_down" 0.0; + target: "swallow"; + target: "bottom_padding"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hideleft"; + signal: "elm,state,hide,left"; + source: "elm"; + action: STATE_SET "show_left" 0.0; + target: "swallow"; + target: "left_padding"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hideright"; + signal: "elm,state,hide,right"; + source: "elm"; + action: STATE_SET "show_right" 0.0; + target: "swallow"; + target: "right_padding"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hideup_clip"; + signal: "elm,state,hide,up"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hidedown_clip"; + signal: "elm,state,hide,down"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hideleft_clip"; + signal: "elm,state,hide,left"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hideright_clip"; + signal: "elm,state,hide,right"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: LINEAR 0.25; + after: "hidefinished"; + } + program { + name: "hidefinished"; + action: SIGNAL_EMIT "elm,action,hide,finished" ""; + } + } } /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/base/default"; - images { - image: "00_popup_bubble_bg.png" COMP; - image: "00_popup_bubble_mask.png" COMP; - } + name: "elm/ctxpopup/layout/more/default"; + max: CTXPOPUP_MORE_WIDTH_INC 802; parts { part { - name:"frame_shadow_left_top_padding"; - type:RECT; + name:"top_padding"; + type: RECT; scale: 1; - mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; - max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; - rel2 { relative: 0 0; } - align: 1 1; - fixed: 1 1; + min: 0 CTXPOPUP_MORE_MOVE_INC; visible: 0; + fixed: 0 1; + align: 0.5 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + } + description { + state: "show_up" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name:"frame_shadow_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; + name:"bottom_padding"; + type: RECT; + scale: 0; description { state: "default" 0.0; - min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; - max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; - rel1{relative: 1 1;} - align: 0 0; - fixed: 1 1; + min: 0 CTXPOPUP_MORE_MOVE_INC; visible: 0; + fixed: 0 1; + align: 0.5 1.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + } + description { + state: "show_down" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } part { - name: "frame_bg"; - type: IMAGE; + name:"left_padding"; + type: RECT; scale: 1; - mouse_events: 0; - clip_to: "ctxpopup_clip"; description { state: "default" 0.0; - rel1 {to:"frame_shadow_left_top_padding";} - rel2 {to:"frame_shadow_right_bottom_padding";} - min: (CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC + CTXPOPUP_SHADOW_LEFT_PADDING + CTXPOPUP_SHADOW_RIGHT_PADDING) 0; - image { - normal: "00_popup_bubble_bg.png"; - border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER; - border_scale: 1; - } + min: CTXPOPUP_MORE_MOVE_INC 0; + visible: 0; + fixed: 1 0; + align: 0.0 0.5; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { + state: "show_left" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } - part { name: "arrow_area_left"; + part { + name:"right_padding"; type: RECT; - mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; - description { state: "default" 0.0; + description { + state: "default" 0.0; + min: CTXPOPUP_MORE_MOVE_INC 0; visible: 0; - min: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - fixed: 1 1; + fixed: 1 0; align: 1 0.5; - rel1 { - relative: 1 1; - to_x:"content_left_top_padding"; - to_y: "ctxpopup_frame_left_top"; - } - rel2 { - relative: 1 0; - to_x:"content_left_top_padding"; - to_y:"ctxpopup_frame_right_bottom"; - } + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; } - } - part { name: "arrow_area_right"; - type: RECT; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 0 0.5; - rel1 { - relative: 0 1; - to_x:"content_right_bottom_padding"; - to_y:"ctxpopup_frame_left_top"; - } - rel2 { - relative: 0 0; - to_x:"content_right_bottom_padding"; - to_y: "ctxpopup_frame_right_bottom"; - } + description { + state: "show_right" 0.0; + inherit: "default" 0.0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 0; } } - part { name: "arrow_area_up"; - type: RECT; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 1; - rel1 { - relative: 1 1; - to_x: "ctxpopup_frame_left_top"; - to_y: "content_left_top_padding"; - } - rel2 { - relative: 0 1; - to_x:"ctxpopup_frame_right_bottom"; - to_y: "content_left_top_padding"; - } - } - } - part { name: "arrow_area_down"; - type: RECT; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 0; - rel1 { - relative: 1 0; - to_x:"ctxpopup_frame_left_top"; - to_y:"content_right_bottom_padding"; - } - rel2 { - relative: 0 0; - to_x: "ctxpopup_frame_right_bottom"; - to_y:"content_right_bottom_padding"; - } - } - } - part { name: "elm.swallow.arrow_up"; + part { + name: "swallow"; type: SWALLOW; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_up"; - } + clip_to: "layout_clip"; description { state: "default" 0.0; - min: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { name: "elm.swallow.arrow_down"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_down"; + max: CTXPOPUP_MORE_WIDTH_INC 806; + visible: 0; } description { - state: "default" 0.0; - min: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { name: "elm.swallow.arrow_left"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_left"; + state: "show_up" 0.0; + max: CTXPOPUP_MORE_WIDTH_INC 806; + rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} + rel2 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} + align: 0.5 0.0; } description { - state: "default" 0.0; - min: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; - } - } - part { name: "elm.swallow.arrow_right"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - clip_to: "ctxpopup_clip"; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_right"; + state: "show_down" 0.0; + max: CTXPOPUP_MORE_WIDTH_INC 806; + rel1 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} + rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} + align: 0.5 1.0; } description { - state: "default" 0.0; - min: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - fixed: 1 1; - visible: 1; + state: "show_left" 0.0; + max: CTXPOPUP_MORE_WIDTH_INC 806; + rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} + rel2 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} + align: 0.0 0.5; } - } - part { - name: "ctxpopup_frame_left_top"; - type: RECT; - scale: 1; description { - state: "default" 0.0; - visible: 0; - align: 0 0; - fixed: 1 1; - min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - rel1 {relative: 0 0; to: "content_left_top_padding";} + state: "show_right" 0.0; + max: CTXPOPUP_MORE_WIDTH_INC 806; + rel1 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} + rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} + align: 1.0 0.5; } } part { - name: "ctxpopup_frame_right_bottom"; + name: "layout_clip"; type: RECT; - scale: 1; description { state: "default" 0.0; - visible: 0; - align: 1 1; - fixed: 1 1; - min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; - rel2 {relative: 1 1; to: "content_right_bottom_padding";} + color: 255 255 255 0; + rel1 {to: "swallow"; relative: -0.2 -0.2; } + rel2 {to: "swallow"; relative: 1.2 1.2;} } - } - part { - name:"content_left_top_padding"; - type:RECT; - scale: 1; - mouse_events: 0; description { - state: "default" 0.0; - min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} - align: 0 0; - fixed: 1 1; - visible: 0; + state: "show_up" 0.0; + inherit: "default" 0.0; } - } - part { - name:"content_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; description { - state: "default" 0.0; - min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; - rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} - align: 1 1; - fixed: 1 1; - visible: 0; + state: "show_down" 0.0; + inherit: "default" 0.0; } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "ctxpopup_clip"; description { - state: "default" 0.0; - align: 0 0; - rel1 {to:"content_left_top_padding"; relative: 1.0 1.0;} - rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} + state: "show_left" 0.0; + inherit: "default" 0.0; } - } - part { - name: "mask"; - type: IMAGE; - scale: 1; - mouse_events: 0; - clip_to: "ctxpopup_clip"; description { - state: "default" 0.0; - rel1 {to:"elm.swallow.content";} - rel2 {to:"elm.swallow.content";} - image { - normal: "00_popup_bubble_mask.png"; - border: CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER; - border_scale: 1; - } - } - } - part { name: "ctxpopup_clip"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 0; - rel1 { to:"ctxpopup_frame_left_top"; relative: 0.5 0.5; } - rel2 { to:"ctxpopup_frame_right_bottom"; relative: 0.5 0.5; } - } - description { state: "show_up" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_down"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_down"; relative: 0.5 0.5; } - } - description { state: "show_left" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_right"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_right"; relative: 0.5 0.5; } - } - description { state: "show_right" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_left"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_left"; relative: 0.5 0.5; } - } - description { state: "show_down" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_up"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_up"; relative: 0.5 0.5; } - } - description { state: "hide_up" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_down"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_down"; relative: 0.5 0.5; } - } - description { state: "hide_left" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_right"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_right"; relative: 0.5 0.5; } - } - description { state: "hide_right" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_left"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_left"; relative: 0.5 0.5; } - } - description { state: "hide_down" 0.0; - color: 255 255 255 0; - rel1 { to:"elm.swallow.arrow_up"; relative: 0.5 0.5; } - rel2 { to:"elm.swallow.arrow_up"; relative: 0.5 0.5; } + state: "show_right" 0.0; + inherit: "default" 0.0; } - description { state: "visible" 0.0; + description { + state: "visible" 0.0; + inherit: "default" 0.0; color: 255 255 255 255; - rel1 { to_x:"arrow_area_left"; to_y:"arrow_area_up"; } - rel2 { to_x:"arrow_area_right"; to_y:"arrow_area_down"; } } } } programs { - program { name: "show"; - signal: "elm,state,show"; - source: "elm"; - action: STATE_SET "visible" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; - } - program { name: "show_up"; + program { + name: "showup"; signal: "elm,state,show,up"; source: "elm"; action: STATE_SET "show_up" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; + target: "swallow"; + target: "top_padding"; + target: "layout_clip"; + after: "showupend"; + } + program { + name: "showdown"; + signal: "elm,state,show,down"; + source: "elm"; + action: STATE_SET "show_down" 0.0; + target: "swallow"; + target: "bottom_padding"; + target: "layout_clip"; + after: "showdownend"; } - program { name: "show_left"; + program { + name: "showleft"; signal: "elm,state,show,left"; source: "elm"; action: STATE_SET "show_left" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; + target: "swallow"; + target: "left_padding"; + target: "layout_clip"; + after: "showleftend"; } - program { name: "show_right"; + program { + name: "showright"; signal: "elm,state,show,right"; source: "elm"; action: STATE_SET "show_right" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; + target: "swallow"; + target: "right_padding"; + target: "layout_clip"; + after: "showrightend"; } - program { name: "show_down"; - signal: "elm,state,show,down"; - source: "elm"; - action: STATE_SET "show_down" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; + program { + name: "showupend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 1.1; + target: "top_padding"; + target: "layout_clip"; + } + program { + name: "showdownend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 1.1; + target: "bottom_padding"; + target: "layout_clip"; + } + program { + name: "showleftend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 1.1; + target: "left_padding"; + target: "layout_clip"; + } + program { + name: "showrightend"; + action: STATE_SET "visible" 0.0; + transition:SIN_FAC 0.33 1.1; + target: "right_padding"; + target: "layout_clip"; } - program { name: "hide_up"; + program { + name: "hideup"; signal: "elm,state,hide,up"; source: "elm"; - action: STATE_SET "hide_up" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; - after: "hide_finished"; + action: STATE_SET "show_up" 0.0; + target: "swallow"; + target: "top_padding"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; + } + program { + name: "hidedown"; + signal: "elm,state,hide,down"; + source: "elm"; + action: STATE_SET "show_down" 0.0; + target: "swallow"; + target: "bottom_padding"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; } - program { name: "hide_left"; + program { + name: "hideleft"; signal: "elm,state,hide,left"; source: "elm"; - action: STATE_SET "hide_left" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; - after: "hide_finished"; + action: STATE_SET "show_left" 0.0; + target: "swallow"; + target: "left_padding"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; } - program { name: "hide_right"; + program { + name: "hideright"; signal: "elm,state,hide,right"; source: "elm"; - action: STATE_SET "hide_right" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; - after: "hide_finished"; + action: STATE_SET "show_right" 0.0; + target: "swallow"; + target: "right_padding"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; + } + program { + name: "hideup_clip"; + signal: "elm,state,hide,up"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; } - program { name: "hide_down"; + program { + name: "hidedown_clip"; signal: "elm,state,hide,down"; source: "elm"; - action: STATE_SET "hide_down" 0.0; - transition: SIN_FAC 0.33 0.6; - target: "ctxpopup_clip"; - after: "hide_finished"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; + } + program { + name: "hideleft_clip"; + signal: "elm,state,hide,left"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; + } + program { + name: "hideright_clip"; + signal: "elm,state,hide,right"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "layout_clip"; + transition: SIN_FAC 0.33 1.1; + after: "hidefinished"; } - program { name: "hide_finished"; + program { + name: "hidefinished"; action: SIGNAL_EMIT "elm,action,hide,finished" ""; } } } - /////////////////////////////////////////////////////////////////////////////// - group { name: "elm/ctxpopup/arrow/default"; - images { - image: "00_popup_bubble_tail_left.png" COMP; - image: "00_popup_bubble_tail_right.png" COMP; - image: "00_popup_bubble_tail_top.png" COMP; - image: "00_popup_bubble_tail_bottom.png" COMP; + group { + name: "elm/scroller/base/ctxpopup"; + script { + public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; + public timer0(val) { + new v; + v = get_int(sbvis_v); + if (v) { + v = get_int(sbalways_v); + if(!v) { + emit("do-hide-vbar", ""); + set_int(sbvis_v, 0); + } + } + v = get_int(sbvis_h); + if (v) { + v = get_int(sbalways_h); + if(!v) { + emit("do-hide-hbar", ""); + set_int(sbvis_h, 0); + } + } + set_int(sbvis_timer, 0); + return 0; + } + } + images { + image: "00_popup_scroll.png" COMP; + image: "01_scroller.png" COMP; } parts { part { - name: "ctxpopup_arrow"; - type: IMAGE; + name: "clipper"; + type: RECT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: CTXPOPUP_ARROW_SIZE_INC; - max: CTXPOPUP_ARROW_SIZE_INC; - fixed: 1 1; - visible: 0; - align: 0.5 0.5; - } - description { - state: "left" 0.0; - min: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - max: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 1.0 0.5; - image { - normal: "00_popup_bubble_tail_left.png"; - } - } - description { - state: "right" 0.0; - min: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - max: CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.0 0.5; - image { - normal: "00_popup_bubble_tail_right.png"; - } - } - description { - state: "top" 0.0; - min: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - max: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 1.0; - image { - normal: "00_popup_bubble_tail_top.png"; - } - } - description { - state: "bottom" 0.0; - min: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - max: CTXPOPUP_VERTICAL_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 0.0; - image { - normal: "00_popup_bubble_tail_bottom.png"; - } } } - } - programs { - program { - name: "enable_left_arrow"; - signal: "elm,state,left"; - source: "elm"; - action: STATE_SET "left" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_right_arrow"; - signal: "elm,state,right"; - source: "elm"; - action: STATE_SET "right" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_top_arrow"; - signal: "elm,state,top"; - source: "elm"; - action: STATE_SET "top" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_bottom_arrow"; - signal: "elm,state,bottom"; - source: "elm"; - action: STATE_SET "bottom" 0.0; - target: "ctxpopup_arrow"; - } - } - } -/////////////////////////////////////////////////////////////////////////////// - group { - name: "elm/ctxpopup/text_style_item/default"; - parts { part { - name: "event_blocker"; - mouse_events: 1; + name: "elm.swallow.content"; + clip_to: "clipper"; + type: SWALLOW; + scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + align: 0.5 0.5; } } part { - name: "bg"; - mouse_events: 0; + name: "sb_vbar_clip_master"; type: RECT; + mouse_events: 0; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; - min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_ITEM_HEIGHT_MAX_INC; - } - description { - state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; } description { - state: "clicked_separator" 0.0; - rel1 { relative: 0.0 1.0; to_y: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; + state: "hidden" 0.0; + visible: 0; + color: 255 255 255 0; } } part { - name: "separator1"; - mouse_events: 0; + name: "sb_vbar_clip"; + clip_to:"sb_vbar_clip_master"; type: RECT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "left_padding";} - rel2 { relative: 0.0 1.0; to_x: "right_padding";} - align: 0.5 0; - min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - visible: 0; + align: 0.0 0.0; + rel2{ to:"clipper"; relative: 1.0 1.0;} } description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + state: "hidden" 0.0; + visible: 0; + color: 255 255 255 0; } } part { - name: "separator2"; - mouse_events: 0; + name: "sb_vbar_padding"; type: RECT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR2_COLOR_INC; - rel1 { relative: 0.0 1.0; to: "separator1";} - rel2 { relative: 1.0 1.0; to: "separator1";} - align: 0.5 0; - fixed: 0 1; - min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + fixed: 1 1; + min: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING) 0; + max: (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING) 0; visible: 0; - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + align: 1.0 0.0; + rel1 { to:"clipper"; relative: 1.0 0.0; } + rel2 { to:"clipper"; relative: 1.0 1.0; } } } part { - name: "left_padding"; + name: "sb_vbar"; type: RECT; - scale: 1; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; - align: 0 0; fixed: 1 1; visible: 0; + align: 1.0 0.0; + rel1 { to_x:"sb_vbar_padding"; to_y:"clipper"; relative: 0.0 0.0; } + rel2 { to_x:"sb_vbar_padding"; to_y:"clipper"; relative: 0.0 1.0; } } } part { - name: "elm.text"; - type: TEXT; + name: "elm.dragable.vbar"; + clip_to: "sb_vbar_clip"; mouse_events: 0; scale: 1; + dragable { + x: 0 0 0; + y: 1 1 0; + confine: "sb_vbar"; + } description { state: "default" 0.0; - min: 1 CTXPOPUP_ITEM_HEIGHT_MIN_INC; - align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to_x: "left_padding"; to_y: "bg";} - rel2 {relative: 0.0 1.0; to_x: "right_padding"; to_y: "bg";} - color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; - text { - font: "Tizen:style=Roman"; - size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; - align: 0 0.5; - min: 1 1; - text_class: "list_item"; + fixed: 1 1; + min: CTXPOPUP_SCROLLER_MIN_SIZE_INC; + rel1 { + relative: 0.5 0.5; + to: "sb_vbar"; } - } - description { - state: "compress" 0.0; - inherit: "default" 0.0; - max: -1 -1; - text { - min: 0 1; + rel2 { + relative: 0.5 0.5; + to: "sb_vbar"; + } + image { + normal: "00_popup_scroll.png"; + border: 0 0 5 5; + border_scale: 1; } - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; - } - description { - state: "compress_disabled" 0.0; - inherit: "compress" 0.0; - color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; } } part { - name: "right_padding"; + name: "sb_hbar_clip_master"; type: RECT; - scale: 1; mouse_events: 0; description { state: "default" 0.0; + } + description { + state: "hidden" 0.0; visible: 0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; - fixed: 1 1; - align: 1.0 1.0; + color: 255 255 255 0; } } part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; + name: "sb_hbar_clip"; + clip_to: "sb_hbar_clip_master"; + type: RECT; + mouse_events: 0; + scale: 1; description { state: "default" 0.0; - } - } - part { - name: "over2"; - type: RECT; - mouse_events: 1; - repeat_events: 1; - dragable { - x: 0 0 0; - y: 1 1 0; + align: 0.0 0.0; + rel2{ to:"clipper"; relative: 1.0 1.0;} } description { - state: "default" 0.0; - rel1.to:"bg"; - rel2.to:"bg"; - color: 0 0 0 0; + state: "hidden" 0.0; + visible: 0; + color: 255 255 255 0; } } part { - name: "disclip"; + name: "sb_hbar"; type: RECT; + mouse_events: 0; + scale: 1; description { state: "default" 0.0; + fixed: 1 1; visible: 0; + align: 0.0 1.0; + rel1 {to:"clipper"; relative: 0.0 1.0;} + rel2 {to:"clipper"; relative: 1.0 1.0;} + } + } + part { + name: "elm.dragable.hbar"; + clip_to: "sb_hbar_clip"; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 0 0 0; + confine: "sb_hbar"; } description { - state: "disabled" 0.0; - visible: 1; - color: CTXPOPUP_ITEM_DISABLED_COLOR; + state: "default" 0.0; + fixed: 1 1; + min: 32 12; + rel1 {relative: 0.5 0.5; to: "sb_hbar";} + rel2 {relative: 0.5 0.5; to: "sb_hbar";} + image { + normal: "01_scroller.png"; + border: 6 6 0 0; + border_scale: 1; + } } } } programs { program { - name: "item_unclick"; - signal: "mouse,clicked,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; + name: "load"; + signal: "load"; + source: ""; + script { + set_state(PART:"sb_vbar_clip", "hidden", 0.0); + set_state(PART:"sb_hbar_clip", "hidden", 0.0); + set_int(sbvis_v, 0); + set_int(sbvis_h, 0); + set_int(sbalways_v, 0); + set_int(sbalways_h, 0); + set_int(sbvis_timer, 0); + } } program { - name: "disable"; - signal: "elm,state,disabled"; + name: "vbar_show"; + signal: "elm,action,show,vbar"; source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) - set_state(PART:"elm.text", "compress_disabled", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); - - set_state(PART:"disclip", "disabled", 0.0); - } + action: STATE_SET "default" 0.0; + target: "sb_vbar_clip_master"; } program { - name: "enable"; - signal: "elm,state,enabled"; + name: "vbar_hide"; + signal: "elm,action,hide,vbar"; source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) - set_state(PART:"elm.text", "compress", 0.0); - else - set_state(PART:"elm.text", "default", 0.0); - - set_state(PART:"disclip", "default", 0.0); - } + action: STATE_SET "hidden" 0.0; + target: "sb_vbar_clip_master"; } program { - name: "default"; - signal: "elm,state,default"; + name: "vbar_show_always"; + signal: "elm,action,show_always,vbar"; source: "elm"; script { - set_state(PART:"separator1", "default", 0.0); - set_state(PART:"separator2", "default", 0.0); + new v; + v = get_int(sbvis_v); + v |= get_int(sbalways_v); + if (!v) { + set_int(sbalways_v, 1); + emit("do-show-vbar", ""); + set_int(sbvis_v, 1); + } } } program { - name: "compress"; - signal: "elm,state,compress"; + name: "vbar_show_notalways"; + signal: "elm,action,show_notalways,vbar"; source: "elm"; script { - new st[31]; - new Float:vl; - get_state(PART:"disclip", st, 30, vl); - if (!strcmp(st, "disabled")) - set_state(PART:"elm.text", "compress_disabled", 0.0); - else - set_state(PART:"elm.text", "compress", 0.0); + new v; + v = get_int(sbalways_v); + if (v) { + set_int(sbalways_v, 0); + v = get_int(sbvis_v); + if (!v) { + emit("do-hide-vbar", ""); + set_int(sbvis_v, 0); + } + } } } program { - name: "separator"; - signal: "elm,state,separator"; + name: "sb_vbar_show"; + signal: "do-show-vbar"; + source: ""; + action: STATE_SET "default" 0.0; + transition: LINEAR 1.0; + target: "sb_vbar_clip"; + } + program { + name: "sb_vbar_hide"; + signal: "do-hide-vbar"; + source: ""; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 1.0; + target: "sb_vbar_clip"; + } + program { + name: "hbar_show"; + signal: "elm,action,show,hbar"; source: "elm"; - script { - set_state(PART:"separator1", "visible", 0.0); - set_state(PART:"separator2", "visible", 0.0); - } + action: STATE_SET "default" 0.0; + target: "sb_hbar_clip_master"; } program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; + name: "hbar_hide"; + signal: "elm,action,hide,hbar"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "sb_hbar_clip_master"; + } + program { + name: "hbar_show_always"; + signal: "elm,action,show_always,hbar"; + source: "elm"; script { - set_state(PART:"elm.text", "clicked", 0.0); - - new st[31]; - new Float:vl; - get_state(PART:"separator2", st, 30, vl); - if (!strcmp(st, "default")) - set_state(PART:"bg", "clicked", 0.0); - else - set_state(PART:"bg", "clicked_separator", 0.0); + new v; + v = get_int(sbvis_h); + v |= get_int(sbalways_h); + if (!v) { + set_int(sbalways_h, 1); + emit("do-show-hbar", ""); + set_int(sbvis_h, 1); + } } } program { - name: "drag"; - signal: "drag"; - source: "over2"; + name: "hbar_show_notalways"; + signal: "elm,action,show_notalways,hbar"; + source: "elm"; script { - new Float:dx, Float:dy; - get_drag(PART:"over2", dx, dy); - if (abs(dy) > 20) - { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"elm.text", "compress", 0.0); - set_state(PART:"bg", "default", 0.0); + new v; + v = get_int(sbalways_h); + if (v) { + set_int(sbalways_h, 0); + v = get_int(sbvis_h); + if (!v) { + emit("do-hide-hbar", ""); + set_int(sbvis_h, 0); } - set_drag(PART:"over2", 0.0, 0.0); + } } } program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; - script { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"elm.text", "compress", 0.0); - set_state(PART:"bg", "default", 0.0); - } + name: "sb_hbar_show"; + signal: "do-show-hbar"; + source: ""; + action: STATE_SET "default" 0.0; + transition: LINEAR 1.0; + target: "sb_hbar_clip"; } - } - } -/////////////////////////////////////////////////////////////////////////////// - group { - name: "elm/ctxpopup/text_style_item_horizontal/default"; - parts { - part { - name: "event_blocker"; - mouse_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } + program { + name: "sb_hbar_hide"; + signal: "do-hide-hbar"; + source: ""; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 1.0; + target: "sb_hbar_clip"; } - part { - name: "bg"; - mouse_events: 0; - type: RECT; - description { - state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; - min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - } - description { - state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; - } - description { - state: "clicked_separator" 0.0; - rel1 { relative: 1.0 0.0; to_x: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; + program { + name: "scroll"; + signal: "elm,action,scroll"; + source: "elm"; + action: STATE_SET "default" 0.0; + script { + new v; + v = get_int(sbvis_v); + v |= get_int(sbalways_v); + if (!v) { + emit("do-show-vbar", ""); + set_int(sbvis_v, 1); + } + v = get_int(sbvis_h); + v |= get_int(sbalways_h); + if(!v) { + emit("do-show-hbar", ""); + set_int(sbvis_h, 1); + } + v = get_int(sbvis_timer); + if (v > 0) cancel_timer(v); + v = timer(2.0, "timer0", 0); + set_int(sbvis_timer, v); } } + } + } +/////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/bg/pass_event"; + alias: "elm/ctxpopup/bg/extended/entry/pass_event"; + alias: "elm/ctxpopup/bg/extended/entry"; + alias: "elm/ctxpopup/bg/timepicker"; + alias: "elm/ctxpopup/bg/datetime/default"; + parts { part { - name: "separator1"; - mouse_events: 0; + name: "bg"; type: RECT; - scale: 1; + repeat_events: 1; description { state: "default" 0.0; - color: CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC; - align: 0 0.5; - min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; - max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; visible: 0; } description { state: "visible" 0.0; - inherit: "default" 0.0; + color: 0 0 0 0; visible: 1; } } + } + programs { + program { + name: "clicked_event"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "show"; + signal: "elm,state,show"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "bg"; + } + program { + name: "hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg"; + } + } + } +/////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/bg/default"; + parts { part { - name: "separator2"; - mouse_events: 0; + name: "bg"; type: RECT; - scale: 1; + mouse_events: 1; description { state: "default" 0.0; - color: CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC; - rel1 { relative: 1.0 0.0; to: "separator1"; to_y: "bg";} - align: 0 0.5; - min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; - max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; visible: 0; } description { state: "visible" 0.0; - inherit: "default" 0.0; + color: 0 0 0 0; visible: 1; } } + } + programs { + program { + name: "clicked_event"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "show"; + signal: "elm,state,show"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "bg"; + } + program { + name: "hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg"; + } + } + } +/////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/base/no_bg_content"; + images { + image: "ctxpopup_bg.png" COMP; + image: "ctxpopup_shadow.png" COMP; + } + parts { part { - name: "left_padding"; - type: RECT; + name:"frame_shadow_left_top_padding"; + type:RECT; scale: 1; mouse_events: 0; description { - state: "default" 0.0; - min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; align: 0 0; - color: 255 0 0 255; fixed: 1 1; visible: 0; } } part { - name: "elm.text"; - type: TEXT; + name:"frame_shadow_right_bottom_padding"; + type:RECT; + scale: 1; mouse_events: 0; + description { + min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + rel1{relative: 1 1;} + align: 0 0; + fixed: 1 1; + visible: 0; + } + } + part { + name: "frame_shadow"; + type: IMAGE; scale: 1; + mouse_events: 0; description { state: "default" 0.0; - min: (CTXPOPUP_TEXT_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ITEM_ICON_PADDING_INC*2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to: "left_padding"; } - rel2 {relative: 0.0 1.0; to: "right_padding"; } - color: CTXPOPUP_MAIN_TEXT_COLOR_INC; - text { - font: "Tizen:style=Roman"; - size: CTXPOPUP_MAIN_TEXT_SIZE_INC; - align: 0.5 0.5; - min: 1 1; - text_class: "list_item"; + rel1 {to:"frame_shadow_left_top_padding"; relative: 1 1;} + rel2 {to:"frame_shadow_right_bottom_padding";} + image { + normal: "ctxpopup_shadow.png"; + border: 10 10 10 10; + border_scale: 1; } + color: 255 255 255 255; } + } + part { + name: "ctxpopup_frame"; + type: IMAGE; + scale: 1; description { - state: "compress" 0.0; - inherit: "default" 0.0; - max: -1 -1; - text { - min: 0 1; + image { + normal: "ctxpopup_bg.png"; + border: 10 10 10 10; + border_scale: 1; } + rel1 {to:"content_left_top_padding"; relative: 1 1;} + rel2 {to:"content_right_bottom_padding"; relative: 0 0;} } + } + part { + name:"list_shadow_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; description { - state: "clicked" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC; - } - description { - state: "compress_disabled" 0.0; - inherit: "compress" 0.0; - color: CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC; + min: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; + max: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; + align: 0 0; + fixed: 1 1; + visible: 0; + rel1 {to:"elm.swallow.content"; relative: 1 1;} } } part { - name: "right_padding"; - type: RECT; + name:"content_left_top_padding"; + type:RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + align: 0 0; fixed: 1 1; + visible: 0; + } + } + part { + name:"content_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + rel1 { relative: 1 1;} + rel2 { relative: 1 1;} align: 1 1; - color: 0 255 0 255; + fixed: 1 1; visible: 0; } } part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; + name: "elm.swallow.content"; + type: SWALLOW; description { state: "default" 0.0; - } - } - part { - name: "over2"; - type: RECT; - mouse_events: 1; - repeat_events: 1; - dragable { - x: 1 1 0; - y: 0 0 0; - } - description { - state: "default" 0.0; - rel1.to:"bg"; - rel2.to:"bg"; - color: 0 0 0 0; - } - } - part { - name: "disclip"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; - } - description { - state: "disabled" 0.0; - visible: 1; - color: CTXPOPUP_ITEM_DISABLED_COLOR; - } - } - } - programs { - program { - name: "item_unclick"; - signal: "mouse,clicked,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) - set_state(PART:"elm.text", "compress_disabled", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); - - set_state(PART:"disclip", "disabled", 0.0); - } - } - program { - name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) - set_state(PART:"elm.text", "compress", 0.0); - else - set_state(PART:"elm.text", "default", 0.0); - - set_state(PART:"disclip", "default", 0.0); - } - } - program { - name: "default"; - signal: "elm,state,default"; - source: "elm"; - script { - set_state(PART:"separator1", "default", 0.0); - set_state(PART:"separator2", "default", 0.0); - } - } - program { - name: "compress"; - signal: "elm,state,compress"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"disclip", st, 30, vl); - if (!strcmp(st, "disabled")) - set_state(PART:"elm.text", "compress_disabled", 0.0); - else - set_state(PART:"elm.text", "compress", 0.0); - } - } - program { - name: "separator"; - signal: "elm,state,separator"; - source: "elm"; - script { - set_state(PART:"separator1", "visible", 0.0); - set_state(PART:"separator2", "visible", 0.0); - } - } - program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "clicked", 0.0); - - new st[31]; - new Float:vl; - get_state(PART:"separator2", st, 30, vl); - if (!strcmp(st, "default")) - set_state(PART:"bg", "clicked", 0.0); - else - set_state(PART:"bg", "clicked_separator", 0.0); - } - } - program { - name: "drag"; - signal: "drag"; - source: "over2"; - script { - new Float:dx, Float:dy; - get_drag(PART:"over2", dx, dy); - if (abs(dx) > 20) - { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"elm.text", "compress", 0.0); - set_state(PART:"bg", "default", 0.0); - } - set_drag(PART:"over2", 0.0, 0.0); - } - } - program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; - script { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"elm.text", "compress", 0.0); - set_state(PART:"bg", "default", 0.0); + rel1 {to:"content_left_top_padding"; relative: 1 1;} + rel2 {to:"content_right_bottom_padding"; relative: 0 0;} } } } } /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/icon_style_item/default"; + name: "elm/ctxpopup/base/default"; + images { + image: "00_popup_bubble_bg.png" COMP; + image: "00_popup_bubble_mask.png" COMP; + } parts { part { - name: "event_blocker"; - mouse_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - part { - name: "bg"; + name:"frame_shadow_left_top_padding"; + type:RECT; scale: 1; mouse_events: 0; - type: RECT; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; - min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - } - description { - state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; - } - description { - state: "clicked_separator" 0.0; - rel1 { relative: 1.0 0.0; to_x: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; - } - } - part { - name: "left_padding"; - scale: 1; - description { - min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - visible: 0; + min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; + max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; + rel2 { relative: 0 0; } align: 0 0; fixed: 1 1; - } - } - part { - name: "separator1"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: CTXPOPUP_SEPARATOR_COLOR_INC; - align: 0 0.5; - min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; - max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; visible: 0; } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } } part { - name: "separator2"; - mouse_events: 0; - type: RECT; + name:"frame_shadow_right_bottom_padding"; + type:RECT; scale: 1; + mouse_events: 0; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR2_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "separator1"; } - align: 0 0.5; - min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; - max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; + min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; + max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; + rel1{relative: 1 1;} + align: 1 1; + fixed: 1 1; visible: 0; } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } } part { - name: "elm.swallow.icon"; - type: SWALLOW; + name: "frame_bg"; + type: IMAGE; scale: 1; + mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC; - max: CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC; - align: 0.5 0.5; - aspect: 1.0 1.0; - rel1 { relative: 1 0; to_x: "left_padding"; } - rel2 { relative: 0 1; to_x: "right_padding"; } + rel1 {to:"frame_shadow_left_top_padding";} + rel2 {to:"frame_shadow_right_bottom_padding";} + min: (CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC + CTXPOPUP_SHADOW_LEFT_PADDING + CTXPOPUP_SHADOW_RIGHT_PADDING) 0; + image { + normal: "00_popup_bubble_bg.png"; + border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER; + border_scale: 1; + } } } - part { - name: "right_padding"; + part { name: "arrow_area_left"; + type: RECT; + mouse_events: 0; scale: 1; - description { - min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); - max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + description { state: "default" 0.0; visible: 0; - align: 1 1; + min: CTXPOPUP_ARROW_SIZE_INC; fixed: 1 1; + align: 1 0.5; + rel1 { + relative: 1 1; + to_x:"content_left_top_padding"; + to_y: "ctxpopup_frame_left_top"; + } + rel2 { + relative: 1 0; + to_x:"content_left_top_padding"; + to_y:"ctxpopup_frame_right_bottom"; + } } } - part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - } - } - part { - name: "over2"; + part { name: "arrow_area_right"; type: RECT; - mouse_events: 1; - repeat_events: 1; - dragable { - x: 1 1 0; - y: 0 0 0; - } - description { - state: "default" 0.0; - rel1.to:"bg"; - rel2.to:"bg"; - color: 0 0 0 0; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0 0.5; + rel1 { + relative: 0 1; + to_x:"content_right_bottom_padding"; + to_y:"ctxpopup_frame_left_top"; + } + rel2 { + relative: 0 0; + to_x:"content_right_bottom_padding"; + to_y: "ctxpopup_frame_right_bottom"; + } } } - part { - name: "disclip"; + part { name: "arrow_area_up"; type: RECT; - description { - state: "default" 0.0; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; visible: 0; - } - description { - state: "disabled" 0.0; - visible: 1; - color: CTXPOPUP_ITEM_DISABLED_COLOR; - } - } - } - programs { - program { - name: "default"; - signal: "elm,state,default"; - source: "elm"; - script { - set_state(PART:"separator1", "default", 0.0); - set_state(PART:"separator2", "default", 0.0); + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 1; + rel1 { + relative: 1 1; + to_x: "ctxpopup_frame_left_top"; + to_y: "content_left_top_padding"; + } + rel2 { + relative: 0 1; + to_x:"ctxpopup_frame_right_bottom"; + to_y: "content_left_top_padding"; + } } } - program { - name: "separator"; - signal: "elm,state,separator"; - source: "elm"; - script { - set_state(PART:"separator1", "visible", 0.0); - set_state(PART:"separator2", "visible", 0.0); + part { name: "arrow_area_down"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 0; + rel1 { + relative: 1 0; + to_x:"ctxpopup_frame_left_top"; + to_y:"content_right_bottom_padding"; + } + rel2 { + relative: 0 0; + to_x: "ctxpopup_frame_right_bottom"; + to_y:"content_right_bottom_padding"; + } } } - program { - name: "item_unclick"; - signal: "mouse,clicked,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { - name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; - script { - new st[31]; - new Float:vl; - get_state(PART:"separator2", st, 30, vl); - if (!strcmp(st, "default")) - set_state(PART:"bg", "clicked", 0.0); - else - set_state(PART:"bg", "clicked_separator", 0.0); + part { name: "elm.swallow.arrow_up"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_up"; } - } - program { - name: "drag"; - signal: "drag"; - source: "over2"; - script { - new Float:dx, Float:dy; - get_drag(PART:"over2", dx, dy); - if (abs(dx) > 20) - { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"bg", "default", 0.0); - } - set_drag(PART:"over2", 0.0, 0.0); + description { + state: "default" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + visible: 1; } } - program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; - script { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"bg", "default", 0.0); + part { name: "elm.swallow.arrow_down"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_down"; } - } - } - } -/////////////////////////////////////////////////////////////////////////////// - group { - name: "elm/ctxpopup/icon_text_style_item/default"; - parts { - part { - name: "event_blocker"; - mouse_events: 1; description { state: "default" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + visible: 1; } } - part { - name: "bg"; + part { name: "elm.swallow.arrow_left"; + type: SWALLOW; mouse_events: 0; - type: RECT; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_left"; + } description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; visible: 1; } - description { - state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; - visible: 1; + } + part { name: "elm.swallow.arrow_right"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_right"; } description { - state: "clicked_separator" 0.0; - rel1 { relative: 0.0 1.0; to_y: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; + state: "default" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; visible: 1; } } part { - name:"separator_left_padding"; - type:RECT; + name: "ctxpopup_frame_left_top"; + type: RECT; scale: 1; - mouse_events: 0; description { - min: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + state: "default" 0.0; + visible: 0; align: 0 0; fixed: 1 1; - visible: 0; + min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + rel1 {relative: 0 0; to: "content_left_top_padding";} } } part { - name:"separator_right_padding"; - type:RECT; + name: "ctxpopup_frame_right_bottom"; + type: RECT; scale: 1; - mouse_events: 0; description { - min: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + state: "default" 0.0; + visible: 0; align: 1 1; fixed: 1 1; - visible: 0; + min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + rel2 {relative: 1 1; to: "content_right_bottom_padding";} } } part { - name: "icon_left_padding"; + name:"content_left_top_padding"; + type:RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} + align: 0 0; + fixed: 1 1; + visible: 0; + } + } + part { + name:"content_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} + align: 1 1; + fixed: 1 1; + visible: 0; + } + } + part { + name: "elm.swallow.content"; + type: SWALLOW; + description { + state: "default" 0.0; align: 0 0; + rel1 {to:"content_left_top_padding"; relative: 1.0 1.0;} + rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} + } + } + part { + name: "mask"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + rel1 {to:"elm.swallow.content";} + rel2 {to:"elm.swallow.content";} + image { + normal: "00_popup_bubble_mask.png"; + border: CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER; + border_scale: 1; + } + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1 {to:"elm.swallow.content";} + rel2 {to:"elm.swallow.content";} + } + } + } + programs { + program { + name: "show"; + signal: "mouse,down,1"; + source: "elm.swallow.content"; + action: STATE_SET "visible" 0.0; + target: "mask"; + } + program { + name: "hide"; + signal: "mouse,up,1"; + source: "elm.swallow.content"; + action: STATE_SET "default" 0.0; + target: "mask"; + } + } + } + +/////////////////////////////////////////////////////////////////////////////// + group { name: "elm/ctxpopup/arrow/default"; + images { + image: "00_popup_bubble_tail_left.png" COMP; + image: "00_popup_bubble_tail_right.png" COMP; + image: "00_popup_bubble_tail_top.png" COMP; + image: "00_popup_bubble_tail_bottom.png" COMP; + } + parts { + part { + name: "ctxpopup_arrow"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; fixed: 1 1; visible: 0; + align: 0.5 0.5; + } + description { + state: "left" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 1.0 0.5; + image { + normal: "00_popup_bubble_tail_left.png"; + } + } + description { + state: "right" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.0 0.5; + image { + normal: "00_popup_bubble_tail_right.png"; + } + } + description { + state: "top" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 1.0; + image { + normal: "00_popup_bubble_tail_top.png"; + } + } + description { + state: "bottom" 0.0; + min: CTXPOPUP_ARROW_SIZE_INC; + max: CTXPOPUP_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 0.0; + image { + normal: "00_popup_bubble_tail_bottom.png"; + } + } + } + } + programs { + program { + name: "enable_left_arrow"; + signal: "elm,state,left"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_right_arrow"; + signal: "elm,state,right"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_top_arrow"; + signal: "elm,state,top"; + source: "elm"; + action: STATE_SET "top" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_bottom_arrow"; + signal: "elm,state,bottom"; + source: "elm"; + action: STATE_SET "bottom" 0.0; + target: "ctxpopup_arrow"; + } + } + } +/////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/text_style_item/default"; + parts { + part { + name: "event_blocker"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + part { + name: "bg"; + mouse_events: 0; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + color: CTXPOPUP_BG_COLOR_INC; + visible: 1; + min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING*2) 1; + max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + } + description { + state: "clicked" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; + } + description { + state: "clicked_separator" 0.0; + rel1 { relative: 0.0 1.0; to_y: "separator2"; } + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; } } part { @@ -2042,8 +2008,8 @@ description { state: "default" 0.0; color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "separator_left_padding";} - rel2 { relative: 0.0 1.0; to_x: "separator_right_padding";} + rel1 { relative: 1.0 0.0; to_x: "left_padding";} + rel2 { relative: 0.0 1.0; to_x: "right_padding"; offset: 0 0; } align: 0.5 0; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -2064,7 +2030,7 @@ state: "default" 0.0; color: CTXPOPUP_SEPARATOR2_COLOR_INC; rel1 { relative: 0.0 1.0; to: "separator1";} - rel2 { relative: 1.0 1.0; to: "separator1";} + rel2 { relative: 1.0 1.0; to: "separator1"; offset: 0 0; } align: 0.5 0; fixed: 0 1; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -2078,48 +2044,35 @@ } } part { - name: "elm.swallow.icon"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC; - max: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC; - align: 0 0.5; - aspect: 1.0 1.0; - rel1 { to:"icon_left_padding"; relative: 1 0; } - } - } - part { - name: "icon_right_padding"; + name: "left_padding"; + type: RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_ITEM_ICON_PADDING_INC CTXPOPUP_ITEM_HEIGHT_MIN_INC; - max: CTXPOPUP_ITEM_ICON_PADDING_INC CTXPOPUP_ITEM_HEIGHT_MAX_INC; - align: 0 0.5; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + align: 0 0; fixed: 1 1; visible: 0; - rel1 { to:"elm.swallow.icon"; relative: 1 1; } } } part { name: "elm.text"; - type: TEXT; - mouse_events: 0; + type: TEXT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; min: 1 CTXPOPUP_ITEM_HEIGHT_MIN_INC; align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to_x: "icon_right_padding"; to_y: "bg";} - rel2 {relative: 0.0 1.0; to_x: "text_right_padding"; to_y: "bg";} + rel1 {relative: 1.0 0.0; to_x: "left_padding"; to_y: "bg";} + rel2 {relative: 0.0 1.0; to_x: "right_padding"; to_y: "bg";} color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; text { font: "Tizen:style=Roman"; size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; - align: 0.0 0.5; + align: 0 0.5; min: 1 1; text_class: "list_item"; } @@ -2149,7 +2102,7 @@ } } part { - name: "text_right_padding"; + name: "right_padding"; type: RECT; scale: 1; mouse_events: 0; @@ -2158,16 +2111,18 @@ visible: 0; min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; - fixed: 1 0; - align: 1.0 0.5; + fixed: 1 1; + align: 1.0 1.0; } } part { name: "over1"; + type: RECT; mouse_events: 1; repeat_events: 1; description { state: "default" 0.0; + color: 0 0 0 0; } } part { @@ -2315,28 +2270,29 @@ } } } - /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/icon_text_style_item/more_button"; + name: "elm/ctxpopup/text_style_item_horizontal/default"; parts { part { name: "event_blocker"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "bg"; mouse_events: 0; type: RECT; + scale: 1; description { state: "default" 0.0; color: CTXPOPUP_BG_COLOR_INC; visible: 1; - min: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); } description { state: "clicked" 0.0; @@ -2345,64 +2301,22 @@ } description { state: "clicked_separator" 0.0; - rel1 { relative: 0.0 1.0; to_y: "separator2"; } + rel1 { relative: 1.0 0.0; to_x: "separator2"; } color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; } } part { - name:"separator_left_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name:"separator_right_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; - align: 1 1; - fixed: 1 1; - visible: 0; - } - } - part { - name: "icon_left_padding"; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { name: "separator1"; mouse_events: 0; type: RECT; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 1.0 0.0; to_x: "separator_left_padding";} - rel2 { relative: 0.0 1.0; to_x: "separator_right_padding";} - align: 0.5 0; - fixed: 0 1; - min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + color: CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC; + align: 0 0.5; + min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; + max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; visible: 0; } description { @@ -2418,13 +2332,11 @@ scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR2_COLOR_INC; - rel1 { relative: 0.0 1.0; to: "separator1";} - rel2.to: "separator1"; - align: 0.5 0; - fixed: 0 1; - min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + color: CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC; + rel1 { relative: 1.0 0.0; to: "separator1"; to_y: "bg";} + align: 0 0.5; + min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; + max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; visible: 0; } description { @@ -2434,48 +2346,36 @@ } } part { - name: "elm.swallow.icon"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: CTXPOPUP_MORE_ICON_WIDTH_INC CTXPOPUP_MORE_ICON_HEIGHT_INC; - max: CTXPOPUP_MORE_ICON_WIDTH_INC CTXPOPUP_MORE_ICON_HEIGHT_INC; - align: 0 0.5; - aspect: 1.0 1.0; - rel1 { to:"icon_left_padding"; relative: 1 0; } - } - } - part { - name: "icon_right_padding"; + name: "left_padding"; + type: RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: CTXPOPUP_MORE_ITEM_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; - max: CTXPOPUP_MORE_ITEM_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; - align: 0 0.5; + min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + align: 0 0; + color: 255 0 0 255; fixed: 1 1; visible: 0; - rel1 { to:"elm.swallow.icon"; relative: 1 1; } } } part { name: "elm.text"; - type: TEXT; - mouse_events: 0; + type: TEXT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 1 CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + min: (CTXPOPUP_TEXT_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ITEM_ICON_PADDING_INC*2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to_x: "icon_right_padding"; to_y: "bg";} - rel2 {relative: 0.0 1.0; to_x: "text_right_padding"; to_y: "bg";} - color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; + rel1 {relative: 1.0 0.0; to: "left_padding"; } + rel2 {relative: 0.0 1.0; to: "right_padding"; } + color: CTXPOPUP_MAIN_TEXT_COLOR_INC; text { font: "Tizen:style=Roman"; - size: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC; - align: 0.0 0.5; + size: CTXPOPUP_MAIN_TEXT_SIZE_INC; + align: 0.5 0.5; min: 1 1; text_class: "list_item"; } @@ -2491,39 +2391,42 @@ description { state: "clicked" 0.0; inherit: "default" 0.0; - color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC; + color: CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + color: CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC; } description { state: "compress_disabled" 0.0; inherit: "compress" 0.0; - color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + color: CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC; } } part { - name: "text_right_padding"; + name: "right_padding"; type: RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; + min: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + max: CTXPOPUP_ITEM_ICON_PADDING_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + fixed: 1 1; + align: 1 1; + color: 0 255 0 255; visible: 0; - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; - fixed: 1 0; - align: 1.0 0.5; } } part { name: "over1"; + type: RECT; mouse_events: 1; repeat_events: 1; description { state: "default" 0.0; + color: 0 0 0 0; } } part { @@ -2532,8 +2435,8 @@ mouse_events: 1; repeat_events: 1; dragable { - x: 0 0 0; - y: 1 1 0; + x: 1 1 0; + y: 0 0 0; } description { state: "default" 0.0; @@ -2650,7 +2553,7 @@ script { new Float:dx, Float:dy; get_drag(PART:"over2", dx, dy); - if (abs(dy) > 20) + if (abs(dx) > 20) { set_drag(PART:"over2", 0.0, 0.0); set_state(PART:"elm.text", "compress", 0.0); @@ -2671,828 +2574,989 @@ } } } - -/////////////////////////////////////////////////////////////////////////////////////// -#define CTXPOPUP_ENTRY_LIST_PADDING_LEFT 3 -#define CTXPOPUP_ENTRY_LIST_PADDING_TOP 6 -#define CTXPOPUP_ENTRY_LIST_PADDING_RIGHT 3 -#define CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM 6 -////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/base/extended/entry"; - alias: "elm/ctxpopup/base/extended/entry/pass_event"; - images { - image: "copy&paste_bg_center.png" COMP; - image: "ctxpopup_shadow.png" COMP; - } + name: "elm/ctxpopup/icon_style_item/default"; parts { part { - name:"frame_shadow_left_top_padding"; - type:RECT; + name: "event_blocker"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + part { + name: "bg"; scale: 1; mouse_events: 0; + type: RECT; description { - min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - align: 0 0; - fixed: 1 1; - visible: 0; + state: "default" 0.0; + color: CTXPOPUP_BG_COLOR_INC; + visible: 1; + min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + } + description { + state: "clicked" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; + } + description { + state: "clicked_separator" 0.0; + rel1 { relative: 1.0 0.0; to_x: "separator2"; } + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; } } part { - name:"frame_shadow_right_bottom_padding"; - type:RECT; + name: "left_padding"; scale: 1; - mouse_events: 0; description { - min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; - rel1{relative: 1 1;} + min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + visible: 0; align: 0 0; fixed: 1 1; - visible: 0; } } part { - name: "frame_shadow"; - type: IMAGE; - scale: 1; + name: "separator1"; mouse_events: 0; + type: RECT; + scale: 1; description { state: "default" 0.0; - rel1 {to:"frame_shadow_left_top_padding"; relative: 1 1;} - rel2 {to:"frame_shadow_right_bottom_padding";} - image { - normal: "ctxpopup_shadow.png"; - border: 10 10 10 10; - border_scale: 1; - } + color: CTXPOPUP_SEPARATOR_COLOR_INC; + align: 0 0.5; + min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; + max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { - name: "frame_bg"; - type: IMAGE; - scale: 1; + name: "separator2"; mouse_events: 0; + type: RECT; + scale: 1; description { state: "default" 0.0; - rel1 {to:"elm.swallow.content";} - rel2 {to:"elm.swallow.content";} - image { - normal: "copy&paste_bg_center.png"; - border: CTXPOPUP_ENTRY_CENTER_IMAGE_BORDER; - border_scale: 1; - } + color: CTXPOPUP_SEPARATOR2_COLOR_INC; + rel1 { relative: 1.0 0.0; to_x: "separator1"; } + align: 0 0.5; + min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; + max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { - name: "arrow_area_left"; - type: RECT; - mouse_events: 0; + name: "elm.swallow.icon"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; - fixed: 1 1; - align: 1 0.5; - rel1 { - relative: 0 1; - to_y: "ctxpopup_frame_left_top"; - } - rel2 { - relative:0 0; - to:"ctxpopup_frame_left_bottom"; - } + min: CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC; + max: CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC; + align: 0.5 0.5; + aspect: 1.0 1.0; + rel1 { relative: 1 0; to_x: "left_padding"; } + rel2 { relative: 0 1; to_x: "right_padding"; } } } part { - name: "arrow_area_right"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; - fixed: 1 1; - align: 0 0.5; - rel1 { - relative: 1 1; - to:"ctxpopup_frame_right_top"; - } - rel2 { - relative: 1 0; - to_y: "ctxpopup_frame_right_bottom"; - } - } - } - part { - name: "arrow_area_up"; - type: RECT; - mouse_events: 0; + name: "right_padding"; scale: 1; - description { state: "default" 0.0; + description { + min: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); + max: ((CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC-CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC)/2) (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); visible: 0; - min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + align: 1 1; fixed: 1 1; - align: 0.5 1; - rel1 { - relative: 0 0; - to: "frame_bg"; - } - rel2 { - relative: 1 0; - to: "frame_bg"; - } } } part { - name: "arrow_area_down"; + name: "over1"; type: RECT; - mouse_events: 0; - scale: 1; + mouse_events: 1; + repeat_events: 1; description { state: "default" 0.0; - visible: 0; - min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - fixed: 1 1; - align: 0.5 0; - rel1 { - relative: 0 1; - to: "frame_bg"; - } - rel2 { - relative: 1 1; - to: "frame_bg"; - } + color: 0 0 0 0; } } part { - name: "elm.swallow.arrow_up"; - type: SWALLOW; - mouse_events: 0; - scale: 1; + name: "over2"; + type: RECT; + mouse_events: 1; + repeat_events: 1; dragable { x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_up"; + y: 0 0 0; } description { state: "default" 0.0; - min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - fixed: 1 1; - visible: 1; + rel1.to:"bg"; + rel2.to:"bg"; + color: 0 0 0 0; } } part { - name: "elm.swallow.arrow_down"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_down"; - } + name: "disclip"; + type: RECT; description { state: "default" 0.0; - min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - fixed: 1 1; + visible: 0; + } + description { + state: "disabled" 0.0; visible: 1; + color: CTXPOPUP_ITEM_DISABLED_COLOR; } } - part { - name: "elm.swallow.arrow_left"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_left"; + } + programs { + program { + name: "default"; + signal: "elm,state,default"; + source: "elm"; + script { + set_state(PART:"separator1", "default", 0.0); + set_state(PART:"separator2", "default", 0.0); } - description { - state: "default" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; - fixed: 1 1; - visible: 1; + } + program { + name: "separator"; + signal: "elm,state,separator"; + source: "elm"; + script { + set_state(PART:"separator1", "visible", 0.0); + set_state(PART:"separator2", "visible", 0.0); } } - part { - name: "elm.swallow.arrow_right"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - confine: "arrow_area_right"; + program { + name: "item_unclick"; + signal: "mouse,clicked,1"; + source: "over1"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; + } + program { + name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disclip"; + } + program { + name: "item_click2"; + signal: "mouse,down,1"; + source: "over2"; + script { + new st[31]; + new Float:vl; + get_state(PART:"separator2", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"bg", "clicked", 0.0); + else + set_state(PART:"bg", "clicked_separator", 0.0); } - description { - state: "default" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; - fixed: 1 1; - visible: 1; + } + program { + name: "drag"; + signal: "drag"; + source: "over2"; + script { + new Float:dx, Float:dy; + get_drag(PART:"over2", dx, dy); + if (abs(dx) > 20) + { + set_drag(PART:"over2", 0.0, 0.0); + set_state(PART:"bg", "default", 0.0); + } + set_drag(PART:"over2", 0.0, 0.0); } } - part { - name: "ctxpopup_frame_left_top"; - type: RECT; - scale: 1; - description { - visible: 0; - align: 0 0; - min: CTXPOPUP_FRAME_CORNER_SIZE; - max: CTXPOPUP_FRAME_CORNER_SIZE; + program { + name: "item_unclick2"; + signal: "mouse,up,1"; + source: "over2"; + script { + set_drag(PART:"over2", 0.0, 0.0); + set_state(PART:"bg", "default", 0.0); } } + } + } +/////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/icon_text_style_item/default"; + parts { part { - name: "ctxpopup_frame_right_top"; + name: "event_blocker"; type: RECT; - scale: 1; + mouse_events: 1; description { - visible: 0; - align: 1 0; - min: CTXPOPUP_FRAME_CORNER_SIZE; - max: CTXPOPUP_FRAME_CORNER_SIZE; + state: "default" 0.0; + color: 0 0 0 0; } } part { - name: "ctxpopup_frame_left_bottom"; + name: "bg"; + mouse_events: 0; type: RECT; - scale: 1; description { - visible: 0; - align: 0 1; - min: CTXPOPUP_FRAME_CORNER_SIZE; - max: CTXPOPUP_FRAME_CORNER_SIZE; + state: "default" 0.0; + color: CTXPOPUP_BG_COLOR_INC; + visible: 1; } - } - part { - name: "ctxpopup_frame_right_bottom"; - type: RECT; - scale: 1; description { - visible: 0; - align: 1 1; - min: CTXPOPUP_FRAME_CORNER_SIZE; - max: CTXPOPUP_FRAME_CORNER_SIZE; + state: "clicked" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; + } + description { + state: "clicked_separator" 0.0; + rel1 { relative: 0.0 1.0; to_y: "separator2"; } + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; } } part { - name:"list_shadow_right_bottom_padding"; + name:"separator_left_padding"; type:RECT; scale: 1; mouse_events: 0; description { - min: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; - max: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; + min: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + max: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; align: 0 0; fixed: 1 1; visible: 0; - rel1 {to:"elm.swallow.content"; relative: 1 1;} } } part { - name:"content_left_top_padding"; + name:"separator_right_padding"; type:RECT; scale: 1; mouse_events: 0; description { - state: "default" 0.0; - min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - align: 0 0; + min: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + max: (CTXPOPUP_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + align: 1 1; fixed: 1 1; visible: 0; } } part { - name:"content_right_bottom_padding"; - type:RECT; + name: "icon_left_padding"; scale: 1; mouse_events: 0; description { - min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; - rel1 { relative: 1 1;} - rel2 { relative: 1 1;} - align: 1 1; + state: "default" 0.0; + min: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_ICON_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + align: 0 0; fixed: 1 1; visible: 0; } } part { - name: "elm.swallow.content"; - type: SWALLOW; + name: "separator1"; + mouse_events: 0; + type: RECT; + scale: 1; description { state: "default" 0.0; - align: 0 0; - rel1 {to:"ctxpopup_frame_left_top"; relative: 0.5 0.5;} - rel2 {to:"ctxpopup_frame_right_bottom"; relative: 0.5 0.5;} + color: CTXPOPUP_SEPARATOR_COLOR_INC; + rel1 { relative: 1.0 0.0; to_x: "separator_left_padding";} + rel2 { relative: 0.0 1.0; to_x: "separator_right_padding"; offset: 0 0; } + align: 0.5 0; + min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } - } - } -/////////////////////////////////////////////////////////////////////////////////////// - group { - name: "elm/ctxpopup/arrow/extended/entry"; - alias: "elm/ctxpopup/arrow/extended/entry/pass_event"; - images { - image: "copy&paste_arrow_up.png" COMP; - image: "copy&paste_arrow_left.png" COMP; - image: "copy&paste_arrow_right.png" COMP; - image: "copy&paste_arrow_down.png" COMP; - } - parts { part { - name: "ctxpopup_arrow"; - type: IMAGE; + name: "separator2"; + mouse_events: 0; + type: RECT; scale: 1; description { state: "default" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - fixed: 1 1; + color: CTXPOPUP_SEPARATOR2_COLOR_INC; + rel1 { relative: 0.0 1.0; to: "separator1";} + rel2 { relative: 1.0 1.0; to: "separator1"; offset: 0 0; } + align: 0.5 0; + fixed: 0 1; + min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; visible: 0; - align: 0.5 0.5; } description { - state: "left" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; - max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; - fixed: 1 1; + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { + name: "elm.swallow.icon"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC; + max: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC; align: 0 0.5; - image { - normal: "copy&paste_arrow_left.png"; - } + aspect: 1.0 1.0; + rel1 { to:"icon_left_padding"; relative: 1 0; } } + } + part { + name: "icon_right_padding"; + scale: 1; + mouse_events: 0; description { - state: "right" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; - max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; + state: "default" 0.0; + min: CTXPOPUP_ITEM_ICON_PADDING_INC CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: CTXPOPUP_ITEM_ICON_PADDING_INC CTXPOPUP_ITEM_HEIGHT_MAX_INC; + align: 0 0.5; fixed: 1 1; - align: 1 0.5; - image { - normal: "copy&paste_arrow_right.png"; - } + visible: 0; + rel1 { to:"elm.swallow.icon"; relative: 1 1; } } + } + part { + name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; description { - state: "top" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - fixed: 1 1; - align: 0.5 0; - image { - normal: "copy&paste_arrow_up.png"; + state: "default" 0.0; + min: 1 CTXPOPUP_ITEM_HEIGHT_MIN_INC; + align: 0.5 0.5; + rel1 {relative: 1.0 0.0; to_x: "icon_right_padding"; to_y: "bg";} + rel2 {relative: 0.0 1.0; to_x: "text_right_padding"; to_y: "bg";} + color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; + text { + font: "Tizen:style=Roman"; + size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; + align: 0.0 0.5; + min: 1 1; + text_class: "list_item"; } } description { - state: "bottom" 0.0; - min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; - fixed: 1 1; - align: 0.5 1; - image { - normal: "copy&paste_arrow_down.png"; + state: "compress" 0.0; + inherit: "default" 0.0; + max: -1 -1; + text { + min: 0 1; } } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC; + } + description { + state: "disabled" 0.0; + inherit: "default" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } + description { + state: "compress_disabled" 0.0; + inherit: "compress" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } + } + part { + name: "text_right_padding"; + type: RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 0; + min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_ITEM_HEIGHT_MAX_INC; + fixed: 1 0; + align: 1.0 0.5; + } + } + part { + name: "over1"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + part { + name: "over2"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + dragable { + x: 0 0 0; + y: 1 1 0; + } + description { + state: "default" 0.0; + rel1.to:"bg"; + rel2.to:"bg"; + color: 0 0 0 0; + } + } + part { + name: "disclip"; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + } + description { + state: "disabled" 0.0; + visible: 1; + color: CTXPOPUP_ITEM_DISABLED_COLOR; + } } } programs { program { - name: "enable_left_arrow"; - signal: "elm,state,left"; - source: "elm"; - action: STATE_SET "left" 0.0; - target: "ctxpopup_arrow"; + name: "item_unclick"; + signal: "mouse,clicked,1"; + source: "over1"; + action: SIGNAL_EMIT "elm,action,click" ""; } program { - name: "enable_right_arrow"; - signal: "elm,state,right"; + name: "disable"; + signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "right" 0.0; - target: "ctxpopup_arrow"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) + set_state(PART:"elm.text", "compress_disabled", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + + set_state(PART:"disclip", "disabled", 0.0); + } } program { - name: "enable_top_arrow"; - signal: "elm,state,top"; + name: "enable"; + signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "top" 0.0; - target: "ctxpopup_arrow"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) + set_state(PART:"elm.text", "compress", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + + set_state(PART:"disclip", "default", 0.0); + } } program { - name: "enable_bottom_arrow"; - signal: "elm,state,bottom"; + name: "default"; + signal: "elm,state,default"; source: "elm"; - action: STATE_SET "bottom" 0.0; - target: "ctxpopup_arrow"; - } - } - } -/////////////////////////////////////////////////////////////////////////////////////// -#define CTXPOPUP_ENTRY_ITEM_BG_PART \ - part {\ - name: "bg";\ - mouse_events: 0;\ - type: IMAGE;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - rel1 {to:"left_bg_padding"; relative: 1 0;}\ - rel2 {to:"right_bg_padding"; relative: 0 1;}\ - image {\ - normal: "copy&paste_press_center.png";\ - border: 0 0 0 0;\ - }\ - }\ - description {\ - state: "clicked" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - image {\ - normal: "copy&paste_press_center.png";\ - border: 0 0 0 0;\ - }\ - }\ - } -#define CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART \ - part {\ - name: "left_bg_padding";\ - type: IMAGE;\ - scale: 1;\ - mouse_events: 0;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - align: 0 0.5;\ - fixed: 1 0;\ - rel1 { to: "event_blocker"; relative: 0 0; }\ - rel2 { to: "event_blocker"; relative: 0 1; }\ - image {\ - normal: "copy&paste_press_left.png";\ - border: CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0 0;\ - border_scale: 1;\ - }\ - }\ - description {\ - state: "clicked" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - image {\ - normal: "copy&paste_press_left.png";\ - border: CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0 0;\ - border_scale: 1;\ - }\ - }\ + script { + set_state(PART:"separator1", "default", 0.0); + set_state(PART:"separator2", "default", 0.0); + } } -#define CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART \ - part {\ - name: "right_bg_padding";\ - type: IMAGE;\ - scale: 1;\ - mouse_events: 0;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - fixed: 1 0;\ - align: 1.0 0.5;\ - rel1 { to: "event_blocker"; relative: 1 0; }\ - rel2 { to: "event_blocker"; relative: 1 1; }\ - image {\ - normal: "copy&paste_press_right.png";\ - border: 0 CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0;\ - border_scale: 1;\ - }\ - }\ - description {\ - state: "clicked" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - image {\ - normal: "copy&paste_press_right.png";\ - border: 0 CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0;\ - border_scale: 1;\ - }\ - }\ + program { + name: "compress"; + signal: "elm,state,compress"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"disclip", st, 30, vl); + if (!strcmp(st, "disabled")) + set_state(PART:"elm.text", "compress_disabled", 0.0); + else + set_state(PART:"elm.text", "compress", 0.0); + } } -#define CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART \ - part {\ - name: "left_padding";\ - type: RECT;\ - scale: 1;\ - mouse_events: 0;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - align: 0 0.5;\ - fixed: 1 0;\ - }\ + program { + name: "separator"; + signal: "elm,state,separator"; + source: "elm"; + script { + set_state(PART:"separator1", "visible", 0.0); + set_state(PART:"separator2", "visible", 0.0); + } } -#define CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART \ - part {\ - name: "right_padding";\ - type: RECT;\ - scale: 1;\ - mouse_events: 0;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ - fixed: 1 0;\ - align: 1.0 0.5;\ - }\ + program { + name: "item_click2"; + signal: "mouse,down,1"; + source: "over2"; + script { + set_state(PART:"elm.text", "clicked", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"separator2", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"bg", "clicked", 0.0); + else + set_state(PART:"bg", "clicked_separator", 0.0); + } } -#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART \ - part {\ - name: "left_separator";\ - mouse_events: 0;\ - type: RECT;\ - scale: 1;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - color: CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR;\ - min: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ - max: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ - fixed: 1 1;\ - rel2 {\ - relative: 0 1;\ - }\ - }\ - description {\ - state: "vertical" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - }\ - description {\ - state: "horizontal" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - }\ + program { + name: "drag"; + signal: "drag"; + source: "over2"; + script { + new Float:dx, Float:dy; + get_drag(PART:"over2", dx, dy); + if (abs(dy) > 20) + { + set_drag(PART:"over2", 0.0, 0.0); + set_state(PART:"elm.text", "compress", 0.0); + set_state(PART:"bg", "default", 0.0); + } + set_drag(PART:"over2", 0.0, 0.0); + } } -#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART \ - part {\ - name: "right_separator";\ - mouse_events: 0;\ - type: RECT;\ - scale: 1;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - color: CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR;\ - min: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ - max: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ - fixed: 1 1;\ - rel1 {\ - offset: -1 0;\ - }\ - rel2 {\ - relative: 0 1;\ - offset: -1 0;\ - }\ - }\ - description {\ - state: "vertical" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - }\ - description {\ - state: "horizontal" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - }\ + program { + name: "item_unclick2"; + signal: "mouse,up,1"; + source: "over2"; + script { + set_drag(PART:"over2", 0.0, 0.0); + set_state(PART:"elm.text", "compress", 0.0); + set_state(PART:"bg", "default", 0.0); + } } -/////////////////////////////////////////////////////////////////////////////////////// + } + } +/////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/text_style_item/extended/entry"; - alias: "elm/ctxpopup/text_style_item/extended/entry/pass_event"; + name: "elm/ctxpopup/base/more/default"; images { - image: "copy&paste_press_center.png" COMP; - image: "copy&paste_press_left.png" COMP; - image: "copy&paste_press_right.png" COMP; + image: "00_popup_bubble_bg.png" COMP; + image: "00_popup_bubble_mask.png" COMP; } parts { part { - name: "event_blocker"; - mouse_events: 1; + name:"frame_shadow_left_top_padding"; + type:RECT; + scale: 1; + mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 0; + min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; + max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING; + rel2 { relative: 0 0; } + align: 0 0; + fixed: 1 1; + visible: 0; } } - CTXPOPUP_ENTRY_ITEM_BG_PART - CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART - CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART - CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART - CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART - CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART - CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART part { - name: "elm.text"; - type: TEXT; - mouse_events: 0; + name:"frame_shadow_right_bottom_padding"; + type:RECT; scale: 1; + mouse_events: 0; description { state: "default" 0.0; - min: 1 CTXPOPUP_ENTRY_ITEM_HEIGHT; - max: CTXPOPUP_ENTRY_ITEM_WIDTH_MAX CTXPOPUP_ENTRY_ITEM_HEIGHT; - fixed: 0 1; - align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to: "left_padding";} - rel2 {relative: 0.0 1.0; to: "right_padding";} - color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR; - text { - font: "Tizen:style=Roman"; - size: CTXPOPUP_ENTRY_ITEM_FONT_SIZE; - align: 0.5 0.5; - min: 1 1; - text_class: "list_item"; + min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; + max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING; + rel1{relative: 1 1;} + align: 1 1; + fixed: 1 1; + visible: 0; + } + } + part { + name: "frame_bg"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 {to:"frame_shadow_left_top_padding";} + rel2 {to:"frame_shadow_right_bottom_padding";} + min: CTXPOPUP_MORE_WIDTH_INC 0; + //max: CTXPOPUP_MORE_WIDTH_INC 806; + image { + normal: "00_popup_bubble_bg.png"; + border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER; + border_scale: 1; } } + } + part { + name: "ctxpopup_frame_left_top"; + type: RECT; + scale: 1; description { - state: "clicked" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR; + state: "default" 0.0; + visible: 0; + align: 0 0; + fixed: 1 1; + min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + rel1 {relative: 0 0; to: "content_left_top_padding";} } } part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; - ignore_flags: ON_HOLD; + name: "ctxpopup_frame_right_bottom"; + type: RECT; + scale: 1; description { state: "default" 0.0; + visible: 0; + align: 1 1; + fixed: 1 1; + min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING; + rel2 {relative: 1 1; to: "content_right_bottom_padding";} } } part { - name: "over2"; - mouse_events: 1; - repeat_events: 1; + name:"content_left_top_padding"; + type:RECT; + scale: 1; + mouse_events: 0; description { state: "default" 0.0; + min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;} + align: 0 0; + fixed: 1 1; + visible: 0; } } part { - name: "disclip"; - type: RECT; + name:"content_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; description { state: "default" 0.0; + min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING; + rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;} + align: 1 1; + fixed: 1 1; visible: 0; } + } + part { + name: "elm.swallow.content"; + type: SWALLOW; + description { + state: "default" 0.0; + align: 0 0; + rel1 {to:"content_left_top_padding"; relative: 1.0 1.0;} + rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} + } + } + part { + name: "mask"; + type: IMAGE; + scale: 1; description { - state: "disabled" 0.0; + state: "default" 0.0; + visible: 0; + rel1 {to:"elm.swallow.content";} + rel2 {to:"elm.swallow.content";} + image { + normal: "00_popup_bubble_mask.png"; + border: CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER; + border_scale: 1; + } + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; visible: 1; - color: CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR; + rel1 {to:"elm.swallow.content";} + rel2 {to:"elm.swallow.content";} } } } programs { program { - name: "item_unclick"; - signal: "mouse,up,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { - name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - program { - name: "item_click2"; + name: "show"; signal: "mouse,down,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "clicked", 0.0); - set_state(PART:"bg", "clicked", 0.0); - set_state(PART:"left_bg_padding", "clicked", 0.0); - set_state(PART:"right_bg_padding", "clicked", 0.0); - } + source: "elm.swallow.content"; + action: STATE_SET "visible" 0.0; + target: "mask"; } program { - name: "item_unclick2"; + name: "hide"; signal: "mouse,up,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"left_bg_padding", "default", 0.0); - set_state(PART:"right_bg_padding", "default", 0.0); - } - } - program { - name: "default"; - signal: "elm,state,default"; - source: "elm"; - script { - set_state(PART:"left_separator", "default", 0.0); - set_state(PART:"right_separator", "default", 0.0); - } - } - program { - name: "vertical"; - signal: "elm,state,vertical"; - source: "elm"; - script { - set_state(PART:"left_separator", "vertical", 0.0); - set_state(PART:"right_separator", "vertical", 0.0); - } - } - program { - name: "horizontal"; - signal: "elm,state,horizontal"; - source: "elm"; - script { - set_state(PART:"left_separator", "horizontal", 0.0); - set_state(PART:"right_separator", "horizontal", 0.0); - } + source: "elm.swallow.content"; + action: STATE_SET "default" 0.0; + target: "mask"; } } } /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/icon_style_item/extended/entry"; - images { - image: "copy&paste_press_center.png" COMP; - image: "copy&paste_press_left.png" COMP; - image: "copy&paste_press_right.png" COMP; - } + name: "elm/ctxpopup/icon_text_style_item/more/default"; parts { part { name: "event_blocker"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; color: 0 0 0 0; } } - CTXPOPUP_ENTRY_ITEM_BG_PART - CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART - CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART - CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART - CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART - CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART - CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART part { - name: "elm.swallow.icon"; - type: SWALLOW; + name: "bg"; + mouse_events: 0; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 36 36; - max: 36 36; - fixed: 0 1; - align: 0.5 0.5; -// aspect: 1.0 1.0; - rel1 {relative: 1.0 0.0; to: "left_padding";} - rel2 {relative: 0.0 1.0; to: "right_padding";} + color: CTXPOPUP_BG_COLOR_INC; + visible: 1; + min: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; + max: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + } + description { + state: "clicked" 0.0; + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; + } + description { + state: "clicked_separator" 0.0; + rel1 { relative: 0.0 1.0; to_y: "separator2"; } + color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; } } part { - name: "elm.swallow.icon.paint"; - type: RECT; + name:"separator_left_padding"; + type:RECT; scale: 1; + mouse_events: 0; description { - state: "default" 0.0; + min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + align: 0 0; + fixed: 1 1; visible: 0; - color: 255 255 0 255; - rel1 { to: "elm.swallow.icon"; } - rel2 { to: "elm.swallow.icon"; } + } + } + part { + name:"separator_right_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) 0; + align: 1 1; + fixed: 1 1; + visible: 0; + } + } + part { + name: "icon_left_padding"; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + align: 0 0; + fixed: 1 1; + visible: 0; + } + } + part { + name: "separator1"; + mouse_events: 0; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + color: CTXPOPUP_SEPARATOR_COLOR_INC; + rel1 { relative: 1.0 0.0; to_x: "separator_left_padding";} + rel2 { relative: 0.0 1.0; to_x: "separator_right_padding"; offset: 0 0; } + align: 0.5 0; + fixed: 0 1; + min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { + name: "separator2"; + mouse_events: 0; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + color: CTXPOPUP_SEPARATOR2_COLOR_INC; + rel1 { relative: 0.0 1.0; to: "separator1"; } + rel2.to: "separator1"; + rel2.offset: 0 0; + align: 0.5 0; + fixed: 0 1; + min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { + name: "elm.swallow.icon"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: CTXPOPUP_MORE_ICON_WIDTH_INC CTXPOPUP_MORE_ICON_HEIGHT_INC; + max: CTXPOPUP_MORE_ICON_WIDTH_INC CTXPOPUP_MORE_ICON_HEIGHT_INC; + align: 0 0.5; + aspect: 1.0 1.0; + rel1 { to:"icon_left_padding"; relative: 1 0; } + } + } + part { + name: "icon_right_padding"; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_MORE_ITEM_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + max: CTXPOPUP_MORE_ITEM_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + align: 0 0.5; + fixed: 1 1; + visible: 0; + rel1 { to:"elm.swallow.icon"; relative: 1 1; } + } + } + part { + name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: 1 CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + align: 0.5 0.5; + rel1 {relative: 1.0 0.0; to_x: "icon_right_padding"; to_y: "bg";} + rel2 {relative: 0.0 1.0; to_x: "text_right_padding"; to_y: "bg";} + color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; + text { + font: "Tizen:style=Roman"; + size: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC; + align: 0.0 0.5; + min: 1 1; + text_class: "list_item"; + } + } + description { + state: "compress" 0.0; + inherit: "default" 0.0; + max: -1 -1; + text { + min: 0 1; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC; + } + description { + state: "disabled" 0.0; + inherit: "default" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } + description { + state: "compress_disabled" 0.0; + inherit: "compress" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } + } + part { + name: "text_right_padding"; + type: RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 0; + min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + fixed: 1 0; + align: 1.0 0.5; } } part { name: "over1"; + type: RECT; mouse_events: 1; repeat_events: 1; - ignore_flags: ON_HOLD; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "over2"; + type: RECT; mouse_events: 1; repeat_events: 1; + dragable { + x: 0 0 0; + y: 1 1 0; + } description { state: "default" 0.0; + rel1.to:"bg"; + rel2.to:"bg"; + color: 0 0 0 0; } } part { @@ -3505,14 +3569,14 @@ description { state: "disabled" 0.0; visible: 1; - color: CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR; + color: CTXPOPUP_ITEM_DISABLED_COLOR; } } } programs { program { name: "item_unclick"; - signal: "mouse,up,1"; + signal: "mouse,clicked,1"; source: "over1"; action: SIGNAL_EMIT "elm,action,click" ""; } @@ -3520,27 +3584,32 @@ name: "disable"; signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; script { - set_state(PART:"bg", "clicked", 0.0); - set_state(PART:"left_bg_padding", "clicked", 0.0); - set_state(PART:"right_bg_padding", "clicked", 0.0); + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) + set_state(PART:"elm.text", "compress_disabled", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + + set_state(PART:"disclip", "disabled", 0.0); } } program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; + name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; script { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"left_bg_padding", "default", 0.0); - set_state(PART:"right_bg_padding", "default", 0.0); + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if ((!strcmp(st, "compress")) || (!strcmp(st, "compress_disabled"))) + set_state(PART:"elm.text", "compress", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + + set_state(PART:"disclip", "default", 0.0); } } program { @@ -3548,652 +3617,986 @@ signal: "elm,state,default"; source: "elm"; script { - set_state(PART:"left_separator", "default", 0.0); - set_state(PART:"right_separator", "default", 0.0); + set_state(PART:"separator1", "default", 0.0); + set_state(PART:"separator2", "default", 0.0); } } program { - name: "vertical"; - signal: "elm,state,vertical"; + name: "compress"; + signal: "elm,state,compress"; source: "elm"; script { - set_state(PART:"left_separator", "vertical", 0.0); - set_state(PART:"right_separator", "vertical", 0.0); + new st[31]; + new Float:vl; + get_state(PART:"disclip", st, 30, vl); + if (!strcmp(st, "disabled")) + set_state(PART:"elm.text", "compress_disabled", 0.0); + else + set_state(PART:"elm.text", "compress", 0.0); } } program { - name: "horizontal"; - signal: "elm,state,horizontal"; + name: "separator"; + signal: "elm,state,separator"; source: "elm"; script { - set_state(PART:"left_separator", "horizontal", 0.0); - set_state(PART:"right_separator", "horizontal", 0.0); + set_state(PART:"separator1", "visible", 0.0); + set_state(PART:"separator2", "visible", 0.0); } } - } - } + program { + name: "item_click2"; + signal: "mouse,down,1"; + source: "over2"; + script { + set_state(PART:"elm.text", "clicked", 0.0); -/////////////////////////////////////////////////////////////////////////////////////// -#define CTXPOPUP_IE_FONT_COLOR 255 255 255 255 -#define CTXPOPUP_IE_CLICKED_FONT_COLOR 255 255 100 255 -#define CTXPOPUP_IE_SEPARATOR_COLOR 120 120 120 255 -#define CTXPOPUP_IE_ITEM_DISABLED_COLOR 200 200 200 127 -#define CTXPOPUP_IE_SEPARATOR_PADDING_SIZE 6 2 -/////////////////////////////////////////////////////////////////////////////// -group { - name: "elm/ctxpopup/base/extended/imageeditor"; - images { - image: "imageeditor_bg.png" COMP; - } - parts { - part { - name: "ctxpopup_frame"; - type: IMAGE; - scale: 1; - description { - image { - normal: "imageeditor_bg.png"; - border: 10 10 10 10; - border_scale: 1; - } - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - description { - state: "default" 0.0; - } - }//part - }//parts -} -/////////////////////////////////////////////////////////////////////////////// -group { name: "elm/ctxpopup/arrow/extended/imageeditor"; - images { - image: "imageeditor_left_arrow.png" COMP; - image: "imageeditor_right_arrow.png" COMP; - image: "imageeditor_top_arrow.png" COMP; - image: "imageeditor_bottom_arrow.png" COMP; - } - parts { - part { - name: "ctxpopup_arrow"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - fixed: 1 1; - visible: 0; - align: 0.5 0.5; - } - description { - state: "left" 0.0; - min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.0 0.5; - image { - normal: "imageeditor_left_arrow.png"; - } - } - description { - state: "right" 0.0; - min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - fixed: 1 1; - align: 1.0 0.5; - image { - normal: "imageeditor_right_arrow.png"; + new st[31]; + new Float:vl; + get_state(PART:"separator2", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"bg", "clicked", 0.0); + else + set_state(PART:"bg", "clicked_separator", 0.0); } } - description { - state: "top" 0.0; - min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 0.0; - image { - normal: "imageeditor_top_arrow.png"; + program { + name: "drag"; + signal: "drag"; + source: "over2"; + script { + new Float:dx, Float:dy; + get_drag(PART:"over2", dx, dy); + if (abs(dy) > 20) + { + set_drag(PART:"over2", 0.0, 0.0); + set_state(PART:"elm.text", "compress", 0.0); + set_state(PART:"bg", "default", 0.0); + } + set_drag(PART:"over2", 0.0, 0.0); } } - description { - state: "bottom" 0.0; - min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC; - fixed: 1 1; - align: 0.5 1.0; - image { - normal: "imageeditor_bottom_arrow.png"; + program { + name: "item_unclick2"; + signal: "mouse,up,1"; + source: "over2"; + script { + set_drag(PART:"over2", 0.0, 0.0); + set_state(PART:"elm.text", "compress", 0.0); + set_state(PART:"bg", "default", 0.0); } } } } - programs { - program { - name: "enable_left_arrow"; - signal: "elm,state,left"; - source: "elm"; - action: STATE_SET "left" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_right_arrow"; - signal: "elm,state,right"; - source: "elm"; - action: STATE_SET "right" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_top_arrow"; - signal: "elm,state,top"; - source: "elm"; - action: STATE_SET "top" 0.0; - target: "ctxpopup_arrow"; - } - program { - name: "enable_bottom_arrow"; - signal: "elm,state,bottom"; - source: "elm"; - action: STATE_SET "bottom" 0.0; - target: "ctxpopup_arrow"; - } - } -} -/////////////////////////////////////////////////////////////////////////////// -group { - name: "elm/ctxpopup/icon_text_style_item/extended/imageeditor"; - images { - image: "imageeditor_bar_press.png" COMP; - } - parts { - part { - name: "event_blocker"; - mouse_events: 1; - description { - state: "default" 0.0; - } +/////////////////////////////////////////////////////////////////////////////////////// +#define CTXPOPUP_ENTRY_LIST_PADDING_LEFT 3 +#define CTXPOPUP_ENTRY_LIST_PADDING_TOP 6 +#define CTXPOPUP_ENTRY_LIST_PADDING_RIGHT 3 +#define CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM 6 +////////////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/base/extended/entry"; + alias: "elm/ctxpopup/base/extended/entry/pass_event"; + images { + image: "copy&paste_bg_center.png" COMP; + image: "ctxpopup_shadow.png" COMP; } - - part { - name: "bg"; - mouse_events: 0; - type: IMAGE; - description { - state: "default" 0.0; - rel1 { to:"separator_left_top_padding"; relative: 1 0; } - rel2 { to:"separator_right_bottom_padding"; relative: 0 1; } - visible: 0; - } - description { - state: "clicked" 0.0; - rel1 { to:"separator_left_top_padding"; relative: 1 0; } - rel2 { to:"separator_right_bottom_padding"; relative: 0 1; } - image { - normal: "imageeditor_bar_press.png"; - border: 10 10 10 10; - border_scale: 1; + parts { + part { + name:"frame_shadow_left_top_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + align: 0 0; + fixed: 1 1; + visible: 0; } } - } - - part { - name: "icon_left_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name: "separator_left_top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 0 0; - fixed: 1 1; + part { + name:"frame_shadow_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING; + rel1{relative: 1 1;} + align: 0 0; + fixed: 1 1; + visible: 0; + } } - } - part { - name: "separator_right_top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 1 0; - fixed: 1 1; + part { + name: "frame_shadow"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 {to:"frame_shadow_left_top_padding"; relative: 1 1;} + rel2 {to:"frame_shadow_right_bottom_padding";} + image { + normal: "ctxpopup_shadow.png"; + border: 10 10 10 10; + border_scale: 1; + } + } } - } - part { - name: "separator_left_bottom_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 0 1; - fixed: 1 1; + part { + name: "frame_bg"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 {to:"elm.swallow.content";} + rel2 {to:"elm.swallow.content";} + image { + normal: "copy&paste_bg_center.png"; + border: CTXPOPUP_ENTRY_CENTER_IMAGE_BORDER; + border_scale: 1; + } + } } - } - part { - name: "separator_right_bottom_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 1 1; - fixed: 1 1; + part { + name: "arrow_area_left"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; + fixed: 1 1; + align: 1 0.5; + rel1 { + relative: 0 1; + to_y: "ctxpopup_frame_left_top"; + } + rel2 { + relative:0 0; + to:"ctxpopup_frame_left_bottom"; + } + } + } + part { + name: "arrow_area_right"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; + fixed: 1 1; + align: 0 0.5; + rel1 { + relative: 1 1; + to:"ctxpopup_frame_right_top"; + } + rel2 { + relative: 1 0; + to_y: "ctxpopup_frame_right_bottom"; + } + } + } + part { + name: "arrow_area_up"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + align: 0.5 1; + rel1 { + relative: 0 0; + to: "frame_bg"; + } + rel2 { + relative: 1 0; + to: "frame_bg"; + } + } + } + part { + name: "arrow_area_down"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + align: 0.5 0; + rel1 { + relative: 0 1; + to: "frame_bg"; + } + rel2 { + relative: 1 1; + to: "frame_bg"; + } + } + } + part { + name: "elm.swallow.arrow_up"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_up"; + } + description { + state: "default" 0.0; + min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + visible: 1; + } + } + part { + name: "elm.swallow.arrow_down"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_down"; + } + description { + state: "default" 0.0; + min: 0 CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + visible: 1; + } + } + part { + name: "elm.swallow.arrow_left"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_left"; + } + description { + state: "default" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; + fixed: 1 1; + visible: 1; + } + } + part { + name: "elm.swallow.arrow_right"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + dragable { + x: 1 1 0; + y: 1 1 0; + confine: "arrow_area_right"; + } + description { + state: "default" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 0; + fixed: 1 1; + visible: 1; + } + } + part { + name: "ctxpopup_frame_left_top"; + type: RECT; + scale: 1; + description { + visible: 0; + align: 0 0; + min: CTXPOPUP_FRAME_CORNER_SIZE; + max: CTXPOPUP_FRAME_CORNER_SIZE; + } + } + part { + name: "ctxpopup_frame_right_top"; + type: RECT; + scale: 1; + description { + visible: 0; + align: 1 0; + min: CTXPOPUP_FRAME_CORNER_SIZE; + max: CTXPOPUP_FRAME_CORNER_SIZE; + } + } + part { + name: "ctxpopup_frame_left_bottom"; + type: RECT; + scale: 1; + description { + visible: 0; + align: 0 1; + min: CTXPOPUP_FRAME_CORNER_SIZE; + max: CTXPOPUP_FRAME_CORNER_SIZE; + } + } + part { + name: "ctxpopup_frame_right_bottom"; + type: RECT; + scale: 1; + description { + visible: 0; + align: 1 1; + min: CTXPOPUP_FRAME_CORNER_SIZE; + max: CTXPOPUP_FRAME_CORNER_SIZE; + } + } + part { + name:"list_shadow_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + min: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; + max: CTXPOPUP_LIST_SHADOW_PADDING CTXPOPUP_LIST_SHADOW_PADDING; + align: 0 0; + fixed: 1 1; + visible: 0; + rel1 {to:"elm.swallow.content"; relative: 1 1;} + } + } + part { + name:"content_left_top_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + align: 0 0; + fixed: 1 1; + visible: 0; + } + } + part { + name:"content_right_bottom_padding"; + type:RECT; + scale: 1; + mouse_events: 0; + description { + min: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + max: CTXPOPUP_LIST_PADDING CTXPOPUP_LIST_PADDING; + rel1 { relative: 1 1;} + rel2 { relative: 1 1;} + align: 1 1; + fixed: 1 1; + visible: 0; + } + } + part { + name: "elm.swallow.content"; + type: SWALLOW; + description { + state: "default" 0.0; + align: 0 0; + rel1 {to:"ctxpopup_frame_left_top"; relative: 0.5 0.5;} + rel2 {to:"ctxpopup_frame_right_bottom"; relative: 0.5 0.5;} + } } } - - part { - name: "bottom_separator"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: CTXPOPUP_IE_SEPARATOR_COLOR; - rel1 { to:"separator_left_bottom_padding"; relative: 1 0.5; } - rel2 { to:"separator_right_bottom_padding"; relative: 0 1; } + } +/////////////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/arrow/extended/entry"; + alias: "elm/ctxpopup/arrow/extended/entry/pass_event"; + images { + image: "copy&paste_arrow_up.png" COMP; + image: "copy&paste_arrow_left.png" COMP; + image: "copy&paste_arrow_right.png" COMP; + image: "copy&paste_arrow_down.png" COMP; + } + parts { + part { + name: "ctxpopup_arrow"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + visible: 0; + align: 0.5 0.5; + } + description { + state: "left" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; + max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; + fixed: 1 1; + align: 0 0.5; + image { + normal: "copy&paste_arrow_left.png"; + } + } + description { + state: "right" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; + max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH; + fixed: 1 1; + align: 1 0.5; + image { + normal: "copy&paste_arrow_right.png"; + } + } + description { + state: "top" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + align: 0.5 0; + image { + normal: "copy&paste_arrow_up.png"; + } + } + description { + state: "bottom" 0.0; + min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT; + fixed: 1 1; + align: 0.5 1; + image { + normal: "copy&paste_arrow_down.png"; + } + } + } + } + programs { + program { + name: "enable_left_arrow"; + signal: "elm,state,left"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "ctxpopup_arrow"; } - } - part { - name: "elm.swallow.icon"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: CTXPOPUP_IE_ICON_WIDTH_INC CTXPOPUP_IE_ICON_HEIGHT_INC; - max: CTXPOPUP_IE_ICON_WIDTH_INC CTXPOPUP_IE_ICON_HEIGHT_INC; - align: 0 0.5; - aspect: 1.0 1.0; - rel1 { to:"icon_left_padding"; relative: 1 0; } + program { + name: "enable_right_arrow"; + signal: "elm,state,right"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_top_arrow"; + signal: "elm,state,top"; + source: "elm"; + action: STATE_SET "top" 0.0; + target: "ctxpopup_arrow"; + } + program { + name: "enable_bottom_arrow"; + signal: "elm,state,bottom"; + source: "elm"; + action: STATE_SET "bottom" 0.0; + target: "ctxpopup_arrow"; } } - part { - name: "icon_right_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - align: 0 0.5; - fixed: 1 1; - visible: 0; - rel1 { to:"elm.swallow.icon"; relative: 1 1; } + } +/////////////////////////////////////////////////////////////////////////////////////// +#define CTXPOPUP_ENTRY_ITEM_BG_PART \ + part {\ + name: "bg";\ + mouse_events: 0;\ + type: IMAGE;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + rel1 {to:"left_bg_padding"; relative: 1 0;}\ + rel2 {to:"right_bg_padding"; relative: 0 1;}\ + image {\ + normal: "copy&paste_press_center.png";\ + border: 0 0 0 0;\ + }\ + }\ + description {\ + state: "clicked" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + image {\ + normal: "copy&paste_press_center.png";\ + border: 0 0 0 0;\ + }\ + }\ + } +#define CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART \ + part {\ + name: "left_bg_padding";\ + type: IMAGE;\ + scale: 1;\ + mouse_events: 0;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + align: 0 0.5;\ + fixed: 1 0;\ + rel1 { to: "event_blocker"; relative: 0 0; }\ + rel2 { to: "event_blocker"; relative: 0 1; }\ + image {\ + normal: "copy&paste_press_left.png";\ + border: CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0 0;\ + border_scale: 1;\ + }\ + }\ + description {\ + state: "clicked" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + image {\ + normal: "copy&paste_press_left.png";\ + border: CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0 0;\ + border_scale: 1;\ + }\ + }\ + } +#define CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART \ + part {\ + name: "right_bg_padding";\ + type: IMAGE;\ + scale: 1;\ + mouse_events: 0;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + fixed: 1 0;\ + align: 1.0 0.5;\ + rel1 { to: "event_blocker"; relative: 1 0; }\ + rel2 { to: "event_blocker"; relative: 1 1; }\ + image {\ + normal: "copy&paste_press_right.png";\ + border: 0 CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0;\ + border_scale: 1;\ + }\ + }\ + description {\ + state: "clicked" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + image {\ + normal: "copy&paste_press_right.png";\ + border: 0 CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 0 0;\ + border_scale: 1;\ + }\ + }\ + } +#define CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART \ + part {\ + name: "left_padding";\ + type: RECT;\ + scale: 1;\ + mouse_events: 0;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + align: 0 0.5;\ + fixed: 1 0;\ + }\ + } +#define CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART \ + part {\ + name: "right_padding";\ + type: RECT;\ + scale: 1;\ + mouse_events: 0;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\ + fixed: 1 0;\ + align: 1.0 0.5;\ + }\ + } +#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART \ + part {\ + name: "left_separator";\ + mouse_events: 0;\ + type: RECT;\ + scale: 1;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + color: CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR;\ + min: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ + max: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ + fixed: 1 1;\ + rel2 {\ + relative: 0 1;\ + }\ + }\ + description {\ + state: "vertical" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ + description {\ + state: "horizontal" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ + } +#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART \ + part {\ + name: "right_separator";\ + mouse_events: 0;\ + type: RECT;\ + scale: 1;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + color: CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR;\ + min: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ + max: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\ + fixed: 1 1;\ + rel1 {\ + offset: -1 0;\ + }\ + rel2 {\ + relative: 0 1;\ + offset: -1 0;\ + }\ + }\ + description {\ + state: "vertical" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ + description {\ + state: "horizontal" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ } +/////////////////////////////////////////////////////////////////////////////////////// + + group { + name: "elm/ctxpopup/text_style_item/extended/entry"; + alias: "elm/ctxpopup/text_style_item/extended/entry/pass_event"; + images { + image: "copy&paste_press_center.png" COMP; + image: "copy&paste_press_left.png" COMP; + image: "copy&paste_press_right.png" COMP; } - part { - name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: 1 CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: (CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC-(3*CTXPOPUP_IE_ITEM_PADDING_INC)-CTXPOPUP_IE_ICON_WIDTH_INC) CTXPOPUP_IE_ITEM_HEIGHT_INC; - fixed: 0 1; - align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to_x: "icon_right_padding";} - rel2 {relative: 0.0 1.0; to_x: "text_right_padding";} - color: CTXPOPUP_IE_FONT_COLOR; - text { - font: "Tizen:style=Medium"; - size: CTXPOPUP_IE_FONT_SIZE_INC; - align: 0.0 0.5; - min: 1 1; - text_class: "list_item"; + parts { + part { + name: "event_blocker"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + CTXPOPUP_ENTRY_ITEM_BG_PART + CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART + CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART + CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART + CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART + CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART + CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART + part { + name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: 1 CTXPOPUP_ENTRY_ITEM_HEIGHT; + max: CTXPOPUP_ENTRY_ITEM_WIDTH_MAX CTXPOPUP_ENTRY_ITEM_HEIGHT; + fixed: 0 1; + align: 0.5 0.5; + rel1 {relative: 1.0 0.0; to: "left_padding";} + rel2 {relative: 0.0 1.0; to: "right_padding";} + color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR; + text { + font: "Tizen:style=Roman"; + size: CTXPOPUP_ENTRY_ITEM_FONT_SIZE; + align: 0.5 0.5; + min: 1 1; + text_class: "list_item"; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR; } } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_IE_CLICKED_FONT_COLOR; + part { + name: "over1"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + color: 0 0 0 0; + } } - } - part { - name: "text_right_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - fixed: 1 0; - align: 1.0 0.5; - } - } - part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; + part { + name: "over2"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + } } - } - part { - name: "over2"; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; + part { + name: "disclip"; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + } + description { + state: "disabled" 0.0; + visible: 1; + color: CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR; + } } } - part { - name: "disclip"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; + programs { + program { + name: "item_unclick"; + signal: "mouse,up,1"; + source: "over1"; + action: SIGNAL_EMIT "elm,action,click" ""; } - description { - state: "disabled" 0.0; - visible: 1; - color: CTXPOPUP_IE_ITEM_DISABLED_COLOR; + program { + name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; } - } - } - programs { - program { - name: "item_unclick"; - signal: "mouse,up,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { - name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "clicked", 0.0); + program { + name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disclip"; } - } - program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "default", 0.0); + program { + name: "item_click2"; + signal: "mouse,down,1"; + source: "over2"; + script { + set_state(PART:"elm.text", "clicked", 0.0); + set_state(PART:"bg", "clicked", 0.0); + set_state(PART:"left_bg_padding", "clicked", 0.0); + set_state(PART:"right_bg_padding", "clicked", 0.0); + } } - } - } -} -/////////////////////////////////////////////////////////////////////////////////////// -group { - name: "elm/ctxpopup/text_style_item/extended/imageeditor"; - images { - image: "imageeditor_bar_press.png" COMP; - } - - parts { - part { - name: "separator_left_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: 2 2; - max: 2 2; - align: 0 1; - fixed: 1 1; + program { + name: "item_unclick2"; + signal: "mouse,up,1"; + source: "over2"; + script { + set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"bg", "default", 0.0); + set_state(PART:"left_bg_padding", "default", 0.0); + set_state(PART:"right_bg_padding", "default", 0.0); + } } - } - part { - name: "bg"; - mouse_events: 0; - type: IMAGE; - description { - state: "default" 0.0; - rel1 { to:"separator_left_top_padding"; relative: 1 0; } - rel2 { to:"separator_right_bottom_padding"; relative: 0 1; } - visible: 0; + program { + name: "default"; + signal: "elm,state,default"; + source: "elm"; + script { + set_state(PART:"left_separator", "default", 0.0); + set_state(PART:"right_separator", "default", 0.0); + } } - description { - state: "clicked" 0.0; - rel1 { to:"separator_left_top_padding"; relative: 1 0; } - rel2 { to:"separator_right_bottom_padding"; relative: 0 1; } - image { - normal: "imageeditor_bar_press.png"; - border: 10 10 10 10; - border_scale: 1; + program { + name: "vertical"; + signal: "elm,state,vertical"; + source: "elm"; + script { + set_state(PART:"left_separator", "vertical", 0.0); + set_state(PART:"right_separator", "vertical", 0.0); } } - } - part { - name: "separator_left_top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 0 0; - fixed: 1 1; + program { + name: "horizontal"; + signal: "elm,state,horizontal"; + source: "elm"; + script { + set_state(PART:"left_separator", "horizontal", 0.0); + set_state(PART:"right_separator", "horizontal", 0.0); + } } } - part { - name: "separator_right_top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 1 0; - fixed: 1 1; - } + } +/////////////////////////////////////////////////////////////////////////////// + group { + name: "elm/ctxpopup/icon_style_item/extended/entry"; + images { + image: "copy&paste_press_center.png" COMP; + image: "copy&paste_press_left.png" COMP; + image: "copy&paste_press_right.png" COMP; } - part { - name: "separator_left_bottom_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 0 1; - fixed: 1 1; + parts { + part { + name: "event_blocker"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + } } - } - part { - name: "separator_right_bottom_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - max: CTXPOPUP_IE_SEPARATOR_PADDING_SIZE; - align: 1 1; - fixed: 1 1; + CTXPOPUP_ENTRY_ITEM_BG_PART + CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART + CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART + CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART + CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART + CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART + CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART + part { + name: "elm.swallow.icon"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: 36 36; + max: 36 36; + fixed: 0 1; + align: 0.5 0.5; +// aspect: 1.0 1.0; + rel1 {relative: 1.0 0.0; to: "left_padding";} + rel2 {relative: 0.0 1.0; to: "right_padding";} + } } - } - - part { - name: "bottom_separator"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: CTXPOPUP_IE_SEPARATOR_COLOR; - rel1 { to:"separator_left_bottom_padding"; relative: 1 0.5; } - rel2 { to:"separator_right_bottom_padding"; relative: 0 1; } + part { + name: "elm.swallow.icon.paint"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + color: 255 255 0 255; + rel1 { to: "elm.swallow.icon"; } + rel2 { to: "elm.swallow.icon"; } + } } - } - part { - name: "left_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC; - align: 0 0.5; - fixed: 1 1; - visible: 0; + part { + name: "over1"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + color: 0 0 0 0; + } } - } - part { - name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: 1 CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: (CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC-2*CTXPOPUP_IE_ITEM_PADDING_INC) CTXPOPUP_IE_ITEM_HEIGHT_INC; - fixed: 0 1; - align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to: "left_padding";} - rel2 {relative: 0.0 1.0; to: "right_padding";} - color: CTXPOPUP_IE_FONT_COLOR; - text { - font: "Tizen:style=Medium"; - size: CTXPOPUP_IE_FONT_SIZE_INC; - align: 0.5 0.5; - min: 1 1; - text_class: "tizen"; + part { + name: "over2"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; } } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - color: CTXPOPUP_IE_CLICKED_FONT_COLOR; + part { + name: "disclip"; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + } + description { + state: "disabled" 0.0; + visible: 1; + color: CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR; + } } } - part { - name: "right_padding"; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - min: 30 CTXPOPUP_IE_ITEM_HEIGHT_INC; - max: 30 CTXPOPUP_IE_ITEM_HEIGHT_INC; - fixed: 1 0; - align: 1.0 0.5; + programs { + program { + name: "item_unclick"; + signal: "mouse,up,1"; + source: "over1"; + action: SIGNAL_EMIT "elm,action,click" ""; } - } - part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; + program { + name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; } - } - part { - name: "over2"; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; + program { + name: "item_click2"; + signal: "mouse,down,1"; + source: "over2"; + script { + set_state(PART:"bg", "clicked", 0.0); + set_state(PART:"left_bg_padding", "clicked", 0.0); + set_state(PART:"right_bg_padding", "clicked", 0.0); + } } - } - part { - name: "disclip"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; + program { + name: "item_unclick2"; + signal: "mouse,up,1"; + source: "over2"; + script { + set_state(PART:"bg", "default", 0.0); + set_state(PART:"left_bg_padding", "default", 0.0); + set_state(PART:"right_bg_padding", "default", 0.0); + } } - description { - state: "disabled" 0.0; - visible: 1; - color: CTXPOPUP_IE_ITEM_DISABLED_COLOR; + program { + name: "default"; + signal: "elm,state,default"; + source: "elm"; + script { + set_state(PART:"left_separator", "default", 0.0); + set_state(PART:"right_separator", "default", 0.0); + } } - } - - } - - programs { - program { - name: "item_unclick"; - signal: "mouse,up,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { - name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { - name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - - program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "clicked", 0.0); + program { + name: "vertical"; + signal: "elm,state,vertical"; + source: "elm"; + script { + set_state(PART:"left_separator", "vertical", 0.0); + set_state(PART:"right_separator", "vertical", 0.0); + } } - } - program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "default", 0.0); + program { + name: "horizontal"; + signal: "elm,state,horizontal"; + source: "elm"; + script { + set_state(PART:"left_separator", "horizontal", 0.0); + set_state(PART:"right_separator", "horizontal", 0.0); + } } } } -} - /////////////////////////////////////////////////////////////////////////////////////// #define CTXPOPUP_TP_TEXT_WIDTH 32 #define CTXPOPUP_TP_PADDING 15 @@ -4209,7 +4612,6 @@ group { name: "ctxpopup_frame"; type: RECT; scale: 1; - clip_to: "ctxpopup_clip"; description { color: CTXPOPUP_TP_BG_COLOR_INC; min: 1 CTXPOPUP_TP_HEIGHT_INC; @@ -4221,7 +4623,6 @@ group { name: "elm.swallow.content"; type: SWALLOW; scale: 1; - clip_to: "ctxpopup_clip"; description { state: "default" 0.0; min: 1 CTXPOPUP_TP_HEIGHT_INC; @@ -4231,7 +4632,6 @@ group { type: RECT; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; description { state: "default" 0.0; visible: 0; min: 20 0; @@ -4251,7 +4651,6 @@ group { type: RECT; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; description { state: "default" 0.0; visible: 0; min: 20 0; @@ -4271,7 +4670,6 @@ group { type: RECT; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; description { state: "default" 0.0; visible: 0; min: 0 20; @@ -4291,7 +4689,6 @@ group { type: RECT; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; description { state: "default" 0.0; visible: 0; min: 0 20; @@ -4311,7 +4708,6 @@ group { type: SWALLOW; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; dragable { x: 1 1 0; y: 1 1 0; @@ -4328,7 +4724,6 @@ group { type: SWALLOW; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; dragable { x: 1 1 0; y: 1 1 0; @@ -4345,7 +4740,6 @@ group { type: SWALLOW; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; dragable { x: 1 1 0; y: 1 1 0; @@ -4362,7 +4756,6 @@ group { type: SWALLOW; mouse_events: 0; scale: 1; - clip_to: "ctxpopup_clip"; dragable { x: 1 1 0; y: 1 1 0; @@ -4375,131 +4768,6 @@ group { visible: 1; } } - part { name: "ctxpopup_clip"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 0; - rel1 { to:"ctxpopup_frame"; relative: 0 0; } - rel2 { to:"ctxpopup_frame"; relative: 0 1; } - } - description { state: "show_up" 0.0; - color: 255 255 255 0; - rel1 { to:"arrow_area_down"; relative: 0 1; } - rel2 { to:"arrow_area_down"; relative: 1 1; } - } - description { state: "show_left" 0.0; - color: 255 255 255 0; - rel1 { to:"arrow_area_right"; relative: 1 0; } - rel2 { to:"arrow_area_right"; relative: 1 1; } - } - description { state: "show_right" 0.0; - color: 255 255 255 0; - rel1 { to:"arrow_area_left"; relative: 0 0; } - rel2 { to:"arrow_area_left"; relative: 0 1; } - } - description { state: "show_down" 0.0; - color: 255 255 255 0; - rel1 { to:"arrow_area_up"; relative: 0 0; } - rel2 { to:"arrow_area_up"; relative: 1 0; } - } - description { state: "hide_up" 0.0; - color: 255 255 255 255; - rel1 { to:"arrow_area_down"; relative: 0 1; } - rel1 { to:"arrow_area_down"; relative: 1 1; } - } - description { state: "hide_left" 0.0; - color: 255 255 255 255; - rel1 { to:"arrow_area_right"; relative: 1 0; } - rel2 { to:"arrow_area_right"; relative: 1 1; } - } - description { state: "hide_right" 0.0; - color: 255 255 255 255; - rel1 { to:"arrow_area_left"; relative: 0 0; } - rel2 { to:"arrow_area_left"; relative: 0 1; } - } - description { state: "hide_down" 0.0; - color: 255 255 255 255; - rel1 { to:"arrow_area_up"; relative: 0 0; } - rel2 { to:"arrow_area_up"; relative: 1 0; } - } - description { state: "visible" 0.0; - color: 255 255 255 255; - rel1 { to_x:"arrow_area_left"; to_y:"arrow_area_up"; } - rel2 { to_x:"arrow_area_right"; to_y:"arrow_area_down"; } - } - } - } - programs { - program { name: "show"; - signal: "elm,state,show"; - source: "elm"; - action: STATE_SET "visible" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "show_up"; - signal: "elm,state,show,up"; - source: "elm"; - action: STATE_SET "show_up" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "show_left"; - signal: "elm,state,show,left"; - source: "elm"; - action: STATE_SET "show_left" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "show_right"; - signal: "elm,state,show,right"; - source: "elm"; - action: STATE_SET "show_right" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "show_down"; - signal: "elm,state,show,down"; - source: "elm"; - action: STATE_SET "show_down" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "hide_up"; - signal: "elm,state,hide,up"; - source: "elm"; - action: STATE_SET "hide_up" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - after: "hide_finished"; - } - program { name: "hide_left"; - signal: "elm,state,hide,left"; - source: "elm"; - action: STATE_SET "hide_left" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - after: "hide_finished"; - } - program { name: "hide_right"; - signal: "elm,state,hide,right"; - source: "elm"; - action: STATE_SET "hide_right" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - after: "hide_finished"; - } - program { name: "hide_down"; - signal: "elm,state,hide,down"; - source: "elm"; - action: STATE_SET "hide_down" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - after: "hide_finished"; - } - program { name: "hide_finished"; - action: SIGNAL_EMIT "elm,action,hide,finished" ""; - } } } /////////////////////////////////////////////////////////////////////////////// @@ -4658,15 +4926,18 @@ group { } part { name: "over1"; + type: RECT; mouse_events: 1; repeat_events: 1; ignore_flags: ON_HOLD; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "over2"; + type: RECT; mouse_events: 1; repeat_events: 1; description { @@ -4706,6 +4977,7 @@ group { parts { part { name: "event_blocker"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; @@ -4716,6 +4988,7 @@ group { name: "bg"; mouse_events: 0; type: RECT; + scale: 1; description { state: "default" 0.0; color: CTXPOPUP_BG_COLOR_INC; @@ -4744,7 +5017,7 @@ group { state: "default" 0.0; color: CTXPOPUP_SEPARATOR_COLOR_INC; rel1 { relative: 1.0 0.0; to_x: "left_padding";} - rel2 { relative: 0.0 1.0; to_x: "right_padding";} + rel2 { relative: 0.0 1.0; to_x: "right_padding"; offset: 0 0;} align: 0.5 0; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -4765,7 +5038,7 @@ group { state: "default" 0.0; color: CTXPOPUP_SEPARATOR2_COLOR_INC; rel1 { relative: 0.0 1.0; to: "separator1";} - rel2 { relative: 1.0 1.0; to: "separator1";} + rel2 { relative: 1.0 1.0; to: "separator1"; offset: 0 0; } align: 0.5 0; fixed: 0 1; min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; @@ -4852,10 +5125,12 @@ group { } part { name: "over1"; + type: RECT; mouse_events: 1; repeat_events: 1; description { state: "default" 0.0; + color: 0 0 0 0; } } part { @@ -5002,4 +5277,4 @@ group { } } } - } \ No newline at end of file + } diff --git a/themes/widgets/diskselector.edc b/themes/widgets/diskselector.edc index 3f21f4d..e5c9a48 100644 --- a/themes/widgets/diskselector.edc +++ b/themes/widgets/diskselector.edc @@ -117,10 +117,12 @@ group { name: "elm/diskselector/item/default"; part { name: "over1"; + type: RECT; mouse_events: 1; repeat_events: 1; description { state: "default" 0.0; + color: 0 0 0 0; } } } diff --git a/themes/widgets/editfield.edc b/themes/widgets/editfield.edc index 4317656..3dd988e 100644 --- a/themes/widgets/editfield.edc +++ b/themes/widgets/editfield.edc @@ -498,6 +498,7 @@ group { name: "elm/editfield/base/default"; } part { name: "eraser"; + type: RECT; mouse_events: 1; ignore_flags: ON_HOLD; description { @@ -1084,6 +1085,7 @@ group { name: "elm/editfield/base/searchbar"; } part { name: "eraser"; + type: RECT; mouse_events: 1; ignore_flags: ON_HOLD; description { @@ -1701,6 +1703,7 @@ group { name: "elm/editfield/base/font_color_black"; } part { name: "eraser"; + type: RECT; mouse_events: 1; ignore_flags: ON_HOLD; description { @@ -2286,6 +2289,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black"; } part { name: "eraser"; + type: RECT; mouse_events: 1; ignore_flags: ON_HOLD; description { diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc index 3804e07..9976dd4 100644 --- a/themes/widgets/entry.edc +++ b/themes/widgets/entry.edc @@ -60,11 +60,39 @@ group { name: "elm/entry/base/default"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "entry_textblock_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" left_margin=1 right_margin=2 wrap=mixed text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -115,6 +143,18 @@ group { name: "elm/entry/base/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -156,11 +196,39 @@ group { name: "elm/entry/base-charwrap/default"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "entry_textblock_char_wrap_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_textblock_char_wrap_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -211,6 +279,18 @@ group { name: "elm/entry/base-charwrap/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -222,6 +302,24 @@ group { name: "elm/entry/base-nowrap/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -270,6 +368,18 @@ group { name: "elm/entry/base-nowrap/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -317,11 +427,39 @@ group { name: "elm/entry/base/editfield"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "editfield_textblock_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "editfield_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -372,6 +510,18 @@ group { name: "elm/entry/base/editfield"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -418,11 +568,39 @@ group { name: "elm/entry/base-charwrap/editfield"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "editfield_textblock_char_wrap_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "editfield_textblock_char_wrap_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -473,6 +651,18 @@ group { name: "elm/entry/base-charwrap/editfield"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -518,11 +708,39 @@ group { name: "elm/entry/base-single/editfield"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "editfield_single_textblock_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "editfield_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -570,6 +788,18 @@ group { name: "elm/entry/base-single/editfield"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -581,6 +811,24 @@ group { name: "elm/entry/base-single/editfield/searchbar/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "editfield_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -628,6 +876,18 @@ group { name: "elm/entry/base-single/editfield/searchbar/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -668,11 +928,40 @@ group { name: "elm/entry/base-single/default"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "entry_single_textblock_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_single_textblock_guide_style"; + min: 1 1; + max: 0 0; + align: 0.0 0.5; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -721,6 +1010,18 @@ group { name: "elm/entry/base-single/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -732,6 +1033,24 @@ group { name: "elm/entry/base-single-noedit/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -778,6 +1097,18 @@ group { name: "elm/entry/base-single-noedit/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -789,6 +1120,24 @@ group { name: "elm/entry/base-noedit/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -836,6 +1185,18 @@ group { name: "elm/entry/base-noedit/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -847,6 +1208,24 @@ group { name: "elm/entry/base-noedit/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_textblock_char_wrap_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -862,7 +1241,7 @@ group { name: "elm/entry/base-noedit/default"; description { state: "default" 0.0; fixed: 1 0; text { - style: "entry_textblock_style_charwrap"; + style: "entry_textblock_char_wrap_style"; min: 0 1; align: 0.0 0.0; } @@ -870,7 +1249,7 @@ group { name: "elm/entry/base-noedit/default"; description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_textblock_disabled_style_charwrap"; + style: "entry_textblock_char_wrap_disabled_style"; } } } @@ -894,6 +1273,18 @@ group { name: "elm/entry/base-noedit/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -905,6 +1296,24 @@ group { name: "elm/entry/base-noedit/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -951,6 +1360,18 @@ group { name: "elm/entry/base-noedit/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -962,6 +1383,24 @@ group { name: "elm/entry/base-noedit/default"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "editfield_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -1010,6 +1449,18 @@ group { name: "elm/entry/base-noedit/default"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -1054,8 +1505,36 @@ group { name: "elm/entry/base-password/popup"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; } + style { name: "entry_single_textblock_popup_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" align=center wrap=mixed ellipsis=1.0 text_class=entry"; + 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"; + } } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "entry_single_textblock_popup_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -1104,6 +1583,18 @@ group { name: "elm/entry/base-password/popup"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -1138,6 +1629,7 @@ group { name: "elm/entry/base-password/popup"; } } part { name: "base"; + type: RECT; mouse_events: 0; scale: 1; clip_to: "clip"; @@ -1359,7 +1851,7 @@ group { name: "elm/entry/base-password/popup"; } } } -///////////////////////////////////////////////////////////////////////// + group { name: "elm/entry/selection/block_handle_left"; data.item: "position" "BOTTOM"; data.item: "height" "40"; @@ -1791,9 +2283,6 @@ group { name: "elm/entry/base-password/popup"; } } - -///////////////////////////////////////////////////////////////////////// - group { name: "elm/entry/selection/block_bar"; images { image: "reader_longtap_blue.png" COMP; @@ -2556,12 +3045,31 @@ styles { } } part { + name: "elm.rect.middle.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 0; + max: 0 0; + align: 0.0 0.0; + color: 0 0 0 0; + rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text"; } + } + description { + state: "show" 0.0; + inherit: "default" 0.0; + min: 0 ENTRY_BUBBLE_MIDDLE_PAD; + max: 0 ENTRY_BUBBLE_MIDDLE_PAD; + } + } + part { name: "elm.swallow.end"; type: SWALLOW; scale: 1; description { state: "default" 0.0; align: 0.0 0.0; - rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text"; } + rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.middle.pad"; } rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } } } @@ -2674,6 +3182,18 @@ styles { action: STATE_SET "default" 0.0; target: "elm.swallow.icon1"; } + program { name: "show_middle_pad"; + signal: "elm,state,middle,pad,enabled"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "elm.rect.middle.pad"; + } + program { name: "hide_middle_pad"; + signal: "elm,state,middle,pad,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.rect.middle.pad"; + } } } @@ -2770,7 +3290,7 @@ styles { rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; } rel2 { relative: 1.0 0.0; to_y: "elm.rect.bottom.pad"; } text { - style: "entry_textblock_style_charwrap"; + style: "entry_textblock_char_wrap_style"; min: 0 1; max: 1 0; } @@ -2778,7 +3298,7 @@ styles { description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_textblock_disabled_style_charwrap"; + style: "entry_textblock_char_wrap_disabled_style"; } } } @@ -3315,13 +3835,32 @@ styles { } } part { + name: "elm.rect.middle.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 0; + max: 0 0; + align: 0.0 0.0; + color: 0 0 0 0; + rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text"; } + } + description { + state: "show" 0.0; + inherit: "default" 0.0; + min: 0 ENTRY_BUBBLE_MIDDLE_PAD; + max: 0 ENTRY_BUBBLE_MIDDLE_PAD; + } + } + part { name: "elm.swallow.end"; type: SWALLOW; scale: 1; description { state: "default" 0.0; align: 0.0 0.0; - rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text"; } + rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.middle.pad"; } rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } } } @@ -3451,6 +3990,18 @@ styles { action: STATE_SET "default" 0.0; target: "elm.swallow.icon1"; } + program { name: "show_middle_pad"; + signal: "elm,state,middle,pad,enabled"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "elm.rect.middle.pad"; + } + program { name: "hide_middle_pad"; + signal: "elm,state,middle,pad,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.rect.middle.pad"; + } } } @@ -3547,7 +4098,7 @@ styles { rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad";} rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } text { - style: "entry_textblock_style_charwrap"; + style: "entry_textblock_char_wrap_style"; min: 0 1; max: 1 0; } @@ -3555,7 +4106,7 @@ styles { description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_textblock_disabled_style_charwrap"; + style: "entry_textblock_char_wrap_disabled_style"; } } } @@ -3628,11 +4179,39 @@ group { name: "elm/entry/base/font_color_black"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } + style { name: "font_color_black_textblock_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=mixed left_margin=1 right_margin=2 text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "font_color_black_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -3682,6 +4261,18 @@ group { name: "elm/entry/base/font_color_black"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -3693,6 +4284,24 @@ group { name: "elm/entry/base-noedit/font_color_black"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "font_color_black_textblock_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -3742,6 +4351,18 @@ group { name: "elm/entry/base-noedit/font_color_black"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -3791,11 +4412,39 @@ group { name: "elm/entry/base-charwrap/font_color_black"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } + style { name: "font_color_black_textblock_char_wrap_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=char left_margin=1 right_margin=2 text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "font_color_black_textblock_char_wrap_guide_style"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -3845,6 +4494,18 @@ group { name: "elm/entry/base-charwrap/font_color_black"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -3894,11 +4555,39 @@ group { name: "elm/entry/base-single/font_color_black"; tag: "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } + style { name: "font_color_black_single_textblock_guide_style"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=entry"; + 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"; + } } data { item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "font_color_black_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -3946,6 +4635,18 @@ group { name: "elm/entry/base-single/font_color_black"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } @@ -3957,6 +4658,24 @@ group { name: "elm/entry/base-single-noedit/font_color_black"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "font_color_black_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -4004,6 +4723,18 @@ group { name: "elm/entry/base-single-noedit/font_color_black"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } group { name: "elm/entry/base-password/font_color_black"; @@ -4015,6 +4746,24 @@ group { name: "elm/entry/base-password/font_color_black"; item: context_menu_orientation "horizontal"; } parts { + part { name: "elm.guide"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + text { + style: "font_color_black_single_textblock_guide_style"; + min: 1 1; + max: 0 1; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; @@ -4062,6 +4811,18 @@ group { name: "elm/entry/base-password/font_color_black"; action: STATE_SET "default" 0.0; target: "elm.text"; } + program { name: "gdisable"; + signal: "elm,guide,disabled"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.guide"; + } + program { name: "genable"; + signal: "elm,guide,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.guide"; + } } } diff --git a/themes/widgets/gengrid.edc b/themes/widgets/gengrid.edc index 7cd0049..3272bf4 100644 --- a/themes/widgets/gengrid.edc +++ b/themes/widgets/gengrid.edc @@ -236,7 +236,7 @@ to: "focus_bg_right_bottom_padding"; } image.normal: "00_thumbs_bg_focus.png"; - image.border: 6 6 6 6; + image.border: 13 13 13 13; } description { state: "enabled" 0.0; inherit: "default" 0.0; @@ -477,3 +477,221 @@ } } } + + +#define GROUPINDEX_PADDING_SIZE_LEFT 26 +#define GROUPINDEX_PADDING_SIZE_RIGHT 26 + + group { name: "elm/gengrid/item/group_index/default"; + data.item: "selectraise" "on"; + data.item: "texts" "elm.text"; + data.item: "contents" "elm.swallow.icon elm.swallow.end"; + + images { + image: "00_index list_bg.png" COMP; + } + parts { + part { name: "base"; + type: RECT; + repeat_events: 1; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.5; + color: 0 0 0 0; + } + } + part { name: "bg_image"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + color: GENLIST_GROUPINDEX_LIST_BG_COLOR; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_GROUPINDEX_LIST_PRESS_COLOR; + } + } + part { name: "elm.swallow.pad"; + type: SWALLOW; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + min: 0 0; + fixed: 1 0; + align: 0.0 0.5; + rel1.to: "base"; + rel2.to: "base"; + rel2.relative: 0.0 1.0; + } + } + part { name: "elm.padding.left"; + scale: 1; + mouse_events: 0; + type: SPACER; + description { state: "default" 0.0; + align: 0 0.5; + fixed: 1 0; + rel1 { + relative: 1 0; + to_x: "elm.swallow.pad"; + to_y: "base"; + } + rel2 { + relative: 1 1; + to_x: "elm.swallow.pad"; + to_y: "base"; + } + min: GROUPINDEX_PADDING_SIZE_LEFT 0; + max: GROUPINDEX_PADDING_SIZE_LEFT -1; + fixed: 1 0; + } + description { state: "decorate" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + } + } + part { name: "elm.padding.right"; + scale: 1; + mouse_events: 0; + type: SPACER; + description { state: "default" 0.0; + min: GROUPINDEX_PADDING_SIZE_RIGHT 0; + max: GROUPINDEX_PADDING_SIZE_RIGHT -1; + fixed: 1 0; + align: 1.0 0.5; + rel1.to: "base"; + rel2.to: "base"; + rel1.relative: 1 0; + } + description { state: "decorate" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + } + } + part { name: "elm.padding.top"; + scale: 1; + mouse_events: 0; + type: SPACER; + description { + state: "default" 0.0; + min: 0 20; + max: -1 20; + fixed: 0 1; + rel1.to: "base"; + rel2.to: "base"; + rel2.relative: 1.0 0.0; + align: 0.5 0.0; + } + } + part { name: "elm.padding.bottom"; + scale: 1; + mouse_events: 0; + type: SPACER; + description { state: "default" 0.0; + min: 0 14; + max: -1 14; + fixed: 0 1; + rel1.to: "base"; + rel2.to: "base"; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + } + } + part { name: "elm.text"; + scale: 1; + mouse_events: 0; + type: TEXT; + description { state: "default" 0.0; + align: 0.5 0; + rel1 { + relative: 1 1; + to_x: "elm.padding.left"; + to_y: "elm.padding.top"; + } + rel2 { + relative: 0 1; + to_x: "elm.padding.right"; + to_y: "elm.padding.top"; + } + color: GENLIST_GROUPINDEX_LIST_COLOR; + text { + align: 0 0.5; + min: 0 1; + font: "Tizen:style=Bold"; + size: GENLIST_GROUPINDEX_LIST_SIZE; + text_class: "list_item"; + } + min: 0 38; + fixed: 1 1; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_GROUPINDEX_LIST_FOCUS_COLOR; + } + } + part { name: "index_line"; + scale: 1; + type: RECT; + description { state: "default" 0.0; + rel1 { + relative: 1 1; + to_x: "elm.padding.left"; + to_y: "elm.text"; + } + rel2 { + relative: 0 0; + to_x: "elm.padding.right"; + to_y: "elm.padding.bottom"; + } + color: GENLIST_GROUPINDEX_LINE_COLOR; + min: 0 4; + max: -1 4; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; + } + } + } + programs { + program { name: "enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_image"; + target: "elm.text"; + target: "index_line"; + } + program { name: "disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "bg_image"; + target: "elm.text"; + target: "index_line"; + } + program { name: "selected"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "bg_image"; + target: "elm.text"; + target: "index_line"; + } + program { name: "unselected"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_image"; + target: "elm.text"; + target: "index_line"; + transition: LINEAR 0.1; + } + } + } + + diff --git a/themes/widgets/genlist/genlist.edc b/themes/widgets/genlist/genlist.edc index dbfd407..536102e 100644 --- a/themes/widgets/genlist/genlist.edc +++ b/themes/widgets/genlist/genlist.edc @@ -148,7 +148,7 @@ color: 255 255 255 0; } } - part { name: "bg_image"; + part { name: "bg"; mouse_events: 0; scale: 1; description { state: "default" 0.0; diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc index c67b4c2..e5369c6 100644 --- a/themes/widgets/genlist/genlist_decorate.edc +++ b/themes/widgets/genlist/genlist_decorate.edc @@ -21,62 +21,85 @@ * vim:ts=3 */ -// 2.2.7.1 edit elect all style - group { name: "elm/genlist/item/select_all/default"; - alias: "elm/genlist/item_odd/select_all/default"; - alias: "elm/genlist/item_compress/select_all/default"; - alias: "elm/genlist/item_compress_odd/select_all/default"; - alias: "elm/layout/select_all/default"; - inherit: "elm/genlist/item/1text.1icon.3/default"; +// 2.2.7.1 edit mode select all style + group { GENLIST_NAME("select_all/default") + alias: "elm/layout/select_all/default"; - parts { - GENLIST_PART_BOTTOM_LINE_OFF - part { name: "bg_image"; - description { state: "default" 0.0; + GENLIST_PROLOG + + data.item: "texts" "elm.text"; + data.item: "contents" "elm.icon"; + + parts { + GENLIST_PART_BG_NORMAL + GENLIST_PART_BASE + GENLIST_PART_PADDING_LEFT + GENLIST_PART_PADDING_RIGHT + GENLIST_PART_PADDING_TOP_SIZE( 21 ) // (112-70)/2 + GENLIST_PART_PADDING_BOTTOM_SIZE( 21 ) // (112-70)/2 + part { name: "bg_color"; + type: RECT; + description { state: "default" 0.0; + rel1.to_y: "elm.text"; + rel2.to_y: "elm.text"; color: GENLIST_SELECT_ALL_BG_COLOR; - } - } - } - } + } + } + GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon", "elm.padding.left") + GENLIST_PART_PADDING_L("elm.padding.icon.right", "elm.icon") + GENLIST_PART_LISTITEM_("elm.text", 70, // FIXME: This value is not defined in the UX yet. + "elm.padding.icon.right", "elm.padding.right", "elm.padding.top", "elm.padding.bottom", + ) + } + programs { + program { name: "play_sound"; + signal: "mouse,down,1"; + source: "elm.*"; + action: PLAY_SAMPLE "button-pressed" 1.0; + } + program { name: "play_sound_bg"; + signal: "mouse,down,1"; + source: "bg_color"; + action: PLAY_SAMPLE "button-pressed" 1.0; + } + } + } // 2.2.7. Genlist Edit mode (rename) // Should be used as decorate all item style - group { name: "elm/genlist/item/edit_default/default"; - alias: "elm/genlist/item_odd/edit_default/default"; - alias: "elm/genlist/item_compress/edit_default/default"; - alias: "elm/genlist/item_compress_odd/edit_default/default"; - alias: "elm/genlist/tree/edit_default/default"; - alias: "elm/genlist/tree_odd/edit_default/default"; - alias: "elm/genlist/tree_compress/edit_default/default"; - alias: "elm/genlist/tree_compress_odd/edit_default/default"; + group { GENLIST_NAME("edit_default/default") + + GENLIST_PROLOG_NORMAL - data.item: "stacking" "above"; - data.item: "selectraise" "on"; data.item: "contents" "elm.edit.icon.1 elm.edit.icon.2"; parts { - GENLIST_PART_BG_IMAGE - GENLIST_PART_BASE_REORDER - GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT - part { name: "elm.swallow.decorate.content"; - type: SWALLOW; - scale: 1; - GENLIST_DESCRIPTION_LR("elm.edit.icon1.right", "elm.edit.icon.2", - min: 0 GENLIST_HEIGHT_1LINE; + GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL + GENLIST_PART_EXPANDED_PAD + GENLIST_PART_SPACER("elm.padding.left", + GENLIST_DESCRIPTION_L("elm.swallow.pad", + min: GENLIST_PADDING_SIZE_LEFT 0; + max: GENLIST_PADDING_SIZE_LEFT -1; + fixed: 1 0; ) - description { state: "flip_enabled" 0.0; + description { state: "reorder" 0.0; inherit: "default" 0.0; - rel1 { - relative: 0 0; - to: "base"; - } - rel2 { - relative: 1 1; - to: "base"; - } + min: 32 0; + max: 32 -1; } - } + ) + GENLIST_PART_SPACER("elm.padding.right", + description { state: "default" 0.0; + min: GENLIST_PADDING_SIZE_RIGHT 0; + max: GENLIST_PADDING_SIZE_RIGHT -1; + fixed: 1 0; + align: 1.0 0.5; + rel1.to: "base"; + rel2.to: "base"; + rel1.relative: 1 0; + } + ) GENLIST_PART_BOTTOM_LINE GENLIST_PART_ICON("elm.edit.icon.1", @@ -90,94 +113,63 @@ } description { state: "flip_enabled" 0.0; inherit: "default" 0.0; - visible: 0; + rel1.relative: 0 0; + rel2.relative: 0 1; + align: 1 0.5; } ) GENLIST_PART_PADDING_L("elm.edit.icon1.right", "elm.edit.icon.1") - GENLIST_PART_ICON("elm.edit.icon.2", GENLIST_DESCRIPTION_R("elm.padding.right", - align: 0 0.5; - max: 48 48;) + GENLIST_PART_ICON("elm.swallow.decorate.content", + GENLIST_DESCRIPTION_LR("elm.edit.icon1.right", "elm.edit.icon.2", + min: 0 GENLIST_HEIGHT_1LINE; + ) + ) + GENLIST_PART_ICON("elm.edit.icon.2", + GENLIST_DESCRIPTION_R("elm.padding.right", + align: 0 0.5; + max: 48 48; + ) description { state: "decorate" 0.0; inherit: "default" 0.0; align: 1 0.5; } description { state: "flip_enabled" 0.0; inherit: "default" 0.0; - visible: 0; + rel1.relative: 1 0; + rel2.relative: 1 1; + align: 0 0.5; } ) } programs { - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( ; ) - program { name: "selected"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg_image"; + GENLIST_PROGRAM_DISABLED( + target: "bg"; + target: "bg_reorder"; target: "bottom_line"; target: "bottom_line2"; - } - program { name: "unselected"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg_image"; + ) + GENLIST_PROGRAM_SELECT_NOSOUND( + target: "bg"; + target: "bg_reorder"; target: "bottom_line"; target: "bottom_line2"; - transition: LINEAR 0.1; - } - GENLIST_PROGRAM_FLIP_TARGET( target: "elm.swallow.decorate.content"; - target: "elm.edit.icon.1"; target: "elm.edit.icon.2"; ) - program { name: "reorder_enabled"; - signal: "elm,state,reorder,mode_set"; - source: "elm"; - transition: DECELERATE 0.5; - action: STATE_SET "reorder" 0.0; - target: "reorder.padding.left"; - target: "reorder.padding.right"; - } - program { name: "reorder_disabled"; - signal: "elm,state,reorder,mode_unset"; - source: "elm"; - transition: ACCELERATE 0.5; - action: STATE_SET "default" 0.0; - target: "reorder.padding.left"; - target: "reorder.padding.right"; - } - program { name: "decorate_enabled_effect"; - signal: "elm,state,decorate,enabled,effect"; - source: "elm"; - transition: DECELERATE 0.7; - action: STATE_SET "decorate" 0.0; - target: "elm.edit.icon.1"; - target: "elm.edit.icon.2"; - } - program { name: "decorate_disabled_effect"; - signal: "elm,state,decorate,disabled,effect"; - source: "elm"; - transition: ACCELERATE 0.7; - action: STATE_SET "default" 0.0; - target: "elm.swallow.decorate.content"; - target: "elm.edit.icon.1"; - target: "elm.edit.icon.2"; - } - - program { name: "decorate_enabled"; - signal: "elm,state,decorate,enabled"; - source: "elm"; - action: STATE_SET "decorate" 0.0; + GENLIST_PROGRAM_REORDER( + target: "bg_clip"; + target: "bottom_line_clip"; + target: "bg_reorder_clip"; + target: "elm.padding.left"; + target: "elm.padding.right"; + ) + GENLIST_PROGRAMS_DECORATE_EFFECT( target: "elm.edit.icon.1"; target: "elm.edit.icon.2"; - } - program { name: "decorate_disabled"; - signal: "elm,state,decorate,disabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.decorate.content"; + ) + GENLIST_PROGRAM_FLIP_TARGET( target: "elm.edit.icon.1"; - target: "elm.edit.icon.2"; - } + target: "elm.edit.icon.2";, + target: "bg_reorder_clip"; + ) } } @@ -1977,7 +1969,7 @@ color: GENLIST_SELECT_ALL_BG_COLOR; } } - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( 0 ) GENLIST_PART_PADDING_BOTTOM_SIZE( 0 ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -2059,14 +2051,14 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; } program { name: "go_passive"; signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; transition: LINEAR 0.1; } diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc index ba3b797..5fda093 100644 --- a/themes/widgets/genlist/genlist_expandable.edc +++ b/themes/widgets/genlist/genlist_expandable.edc @@ -22,28 +22,18 @@ */ // 2.5.1.1 - group { name: "elm/genlist/tree/dialogue/2text/expandable/default"; - alias: "elm/genlist/tree_odd/dialogue/2text/expandable/default"; - alias: "elm/genlist/tree_compress/dialogue/2text/expandable/default"; - alias: "elm/genlist/tree_compress_odd/dialogue/2text/expandable/default"; - alias: "elm/genlist/item/dialogue/2text/expandable/default"; - alias: "elm/genlist/item_odd/dialogue/2text/expandable/default"; - alias: "elm/genlist/item_compress/dialogue/2text/expandable/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text/expandable/default"; - - GENLIST_DATA_ITEM_NORMAL - data.item: "treesize" 0; + group { GENLIST_NAME("dialogue/2text/expandable/default") + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE GENLIST_IMAGES_EXPANDABLE_BTN parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_LISTITEM("elm.text.1", GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.arrow.left", @@ -54,45 +44,35 @@ ) GENLIST_PART_SUBITEM("elm.text.2", GENLIST_DESCRIPTION_LRB("elm.padding.left", "elm.padding.arrow.left", "elm.padding.bottom", - fixed: 1 1; + fixed: 0 1; min: 0 GENLIST_HEIGHT_2LINE_SUB; GENLIST_PARAM_SUBITEM_DEFAULT ) ) GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW + GENLIST_PART_FLIP } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; ) programs { - GENLIST_PROGRAM_DISABLED_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) - GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( target: "elm.text.1"; target: "elm.text.2"; ) + GENLIST_PROGRAM_SELECT_ARROW GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "arrow"; target: "elm.text.1"; target: "elm.text.2"; ) } } // 2.5.1.2 - group { name: "elm/genlist/tree/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/tree_odd/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/tree_compress/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/tree_compress_odd/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/item/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2/expandable/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2/expandable/default"; - - GENLIST_DATA_ITEM_NORMAL - data.item: "treesize" 0; + group { GENLIST_NAME("dialogue/2text.2/expandable/default") + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE GENLIST_IMAGES_EXPANDABLE_BTN parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_SUBITEM("elm.text.2", GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.arrow.left", @@ -111,38 +91,28 @@ ) GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW + GENLIST_PART_FLIP } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; ) programs { - GENLIST_PROGRAM_DISABLED_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) - GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( target: "elm.text.1"; target: "elm.text.2"; ) + GENLIST_PROGRAM_SELECT_ARROW GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "arrow"; target: "elm.text.1"; target: "elm.text.2"; ) } } // 2.5.1.3 - group { name: "elm/genlist/tree/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/tree_odd/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/tree_compress/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/tree_compress_odd/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/item/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/item_odd/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/item_compress/dialogue/2text.3/expandable/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.3/expandable/default"; - - GENLIST_DATA_ITEM_NORMAL - data.item: "treesize" 0; + group { GENLIST_NAME("dialogue/2text.3/expandable/default") + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE GENLIST_IMAGES_EXPANDABLE_BTN parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_LISTITEM("elm.text.1", GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.arrow.left", @@ -160,27 +130,18 @@ ) GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW + GENLIST_PART_FLIP } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; ) programs { - GENLIST_PROGRAM_DISABLED_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) - GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( target: "elm.text.1"; target: "elm.text.2"; ) + GENLIST_PROGRAM_SELECT_ARROW GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "arrow"; target: "elm.text.1"; target: "elm.text.2"; ) } } // 2.5.1.4 - group { name: "elm/genlist/tree/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/tree_odd/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/tree_compress/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/tree_compress_odd/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/item/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon/expandable/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon/expandable/default"; - - GENLIST_DATA_ITEM_NORMAL - data.item: "treesize" 0; + group { GENLIST_NAME("dialogue/2text.1icon/expandable/default") + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; @@ -188,15 +149,14 @@ image: "00_button_expand_closed.png" COMP; image: "00_button_expand_opened.png" COMP; } - GENLIST_IMAGES_DIALOGUE_BG_IMAGE GENLIST_IMAGES_EXPANDABLE_BTN parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_ICON("elm.icon", GENLIST_DESCRIPTION_L("elm.padding.left", GENLIST_PARAM_ICON_CHECK_RADIO) @@ -218,27 +178,19 @@ ) GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW + GENLIST_PART_FLIP } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; ) programs { - GENLIST_PROGRAM_DISABLED_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) - GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( target: "elm.text.1"; target: "elm.text.2"; ) + GENLIST_PROGRAM_SELECT_ARROW GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "arrow"; target: "elm.text.1"; target: "elm.text.2"; ) } } // 2.5.1.5 - group { name: "elm/genlist/tree/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/tree_odd/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/tree_compress/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/tree_compress_odd/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/item/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/item_odd/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/item_compress/dialogue/3text.1icon/expandable/default"; - alias: "elm/genlist/item_compress_odd/dialogue/3text.1icon/expandable/default"; + group { GENLIST_NAME("dialogue/3text.1icon/expandable/default") + GENLIST_PROLOG_DIALOGUE - GENLIST_DATA_ITEM_NORMAL - data.item: "treesize" 0; data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.swallow.colorbar elm.icon"; @@ -246,15 +198,15 @@ image: "00_button_expand_closed.png" COMP; image: "00_button_expand_opened.png" COMP; } - GENLIST_IMAGES_DIALOGUE_BG_IMAGE + GENLIST_IMAGES_EXPANDABLE_BTN parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_COLORBAR GENLIST_PART_ICON_BIG_L("elm.icon", "elm.padding.left") @@ -278,56 +230,51 @@ ) GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW + GENLIST_PART_FLIP } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) programs { - GENLIST_PROGRAM_DISABLED_DIALOGUE( target: "elm.icon"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "arrow_clip"; ) - GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( target: "elm.icon"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) + GENLIST_PROGRAM_SELECT_ARROW GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "arrow"; target: "elm.icon"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) } } // 2.5.1.6 - group { name: "elm/genlist/tree/dialogue/1text/expandable/default"; - alias: "elm/genlist/tree_odd/dialogue/1text/expandable/default"; - alias: "elm/genlist/tree_compress/dialogue/1text/expandable/default"; - alias: "elm/genlist/tree_compress_odd/dialogue/1text/expandable/default"; - alias: "elm/genlist/item/dialogue/1text/expandable/default"; - alias: "elm/genlist/item_odd/dialogue/1text/expandable/default"; - alias: "elm/genlist/item_compress/dialogue/1text/expandable/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text/expandable/default"; + group { GENLIST_NAME("dialogue/1text/expandable/default") + // FIXME: deprecated, only for backward compatibility alias: "elm/genlist/tree/dialogue/1text/expandable2/default"; alias: "elm/genlist/tree_odd/dialogue/1text/expandable2/default"; alias: "elm/genlist/tree_compress/dialogue/1text/expandable2/default"; alias: "elm/genlist/tree_compress_odd/dialogue/1text/expandable2/default"; - GENLIST_DATA_ITEM_NORMAL - data.item: "treesize" 0; + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE GENLIST_IMAGES_EXPANDABLE_BTN parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_TOP_SIZE(0) + GENLIST_PART_PADDING_BOTTOM_SIZE(0) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_LISTITEM("elm.text", - GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.arrow.left", + GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.arrow.left", + "elm.padding.top", "elm.padding.bottom", min: 0 GENLIST_HEIGHT_1LINE; GENLIST_PARAM_LISTITEM ) ) GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW + GENLIST_PART_FLIP } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; ) programs { - GENLIST_PROGRAM_DISABLED_DIALOGUE( target: "elm.text"; target: "arrow_clip"; ) - GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( target: "elm.text"; ) + GENLIST_PROGRAM_SELECT_ARROW GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "arrow"; target: "elm.text"; ) } } #if 0 @@ -340,12 +287,11 @@ alias: "elm/genlist/item_compress/1text.2/expandable_n_depth/default"; alias: "elm/genlist/item_compress_odd/1text.2/expandable_n_depth/default"; - GENLIST_DATA_ITEM_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon elm.icon.edit"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -361,7 +307,7 @@ ) } programs { - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( target: "elm.text"; ) + GENLIST_PROGRAM_DISABLED GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text"; ) GENLIST_PROGRAM_EXPAND_FADE( target: "elm.text"; target: "elm.icon"; ) } @@ -376,12 +322,11 @@ alias: "elm/genlist/tree_compress/1text.1/expandable_n_depth/default"; alias: "elm/genlist/tree_compress_odd/1text.1/expandable_n_depth/default"; - GENLIST_DATA_ITEM_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon elm.icon.edit"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -397,14 +342,13 @@ ) } programs { - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( target: "elm.text"; ) + GENLIST_PROGRAM_DISABLED GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text"; ) GENLIST_PROGRAM_EXPAND_FADE( target: "elm.text"; target: "elm.icon"; target: "bottom_line"; target: "bottom_line2";) } } - GENLIST_DATA_ITEM_NORMAL data.item: "texts" "elm.text"; data.item: "treesize" "26"; @@ -945,7 +889,7 @@ parts { GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_SIZE_48_INC ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( GENLIST_SIZE_16_INC ) + GENLIST_PART_PADDING_RIGHT_EDIT( GENLIST_SIZE_16_INC ) part { name: "elm.text"; type: TEXT; mouse_events: 0; diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc index 9a6d208..5aebfd3 100644 --- a/themes/widgets/genlist/genlist_groupindex.edc +++ b/themes/widgets/genlist/genlist_groupindex.edc @@ -22,26 +22,64 @@ #define GROUPINDEX_PADDING_SIZE_LEFT 26 #define GROUPINDEX_PADDING_SIZE_RIGHT 26 +#define GROUPINDEX_TEXT_HEIGHT 38 +#define GROUPINDEX_ICON_SIZE 64 + + +#define GENLIST_PART_INDEX_BG \ + GENLIST_PART_BG(GENLIST_GROUPINDEX_LIST_BG_COLOR, \ + GENLIST_GROUPINDEX_LIST_PRESS_COLOR, \ + GENLIST_GROUPINDEX_LIST_BG_COLOR \ + ) + + // group index +#define GENLIST_DESCRIPTION_INDEX_LIST \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LIST_FOCUS_COLOR; \ + } + +#define GENLIST_PART_INDEX_LINE(LEFT, RIGHT, TOP, BOTTOM) \ + GENLIST_PART_RECT("index_line", \ + GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ + color: GENLIST_GROUPINDEX_LINE_COLOR; \ + min: 0 4; \ + max: -1 4; \ + ) \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \ + } \ + ) + +// Group Index +#define GENLIST_PARAM_INDEX_LIST \ + color: GENLIST_GROUPINDEX_LIST_COLOR; \ + text { \ + align: 0 0.5; \ + min: 0 1; \ + font: "Tizen:style=Bold"; \ + size: GENLIST_GROUPINDEX_LIST_SIZE; \ + text_class: "list_item"; \ + } // 2.1.1 - group { name: "elm/genlist/item/groupindex/default"; - alias: "elm/genlist/item_odd/groupindex/default"; - alias: "elm/genlist/item_compress/groupindex/default"; - alias: "elm/genlist/item_compress_odd/groupindex/default"; - alias: "elm/genlist/item/grouptitle/default"; + group { GENLIST_NAME("groupindex/default") + alias: "elm/genlist/item/grouptitle/default"; alias: "elm/genlist/item_odd/grouptitle/default"; alias: "elm/genlist/item_compress/grouptitle/default"; alias: "elm/genlist/item_compress_odd/grouptitle/default"; + alias: "elm/genlist/tree/grouptitle/default"; + alias: "elm/genlist/tree_odd/grouptitle/default"; + alias: "elm/genlist/tree_compress/grouptitle/default"; + alias: "elm/genlist/tree_compress_odd/grouptitle/default"; + GENLIST_PROLOG - data.item: "stacking" "above"; - data.item: "selectraise" "on"; data.item: "texts" "elm.text"; - data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; - GENLIST_IMAGE_GROUPINDEX parts { GENLIST_PART_BASE - GENLIST_PART_INDEX_BG_IMAGE + GENLIST_PART_INDEX_BG GENLIST_PART_PADDING_LEFT_SIZE(GROUPINDEX_PADDING_SIZE_LEFT) GENLIST_PART_PADDING_RIGHT_SIZE(GROUPINDEX_PADDING_SIZE_RIGHT) GENLIST_PART_PADDING_TOP_SIZE(20) @@ -49,53 +87,63 @@ GENLIST_PART_TEXT("elm.text", GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top", GENLIST_PARAM_INDEX_LIST - min: 0 38; fixed: 1 1;) + min: 0 GROUPINDEX_TEXT_HEIGHT; + fixed: 0 1; + ) GENLIST_DESCRIPTION_INDEX_LIST ) GENLIST_PART_INDEX_LINE("elm.padding.left", "elm.padding.right", "elm.text", "elm.padding.bottom") } programs { GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line"; ) - GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; ) + GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; target: "bg"; ) } } //2.1.3 - group { name: "elm/genlist/item/groupindex.icon/default"; - alias: "elm/genlist/item_odd/groupindex.icon/default"; - alias: "elm/genlist/item_compress/groupindex.icon/default"; - alias: "elm/genlist/item_compress_odd/groupindex.icon/default"; + group { GENLIST_NAME("groupindex.icon/default") + alias: "elm/genlist/item/grouptitle.icon/default"; + alias: "elm/genlist/item_odd/grouptitle.icon/default"; + alias: "elm/genlist/item_compress/grouptitle.icon/default"; + alias: "elm/genlist/item_compress_odd/grouptitle.icon/default"; + alias: "elm/genlist/tree/grouptitle.icon/default"; + alias: "elm/genlist/tree_odd/grouptitle.icon/default"; + alias: "elm/genlist/tree_compress/grouptitle.icon/default"; + alias: "elm/genlist/tree_compress_odd/grouptitle.icon/default"; + GENLIST_PROLOG - data.item: "stacking" "above"; - data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; - GENLIST_IMAGE_GROUPINDEX parts { - GENLIST_PART_INDEX_BG_IMAGE GENLIST_PART_BASE + GENLIST_PART_INDEX_BG GENLIST_PART_PADDING_LEFT_SIZE(GROUPINDEX_PADDING_SIZE_LEFT) GENLIST_PART_PADDING_RIGHT_SIZE(GROUPINDEX_PADDING_SIZE_RIGHT) GENLIST_PART_PADDING_TOP_SIZE(6) GENLIST_PART_PADDING_BOTTOM_SIZE(6) GENLIST_PART_ICON("elm.icon", - GENLIST_DESCRIPTION_L("elm.padding.left", - min: 64 64; max: 64 64; ) + GENLIST_DESCRIPTION_LTB("elm.padding.left", + "elm.padding.top", "elm.padding.bottom", + min: GROUPINDEX_ICON_SIZE GROUPINDEX_ICON_SIZE; + max: GROUPINDEX_ICON_SIZE GROUPINDEX_ICON_SIZE; + fixed: 1 0; + ) ) GENLIST_PART_PADDING_L_SIZE("elm.padding.icon.right", "elm.icon", 16) GENLIST_PART_TEXT("elm.text", GENLIST_DESCRIPTION_LRT("elm.padding.icon.right", "elm.padding.right", "elm.padding.top", GENLIST_PARAM_INDEX_LIST - min: 0 36; fixed: 0 1;) + min: 0 GROUPINDEX_TEXT_HEIGHT; + fixed: 0 1; + ) GENLIST_DESCRIPTION_INDEX_LIST ) GENLIST_PART_INDEX_LINE("elm.padding.icon.right", "elm.padding.right", "elm.text", "elm.padding.bottom") } programs { GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line"; ) - GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; ) + GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; target: "bg"; ) } } @@ -115,11 +163,11 @@ } parts { GENLIST_PART_DISCLIP - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( 23 ) + GENLIST_PART_PADDING_RIGHT_EDIT //GENLIST_PART_TEXT_INDEX_LIST("elm.text", "elm.padding.left", "elm.divider") part { name: "elm.divider"; scale: 1; @@ -148,7 +196,7 @@ } } programs { - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( target: "elm.text"; ) + GENLIST_PROGRAM_DISABLED GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text";) GENLIST_PROOGRAM_EXPAND("arrow", target: "arrow"; ) } @@ -170,11 +218,11 @@ } parts { GENLIST_PART_DISCLIP - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( 23 ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_ICON("elm.icon", GENLIST_DESCRIPTION_L("elm.padding.left", )) GENLIST_PART_PADDING_L_SIZE("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT) //GENLIST_PART_TEXT_INDEX_LIST("elm.text", "elm.padding.icon.right", "elm.divider") @@ -205,7 +253,7 @@ } } programs { - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( target: "elm.text"; ) + GENLIST_PROGRAM_DISABLED GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text";) GENLIST_PROOGRAM_EXPAND("arrow", target: "arrow"; ) } @@ -237,7 +285,7 @@ } } GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_24_INC ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( GENLIST_PADDING_24_INC ) + GENLIST_PART_PADDING_RIGHT_EDIT part { name: "text_base"; type: RECT; repeat_events: 1; @@ -300,7 +348,7 @@ } } GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_24_INC ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( GENLIST_PADDING_24_INC ) + GENLIST_PART_PADDING_RIGHT_EDIT part { name: "text_base"; type: RECT; repeat_events: 1; diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index d7b96b3..26d2b3c 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -46,18 +46,20 @@ #define DIALOGUE_PADDING_SIZE_LEFT 16+20 #define DIALOGUE_PADDING_SIZE_RIGHT 16+20 -#define GENLIST_ICON_BIG_SIZE 74 -#define GENLIST_ICON_SMALL_SIZE 38 -#define GENLIST_ICON_STAR_SIZE 38 +#define GENLIST_ICON_BIG_SIZE 72 +#define GENLIST_ICON_SMALL_SIZE 45 +#define GENLIST_ICON_STAR_SIZE 45 #define GENLIST_ICON_THUMBNAIL1_SIZE 104 #define GENLIST_BTN_01_HEIGHT 74 -#define GENLIST_BTN_02_SIZE 74 +#define GENLIST_BTN_02_SIZE 72 #define GENLIST_ICON_ONOFF_WIDTH 132 #define GENLIST_ICON_ONOFF_HEIGHT 70 #define GENLIST_ICON_CHECK_RADIO_SIZE 64 #define GENLIST_ICON_COLORBAR_SIZE 7 #define GENLIST_ICON_PASSWORD_SIZE 82 +#define GENLIST_ICON_ENTRY_SIZE 54 + #define GENLIST_TREESIZE_DEFAULT 26 //#define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40 @@ -334,23 +336,55 @@ param\ } -#define GENLIST_DATA_ITEM_NORMAL \ +#define GENLIST_PROLOG \ data.item: "stacking" "above"; \ data.item: "selectraise" "on"; \ - data.item: "flips" "elm.flip.icon elm.flip.content"; \ - data.item: "treesize" GENLIST_TREESIZE_DEFAULT; + data.item: "treesize" 0; + +#define GENLIST_PROLOG_NORMAL \ + GENLIST_PROLOG \ + data.item: "treesize" GENLIST_TREESIZE_DEFAULT; \ + data.item: "flips" "elm.flip.icon elm.flip.content elm.flip.eraser"; \ + images { \ + image : "00_list_group_bg.png" COMP; \ + image : "00_list_group_bg_press.png" COMP; \ + } + +#define GENLIST_PROLOG_DIALOGUE \ + GENLIST_PROLOG \ + data.item: "flips" "elm.flip.icon elm.flip.content elm.flip.eraser"; \ + images { \ + image : "00_list_group_bg.png" COMP; \ + image : "00_list_group_bg_press.png" COMP; \ + image : "00_list_group_bg_top.png" COMP; \ + image : "00_list_group_bg_top_press.png" COMP; \ + image : "00_list_group_bg_center.png" COMP; \ + image : "00_list_group_bg_center_press.png" COMP; \ + image : "00_list_group_bg_bottom.png" COMP; \ + image : "00_list_group_bg_bottom_press.png" COMP; \ + } + +#define GENLIST_NAME(NAME) \ + name: "elm/genlist/item/"NAME; \ + alias: "elm/genlist/item_odd/"NAME; \ + alias: "elm/genlist/item_compress/"NAME; \ + alias: "elm/genlist/item_compress_odd/"NAME; \ + alias: "elm/genlist/tree/"NAME; \ + alias: "elm/genlist/tree_odd/"NAME; \ + alias: "elm/genlist/tree_compress/"NAME; \ + alias: "elm/genlist/tree_compress_odd/"NAME; \ /*****************************************************************************/ /******************************* Dialogue group ******************************/ /*****************************************************************************/ #define GENLIST_DIALOGUE_INHERIT_BODY( _PARTS ) \ data.item: "treesize" 0; \ - GENLIST_IMAGES_DIALOGUE_BG_IMAGE \ parts { \ - GENLIST_PART_BG_IMAGE_DIALOGUE \ + GENLIST_PART_BG_NORMAL_OFF \ GENLIST_PART_BOTTOM_LINE_OFF \ + GENLIST_PART_BG_DIALOGUE \ GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) \ - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) \ + GENLIST_PART_PADDING_RIGHT_EDIT \ _PARTS \ GENLIST_PART_FLIP \ } @@ -358,202 +392,234 @@ //****************************************************************************// // ****************************** BG Image **********************************// //****************************************************************************// -#define GENLIST_IMAGE_GROUPINDEX \ - images { \ - image: "00_index list_bg.png" COMP; \ - } -#define GENLIST_PART_INDEX_BG_IMAGE \ - part { name: "bg_image"; \ - type: RECT; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: GENLIST_GROUPINDEX_LIST_BG_COLOR; \ - } \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - color: GENLIST_GROUPINDEX_LIST_PRESS_COLOR; \ - } \ - GENLIST_DESCRIPTION_FADE \ - } - -#define GENLIST_PART_BG_IMAGE \ - part { name: "bg_image_depth_clip"; \ - type: RECT; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: 0 0 0 0; \ - } \ - description { state: "2depth" 0.0; \ - color: 0 0 0 0; \ - } \ +#define GENLIST_PART_BG(DEFAULT_COLOR, SELECT_COLOR, DISABLE_COLOR) \ + GENLIST_PART_RECT("bg_clip", \ + mouse_events: 0; \ + description { state: "default" 0.0; \ } \ - part { name: "bg_image"; \ - type: RECT; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: GENLIST_LIST_BG_COLOR; \ - } \ - description { state: "selected" 0.0; \ - color: GENLIST_LIST_PRESS_COLOR; \ - } \ - description { state: "disabled" 0.0; \ - color: GENLIST_LIST_DIM_COLOR; \ - } \ - GENLIST_DESCRIPTION_FADE \ - } + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + ) \ + GENLIST_PART_RECT("bg", \ + mouse_events: 0; \ + clip_to: "bg_clip"; \ + description { state: "default" 0.0; \ + color: GENLIST_LIST_BG_COLOR; \ + } \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: SELECT_COLOR; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + color: DISABLE_COLOR; \ + } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + } \ + GENLIST_DESCRIPTION_FADE \ + ) -#define GENLIST_IMAGES_DIALOGUE_BG_IMAGE \ - images { \ - image : "00_list_group_bg.png" COMP; \ - image : "00_list_group_bg_top.png" COMP; \ - image : "00_list_group_bg_center.png" COMP; \ - image : "00_list_group_bg_bottom.png" COMP; \ - image : "00_list_group_bg_press.png" COMP; \ - image : "00_list_group_bg_top_press.png" COMP; \ - image : "00_list_group_bg_center_press.png" COMP; \ - image : "00_list_group_bg_bottom_press.png" COMP; \ - } +#define GENLIST_PART_BG_NORMAL \ + GENLIST_PART_BG(GENLIST_LIST_BG_COLOR, \ + GENLIST_LIST_PRESS_COLOR, \ + GENLIST_LIST_DIM_COLOR \ + ) \ + GENLIST_PART_BG_REORDER -#define GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - rel1 { \ - to_x: "bg_image_left"; \ - relative: 1 0; \ +#define GENLIST_PART_BG_NORMAL_OFF \ + GENLIST_PART_BG_OFF \ + GENLIST_PART_BG_REORDER_OFF + +#define GENLIST_PART_BG_OFF \ + GENLIST_PART_RECT("bg", \ + mouse_events: 0; \ + description { state: "default" 0.0; \ + visible: 0; \ + } \ + description { state: "selected" 0.0; \ + visible: 0; \ + } \ + description { state: "disabled" 0.0; \ + visible: 0; \ + } \ + description { state: "decorate" 0.0; \ + visible: 0; \ + } \ + ) + +#define GENLIST_PART_BG_REORDER \ + GENLIST_PART_RECT("bg_reorder_clip", \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + color: 255 255 255 255; \ + } \ + description { state: "flip" 0.0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + ) \ + GENLIST_PART_SPACER("bg_reorder_left", \ + description { state: "default" 0.0; \ + min: 16 0; \ + max: 16 -1; \ + fixed: 1 0; \ + align: 0 0.5; \ + rel2.relative: 0 1; \ + } \ + ) \ + GENLIST_PART_SPACER("bg_reorder_right", \ + description { state: "default" 0.0; \ + min: 16 0; \ + max: 16 -1; \ + fixed: 1 0; \ + align: 1.0 0.5; \ + rel1.relative: 1 0; \ + } \ + ) \ + GENLIST_PART_IMAGE("bg_reorder", \ + clip_to: "bg_reorder_clip"; \ + mouse_events: 0; \ + GENLIST_DESCRIPTION_LR("bg_reorder_left", "bg_reorder_right", \ + image { \ + normal: "00_list_group_bg.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ } \ - rel2 { \ - to_x: "bg_image_right"; \ - relative: 0 1; \ - } + ) \ + description { state: "selected" 0.0; \ + inherit: "default"; \ + image { \ + normal: "00_list_group_bg_press.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + GENLIST_DESCRIPTION_FADE \ + ) -#define GENLIST_PART_BG_IMAGE_DIALOGUE \ - part { name: "bg_image_depth_clip"; \ - type: RECT; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { state: "2depth" 0.0; \ - color: 220 218 211 255; \ - } \ +#define GENLIST_PART_BG_REORDER_OFF \ + GENLIST_PART_IMAGE("bg_reorder", \ + description {state: "default" 0.0;\ + visible: 0;\ + }\ + description { state: "selected" 0.0; {\ + inherit: "default" 0.0; \ + visible: 0; \ + } \ + ) \ + +#define GENLIST_PART_BG_DIALOGUE \ + GENLIST_PART_RECT("bg_dialogue_clip", \ + description { state: "default" 0.0; \ + color: 255 255 255 255; \ + } \ + description { state: "2depth" 0.0; \ + color: 220 218 211 255; \ + } \ + ) \ + GENLIST_PART_SPACER("bg_dialogue_left", \ + description { state: "default" 0.0; \ + min: 16 0; \ + max: 16 -1; \ + fixed: 1 0; \ + align: 0 0.5; \ + rel2.relative: 0 1; \ + } \ + ) \ + GENLIST_PART_SPACER("bg_dialogue_right", \ + description { state: "default" 0.0; \ + min: 16 0; \ + max: 16 -1; \ + fixed: 1 0; \ + align: 1.0 0.5; \ + rel1.relative: 1 0; \ + } \ + description { state: "editmode" 0.0; \ + inherit: "default" 0.0; \ + min: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_ICON_BIG_SIZE) 0; \ + max: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_ICON_BIG_SIZE) 0; \ + } \ + ) \ + GENLIST_PART_IMAGE("bg_dialogue", \ + insert_after: "base"; \ + clip_to: "bg_dialogue_clip"; \ + mouse_events: 0; \ + GENLIST_DESCRIPTION_LR("bg_dialogue_left", "bg_dialogue_right", \ + image { \ + normal: "00_list_group_bg.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ } \ - part { name: "bg_image_left"; \ - type: SPACER; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - min: 16 0; \ - max: 16 -1; \ - fixed: 1 0; \ - align: 0 0.5; \ - rel2.relative: 0 1; \ - } \ + ) \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_press.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ } \ - part { name: "bg_image_right"; \ - type: SPACER; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - min: 16 0; \ - max: 16 -1; \ - fixed: 1 0; \ - align: 1 0.5; \ - rel1.relative: 1 0; \ - } \ - description { state: "editmode" 0.0; \ - inherit: "default" 0.0; \ - min: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_ICON_BIG_SIZE) 0; \ - max: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_ICON_BIG_SIZE) 0; \ - } \ + } \ + description { state: "top" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_top.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ } \ - part { name: "bg_image"; \ - clip_to: "bg_image_depth_clip"; \ - type: IMAGE; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: 255 255 255 255; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg.png"; \ - border: 15 15 55 55; \ - border_scale: 1; \ - } \ - } \ - description { state: "selected" 0.0; \ - color: 255 255 255 255; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_press.png"; \ - border: 15 15 55 55; \ - border_scale: 1; \ - } \ - } \ - description { state: "disabled" 0.0; \ - inherit: "default"; \ - color: 255 255 255 255; \ - } \ - description { state: "top" 0.0; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_top.png"; \ - border: 15 15 55 2; \ - border_scale: 1; \ - } \ - } \ - description { state: "top_selected" 0.0; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_top_press.png"; \ - border: 15 15 55 2; \ - border_scale: 1; \ - } \ - } \ - description { state: "top_disabled" 0.0; \ - inherit: "top"; \ - } \ - description { state: "center" 0.0; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_center.png"; \ - border: 15 15 2 2; \ - border_scale: 1; \ - } \ - } \ - description { state: "center_selected" 0.0; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_center_press.png"; \ - border: 15 15 2 2; \ - border_scale: 1; \ - } \ - } \ - description { state: "center_disabled" 0.0; \ - inherit: "center"; \ - } \ - description { state: "bottom" 0.0; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_bottom.png"; \ - border: 15 15 2 55; \ - border_scale: 1; \ - } \ - } \ - description { state: "bottom_selected" 0.0; \ - GENLIST_PARAM_BG_IMAGE_DIALOGUE \ - image { \ - normal: "00_list_group_bg_bottom_press.png"; \ - border: 15 15 2 10; \ - border_scale: 1; \ - } \ - } \ - description { state: "bottom_disabled" 0.0; \ - inherit: "bottom"; \ - } \ - GENLIST_DESCRIPTION_FADE \ - } + } \ + description { state: "top_selected" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_top_press.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + description { state: "center" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_center.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + description { state: "center_selected" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_center_press.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + description { state: "bottom" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_bottom.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + description { state: "bottom_selected" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_list_group_bg_bottom_press.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + GENLIST_DESCRIPTION_FADE \ + ) //****************************************************************************// // ****************************** BASE ********************************// @@ -570,7 +636,7 @@ } \ GENLIST_PART_PERSPECTIVE_POINT -#define GENLIST_PART_BASE_REORDER \ +#define GENLIST_PART_BASE_SIZE(HEIGHT) \ part { name: "base"; \ type: RECT; \ repeat_events: 1; \ @@ -578,42 +644,7 @@ description { state: "default" 0.0; \ align: 0.5 0.5; \ color: 0 0 0 0; \ - rel1 { \ - relative: 1 0; \ - to_x: "reorder.padding.left"; \ - } \ - rel2 { \ - relative: 0 1; \ - to_x: "reorder.padding.right"; \ - } \ - } \ - } \ - part { name: "reorder.padding.left"; \ - type: SPACER; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - rel2.relative: 0 1; \ - align: 0 0.5; \ - } \ - description { state: "reorder" 0.0; \ - inherit: "default" 0.0; \ - min: 16 0; \ - max: 16 -1; \ - } \ - } \ - part { name: "reorder.padding.right"; \ - type: SPACER; \ - scale: 1; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - rel1.relative: 1 0; \ - align: 1 0.5; \ - } \ - description { state: "reorder" 0.0; \ - inherit: "default" 0.0; \ - min: 16 0; \ - max: 16 -1; \ + min: 0 HEIGHT; \ } \ } \ GENLIST_PART_PERSPECTIVE_POINT @@ -622,10 +653,21 @@ // ****************************** LINE ********************************// //****************************************************************************// #define GENLIST_PART_BOTTOM_LINE \ - part { name: "bottom_line"; \ - type: RECT; \ - scale: 1; \ + GENLIST_PART_RECT("bottom_line_clip", \ + mouse_events: 0; \ + description { state: "default" 0.0; \ + visible: 1; \ + } \ + description { state: "decorate" 0.0; \ + visible: 0; \ + } \ + description { state: "reorder" 0.0; \ + visible: 0; \ + } \ + ) \ + GENLIST_PART_RECT("bottom_line", \ mouse_events: 0; \ + clip_to: "bottom_line_clip"; \ description { state: "default" 0.0; \ min: 0 GENLIST_PART_LIST_LINE_HEIGHT; \ max: -1 GENLIST_PART_LIST_LINE_HEIGHT; \ @@ -635,10 +677,7 @@ rel1.to: "bottom_line2"; \ rel2.to: "bottom_line2"; \ rel2.relative: 1 0; \ - } \ - description { state: "reorder" 0.0; \ - inherit: "default" 0.0; \ - visible: 0; \ + rel1.offset: -1 -1; \ } \ description { state: "selected" 0.0; \ inherit: "default" 0.0; \ @@ -648,12 +687,15 @@ inherit: "default" 0.0; \ color: GENLIST_LIST_DIM_COLOR; \ } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + } \ GENLIST_DESCRIPTION_FADE \ - } \ - part { name: "bottom_line2"; \ - type: RECT; \ - scale: 1; \ + ) \ + GENLIST_PART_RECT("bottom_line2", \ mouse_events: 0; \ + clip_to: "bottom_line_clip"; \ description { state: "default" 0.0; \ min: 0 GENLIST_PART_LIST_LINE_HEIGHT; \ max: -1 GENLIST_PART_LIST_LINE_HEIGHT; \ @@ -664,85 +706,85 @@ rel1.relative: 1 0; \ rel2.to_x: "elm.padding.right"; \ rel2.relative: 0 1; \ + rel1.offset: -1 -1; \ } \ description { state: "selected" 0.0; \ inherit: "default" 0.0; \ color: GENLIST_LIST_PRESS_COLOR; \ } \ - description { state: "reorder" 0.0; \ - inherit: "default" 0.0; \ - visible: 0; \ - } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ color: GENLIST_LIST_DIM_COLOR; \ } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + } \ GENLIST_DESCRIPTION_FADE \ - } + ) #define GENLIST_PART_BOTTOM_LINE_OFF \ - part { name: "bottom_line"; \ - type: RECT; \ - scale: 1; \ + GENLIST_PART_RECT("bottom_line", \ mouse_events: 0; \ description { state: "default" 0.0; \ - min: 0 GENLIST_PART_LIST_LINE_HEIGHT; \ - max: -1 GENLIST_PART_LIST_LINE_HEIGHT; \ - fixed: 0 1; \ - align: 0.5 1; \ - rel1.to: "bottom_line2"; \ - rel2.to: "bottom_line2"; \ - rel2.relative: 1 0; \ visible: 0; \ } \ - GENLIST_DESCRIPTION_FADE \ - } \ - part { name: "bottom_line2"; \ - type: RECT; \ - scale: 1; \ + description { state: "selected" 0.0; \ + visible: 0; \ + } \ + description { state: "disabled" 0.0; \ + visible: 0; \ + } \ + description { state: "decorate" 0.0; \ + visible: 0; \ + } \ + ) \ + GENLIST_PART_RECT("bottom_line2", \ mouse_events: 0; \ description { state: "default" 0.0; \ - min: 0 GENLIST_PART_LIST_LINE_HEIGHT; \ - max: -1 GENLIST_PART_LIST_LINE_HEIGHT; \ - fixed: 0 1; \ - align: 0.5 1; \ - rel1.to_x: "elm.padding.left"; \ - rel1.relative: 1 0; \ - rel2.to_x: "elm.padding.right"; \ - rel2.relative: 0 1; \ visible: 0; \ } \ - GENLIST_DESCRIPTION_FADE \ - } + description { state: "selected" 0.0; \ + visible: 0; \ + } \ + description { state: "disabled" 0.0; \ + visible: 0; \ + } \ + description { state: "decorate" 0.0; \ + visible: 0; \ + } \ + ) -#define GENLIST_PART_DIVIDER_MARGIN \ +#define GENLIST_PART_DIVIDER_PADDING \ GENLIST_PART_SPACER("elm.padding.divider.top", \ - GENLIST_DESCRIPTION_ENVELOP("base", \ + description { state: "default" 0.0; \ align: 0.5 0; \ min: 0 30; \ max: -1 30; \ fixed: 0 1; \ rel2.relative: 1 0; \ - ) \ + } \ ) \ GENLIST_PART_SPACER("elm.padding.divider.bottom", \ - GENLIST_DESCRIPTION_ENVELOP("base", \ + description { state: "default" 0.0; \ align: 0.5 1; \ min: 0 30; \ max: -1 30; \ fixed: 0 1; \ rel1.relative: 0 1; \ - ) \ + } \ ) \ #define GENLIST_PART_DIVIDER_L(LEFT) \ - GENLIST_PART_DIVIDER_MARGIN \ + GENLIST_PART_DIVIDER_PADDING \ GENLIST_PART_RECT("elm.divider1", \ mouse_events: 0; \ GENLIST_DESCRIPTION_LTB(LEFT, "elm.padding.divider.top", "elm.padding.divider.bottom", \ + align: 0 0.5; \ min: 1 0; \ max: 1 -1; \ fixed: 1 0; \ + rel2.offset: 0 0; \ color: GENLIST_LIST_DIVIDER1_COLOR; \ ) \ GENLIST_DESCRIPTION_FADE \ @@ -750,22 +792,25 @@ GENLIST_PART_RECT("elm.divider2", \ mouse_events: 0; \ GENLIST_DESCRIPTION_LTB("elm.divider1", "elm.padding.divider.top", "elm.padding.divider.bottom", \ + align: 0 0.5; \ min: 1 0; \ max: 1 -1; \ fixed: 1 0; \ + rel2.offset: 0 0; \ color: GENLIST_LIST_DIVIDER2_COLOR; \ ) \ GENLIST_DESCRIPTION_FADE \ ) #define GENLIST_PART_DIVIDER_R(RIGHT) \ - GENLIST_PART_DIVIDER_MARGIN \ + GENLIST_PART_DIVIDER_PADDING \ GENLIST_PART_RECT("elm.divider1", \ mouse_events: 0; \ GENLIST_DESCRIPTION_RTB("elm.divider2", "elm.padding.divider.top", "elm.padding.divider.bottom", \ min: 1 0; \ max: 1 -1; \ fixed: 1 0; \ + rel1.offset: -1 0;\ color: GENLIST_LIST_DIVIDER1_COLOR; \ ) \ GENLIST_DESCRIPTION_FADE \ @@ -776,6 +821,7 @@ min: 1 0; \ max: 1 -1; \ fixed: 1 0; \ + rel1.offset: -1 0;\ color: GENLIST_LIST_DIVIDER2_COLOR; \ ) \ GENLIST_DESCRIPTION_FADE \ @@ -838,10 +884,11 @@ ) \ ) \ GENLIST_PART_ICON("elm.swallow.colorbar", \ - GENLIST_DESCRIPTION_LTB("bg_image", "elm.padding.colorbar.top", "elm.padding.colorbar.bottom", \ + GENLIST_DESCRIPTION_TB("elm.padding.colorbar.top", "elm.padding.colorbar.bottom", \ min: GENLIST_ICON_COLORBAR_SIZE 0; \ max: GENLIST_ICON_COLORBAR_SIZE -1; \ fixed: 1 0; \ + align: 0 0.5; \ rel1.relative: 0 1; \ rel2.relative: 0 0; \ ) \ @@ -885,6 +932,20 @@ } \ ) +#define GENLIST_DESCRIPTION_DECORATE_PADDING \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + min: 0 0; \ + max: 0 0; \ + } + +#define GENLIST_DESCRIPTION_REORDER_PADDING \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + min: 32 0; \ + max: 32 -1; \ + } + #define GENLIST_PART_PADDING_LEFT \ GENLIST_PART_EXPANDED_PAD \ GENLIST_PART_SPACER("elm.padding.left", \ @@ -893,11 +954,8 @@ max: GENLIST_PADDING_SIZE_LEFT -1; \ fixed: 1 0; \ ) \ - description { state: "decorate" 0.0; \ - inherit: "default" 0.0; \ - min: 0 0; \ - max: 0 0; \ - } \ + GENLIST_DESCRIPTION_DECORATE_PADDING \ + GENLIST_DESCRIPTION_REORDER_PADDING \ ) #define GENLIST_PART_PADDING_LEFT_SIZE( SIZE ) \ @@ -908,39 +966,32 @@ max: SIZE -1; \ fixed: 1 0; \ ) \ - description { state: "decorate" 0.0; \ - inherit: "default" 0.0; \ - min: 0 0; \ - max: 0 0; \ - } \ + GENLIST_DESCRIPTION_DECORATE_PADDING \ + GENLIST_DESCRIPTION_REORDER_PADDING \ ) #define GENLIST_PART_EDITBTN \ - part { name: "elm.icon.edit"; \ - type: SWALLOW; \ - scale: 1; \ - GENLIST_DESCRIPTION_R("elm.padding.edit.right", \ - fixed: 1 1; \ - visible: 0; \ - min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; \ - max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; \ - ) \ - description { state: "editmode" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - } \ - } \ - GENLIST_PART_SPACER("elm.padding.edit.right", \ - description { state: "default" 0.0; \ - fixed: 1 0; \ - align: 1.0 0.5; \ - rel1.to: "base"; \ - rel2.to: "base"; \ - rel1.relative: 1 0; \ - min: GENLIST_PADDING_SIZE_RIGHT 0; \ - max: GENLIST_PADDING_SIZE_RIGHT -1; \ - } \ - ) + GENLIST_PART_ICON("elm.icon.edit", \ + GENLIST_DESCRIPTION_R("elm.padding.edit.right", \ + fixed: 1 1; \ + visible: 0; \ + min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; \ + max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; \ + ) \ + description { state: "editmode" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + ) \ + GENLIST_PART_SPACER("elm.padding.edit.right", \ + description { state: "default" 0.0; \ + fixed: 1 0; \ + align: 1.0 0.5; \ + rel1.relative: 1 0; \ + min: GENLIST_PADDING_SIZE_RIGHT 0; \ + max: GENLIST_PADDING_SIZE_RIGHT -1; \ + } \ + ) #define GENLIST_PART_PADDING_RIGHT \ GENLIST_PART_SPACER("elm.padding.right", \ @@ -953,11 +1004,8 @@ rel2.to: "base"; \ rel1.relative: 1 0; \ } \ - description { state: "decorate" 0.0; \ - inherit: "default" 0.0; \ - min: 0 0; \ - max: 0 0; \ - } \ + GENLIST_DESCRIPTION_DECORATE_PADDING \ + GENLIST_DESCRIPTION_REORDER_PADDING \ ) #define GENLIST_PART_PADDING_RIGHT_SIZE( SIZE ) \ @@ -971,58 +1019,33 @@ rel2.to: "base"; \ rel1.relative: 1 0; \ } \ - description { state: "decorate" 0.0; \ - inherit: "default" 0.0; \ - min: 0 0; \ - max: 0 0; \ - } \ + GENLIST_DESCRIPTION_DECORATE_PADDING \ + GENLIST_DESCRIPTION_REORDER_PADDING \ ) #define GENLIST_PART_PADDING_RIGHT_EDIT \ - GENLIST_PART_SPACER("elm.padding.right", \ + GENLIST_PART_SPACER("elm.padding.right.edit", \ description { state: "default" 0.0; \ - min: GENLIST_PADDING_SIZE_RIGHT 0; \ - max: GENLIST_PADDING_SIZE_RIGHT -1; \ + min:0 0; \ + max: 0 -1; \ fixed: 1 0; \ align: 1.0 0.5; \ - rel1.to: "base"; \ - rel2.to: "base"; \ rel1.relative: 1 0; \ } \ description { state: "editmode" 0.0; \ inherit: "default" 0.0; \ - min: (DIALOGUE_PADDING_SIZE_RIGHT+GENLIST_ICON_BIG_SIZE+GENLIST_PADDING_SIZE_RIGHT) 0; \ - max: (DIALOGUE_PADDING_SIZE_RIGHT+GENLIST_ICON_BIG_SIZE+GENLIST_PADDING_SIZE_RIGHT) -1; \ - } \ - description { state: "decorate" 0.0; \ - inherit: "default" 0.0; \ - min: 0 0; \ - max: 0 0; \ + min: (GENLIST_PADDING_SIZE_DEFAULT+GENLIST_ICON_BIG_SIZE) 0; \ + max: (GENLIST_PADDING_SIZE_DEFAULT+GENLIST_ICON_BIG_SIZE) -1; \ } \ ) \ - GENLIST_PART_EDITBTN - -#define GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( SIZE ) \ GENLIST_PART_SPACER("elm.padding.right", \ - description { state: "default" 0.0; \ - min: SIZE 0; \ - max: SIZE -1; \ + GENLIST_DESCRIPTION_R("elm.padding.right.edit", \ + min: DIALOGUE_PADDING_SIZE_RIGHT 0; \ + max: DIALOGUE_PADDING_SIZE_RIGHT -1; \ fixed: 1 0; \ - align: 1.0 0.5; \ - rel1.to: "base"; \ - rel2.to: "base"; \ - rel1.relative: 1 0; \ - } \ - description { state: "editmode" 0.0; \ - inherit: "default" 0.0; \ - min: (DIALOGUE_PADDING_SIZE_RIGHT+SIZE+GENLIST_ICON_BIG_SIZE) 0; \ - max: (DIALOGUE_PADDING_SIZE_RIGHT+SIZE+GENLIST_ICON_BIG_SIZE) -1; \ - } \ - description { state: "decorate" 0.0; \ - inherit: "default" 0.0; \ - min: 0 0; \ - max: 0 0; \ - } \ + ) \ + GENLIST_DESCRIPTION_DECORATE_PADDING \ + GENLIST_DESCRIPTION_REORDER_PADDING \ ) \ GENLIST_PART_EDITBTN @@ -1265,43 +1288,44 @@ visible: 0; \ } +// Genlist expandable rotation #define GENLIST_PROGRAM_ROTATE( TARGET ) \ program { name: "map_expand_start"; \ signal: "flip_item"; \ action: STATE_SET "map_contracted" 0.0; \ - target: "bg_image"; \ + target: "bg"; \ TARGET \ after: "map_expanding"; \ } \ program { name: "map_expanding"; \ action: STATE_SET "hide" 0.0; \ transition: LINEAR 0.2; \ - target: "bg_image"; \ + target: "bg"; \ TARGET \ after: "map_expand_end"; \ } \ program { name: "map_expand_end"; \ action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ + target: "bg"; \ TARGET \ } \ program { name: "map_contract_start"; \ signal: "elm,state,contract_flip"; \ action: STATE_SET "map_expanded" 0.0; \ - target: "bg_image"; \ + target: "bg"; \ TARGET \ after: "map_contracting"; \ } \ program { name: "map_contracting"; \ action: STATE_SET "map_contracted" 0.0; \ transition: LINEAR 0.3; \ - target: "bg_image"; \ + target: "bg"; \ TARGET \ after: "map_contract_end"; \ } \ program { name: "map_contract_end"; \ action: STATE_SET "hide" 0.0; \ - target: "bg_image"; \ + target: "bg"; \ TARGET \ } @@ -1325,38 +1349,29 @@ inherit: "default" 0.0; \ } \ -// FIXME: bg_color_change is used temporary #define GENLIST_PROGRAM_EXPAND_FADE( TARGET ) \ - program { name: "bg_color_change"; \ - signal: "bg_color_change"; \ - action: STATE_SET "2depth" 0.0; \ - target: "bg_image_depth_clip"; \ - after: "expand_start_fade"; \ - } \ - program { name: "expand_start_fade"; \ + program { name: "expand_start"; \ signal: "flip_item"; \ + source: "elm"; \ action: STATE_SET "fadeout" 0.0; \ - target: "bg_image"; \ TARGET \ - after: "expand_end_fade"; \ + after: "expand_end"; \ } \ - program { name: "expand_end_fade"; \ - action: STATE_SET "default" 0.0; \ + program { name: "expand_end"; \ transition: DECELERATE 0.3; \ - target: "bg_image"; \ + action: STATE_SET "default" 0.0; \ TARGET \ } \ - program { name: "contract_fade"; \ + program { name: "contract_start"; \ signal: "elm,state,contract_flip"; \ + source: "elm"; \ action: STATE_SET "fadein" 0.0; \ - target: "bg_image"; \ TARGET \ - after: "contract_end_fade"; \ + after: "contract_end"; \ } \ - program { name: "contract_end_fade"; \ - action: STATE_SET "fadeout" 0.0; \ + program { name: "contract_end"; \ transition: ACCELERATE 0.3; \ - target: "bg_image"; \ + action: STATE_SET "fadeout" 0.0; \ TARGET \ } @@ -1392,8 +1407,6 @@ TARGET \ } \ - - #define GENLIST_PROGRAM_EXPANDABLE( SRC ) \ program { \ name: "expand"; \ @@ -1404,10 +1417,9 @@ // 2.2.7 Genlist_Edit mode (Rename) // FIXME: padding is not needed when swallow content is NULL. -// But how can edje kwno existence of swallow content? +// But how can edje know existence of swallow content? #define GENLIST_PART_FLIP \ - part { name: "elm.flip.event_block";\ - type: RECT;\ + GENLIST_PART_RECT("elm.flip.bg", \ mouse_events: 0; \ repeat_events: 0;\ description { state: "default" 0.0;\ @@ -1418,62 +1430,59 @@ visible: 1; \ color: GENLIST_LIST_BG_COLOR;\ }\ - }\ - part { name: "elm.flip.padding.left"; \ - type: RECT; \ - scale: 1; \ + ) \ + GENLIST_PART_SPACER("elm.flip.padding.left", \ description { state: "default" 0.0; \ min: 26 0; \ max: 26 -1; \ fixed: 1 0; \ - visible: 0; \ align: 0 0.5; \ - rel1 { \ - relative: 0 0; \ - to: "base"; \ - } \ - rel2 { \ - relative: 0 1; \ - to: "base"; \ - } \ + rel2.relative: 0 1; \ } \ - } \ - part { name: "elm.flip.padding.right"; \ - type: RECT; \ - scale: 1; \ + ) \ + GENLIST_PART_SPACER("elm.flip.padding.right", \ description { state: "default" 0.0; \ min: 26 0; \ max: 26 -1; \ fixed: 1 0; \ - visible: 0; \ align: 1 0.5; \ - rel1 { \ - relative: 1 0; \ - to: "base"; \ - } \ - rel2 { \ - relative: 1 1; \ - to: "base"; \ - } \ + rel1.relative: 1 0; \ } \ - } \ - part { name: "elm.flip.content"; \ - type: SWALLOW; \ - scale: 1; \ - GENLIST_DESCRIPTION_LR("elm.flip.padding.left", "elm.flip.padding.icon.left", \ - aspect: 1 1; visible: 0; ) \ + ) \ + GENLIST_PART_ICON("elm.flip.content", \ + GENLIST_DESCRIPTION("elm.flip.padding.left", "elm.flip.padding.eraser.left", \ + "elm.padding.top", "elm.padding.bottom", \ + visible: 0; \ + aspect: 1 1; \ + ) \ description { state: "flip_enabled" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ - } \ + ) \ + GENLIST_PART_PADDING_R("elm.flip.padding.eraser.left", "elm.flip.eraser") \ + GENLIST_PART_ICON("elm.flip.eraser", \ + GENLIST_DESCRIPTION_RTB("elm.flip.padding.icon.left", \ + "elm.padding.top", "elm.padding.bottom", \ + fixed: 1 0; \ + visible: 0; \ + min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; \ + max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; \ + ) \ + description { state: "show" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + ) \ GENLIST_PART_PADDING_R("elm.flip.padding.icon.left", "elm.flip.icon") \ GENLIST_PART_ICON( "elm.flip.icon", \ - GENLIST_DESCRIPTION_R("elm.flip.padding.right", \ + GENLIST_DESCRIPTION_RTB("elm.flip.padding.right", \ + "elm.padding.top", "elm.padding.bottom", \ visible: 0; \ aspect: 1 1; \ align: 1 0.5; \ - max: 154 74;) \ + max: 154 74; \ + ) \ description { state: "flip_enabled" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ @@ -1488,39 +1497,25 @@ // signal: elm,state,%s,passive // a "check" item named %s went passive // default is passive -#define GENLIST_PROGRAM_DISABLED( TARGET ) \ - program { name: "enabled"; \ - signal: "elm,state,enabled"; \ +#define GENLIST_PROGRAM_DEFAULT( TARGET ) \ + program { name: "default"; \ + signal: "elm,state,default"; \ source: "elm"; \ action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ TARGET \ } \ - program { name: "disabled"; \ - signal: "elm,state,disabled"; \ - source: "elm"; \ - action: STATE_SET "disabled" 0.0; \ - target: "bg_image"; \ - TARGET \ - } -#define GENLIST_PROGRAM_DISABLED_BOTTOMLINE( TARGET ) \ +#define GENLIST_PROGRAM_DISABLED( TARGET ) \ program { name: "enabled"; \ signal: "elm,state,enabled"; \ source: "elm"; \ action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ TARGET \ } \ program { name: "disabled"; \ signal: "elm,state,disabled"; \ source: "elm"; \ action: STATE_SET "disabled" 0.0; \ - target: "bg_image"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ TARGET \ } @@ -1529,184 +1524,141 @@ signal: "elm,state,selected"; \ source: "elm"; \ action: STATE_SET "selected" 0.0; \ - target: "bg_image"; \ TARGET \ after: "play_button_press"; \ } \ + program { name: "selected,nosound"; \ + signal: "elm,state,selected"; \ + source: "elm,nosound"; \ + action: STATE_SET "selected" 0.0; \ + TARGET \ + } \ program { name: "unselected"; \ signal: "elm,state,unselected"; \ source: "elm"; \ + transition: LINEAR 0.1; \ action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ TARGET \ - transition: LINEAR 0.1; \ } \ program { name: "play_button_press"; \ action: PLAY_SAMPLE "button-pressed" 1.0; \ } -#define GENLIST_PROGRAM_SELECT_BOTTOMLINE( TARGET ) \ +#define GENLIST_PROGRAM_SELECT_NOSOUND( TARGET ) \ program { name: "selected"; \ signal: "elm,state,selected"; \ source: "elm"; \ action: STATE_SET "selected" 0.0; \ - target: "bg_image"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ TARGET \ - after: "play_button_press"; \ } \ program { name: "unselected"; \ signal: "elm,state,unselected"; \ source: "elm"; \ + transition: LINEAR 0.1; \ action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ TARGET \ - transition: LINEAR 0.1; \ - } \ - program { name: "play_button_press"; \ - action: PLAY_SAMPLE "button-pressed" 1.0; \ } -#define GENLIST_PROGRAM_DISABLED_DIALOGUE( TARGET ) \ - program { name: "enabled"; \ - signal: "elm,state,enabled"; \ - source: "elm"; \ - script { \ - new st[31]; \ - new Float:vl; \ - get_state(PART:"bg_image", st, 30, vl); \ - if (!strcmp(st, "top_disabled")) \ - set_state(PART:"bg_image", "top", 0.0); \ - else if (!strcmp(st, "center_disabled")) \ - set_state(PART:"bg_image", "center", 0.0); \ - else if (!strcmp(st, "bottom_disabled")) \ - set_state(PART:"bg_image", "bottom", 0.0); \ - else \ - set_state(PART:"bg_image", "default", 0.0); \ - } \ - after: "target_enabled"; \ - } \ - program { name: "target_enabled"; \ - action: STATE_SET "default" 0.0; \ - TARGET \ - }\ - program { name: "disabled"; \ - signal: "elm,state,disabled"; \ +#define GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \ + program { name: "selected"; \ + signal: "elm,state,selected"; \ source: "elm"; \ script { \ new st[31]; \ new Float:vl; \ - get_state(PART:"bg_image", st, 30, vl); \ + get_state(PART:"bg_dialogue", st, 30, vl); \ if (!strcmp(st, "top")) \ - set_state(PART:"bg_image", "top_disabled", 0.0); \ - else if (!strcmp(st, "center")) \ - set_state(PART:"bg_image", "center_disabled", 0.0); \ - else if (!strcmp(st, "bottom")) \ - set_state(PART:"bg_image", "bottom_disabled", 0.0); \ - else \ - set_state(PART:"bg_image", "disabled", 0.0); \ + set_state(PART:"bg_dialogue", "top_selected", 0.0); \ + else if (!strcmp(st, "center")) \ + set_state(PART:"bg_dialogue", "center_selected", 0.0); \ + else if (!strcmp(st, "bottom")) \ + set_state(PART:"bg_dialogue", "bottom_selected", 0.0); \ + else if (!strcmp(st, "default")) \ + set_state(PART:"bg_dialogue", "selected", 0.0); \ + run_program(PROGRAM:"target_selected"); \ } \ - after: "target_disabled"; \ + after: "play_button_press"; \ } \ - program { name: "target_disabled"; \ - action: STATE_SET "disabled" 0.0; \ - TARGET \ - } - -#define GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \ - program { name: "selected"; \ + program { name: "selected,nosound"; \ signal: "elm,state,selected"; \ - source: "elm"; \ + source: "elm,nosound"; \ script { \ new st[31]; \ new Float:vl; \ - get_state(PART:"bg_image", st, 30, vl); \ + get_state(PART:"bg_dialogue", st, 30, vl); \ if (!strcmp(st, "top")) \ - set_state(PART:"bg_image", "top_selected", 0.0); \ + set_state(PART:"bg_dialogue", "top_selected", 0.0); \ else if (!strcmp(st, "center")) \ - set_state(PART:"bg_image", "center_selected", 0.0); \ + set_state(PART:"bg_dialogue", "center_selected", 0.0); \ else if (!strcmp(st, "bottom")) \ - set_state(PART:"bg_image", "bottom_selected", 0.0); \ - else \ - set_state(PART:"bg_image", "selected", 0.0); \ + set_state(PART:"bg_dialogue", "bottom_selected", 0.0); \ + else if (!strcmp(st, "default")) \ + set_state(PART:"bg_dialogue", "selected", 0.0); \ + run_program(PROGRAM:"target_selected"); \ } \ - after: "target_selected"; \ - after: "play_button_press"; \ } \ program { name: "unselected"; \ signal: "elm,state,unselected"; \ source: "elm"; \ + transition: LINEAR 0.1; \ script { \ new st[31]; \ new Float:vl; \ - get_state(PART:"bg_image", st, 30, vl); \ + get_state(PART:"bg_dialogue", st, 30, vl); \ if (!strcmp(st, "top_selected")) \ - set_state(PART:"bg_image", "top", 0.0); \ + set_state(PART:"bg_dialogue", "top", 0.0); \ else if (!strcmp(st, "center_selected")) \ - set_state(PART:"bg_image", "center", 0.0); \ + set_state(PART:"bg_dialogue", "center", 0.0); \ else if (!strcmp(st, "bottom_selected")) \ - set_state(PART:"bg_image", "bottom", 0.0); \ - else \ - set_state(PART:"bg_image", "default", 0.0); \ + set_state(PART:"bg_dialogue", "bottom", 0.0); \ + else if (!strcmp(st, "selected")) \ + set_state(PART:"bg_dialogue", "default", 0.0); \ + run_program(PROGRAM:"target_unselected"); \ } \ - transition: LINEAR 0.1; \ - after: "target_unselected"; \ } \ program { name: "target_selected"; \ action: STATE_SET "selected" 0.0; \ TARGET \ }\ + program { name: "play_button_press"; \ + action: PLAY_SAMPLE "button-pressed" 1.0; \ + } \ program { name: "target_unselected"; \ action: STATE_SET "default" 0.0; \ TARGET \ }\ + program { name: "bg_default"; \ + signal: "elm,state,default"; \ + source: "*"; \ + action: STATE_SET "default" 0.0; \ + target: "bg_dialogue"; \ + } \ program { name: "bg_top"; \ signal: "elm,state,top"; \ source: "*"; \ action: STATE_SET "top" 0.0; \ - target: "bg_image"; \ + target: "bg_dialogue"; \ } \ program { name: "bg_center"; \ signal: "elm,state,center"; \ source: "*"; \ action: STATE_SET "center" 0.0; \ - target: "bg_image"; \ + target: "bg_dialogue"; \ } \ program { name: "bg_bottom"; \ signal: "elm,state,bottom"; \ source: "*"; \ action: STATE_SET "bottom" 0.0; \ - target: "bg_image"; \ - } \ - program { name: "bg_default"; \ - signal: "elm,state,default"; \ - source: "*"; \ - action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ - } \ - program { name: "play_button_press"; \ - action: PLAY_SAMPLE "button-pressed" 1.0; \ + target: "bg_dialogue"; \ } -#define GENLIST_PROGRAM_SELECT_DIALOGUE_ARROW( TARGET ) \ - program { name: "selected"; \ +#define GENLIST_PROGRAM_SELECT_ARROW \ + program { name: "selected_arrow"; \ signal: "elm,state,selected"; \ source: "elm"; \ script { \ new st[31]; \ new Float:vl; \ - get_state(PART:"bg_image", st, 30, vl); \ - if (!strcmp(st, "top")) \ - set_state(PART:"bg_image", "top_selected", 0.0); \ - else if (!strcmp(st, "center")) \ - set_state(PART:"bg_image", "center_selected", 0.0); \ - else if (!strcmp(st, "bottom")) \ - set_state(PART:"bg_image", "bottom_selected", 0.0); \ - else \ - set_state(PART:"bg_image", "selected", 0.0); \ get_state(PART:"arrow", st, 30, vl); \ if (!strcmp(st, "default")) { \ set_state(PART:"arrow", "default_press", 0.0); \ @@ -1717,24 +1669,14 @@ set_state(PART:"arrow_clip", "expand_opened_press", 0.0); \ } \ } \ - after: "target_selected"; \ - after: "play_button_press"; \ } \ - program { name: "unselected"; \ + program { name: "unselected_arrow"; \ signal: "elm,state,unselected"; \ source: "elm"; \ + transition: LINEAR 0.1; \ script { \ new st[31]; \ new Float:vl; \ - get_state(PART:"bg_image", st, 30, vl); \ - if (!strcmp(st, "top_selected")) \ - set_state(PART:"bg_image", "top", 0.0); \ - else if (!strcmp(st, "center_selected")) \ - set_state(PART:"bg_image", "center", 0.0); \ - else if (!strcmp(st, "bottom_selected")) \ - set_state(PART:"bg_image", "bottom", 0.0); \ - else \ - set_state(PART:"bg_image", "default", 0.0); \ get_state(PART:"arrow", st, 30, vl); \ if (!strcmp(st, "default_press")) { \ set_state(PART:"arrow", "default", 0.0); \ @@ -1745,70 +1687,89 @@ set_state(PART:"arrow_clip", "expand_opened", 0.0); \ } \ } \ - transition: LINEAR 0.1; \ - after: "target_unselected"; \ - } \ - program { name: "target_selected"; \ - action: STATE_SET "selected" 0.0; \ + } + +#define GENLIST_PROGRAM_DECORATE( TARGET ) \ + program { name: "decorate_enabled_effect"; \ + signal: "elm,state,decorate,enabled,effect";\ + source: "elm";\ + action: STATE_SET "decorate" 0.0;\ + TARGET \ + }\ + program { name: "decorate_disabled_effect";\ + signal: "elm,state,decorate,disabled,effect";\ + source: "elm";\ + action: STATE_SET "default" 0.0; \ TARGET \ }\ - program { name: "target_unselected"; \ - action: STATE_SET "default" 0.0; \ + program { name: "decorate_enabled";\ + signal: "elm,state,decorate,enabled";\ + source: "elm";\ + action: STATE_SET "decorate" 0.0;\ TARGET \ }\ - program { name: "bg_top"; \ - signal: "elm,state,top"; \ - source: "*"; \ - action: STATE_SET "top" 0.0; \ - target: "bg_image"; \ - } \ - program { name: "bg_center"; \ - signal: "elm,state,center"; \ - source: "*"; \ - action: STATE_SET "center" 0.0; \ - target: "bg_image"; \ - } \ - program { name: "bg_bottom"; \ - signal: "elm,state,bottom"; \ - source: "*"; \ - action: STATE_SET "bottom" 0.0; \ - target: "bg_image"; \ + program { name: "decorate_disabled";\ + signal: "elm,state,decorate,disabled";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + TARGET \ + } + +#define GENLIST_PROGRAM_REORDER( TARGET ) \ + program { name: "reorder_enabled"; \ + signal: "elm,state,reorder,mode_set"; \ + source: "elm"; \ + action: STATE_SET "reorder" 0.0; \ + TARGET \ } \ - program { name: "bg_default"; \ - signal: "elm,state,default"; \ - source: "*"; \ + program { name: "reorder_disabled"; \ + signal: "elm,state,reorder,mode_unset"; \ + source: "elm"; \ action: STATE_SET "default" 0.0; \ - target: "bg_image"; \ - } \ - program { name: "play_button_press"; \ - action: PLAY_SAMPLE "button-pressed" 1.0; \ + TARGET \ } #define GENLIST_PROGRAM_FLIP \ program { name: "flip_enabled"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ - target: "elm.flip.event_block"; \ - after: "flip_enabled_next"; \ - } \ - program { name: "flip_enabled_next"; \ - action: STATE_SET "flip_enabled" 0.0; \ transition: DECELERATE 0.5; \ + action: STATE_SET "flip_enabled" 0.0; \ target: "elm.flip.content"; \ target: "elm.flip.icon"; \ } \ program { name: "flip_disabled"; \ signal: "elm,state,flip,disabled"; \ source: "elm"; \ - action: STATE_SET "default" 0.0; \ transition: DECELERATE 0.5; \ - target: "elm.flip.event_block"; \ + action: STATE_SET "default" 0.0; \ target: "elm.flip.content"; \ target: "elm.flip.icon"; \ + } \ + program { name: "flip_enabled_bg"; \ + signal: "elm,state,flip,enabled"; \ + source: "elm"; \ + action: STATE_SET "flip_enabled" 0.0; \ + target: "elm.flip.bg"; \ + } \ + program { name: "flip_disabled_bg"; \ + signal: "elm,state,flip,disabled"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "elm.flip.bg"; \ + } \ + program { \ + signal: "elm,state,eraser,show"; \ + action: STATE_SET "show" 0.0; \ + target: "elm.flip.eraser"; \ + } \ + program { \ + signal: "elm,state,eraser,hide"; \ + action: STATE_SET "default" 0.0; \ + target: "elm.flip.eraser"; \ } -#define GENLIST_PROGRAM_FLIP_TARGET( TARGET ) \ +#define GENLIST_PROGRAM_FLIP_TARGET( TARGET, BG ) \ program { name: "flip_enabled"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ @@ -1822,50 +1783,114 @@ action: STATE_SET "default" 0.0; \ transition: DECELERATE 0.5; \ TARGET \ - } - -#define GENLIST_PROGRAM_EDITMODE \ - program { name: "edit_enabled"; \ - signal: "elm,state,edit,enabled"; \ - source: "*"; \ - action: STATE_SET "editmode" 0.0; \ - target: "elm.padding.right"; \ - target: "elm.icon.edit"; \ - target: "bg_image_right"; \ } \ - program { name: "edit_disabled"; \ - signal: "elm,state,edit,disabled"; \ - source: "*"; \ - action: STATE_SET "editmode" 0.0; \ - target: "elm.padding.right"; \ - target: "elm.icon.edit"; \ - target: "bg_image_right"; \ + program { name: "flip_enabled_noeffect"; \ + signal: "elm,state,flip,enabled"; \ + source: "elm"; \ + action: STATE_SET "flip_enabled" 0.0; \ + BG; \ + } \ + program { name: "flip_disabled_noeffect"; \ + signal: "elm,state,flip,disabled"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + BG; \ } -#define GENLIST_PROGRAMS_INDEX( TARGET ) \ - programs { \ - GENLIST_PROGRAM_DISABLED( TARGET ) \ - } +#define GENLIST_PROGRAM_EDITMODE \ + program { name: "edit_enabled"; \ + signal: "elm,state,edit,enabled"; \ + source: "*"; \ + action: STATE_SET "editmode" 0.0; \ + target: "elm.padding.right.edit"; \ + target: "elm.icon.edit"; \ + target: "bg_dialogue_right"; \ + } \ + program { name: "edit_disabled"; \ + signal: "elm,state,edit,disabled"; \ + source: "*"; \ + action: STATE_SET "default" 0.0; \ + target: "elm.padding.right.edit"; \ + target: "elm.icon.edit"; \ + target: "bg_dialogue_right"; \ + } #define GENLIST_PROGRAMS_NORMAL( TARGET ) \ - programs { \ - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( TARGET ) \ - GENLIST_PROGRAM_SELECT_BOTTOMLINE( TARGET ) \ - GENLIST_PROGRAM_EXPAND_FADE( target: "bottom_line"; target: "bottom_line2"; TARGET ) \ - GENLIST_PROGRAMS_DECORATE \ - GENLIST_PROGRAM_FLIP \ - } + programs { \ + GENLIST_PROGRAM_DEFAULT( TARGET \ + target: "bg_clip"; \ + target: "bottom_line_clip"; \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + ) \ + GENLIST_PROGRAM_DISABLED( TARGET \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + ) \ + GENLIST_PROGRAM_SELECT( TARGET \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + ) \ + GENLIST_PROGRAM_EXPAND_FADE( TARGET \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + ) \ + GENLIST_PROGRAM_REORDER( \ + target: "bg_clip"; \ + target: "bottom_line_clip"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + target: "bg_reorder_clip"; \ + ) \ + GENLIST_PROGRAM_DECORATE( \ + target: "bg_clip"; \ + target: "bottom_line_clip"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + ) \ + GENLIST_PROGRAM_FLIP \ + } // FIXME: inheritance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1 // if GENLIST_PROGRAM_EXPAND is here, expanda effect is something wrong. // because after can be duplicated when program inheriting. #define GENLIST_PROGRAMS_DIALOGUE( TARGET ) \ - programs { \ - GENLIST_PROGRAM_DISABLED_DIALOGUE( TARGET ) \ - GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \ - GENLIST_PROGRAM_FLIP \ - GENLIST_PROGRAM_EDITMODE \ - } + programs { \ + GENLIST_PROGRAM_DEFAULT( TARGET \ + target: "bg_dialogue_clip"; \ + target: "bg_dialogue"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + ) \ + GENLIST_PROGRAM_DISABLED( TARGET ) \ + GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \ + program { name: "bg_color_change"; \ + signal: "bg_color_change"; \ + source: "elm"; \ + action: STATE_SET "2depth" 0.0; \ + target: "bg_dialogue_clip"; \ + } \ + GENLIST_PROGRAM_EXPAND_FADE( TARGET \ + target: "bg_dialogue"; \ + ) \ + GENLIST_PROGRAM_DECORATE( TARGET \ + target: "bg_dialogue_clip"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + ) \ + GENLIST_PROGRAM_FLIP \ + GENLIST_PROGRAM_EDITMODE \ + } #define GENLIST_PROGRAMS_MULTILINE( TARGET ) \ programs { \ @@ -1874,95 +1899,169 @@ GENLIST_PROGRAM_FLIP \ } -#define GENLIST_PROGRAMS_READ_TEXT -#define GENLIST_PROGRAMS_READ_TEXT1( TARGET ) \ - script { \ - public readed = 0; \ +#define GENLIST_PROGRAMS_READ_TEXT( TARGET ) \ + programs { \ + GENLIST_PROGRAM_DEFAULT( TARGET \ + target: "bg_clip"; \ + target: "bottom_line_clip"; \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + ) \ + GENLIST_PROGRAM_DISABLED( \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + TARGET \ + ) \ + program { name: "selected"; \ + signal: "elm,state,selected"; \ + source: "elm"; \ + action: STATE_SET "selected" 0.0; \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + TARGET \ + after: "play_button_press"; \ } \ - programs { \ - GENLIST_PROGRAM_DISABLED_BOTTOMLINE( TARGET ) \ - GENLIST_PROGRAM_FLIP \ - program { name: "selected"; \ - signal: "elm,state,selected"; \ - source: "elm"; \ - action: STATE_SET "selected" 0.0; \ - target: "bg_image"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ - TARGET \ - after: "play_button_press"; \ - } \ - program { name: "play_button_press"; \ - action: PLAY_SAMPLE "button-pressed" 1.0; \ - } \ - program { name: "go_passive_target"; \ - signal: "elm,state,unselected"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ - TARGET \ - after: "go_passive_text1"; \ - } \ - program { name: "go_passive_text1"; \ - transition: LINEAR 0.1; \ - script { \ - set_state(PART:"bg_image", "default", 0.0); \ - set_state(PART:"bottom_line", "default", 0.0); \ - set_state(PART:"bottom_line2", "default", 0.0); \ - if (get_int(readed) == 1) \ - set_state(PART:"elm.text.1", "read", 0.0); \ - else \ - set_state(PART:"elm.text.1", "default", 0.0); \ - } \ + program { name: "selected,nosound"; \ + signal: "elm,state,selected"; \ + source: "elm,nosound"; \ + action: STATE_SET "selected" 0.0; \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + TARGET \ + } \ + program { name: "unselected"; \ + signal: "elm,state,unselected"; \ + source: "elm"; \ + transition: LINEAR 0.1; \ + action: STATE_SET "default" 0.0; \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + } \ + program { name: "unselected_target"; \ + transition: LINEAR 0.1; \ + action: STATE_SET "default" 0.0; \ + TARGET \ + } \ + program { name: "unselected_read"; \ + signal: "elm,state,unselected"; \ + source: "elm"; \ + script { \ + if (get_int(readed) == 1) \ + run_program(PROGRAM:"go_read_target"); \ + else \ + run_program(PROGRAM:"unselected_target"); \ } \ - program { name: "go_read"; \ - signal: "elm,state,read"; \ - source: "*"; \ - script { \ - set_int(readed, 1); \ - set_state(PART:"elm.text.1", "read", 0.0); \ - } \ + } \ + program { name: "play_button_press"; \ + action: PLAY_SAMPLE "button-pressed" 1.0; \ + } \ + GENLIST_PROGRAM_EXPAND_FADE( \ + target: "bg"; \ + target: "bottom_line"; \ + target: "bottom_line2"; \ + target: "bg_reorder"; \ + TARGET \ + ) \ + GENLIST_PROGRAM_REORDER( \ + target: "bg_clip"; \ + target: "bottom_line_clip"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + target: "bg_reorder_clip"; \ + ) \ + GENLIST_PROGRAM_DECORATE( \ + target: "bg_clip"; \ + target: "bottom_line_clip"; \ + target: "elm.padding.left"; \ + target: "elm.padding.right"; \ + ) \ + program { name: "go_read"; \ + signal: "elm,state,read"; \ + source: "*"; \ + script { \ + set_int(readed, 1); \ + run_program(PROGRAM:"go_read_target"); \ } \ - program { name: "go_unread"; \ - signal: "elm,state,unread"; \ - source: "*"; \ - script { \ - set_int(readed, 0); \ - set_state(PART:"elm.text.1", "default", 0.0); \ - } \ + } \ + program { name: "go_read_target"; \ + action: STATE_SET "read" 0.0; \ + TARGET \ + } \ + program { name: "go_unread"; \ + signal: "elm,state,unread"; \ + source: "*"; \ + script { \ + set_int(readed, 0); \ + run_program(PROGRAM:"go_unread_target"); \ } \ - } + } \ + program { name: "go_unread_target"; \ + action: STATE_SET "unread" 0.0; \ + TARGET \ + } \ + } -#define GENLIST_PROGRAMS_DECORATE \ - program { name: "decorate_enabled_effect"; \ - signal: "elm,state,decorate,enabled,effect";\ - source: "elm";\ - transition: DECELERATE 0.7;\ - action: STATE_SET "decorate" 0.0;\ - target: "elm.padding.left"; \ - target: "elm.padding.right"; \ - }\ - program { name: "decorate_disabled_effect";\ - signal: "elm,state,decorate,disabled,effect";\ - source: "elm";\ - transition: ACCELERATE 0.7;\ - action: STATE_SET "default" 0.0;\ - target: "elm.padding.left"; \ - target: "elm.padding.right"; \ - }\ - program { name: "decorate_enabled";\ - signal: "elm,state,decorate,enabled";\ - source: "elm";\ - action: STATE_SET "decorate" 0.0;\ - target: "elm.padding.left"; \ - target: "elm.padding.right"; \ - }\ - program { name: "decorate_disabled";\ - signal: "elm,state,decorate,disabled";\ - source: "elm";\ - action: STATE_SET "default" 0.0;\ - target: "elm.padding.left"; \ - target: "elm.padding.right"; \ - } +#define GENLIST_PROGRAMS_DECORATE_EFFECT( TARGET ) \ + program { name: "decorate_enabled_effect"; \ + signal: "elm,state,decorate,enabled,effect";\ + source: "elm";\ + transition: DECELERATE 0.5;\ + action: STATE_SET "decorate" 0.0;\ + TARGET \ + }\ + program { name: "decorate_disabled_effect";\ + signal: "elm,state,decorate,disabled,effect";\ + source: "elm";\ + transition: ACCELERATE 0.5;\ + action: STATE_SET "default" 0.0;\ + TARGET \ + } \ + program { name: "decorate_enabled";\ + signal: "elm,state,decorate,enabled";\ + source: "elm";\ + action: STATE_SET "decorate" 0.0;\ + TARGET \ + }\ + program { name: "decorate_disabled";\ + signal: "elm,state,decorate,disabled";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + TARGET \ + } + +#define GENLIST_PROGRAMS_ENTRY \ + program { \ + signal: "elm,state,eraser,show"; \ + action: STATE_SET "show" 0.0; \ + target: "elm.icon.eraser"; \ + } \ + program { \ + signal: "elm,state,eraser,hide"; \ + action: STATE_SET "default" 0.0; \ + target: "elm.icon.eraser"; \ + } \ + program { \ + signal: "elm,state,rename,show"; \ + action: STATE_SET "default" 0.0; \ + target: "elm.icon.rename"; \ + } \ + program { \ + signal: "elm,state,rename,hide"; \ + action: STATE_SET "hide" 0.0; \ + target: "elm.icon.rename"; \ + } //****************************************************************************// // ******************************* Icon Part ******************************// @@ -2018,8 +2117,8 @@ #define GENLIST_PART_ICON_BIG_L(NAME, LEFT) \ GENLIST_PART_ICON(NAME, \ GENLIST_DESCRIPTION_LTB(LEFT, "elm.padding.top", "elm.padding.bottom", \ - fixed: 1 1; \ GENLIST_PARAM_ICON_BIG \ + fixed: 1 1; \ ) \ ) @@ -2034,8 +2133,8 @@ #define GENLIST_PART_ICON_SMALL_LB(NAME, LEFT, BOTTOM) \ GENLIST_PART_ICON(NAME, \ GENLIST_DESCRIPTION_LB(LEFT, BOTTOM, \ - fixed: 1 1; \ GENLIST_PARAM_ICON_SMALL \ + fixed: 1 1; \ ) \ ) @@ -2043,6 +2142,7 @@ GENLIST_PART_ICON(NAME, \ GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \ GENLIST_PARAM_ICON_SMALL \ + fixed: 1 1; \ ) \ ) @@ -2082,6 +2182,7 @@ GENLIST_PART_ICON(NAME, \ GENLIST_DESCRIPTION_LTB(LEFT, "elm.padding.top", "elm.padding.bottom", \ GENLIST_PARAM_ICON_ONOFF_WIDTH \ + fixed: 1 1; \ ) \ ) @@ -2097,6 +2198,7 @@ GENLIST_PART_ICON(NAME, \ GENLIST_DESCRIPTION_LTB(LEFT, "elm.padding.top", "elm.padding.bottom", \ GENLIST_PARAM_ICON_CHECK_RADIO \ + fixed: 1 1; \ ) \ ) @@ -2123,7 +2225,7 @@ min: GENLIST_ICON_PASSWORD_SIZE GENLIST_ICON_PASSWORD_SIZE; \ max: GENLIST_ICON_PASSWORD_SIZE GENLIST_ICON_PASSWORD_SIZE; \ image.normal: "00_search_edit_field_bg_02.png"; \ - image.border: 4 4 4 4; \ + image.border: 12 13 12 13; \ image.border_scale: 1; /*****************************************************************************/ @@ -2149,10 +2251,10 @@ color: 101 101 101 76; \ } \ description { state: "expand_opened_press" 0.0; \ - color: 248 246 230 255; \ + color: 248 246 239 255; \ } \ description { state: "default_press" 0.0; \ - color: 248 246 230 255; \ + color: 248 246 239 255; \ } \ ) \ GENLIST_PART_IMAGE("arrow", \ @@ -2161,8 +2263,8 @@ mouse_events: 0; \ GENLIST_DESCRIPTION_R("elm.padding.right", \ fixed: 1 1; \ - min: 74 74; \ - max: 74 74; \ + min: 72 72; \ + max: 72 72; \ image.normal: "00_button_expand_closed.png"; \ ) \ description { state: "default_press" 0.0; \ @@ -2198,18 +2300,6 @@ GENLIST_DESCRIPTION_FADE \ } -#define GENLIST_PART_INDEX_LINE(LEFT, RIGHT, TOP, BOTTOM) \ - GENLIST_PART_RECT("index_line", \ - GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ - color: GENLIST_GROUPINDEX_LINE_COLOR; \ - min: 0 4; \ - max: -1 4;) \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \ - } \ - ) - /*****************************************************************************/ /******************************* Genlist TEXT ********************************/ /*****************************************************************************/ @@ -2247,24 +2337,13 @@ rel1.relative: 0.35 1; /* This limits text growing. */\ text.max: 1 0; /* This limits text growing. */ -// Group Index -#define GENLIST_PARAM_INDEX_LIST \ - color: GENLIST_GROUPINDEX_LIST_COLOR; \ - text { \ - align: 0 0.5; \ - min: 0 1; \ - font: "Tizen:style=Bold"; \ - size: GENLIST_GROUPINDEX_LIST_SIZE; \ - text_class: "list_item"; \ - } - // Group Title #define GENLIST_PARAM_DIALOGUE_GROUP_TITLE \ color: GENLIST_DIALOGUE_GROUP_TITLE_COLOR; \ text { \ align: 0.0 0.5; \ - min: 0 1; \ font: "Tizen:style=Bold"; \ + min: 0 1; \ size: GENLIST_DIALOGUE_GROUP_TITLE_SIZE; \ text_class: "list_item"; \ } @@ -2280,6 +2359,17 @@ text_class: "list_item"; \ } +// Progress main text +#define GENLIST_PARAM_PROGRESS_MAIN \ + color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \ + text { \ + align: 0 0.5; \ + min: 0 1; \ + font: "Tizen:style=Regular"; \ + size: GENLIST_PROGRESS_MAIN_TEXT_SIZE; \ + text_class: "list_item"; \ + } + // list main text #define GENLIST_PARAM_LISTITEM \ color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \ @@ -2403,13 +2493,6 @@ } /*************************** Descriptions **********************************/ -// group index -#define GENLIST_DESCRIPTION_INDEX_LIST \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - color: GENLIST_GROUPINDEX_LIST_FOCUS_COLOR; \ - } - // list main text #define GENLIST_DESCRIPTION_LISTITEM_OTHERS \ description { state: "disabled" 0.0; \ @@ -2546,9 +2629,9 @@ GENLIST_PART_TEXTBLOCK(NAME, \ GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ min: 0 HEIGHT; \ + fixed: 1 0; \ GENLIST_PARAM_LISTITEM_TB \ PARAM \ - fixed: 1 0; \ ) \ GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB \ ) @@ -2563,12 +2646,23 @@ GENLIST_DESCRIPTION_LISTITEM_OTHERS \ ) +#define GENLIST_PART_LISTITEM_LRT(NAME, HEIGHT, LEFT, RIGHT, TOP, PARAM) \ + GENLIST_PART_TEXT(NAME, \ + GENLIST_DESCRIPTION_LRT(LEFT, RIGHT, TOP, \ + min: 0 HEIGHT; \ + fixed: 0 1; \ + GENLIST_PARAM_LISTITEM \ + PARAM \ + ) \ + GENLIST_DESCRIPTION_LISTITEM_OTHERS \ + ) + #define GENLIST_PART_LISTITEM_LRT_TB(NAME, HEIGHT, LEFT, RIGHT, TOP, PARAM) \ GENLIST_PART_TEXTBLOCK(NAME, \ GENLIST_DESCRIPTION_LRT(LEFT, RIGHT, TOP, \ min: 0 HEIGHT; \ - GENLIST_PARAM_LISTITEM_TB \ fixed: 0 1; \ + GENLIST_PARAM_LISTITEM_TB \ PARAM \ ) \ GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB \ @@ -2578,9 +2672,9 @@ GENLIST_PART_TEXTBLOCK(NAME, \ GENLIST_DESCRIPTION(LEFT, RIGHT, "elm.padding.top", "elm.padding.bottom", \ min: 0 HEIGHT; \ + fixed: 1 0; \ GENLIST_PARAM_LISTITEM_TB \ PARAM \ - fixed: 1 0; \ ) \ GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB \ ) @@ -2588,6 +2682,7 @@ #define GENLIST_PART_SUBITEM_(NAME, HEIGHT, LEFT, RIGHT, TOP, BOTTOM, PARAM) \ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ + min: 0 HEIGHT; \ GENLIST_PARAM_SUBITEM_DEFAULT \ PARAM \ ) \ @@ -2600,17 +2695,11 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \ ) -#define GENLIST_PART_SUBITEM_DEFAULT_TB(NAME, DESCRIPTION) \ - GENLIST_PART_TEXTBLOCK(NAME, \ - DESCRIPTION \ - GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB \ - ) - #define GENLIST_PART_SUBITEM_R(NAME, HEIGHT, RIGHT) \ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION_RTB(RIGHT, "elm.padding.top", "elm.padding.bottom", \ - fixed: 1 0; \ min: 0 HEIGHT; \ + fixed: 1 0; \ GENLIST_PARAM_TEXT_LIMIT_RB \ GENLIST_PARAM_SUBITEM_DEFAULT \ ) \ @@ -2642,6 +2731,7 @@ #define GENLIST_PART_SUBITEM_TB_(NAME, HEIGHT, LEFT, RIGHT, TOP, BOTTOM) \ GENLIST_PART_TEXTBLOCK(NAME, \ GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ + min: 0 HEIGHT; \ GENLIST_PARAM_SUBITEM_DEFAULT_TB \ ) \ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB \ @@ -2709,8 +2799,8 @@ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION_LRB(LEFT, RIGHT, BOTTOM, \ min: 0 HEIGHT; \ - fixed: 1 1; /*FIXME: why text need this, but textblock doesn't */ \ GENLIST_PARAM_SUBITEM_DEFAULT \ + fixed: 0 1; \ ) \ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \ ) @@ -2750,12 +2840,22 @@ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION_LRT(LEFT, RIGHT, TOP, \ min: 0 HEIGHT; \ - fixed: 1 1; /*FIXME: why text need this, but textblock doesn't */ \ + fixed: 0 1; \ GENLIST_PARAM_SUBITEM_DEFAULT \ ) \ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \ ) +#define GENLIST_PART_SUBITEM_SETTINGS_LRT(NAME, HEIGHT, LEFT, RIGHT, TOP) \ + GENLIST_PART_TEXT(NAME, \ + GENLIST_DESCRIPTION_LRT(LEFT, RIGHT, TOP, \ + min: 0 HEIGHT; \ + fixed: 0 1; \ + GENLIST_PARAM_SUBITEM_SETTINGS \ + ) \ + GENLIST_DESCRIPTION_SUBITEM_SETTINGS_OTHERS \ + ) + #define GENLIST_PART_SUBITEM_LTB(NAME, HEIGHT, LEFT, TOP, BOTTOM) \ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \ @@ -2772,6 +2872,7 @@ min: 0 HEIGHT; \ GENLIST_PARAM_TEXT_LIMIT_RT \ GENLIST_PARAM_SUBITEM_DEFAULT \ + fixed: 1 0; \ ) \ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \ ) @@ -2796,6 +2897,7 @@ size: GENLIST_LIST_BUBBLE_TEXT_SIZE; \ text_class: "tizen"; \ } + // FIXME: Need to find why rel2.offset: 9 -1 will not fix the alignment of bubble text ? #define GENLIST_PART_LIST_BUBBLE_TEXT_RTB(NAME, HEIGHT, RIGHT, TOP, BOTTOM) \ GENLIST_PART_IMAGE("elm.bubble", \ @@ -2833,35 +2935,6 @@ } \ } -#define GENLIST_PART_BG \ - part { name: "bg"; \ - type: RECT; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; \ - } \ - description { state: "hide" 0.0; \ - inherit: "default" 0.0; \ - rel1 { relative: 0.025 0.0; } \ - rel2 { relative: 1.025 1.0; } \ - } \ - description { state: "hide" 0.1; \ - inherit: "default" 0.0; \ - rel1 { relative: 0.13 0.0; } \ - rel2 { relative: 1.13 1.0; } \ - } \ - description { state: "hide" 0.2; \ - inherit: "default" 0.0; \ - rel1 { relative: 0.5 0.0; } \ - rel2 { relative: 1.5 1.0; } \ - } \ - description { state: "hide" 0.3; \ - inherit: "default" 0.0; \ - rel1 { relative: 1.0 0.0; } \ - rel2 { relative: 2.0 1.0; } \ - } \ - } - /******************************************************************************/ /** ETC /******************************************************************************/ @@ -3051,7 +3124,7 @@ new st[31]; \ new Float:vl; \ get_state(PART:"elm.text", st, 30, vl); \ - set_state(PART:"bg_image", "selected", 0.0); \ + set_state(PART:"bg", "selected", 0.0); \ if (!strcmp(st, "flip_enabled")) \ set_state(PART:"elm.text", "selected", 1.0); \ else \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index a907900..90399ce 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -27,27 +27,19 @@ source: "button-pressed.wav"; } } - group { name: "elm/genlist/item/default/default"; - alias: "elm/genlist/item_odd/default/default"; - alias: "elm/genlist/item_compress/default/default"; - alias: "elm/genlist/item_compress_odd/default/default"; - alias: "elm/genlist/tree/default/default"; - alias: "elm/genlist/tree_odd/default/default"; - alias: "elm/genlist/tree_compress/default/default"; - alias: "elm/genlist/tree_compress_odd/default/default"; - + group { GENLIST_NAME("default/default") alias: "elm/list/item/default"; alias: "elm/list/item_odd/default"; alias: "elm/list/item_compress/default"; alias: "elm/list/item_compress_odd/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.swallow.icon elm.swallow.end"; parts { - GENLIST_PART_BG_IMAGE GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -55,9 +47,9 @@ GENLIST_PART_PADDING_BOTTOM GENLIST_PART_ICON("elm.swallow.icon", - GENLIST_DESCRIPTION_LTB("elm.padding.left", - "elm.padding.top", "elm.padding.bottom", - fixed: 1 0;) + GENLIST_DESCRIPTION_LTB("elm.padding.left", "elm.padding.top", "elm.padding.bottom", + fixed: 1 0; + ) ) GENLIST_PART_LISTITEM_("elm.text", GENLIST_HEIGHT_1LINE, "elm.swallow.icon", "elm.swallow.end", @@ -65,7 +57,8 @@ ) GENLIST_PART_ICON("elm.swallow.end", GENLIST_DESCRIPTION_R("elm.padding.right", - fixed: 1 0;) + fixed: 1 0; + ) ) GENLIST_PART_FLIP } @@ -75,21 +68,156 @@ // ------------------------------------------------------------------- // Tizen Theme ------------------------------------------------------- // ------------------------------------------------------------------- - group { name: "elm/genlist/item/1icon/default"; - alias: "elm/genlist/item_odd/1icon/default"; - alias: "elm/genlist/item_compress/1icon/default"; - alias: "elm/genlist/item_compress_odd/1icon/default"; - alias: "elm/genlist/tree/1icon/default"; - alias: "elm/genlist/tree_odd/1icon/default"; - alias: "elm/genlist/tree_compress/1icon/default"; - alias: "elm/genlist/tree_compress_odd/1icon/default"; - - GENLIST_DATA_ITEM_NORMAL +// 2.2.6.1 + group { GENLIST_NAME("editfield/default") + alias: "elm/layout/item/editfield/default"; + + GENLIST_PROLOG_NORMAL + images { + image: "00_EditField_rename.png" COMP; + } + + data.item: "contents" "elm.icon.entry elm.icon.eraser"; + + parts { + GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_LEFT + GENLIST_PART_PADDING_RIGHT + GENLIST_PART_PADDING_TOP_SIZE(29) + GENLIST_PART_PADDING_BOTTOM_SIZE(27) + + GENLIST_PART_ICON("elm.icon.entry", + GENLIST_DESCRIPTION( + "elm.padding.left", "elm.icon.eraser", + "elm.padding.top", "elm.padding.bottom", + min: 0 48; // This is tuned value for exact entry size. + ) + ) + GENLIST_PART_ICON("elm.icon.eraser", + GENLIST_DESCRIPTION_RTB("elm.padding.right", + "elm.padding.top", "elm.padding.bottom", + fixed: 1 0; + visible: 0; + min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + ) + description { state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + ) + GENLIST_PART_IMAGE("elm.icon.rename", + GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser", + fixed: 1 0; + visible: 1; + image.normal: "00_EditField_rename.png"; + min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + color: GENLIST_ENTRY_RENAME_COLOR; + ) + description { state: "hide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + ) + GENLIST_PART_FLIP + } + GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.icon.rename"; ) + GENLIST_PROGRAMS_ENTRY + } + +// 2.2.6.1 (without genlist background) + group { GENLIST_NAME("editfield/no_bg/default") + alias: "elm/layout/editfield/no_bg/default"; + inherit: "elm/genlist/item/editfield/default"; + + parts { + GENLIST_PART_BG_NORMAL_OFF + } + } + +// 2.2.6.2 + group { GENLIST_NAME("editfield/title/default") + alias: "elm/layout/editfield/title/default"; + + GENLIST_PROLOG_NORMAL + images { + image: "00_EditField_rename.png" COMP; + } + data.item: "contents" "elm.icon.entry elm.icon.eraser"; + data.item: "texts" "elm.text"; + parts { + GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_LEFT + GENLIST_PART_PADDING_RIGHT + GENLIST_PART_PADDING_TOP_SIZE(22) + GENLIST_PART_PADDING_BOTTOM_SIZE(22) + + GENLIST_PART_SUBITEM_SETTINGS_LRT("elm.text", GENLIST_HEIGHT_2LINE_SUB, + "elm.padding.left", "elm.padding.right", "elm.padding.top" + ) + GENLIST_PART_ICON("elm.icon.entry", + GENLIST_DESCRIPTION( + "elm.padding.left", "elm.icon.eraser", + "elm.text", "elm.padding.bottom", + min: 0 48; // This is tuned value for exact entry size. + ) + ) + GENLIST_PART_ICON("elm.icon.eraser", + GENLIST_DESCRIPTION_RTB("elm.padding.right", + "elm.text", "elm.padding.bottom", + fixed: 1 0; + visible: 0; + min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + ) + description { state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + ) + GENLIST_PART_IMAGE("elm.icon.rename", + GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser", + visible: 1; + fixed: 1 0; + image.normal: "00_EditField_rename.png"; + min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; + color: GENLIST_ENTRY_RENAME_COLOR; + ) + description { state: "hide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + ) + GENLIST_PART_FLIP + } + GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.icon.rename"; ) + GENLIST_PROGRAMS_ENTRY + } + +// 2.2.6.2 (without genlist background) + group { GENLIST_NAME("editfield/title/no_bg/default") + alias: "elm/layout/editfield/title/no_bg/default"; + inherit: "elm/genlist/item/editfield/title/default"; + + parts { + GENLIST_PART_BG_NORMAL_OFF + } + } + + group { GENLIST_NAME("1icon/default") + GENLIST_PROLOG_NORMAL + data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -108,14 +236,7 @@ GENLIST_PROGRAMS_NORMAL( target: "elm.icon"; ) } - group { name: "elm/genlist/item/1icon/with_no_line/default"; - alias: "elm/genlist/item_odd/1icon/with_no_line/default"; - alias: "elm/genlist/item_compress/1icon/with_no_line/default"; - alias: "elm/genlist/item_compress_odd/1icon/with_no_line/default"; - alias: "elm/genlist/tree/1icon/with_no_line/default"; - alias: "elm/genlist/tree_odd/1icon/with_no_line/default"; - alias: "elm/genlist/tree_compress/1icon/with_no_line/default"; - alias: "elm/genlist/tree_compress_odd/1icon/with_no_line/default"; + group { GENLIST_NAME("1icon/with_no_line/default") inherit: "elm/genlist/item/1icon/default"; parts { @@ -132,14 +253,7 @@ } } - group { name: "elm/genlist/item/1icon/no_padding/default"; - alias: "elm/genlist/item_odd/1icon/no_padding/default"; - alias: "elm/genlist/item_compress/1icon/no_padding/default"; - alias: "elm/genlist/item_compress_odd/1icon/no_padding/default"; - alias: "elm/genlist/tree/1icon/no_padding/default"; - alias: "elm/genlist/tree_odd/1icon/no_padding/default"; - alias: "elm/genlist/tree_compress/1icon/no_padding/default"; - alias: "elm/genlist/tree_compress_odd/1icon/no_padding/default"; + group { GENLIST_NAME("1icon/no_padding/default") inherit: "elm/genlist/item/1icon/default"; parts { @@ -152,20 +266,13 @@ // 1 line ------------------------------------------------------- // ------------------------------------------------------------------- // 2.2.1.1 - group { name: "elm/genlist/item/1text/default"; - alias: "elm/genlist/item_odd/1text/default"; - alias: "elm/genlist/item_compress/1text/default"; - alias: "elm/genlist/item_compress_odd/1text/default"; - alias: "elm/genlist/tree/1text/default"; - alias: "elm/genlist/tree_odd/1text/default"; - alias: "elm/genlist/tree_compress/1text/default"; - alias: "elm/genlist/tree_compress_odd/1text/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text/default") + GENLIST_PROLOG_NORMAL + data.item: "texts" "elm.text"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -182,21 +289,12 @@ GENLIST_PROGRAMS_NORMAL( target: "elm.text"; ) } // 2.2.1.1 (textblock) - group { name: "elm/genlist/item/1text.tb/default"; - alias: "elm/genlist/item_odd/1text.tb/default"; - alias: "elm/genlist/item_compress/1text.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.tb/default"; - alias: "elm/genlist/tree/1text.tb/default"; - alias: "elm/genlist/tree_odd/1text.tb/default"; - alias: "elm/genlist/tree_compress/1text.tb/default"; - alias: "elm/genlist/tree_compress_odd/1text.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; - parts { - GENLIST_PART_BG_IMAGE GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -213,20 +311,11 @@ } // 2.2.1.2 - group { name: "elm/genlist/item/2text/default"; - alias: "elm/genlist/item_odd/2text/default"; - alias: "elm/genlist/item_compress/2text/default"; - alias: "elm/genlist/item_compress_odd/2text/default"; - alias: "elm/genlist/tree/2text/default"; - alias: "elm/genlist/tree_odd/2text/default"; - alias: "elm/genlist/tree_compress/2text/default"; - alias: "elm/genlist/tree_compress_odd/2text/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; - parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -248,10 +337,7 @@ } // 2.2.1.3 - group { name: "elm/genlist/item/2text.6/default"; - alias: "elm/genlist/item_odd/2text.6/default"; - alias: "elm/genlist/item_compress/2text.6/default"; - alias: "elm/genlist/item_compress_odd/2text.6/default"; + group { GENLIST_NAME("2text.6/default") inherit: "elm/genlist/item/2text/default"; parts { @@ -266,17 +352,14 @@ } // 2.2.1.4 - group { name: "elm/genlist/item/1text.1icon/default"; - alias: "elm/genlist/item_odd/1text.1icon/default"; - alias: "elm/genlist/item_compress/1text.1icon/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon/default"; + group { GENLIST_NAME("1text.1icon/default") + GENLIST_PROLOG_NORMAL - GENLIST_DATA_ITEM_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -297,10 +380,7 @@ } // 2.2.1.5 - group { name: "elm/genlist/item/1text.1icon.4/default"; - alias: "elm/genlist/item_odd/1text.1icon.4/default"; - alias: "elm/genlist/item_compress/1text.1icon.4/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.4/default"; + group { GENLIST_NAME("1text.1icon.4/default") inherit: "elm/genlist/item/1text.1icon/default"; parts { @@ -309,10 +389,7 @@ } // 2.2.1.6 - group { name: "elm/genlist/item/1text.1icon.6/default"; - alias: "elm/genlist/item_odd/1text.1icon.6/default"; - alias: "elm/genlist/item_compress/1text.1icon.6/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.6/default"; + group { GENLIST_NAME("1text.1icon.6/default") inherit: "elm/genlist/item/1text.1icon/default"; parts { @@ -322,10 +399,7 @@ // 2.2.1.7 - group { name: "elm/genlist/item/1text.1icon.7/default"; - alias: "elm/genlist/item_odd/1text.1icon.7/default"; - alias: "elm/genlist/item_compress/1text.1icon.7/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.7/default"; + group { GENLIST_NAME("1text.1icon.7/default") inherit: "elm/genlist/item/1text.1icon/default"; parts { @@ -334,10 +408,7 @@ } // 2.2.1.8 - group { name: "elm/genlist/item/1text.1icon.5/default"; - alias: "elm/genlist/item_odd/1text.1icon.5/default"; - alias: "elm/genlist/item_compress/1text.1icon.5/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.5/default"; + group { GENLIST_NAME("1text.1icon.5/default") inherit: "elm/genlist/item/1text.1icon/default"; parts { @@ -346,17 +417,13 @@ } // 2.2.1.9 - group { name: "elm/genlist/item/1text.2icon.3/default"; - alias: "elm/genlist/item_odd/1text.2icon.3/default"; - alias: "elm/genlist/item_compress/1text.2icon.3/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.3/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.2icon.3/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -384,21 +451,17 @@ } // 2.2.1.9 (textblock) - group { name: "elm/genlist/item/1text.2icon.3.tb/default"; - alias: "elm/genlist/item_odd/1text.2icon.3.tb/default"; - alias: "elm/genlist/item_compress/1text.2icon.3.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.3.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.2icon.3.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT_SIZE( 0 ) + GENLIST_PART_PADDING_RIGHT GENLIST_PART_PADDING_TOP GENLIST_PART_PADDING_BOTTOM @@ -422,14 +485,7 @@ } // 2.2.1.10 - group { name: "elm/genlist/item/1text.1icon.2/default"; - alias: "elm/genlist/item_odd/1text.1icon.2/default"; - alias: "elm/genlist/item_compress/1text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.2/default"; - alias: "elm/genlist/tree/1text.1icon.2/default"; - alias: "elm/genlist/tree_odd/1text.1icon.2/default"; - alias: "elm/genlist/tree_compress/1text.1icon.2/default"; - alias: "elm/genlist/tree_compress_odd/1text.1icon.2/default"; + group { GENLIST_NAME("1text.1icon.2/default") // FIXME: just for backward compatibility alias: "elm/genlist/item/1text.1/expandable_n_depth/default"; alias: "elm/genlist/item_odd/1text.1/expandable_n_depth/default"; @@ -447,13 +503,12 @@ alias: "elm/genlist/tree_odd/1text.2/expandable_n_depth/default"; alias: "elm/genlist/tree_compress/1text.2/expandable_n_depth/default"; - - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -471,17 +526,13 @@ } // 2.2.1.10 (textblock) - group { name: "elm/genlist/item/1text.1icon.2.tb/default"; - alias: "elm/genlist/item_odd/1text.1icon.2.tb/default"; - alias: "elm/genlist/item_compress/1text.1icon.2.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.2.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.1icon.2.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -498,17 +549,13 @@ } // 2.2.1.11 - group { name: "elm/genlist/item/2text.1icon/default"; - alias: "elm/genlist/item_odd/2text.1icon/default"; - alias: "elm/genlist/item_compress/2text.1icon/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -526,14 +573,7 @@ } // 2.2.1.12 - group { name: "elm/genlist/item/2text.1icon.6/default"; - alias: "elm/genlist/item_odd/2text.1icon.6/default"; - alias: "elm/genlist/item_compress/2text.1icon.6/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.6/default"; - alias: "elm/genlist/tree/2text.1icon.6/default"; - alias: "elm/genlist/tree_odd/2text.1icon.6/default"; - alias: "elm/genlist/tree_compress/2text.1icon.6/default"; - alias: "elm/genlist/tree_compress_odd/2text.1icon.6/default"; + group { GENLIST_NAME("2text.1icon.6/default") inherit: "elm/genlist/item/2text.1icon/default"; parts { @@ -547,17 +587,13 @@ } // 2.2.1.13 - group { name: "elm/genlist/item/1text.2icon/default"; - alias: "elm/genlist/item_odd/1text.2icon/default"; - alias: "elm/genlist/item_compress/1text.2icon/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.2icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -576,17 +612,13 @@ } // 2.2.1.13 (textblock) - group { name: "elm/genlist/item/1text.2icon.tb/default"; - alias: "elm/genlist/item_odd/1text.2icon.tb/default"; - alias: "elm/genlist/item_compress/1text.2icon.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.2icon.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -605,10 +637,7 @@ } // 2.2.1.14 - group { name: "elm/genlist/item/1text.2icon.6/default"; - alias: "elm/genlist/item_odd/1text.2icon.6/default"; - alias: "elm/genlist/item_compress/1text.2icon.6/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.6/default"; + group { GENLIST_NAME("1text.2icon.6/default") inherit: "elm/genlist/item/1text.2icon/default"; parts { @@ -618,10 +647,7 @@ } // 2.2.1.14 (textblock) - group { name: "elm/genlist/item/1text.2icon.6.tb/default"; - alias: "elm/genlist/item_odd/1text.2icon.6.tb/default"; - alias: "elm/genlist/item_compress/1text.2icon.6.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.6.tb/default"; + group { GENLIST_NAME("1text.2icon.6.tb/default") inherit: "elm/genlist/item/1text.2icon.tb/default"; parts { @@ -630,10 +656,7 @@ } // 2.2.1.15 - group { name: "elm/genlist/item/1text.2icon.7/default"; - alias: "elm/genlist/item_odd/1text.2icon.7/default"; - alias: "elm/genlist/item_compress/1text.2icon.7/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.7/default"; + group { GENLIST_NAME("1text.2icon.7/default") inherit: "elm/genlist/item/1text.2icon/default"; parts { @@ -643,10 +666,7 @@ // 2.2.1.16 // 2.2.1.20 - group { name: "elm/genlist/item/1text.1icon.3/default"; - alias: "elm/genlist/item_odd/1text.1icon.3/default"; - alias: "elm/genlist/item_compress/1text.1icon.3/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.3/default"; + group { GENLIST_NAME("1text.1icon.3/default") inherit: "elm/genlist/item/1text.1icon.2/default"; parts { @@ -656,10 +676,7 @@ // 2.2.1.16 (textblock) // 2.2.1.20 (textblock) - group { name: "elm/genlist/item/1text.1icon.3.tb/default"; - alias: "elm/genlist/item_odd/1text.1icon.3.tb/default"; - alias: "elm/genlist/item_compress/1text.1icon.3.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.3.tb/default"; + group { GENLIST_NAME("1text.1icon.3.tb/default") inherit: "elm/genlist/item/1text.1icon.2.tb/default"; parts { @@ -668,10 +685,7 @@ } // 2.2.1.17 - group { name: "elm/genlist/item/1text.2icon.4/default"; - alias: "elm/genlist/item_odd/1text.2icon.4/default"; - alias: "elm/genlist/item_compress/1text.2icon.4/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.4/default"; + group { GENLIST_NAME("1text.2icon.4/default") inherit: "elm/genlist/item/1text.2icon/default"; parts { @@ -681,10 +695,7 @@ } // 2.2.1.17 (textblock) - group { name: "elm/genlist/item/1text.2icon.4.tb/default"; - alias: "elm/genlist/item_odd/1text.2icon.4.tb/default"; - alias: "elm/genlist/item_compress/1text.2icon.4.tb/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.4.tb/default"; + group { GENLIST_NAME("1text.2icon.4.tb/default") inherit: "elm/genlist/item/1text.2icon.tb/default"; parts { @@ -695,17 +706,13 @@ // 2.2.1.18 // 2.2.1.23 - group { name: "elm/genlist/item/1text.2icon.2/default"; - alias: "elm/genlist/item_odd/1text.2icon.2/default"; - alias: "elm/genlist/item_compress/1text.2icon.2/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.2icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -725,17 +732,13 @@ // 2.2.1.19 // 2.2.1.25 - group { name: "elm/genlist/item/1text.3icon/default"; - alias: "elm/genlist/item_odd/1text.3icon/default"; - alias: "elm/genlist/item_compress/1text.3icon/default"; - alias: "elm/genlist/item_compress_odd/1text.3icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.3icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -757,10 +760,7 @@ } // 2.2.1.21 - group { name: "elm/genlist/item/1text.2icon.8/default"; - alias: "elm/genlist/item_odd/1text.2icon.8/default"; - alias: "elm/genlist/item_compress/1text.2icon.8/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.8/default"; + group { GENLIST_NAME("1text.2icon.8/default") inherit: "elm/genlist/item/1text.2icon/default"; parts { @@ -770,10 +770,7 @@ } // 2.2.1.22 - group { name: "elm/genlist/item/1text.2icon.9/default"; - alias: "elm/genlist/item_odd/1text.2icon.9/default"; - alias: "elm/genlist/item_compress/1text.2icon.9/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.9/default"; + group { GENLIST_NAME("1text.2icon.9/default") inherit: "elm/genlist/item/1text.2icon/default"; parts { @@ -783,17 +780,13 @@ } // 2.2.1.24 - group { name: "elm/genlist/item/1text.3icon.2/default"; - alias: "elm/genlist/item_odd/1text.3icon.2/default"; - alias: "elm/genlist/item_compress/1text.3icon.2/default"; - alias: "elm/genlist/item_compress_odd/1text.3icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("1text.3icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -815,16 +808,12 @@ } // 2.2.1.26 - group { name: "elm/genlist/item/2text.4/default"; - alias: "elm/genlist/item_odd/2text.4/default"; - alias: "elm/genlist/item_compress/2text.4/default"; - alias: "elm/genlist/item_compress_odd/2text.4/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.4/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -833,30 +822,27 @@ GENLIST_PART_PADDING_BOTTOM GENLIST_PART_SUBITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE, - "elm.padding.left", "elm.elm.divider1.left", + "elm.padding.left", "elm.divider1.left", ) - GENLIST_PART_PADDING_R("elm.elm.divider1.left", "elm.divider1") + GENLIST_PART_PADDING_R("elm.divider1.left", "elm.divider1") GENLIST_PART_DIVIDER_R("elm.text.2.left") GENLIST_PART_PADDING_R("elm.text.2.left", "elm.text.2") GENLIST_PART_SUBITEM_R_FIXED("elm.text.2", 200, GENLIST_HEIGHT_1LINE, "elm.padding.right") GENLIST_PART_FLIP } - GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; + GENLIST_PROGRAMS_NORMAL( + target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; ) } // 2.2.1.26 (textblock) - group { name: "elm/genlist/item/2text.4.tb/default"; - alias: "elm/genlist/item_odd/2text.4.tb/default"; - alias: "elm/genlist/item_compress/2text.4.tb/default"; - alias: "elm/genlist/item_compress_odd/2text.4.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.4.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -878,16 +864,12 @@ } // 2.2.1.27 - group { name: "elm/genlist/item/2text.5/default"; - alias: "elm/genlist/item_odd/2text.5/default"; - alias: "elm/genlist/item_compress/2text.5/default"; - alias: "elm/genlist/item_compress_odd/2text.5/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.5/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -908,10 +890,7 @@ } // 2.2.1.28 - group { name: "elm/genlist/item/1text.1icon.divider/default"; - alias: "elm/genlist/item_odd/1text.1icon.divider/default"; - alias: "elm/genlist/item_compress/1text.1icon.divider/default"; - alias: "elm/genlist/item_compress_odd/1text.1icon.divider/default"; + group { GENLIST_NAME("1text.1icon.divider/default") inherit: "elm/genlist/item/1text.1icon.7/default"; parts { @@ -926,10 +905,7 @@ } // 2.2.1.29 - group { name: "elm/genlist/item/1text.2icon.divider/default"; - alias: "elm/genlist/item_odd/1text.2icon.divider/default"; - alias: "elm/genlist/item_compress/1text.2icon.divider/default"; - alias: "elm/genlist/item_compress_odd/1text.2icon.divider/default"; + group { GENLIST_NAME("1text.2icon.divider/default") inherit: "elm/genlist/item/1text.2icon.7/default"; parts { @@ -945,16 +921,12 @@ // 2 line ------------------------------------------------------- // ------------------------------------------------------------------- // 2.2.2.1 - group { name: "elm/genlist/item/2text.2/default"; - alias: "elm/genlist/item_odd/2text.2/default"; - alias: "elm/genlist/item_compress/2text.2/default"; - alias: "elm/genlist/item_compress_odd/2text.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -974,16 +946,12 @@ } // 2.2.2.1 (textblock) - group { name: "elm/genlist/item/2text.2.tb/default"; - alias: "elm/genlist/item_odd/2text.2.tb/default"; - alias: "elm/genlist/item_compress/2text.2.tb/default"; - alias: "elm/genlist/item_compress_odd/2text.2.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1004,16 +972,12 @@ } // 2.2.2.2 - group { name: "elm/genlist/item/2text.3/default"; - alias: "elm/genlist/item_odd/2text.3/default"; - alias: "elm/genlist/item_compress/2text.3/default"; - alias: "elm/genlist/item_compress_odd/2text.3/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.3/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1034,16 +998,12 @@ } // 2.2.2.3 - group { name: "elm/genlist/item/3text/default"; - alias: "elm/genlist/item_odd/3text/default"; - alias: "elm/genlist/item_compress/3text/default"; - alias: "elm/genlist/item_compress_odd/3text/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1066,16 +1026,12 @@ } // 2.2.2.3 (textblock) - group { name: "elm/genlist/item/3text.tb/default"; - alias: "elm/genlist/item_odd/3text.tb/default"; - alias: "elm/genlist/item_compress/3text.tb/default"; - alias: "elm/genlist/item_compress_odd/3text.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1099,17 +1055,13 @@ } // 2.2.2.4 - group { name: "elm/genlist/item/2text.1icon.2/default"; - alias: "elm/genlist/item_odd/2text.1icon.2/default"; - alias: "elm/genlist/item_compress/2text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1130,11 +1082,37 @@ GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } +// 2.2.2.4 (textblock) + group { GENLIST_NAME("2text.1icon.2.tb/default") + GENLIST_PROLOG_NORMAL + data.item: "texts" "elm.text.1 elm.text.2"; + data.item: "contents" "elm.icon"; + + parts { + GENLIST_PART_BG_NORMAL + GENLIST_PART_BASE + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_LEFT + GENLIST_PART_PADDING_RIGHT + GENLIST_PART_PADDING_TOP_2LINE + GENLIST_PART_PADDING_BOTTOM_2LINE + + GENLIST_PART_LISTITEM_TB_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN, + "elm.padding.left", "elm.padding.icon.left", + "elm.padding.top", "elm.text.2", + ) + GENLIST_PART_SUBITEM_LRB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, + "elm.padding.left", "elm.padding.icon.left", "elm.padding.bottom") + GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon") + GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") + GENLIST_PART_FLIP + } + GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) + } + + // 2.2.2.5 - group { name: "elm/genlist/item/2text.1icon.10/default"; - alias: "elm/genlist/item_odd/2text.1icon.10/default"; - alias: "elm/genlist/item_compress/2text.1icon.10/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.10/default"; + group { GENLIST_NAME("2text.1icon.10/default") inherit: "elm/genlist/item/2text.1icon.2/default"; parts { @@ -1143,17 +1121,13 @@ } // 2.2.2.5 (textblock) - group { name: "elm/genlist/item/2text.1icon.10.tb/default"; - alias: "elm/genlist/item_odd/2text.1icon.10.tb/default"; - alias: "elm/genlist/item_compress/2text.1icon.10.tb/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.10.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.10.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1176,21 +1150,13 @@ } // 2.2.2.6 - group { name: "elm/genlist/item/2text.5icon/default"; - alias: "elm/genlist/item_odd/2text.5icon/default"; - alias: "elm/genlist/item_compress/2text.5icon/default"; - alias: "elm/genlist/item_compress_odd/2text.5icon/default"; - alias: "elm/genlist/tree/2text.5icon/default"; - alias: "elm/genlist/tree_odd/2text.5icon/default"; - alias: "elm/genlist/tree_compress/2text.5icon/default"; - alias: "elm/genlist/tree_compress_odd/2text.5icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.5icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1225,17 +1191,13 @@ } // 2.2.2.7 - group { name: "elm/genlist/item/3text.1icon/default"; - alias: "elm/genlist/item_odd/3text.1icon/default"; - alias: "elm/genlist/item_compress/3text.1icon/default"; - alias: "elm/genlist/item_compress_odd/3text.1icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text.1icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1266,17 +1228,13 @@ } // 2.2.2.7 (textblock) - group { name: "elm/genlist/item/3text.1icon.tb/default"; - alias: "elm/genlist/item_odd/3text.1icon.tb/default"; - alias: "elm/genlist/item_compress/3text.1icon.tb/default"; - alias: "elm/genlist/item_compress_odd/3text.1icon.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text.1icon.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1308,17 +1266,13 @@ } // 2.2.2.8 - group { name: "elm/genlist/item/2text.2icon/default"; - alias: "elm/genlist/item_odd/2text.2icon/default"; - alias: "elm/genlist/item_compress/2text.2icon/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1349,10 +1303,7 @@ } // 2.2.2.9 - group { name: "elm/genlist/item/2text.7/default"; - alias: "elm/genlist/item_odd/2text.7/default"; - alias: "elm/genlist/item_compress/2text.7/default"; - alias: "elm/genlist/item_compress_odd/2text.7/default"; + group { GENLIST_NAME("2text.7/default") inherit: "elm/genlist/item/2text.2/default"; parts { @@ -1366,10 +1317,7 @@ } // 2.2.2.10 - group { name: "elm/genlist/item/2text.1icon.7/default"; - alias: "elm/genlist/item_odd/2text.1icon.7/default"; - alias: "elm/genlist/item_compress/2text.1icon.7/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.7/default"; + group { GENLIST_NAME("2text.1icon.7/default") inherit: "elm/genlist/item/2text.1icon.2/default"; parts { @@ -1384,17 +1332,13 @@ } // 2.2.2.10 (textblock) - group { name: "elm/genlist/item/2text.1icon.7.tb/default"; - alias: "elm/genlist/item_odd/2text.1icon.7.tb/default"; - alias: "elm/genlist/item_compress/2text.1icon.7.tb/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.7.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.7.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1417,10 +1361,7 @@ } // 2.2.2.11 - group { name: "elm/genlist/item/2text.1icon.11/default"; - alias: "elm/genlist/item_odd/2text.1icon.11/default"; - alias: "elm/genlist/item_compress/2text.1icon.11/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.11/default"; + group { GENLIST_NAME("2text.1icon.11/default") inherit: "elm/genlist/item/2text.1icon.2/default"; parts { part { name: "elm.text.2"; @@ -1434,17 +1375,13 @@ } // 2.2.2.12 - group { name: "elm/genlist/item/2text.2icon.2/default"; - alias: "elm/genlist/item_odd/2text.2icon.2/default"; - alias: "elm/genlist/item_compress/2text.2icon.2/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1481,17 +1418,13 @@ } // 2.2.2.13 - group { name: "elm/genlist/item/2text.1icon.5/default"; - alias: "elm/genlist/item_odd/2text.1icon.5/default"; - alias: "elm/genlist/item_compress/2text.1icon.5/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.5/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.5/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1514,17 +1447,13 @@ } // 2.2.2.14 - group { name: "elm/genlist/item/2text.1icon.4/default"; - alias: "elm/genlist/item_odd/2text.1icon.4/default"; - alias: "elm/genlist/item_compress/2text.1icon.4/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.4/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.4/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1546,17 +1475,13 @@ } // 2.2.2.14 (textblock) - group { name: "elm/genlist/item/2text.1icon.4.tb/default"; - alias: "elm/genlist/item_odd/2text.1icon.4.tb/default"; - alias: "elm/genlist/item_compress/2text.1icon.4.tb/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.4.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.4.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1578,17 +1503,13 @@ } // 2.2.2.15 - group { name: "elm/genlist/item/3text.1icon.2/default"; - alias: "elm/genlist/item_odd/3text.1icon.2/default"; - alias: "elm/genlist/item_compress/3text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/3text.1icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text.1icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1612,10 +1533,7 @@ } // 2.2.2.16 - group { name: "elm/genlist/item/2text.1icon.8/default"; - alias: "elm/genlist/item_odd/2text.1icon.8/default"; - alias: "elm/genlist/item_compress/2text.1icon.8/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.8/default"; + group { GENLIST_NAME("2text.1icon.8/default") inherit: "elm/genlist/item/2text.1icon.4/default"; parts { @@ -1629,17 +1547,13 @@ } // 2.2.2.17 - group { name: "elm/genlist/item/2text.6icon/default"; - alias: "elm/genlist/item_odd/2text.6icon/default"; - alias: "elm/genlist/item_compress/2text.6icon/default"; - alias: "elm/genlist/item_compress_odd/2text.6icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.6icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1676,14 +1590,13 @@ } // 2.2.2.17 (textblock) - group { name: "elm/genlist/item_compress/2text.6icon.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.6icon.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1720,17 +1633,13 @@ } // 2.2.2.18 - group { name: "elm/genlist/item/2text.2icon.4/default"; - alias: "elm/genlist/item_odd/2text.2icon.4/default"; - alias: "elm/genlist/item_compress/2text.2icon.4/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.4/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.4/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1756,15 +1665,13 @@ // 2.2.2.18 (textblock) - group { name: "elm/genlist/item/2text.2icon.4.tb/default"; - alias: "elm/genlist/item_compress/2text.2icon.4.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.4.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1789,17 +1696,13 @@ } // 2.2.2.19 - group { name: "elm/genlist/item/2text.2icon.6/default"; - alias: "elm/genlist/item_odd/2text.2icon.6/default"; - alias: "elm/genlist/item_compress/2text.2icon.6/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.6/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.6/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1825,14 +1728,13 @@ } // 2.2.2.19 (textblock) - group { name: "elm/genlist/item_compress/2text.2icon.6.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.6.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1859,17 +1761,13 @@ } // 2.2.2.20 - group { name: "elm/genlist/item/2text.2icon.8/default"; - alias: "elm/genlist/item_odd/2text.2icon.8/default"; - alias: "elm/genlist/item_compress/2text.2icon.8/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.8/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.8/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1894,17 +1792,13 @@ } // 2.2.2.20 (textblock) - group { name: "elm/genlist/item/2text.2icon.8.tb/default"; - alias: "elm/genlist/item_odd/2text.2icon.8.tb/default"; - alias: "elm/genlist/item_compress/2text.2icon.8.tb/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.8.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.8.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1929,22 +1823,19 @@ } // 2.2.2.21 - group { name: "elm/genlist/item/2text.2icon.progress/default"; - alias: "elm/genlist/item_odd/2text.2icon.progress/default"; - alias: "elm/genlist/item_compress/2text.2icon.progress/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.progress/default"; + group { GENLIST_NAME("2text.2icon.progress/default") // FIXME: deprecated name, will be removed alias: "elm/genlist/item/1text.2icon.5/default"; alias: "elm/genlist/item_odd/1text.2icon.5/default"; alias: "elm/genlist/item_compress/1text.2icon.5/default"; alias: "elm/genlist/item_compress_odd/1text.2icon.5/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.swallow.progress "; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -1975,22 +1866,19 @@ } // 2.2.2.22 - group { name: "elm/genlist/item/3text.3icon.progress/default"; - alias: "elm/genlist/item_odd/3text.3icon.progress/default"; - alias: "elm/genlist/item_compress/3text.3icon.progress/default"; - alias: "elm/genlist/item_compress_odd/3text.3icon.progress/default"; + group { GENLIST_NAME("3text.3icon.progress/default") // FIXME: deprecated name, will be removed alias: "elm/genlist/item/3text.3icon/default"; alias: "elm/genlist/item_odd/3text.3icon/default"; alias: "elm/genlist/item_compress/3text.3icon/default"; alias: "elm/genlist/item_compress_odd/3text.3icon/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2004,7 +1892,8 @@ GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.padding.icon2.left", "elm.padding.top", min: 0 50; - GENLIST_PARAM_LISTITEM fixed: 1 1; + GENLIST_PARAM_PROGRESS_MAIN + fixed: 0 1; ) ) GENLIST_PART_ICON("elm.swallow.progress", @@ -2040,17 +1929,13 @@ } // 2.2.2.23 - group { name: "elm/genlist/item/2text.1icon.divider/default"; - alias: "elm/genlist/item_odd/2text.1icon.divider/default"; - alias: "elm/genlist/item_compress/2text.1icon.divider/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.divider/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.1icon.divider/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2075,17 +1960,13 @@ } // 2.2.2.30 - group { name: "elm/genlist/item/2text.3icon/default"; - alias: "elm/genlist/item_odd/2text.3icon/default"; - alias: "elm/genlist/item_compress/2text.3icon/default"; - alias: "elm/genlist/item_compress_odd/2text.3icon/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.3icon/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2125,11 +2006,7 @@ } // 2.2.2.31 - group { name: "elm/genlist/item/2text.1icon.12/default"; - alias: "elm/genlist/item_odd/2text.1icon.12/default"; - alias: "elm/genlist/item_compress/2text.1icon.12/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.12/default"; - + group { GENLIST_NAME("2text.1icon.12/default") inherit: "elm/genlist/item/2text.1icon.2/default"; parts { GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right") @@ -2137,12 +2014,16 @@ } // 2.2.2.32 -// 2.2.2.36 - group { name: "elm/genlist/item/2text.1icon.9/default"; - alias: "elm/genlist/item_odd/2text.1icon.9/default"; - alias: "elm/genlist/item_compress/2text.1icon.9/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.9/default"; + group { GENLIST_NAME("2text.1icon.12.tb/default") + inherit: "elm/genlist/item/2text.1icon.2.tb/default"; + parts { + GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right") + } + } +// 2.2.2.32 +// 2.2.2.36 + group { GENLIST_NAME("2text.1icon.9/default") inherit:"elm/genlist/item/2text.1icon.4/default"; parts { GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon", "elm.padding.left") @@ -2150,10 +2031,7 @@ } // 2.2.2.33 - group { name: "elm/genlist/item/2text.2icon.7/default"; - alias: "elm/genlist/item_odd/2text.2icon.7/default"; - alias: "elm/genlist/item_compress/2text.2icon.7/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.7/default"; + group { GENLIST_NAME("2text.2icon.7/default") inherit: "elm/genlist/item/2text.2icon.4/default"; parts { @@ -2163,17 +2041,13 @@ // 2.2.2.34 // 2.2.2.37 - group { name: "elm/genlist/item/2text.2icon.5/default"; - alias: "elm/genlist/item_odd/2text.2icon.5/default"; - alias: "elm/genlist/item_compress/2text.2icon.5/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.5/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.5/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2197,17 +2071,13 @@ } // 2.2.2.35 - group { name: "elm/genlist/item/2text.3icon.4/default"; - alias: "elm/genlist/item_odd/2text.3icon.4/default"; - alias: "elm/genlist/item_compress/2text.3icon.4/default"; - alias: "elm/genlist/item_compress_odd/2text.3icon.4/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.3icon.4/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2234,12 +2104,8 @@ // 2.2.2.38 - group { name: "elm/genlist/item/4text.1icon.1/default"; - alias: "elm/genlist/item_odd/4text.1icon.1/default"; - alias: "elm/genlist/item_compress/4text.1icon.1/default"; - alias: "elm/genlist/item_compress_odd/4text.1icon.1/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("4text.1icon.1/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.icon.1"; @@ -2247,7 +2113,7 @@ image: "00_list_bubble_bg.png" COMP; } parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2279,12 +2145,8 @@ } // 2.2.2.38 textblock - group { name: "elm/genlist/item/4text.1icon.1.tb/default"; - alias: "elm/genlist/item_odd/4text.1icon.1.tb/default"; - alias: "elm/genlist/item_compress/4text.1icon.1.tb/default"; - alias: "elm/genlist/item_compress_odd/4text.1icon.1.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("4text.1icon.1.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.icon.1"; @@ -2293,7 +2155,7 @@ } parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2328,17 +2190,13 @@ } // 2.2.2.39 - group { name: "elm/genlist/item/4text.1icon.2/default"; - alias: "elm/genlist/item_odd/4text.1icon.2/default"; - alias: "elm/genlist/item_compress/4text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/4text.1icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("4text.1icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.icon.1 "; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2368,17 +2226,13 @@ target: "elm.icon.1";) } // 2.2.2.39 (TEXTBLOCK) - group { name: "elm/genlist/item/4text.1icon.2.tb/default"; - alias: "elm/genlist/item_odd/4text.1icon.2.tb/default"; - alias: "elm/genlist/item_compress/4text.1icon.2.tb/default"; - alias: "elm/genlist/item_compress_odd/4text.1icon.2.tb/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("4text.1icon.2.tb/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.icon.1"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2409,19 +2263,15 @@ } // 2.2.2.40 - group { name: "elm/genlist/item/4text.1/default"; - alias: "elm/genlist/item_odd/4text.1/default"; - alias: "elm/genlist/item_compress/4text.1/default"; - alias: "elm/genlist/item_compress_odd/4text.1/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("4text.1/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; images { image: "00_list_bubble_bg.png" COMP; } parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2449,10 +2299,7 @@ } // 2.2.2.41 - group { name: "elm/genlist/item/4text.2/default"; - alias: "elm/genlist/item_odd/4text.2/default"; - alias: "elm/genlist/item_compress/4text.2/default"; - alias: "elm/genlist/item_compress_odd/4text.2/default"; + group { GENLIST_NAME("4text.2/default") inherit: "elm/genlist/item/4text.1/default"; parts { part { name: "elm.bubble"; @@ -2466,17 +2313,13 @@ } // 2.2.2.42 - group { name: "elm/genlist/item/3text.1icon.3/default"; - alias: "elm/genlist/item_odd/3text.1icon.3/default"; - alias: "elm/genlist/item_compress/3text.1icon.3/default"; - alias: "elm/genlist/item_compress_odd/3text.1icon.3/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text.1icon.3/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon.1"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2500,19 +2343,49 @@ target: "elm.icon.1";) } +// 2.2.2.42 + group { GENLIST_NAME("3text.1icon.3.tb/default") + GENLIST_PROLOG_NORMAL + data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; + data.item: "contents" "elm.icon.1"; + + parts { + GENLIST_PART_BG_NORMAL + GENLIST_PART_BASE + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_LEFT + GENLIST_PART_PADDING_RIGHT + GENLIST_PART_PADDING_TOP_2LINE + GENLIST_PART_PADDING_BOTTOM_2LINE + + GENLIST_PART_LISTITEM_LRT_TB("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN, + "elm.padding.left", "elm.padding.icon1.left", + "elm.padding.top", + ) + GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1") + GENLIST_PART_ICON_SMALL_RTB("elm.icon.1", + "elm.padding.right", "elm.padding.top", "elm.text.3" + ) + GENLIST_PART_SUBITEM_TB_("elm.text.3", GENLIST_HEIGHT_2LINE_SUB, + "elm.padding.left", "elm.text.2", "elm.text.1", "elm.padding.bottom" + ) + GENLIST_PART_SUBITEM_RTB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, + "elm.padding.right", "elm.text.1", "elm.padding.bottom") + GENLIST_PART_FLIP + } + GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; + target: "elm.icon.1";) + } + // 2.2.2.43 - group { name: "elm/genlist/item/2text.4icon.1/default"; - alias: "elm/genlist/item_odd/2text.4icon.1/default"; - alias: "elm/genlist/item_compress/2text.4icon.1/default"; - alias: "elm/genlist/item_compress_odd/2text.4icon.1/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.4icon.1/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2545,12 +2418,8 @@ } // 2.2.2.44 - group { name: "elm/genlist/item/4text.1icon.3/default"; - alias: "elm/genlist/item_odd/4text.1icon.3/default"; - alias: "elm/genlist/item_compress/4text.1icon.3/default"; - alias: "elm/genlist/item_compress_odd/4text.1icon.3/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("4text.1icon.3/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.swallow.colorbar elm.icon.1"; @@ -2558,7 +2427,7 @@ image: "00_list_bubble_bg.png" COMP; } parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_TOP_2LINE @@ -2571,19 +2440,21 @@ GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1") - GENLIST_PART_LISTITEM_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN, - "elm.padding.icon1.right", "elm.padding.bubble.left", - "elm.padding.top", "elm.text.3", + GENLIST_PART_LISTITEM_LRT("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN, + "elm.padding.icon1.right", "elm.padding.bubble.left", "elm.padding.top", ) GENLIST_PART_PADDING_R("elm.padding.bubble.left", "elm.bubble") GENLIST_PART_LIST_BUBBLE_TEXT_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN, - "elm.padding.right", "elm.padding.top", "elm.text.3") + "elm.padding.right", "elm.padding.top", "elm.text.3" + ) - GENLIST_PART_SUBITEM_LRB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB, - "elm.padding.icon1.right", "elm.padding.text2.left", "elm.padding.bottom") + GENLIST_PART_SUBITEM_("elm.text.3", GENLIST_HEIGHT_2LINE_SUB, + "elm.padding.icon1.right", "elm.padding.text2.left", "elm.text.1", "elm.padding.bottom", + ) GENLIST_PART_PADDING_R("elm.padding.text2.left", "elm.text.2") GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, - "elm.padding.right", "elm.text.1", "elm.padding.bottom") + "elm.padding.right", "elm.text.1", "elm.padding.bottom" + ) GENLIST_PART_FLIP } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; @@ -2591,17 +2462,13 @@ } // 2.2.2.45 - group { name: "elm/genlist/item/3text.1icon.1/default"; - alias: "elm/genlist/item_odd/3text.1icon.1/default"; - alias: "elm/genlist/item_compress/3text.1icon.1/default"; - alias: "elm/genlist/item_compress_odd/3text.1icon.1/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("3text.1icon.1/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2625,17 +2492,13 @@ } // 2.2.2.46 - group { name: "elm/genlist/item/2text.2icon.1/default"; - alias: "elm/genlist/item_odd/2text.2icon.1/default"; - alias: "elm/genlist/item_compress/2text.2icon.1/default"; - alias: "elm/genlist/item_compress_odd/2text.2icon.1/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("2text.2icon.1/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2660,10 +2523,7 @@ } // 2.2.2.47 - group { name: "elm/genlist/item/2text.1icon.1/default"; - alias: "elm/genlist/item_odd/2text.1icon.1/default"; - alias: "elm/genlist/item_compress/2text.1icon.1/default"; - alias: "elm/genlist/item_compress_odd/2text.1icon.1/default"; + group { GENLIST_NAME("2text.1icon.1/default") inherit: "elm/genlist/item/2text.1icon.2/default"; parts { @@ -2675,14 +2535,14 @@ // Email Style ------------------------------------------------------- // ------------------------------------------------------------------- -#define GENLIST_EMAIL_MAIN_TEXT_SIZE 40 +#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_TEXT_FOCUS_COLOR 255 255 255 255 #define GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE "#FFFFFFFF" -#define GENLIST_EMAIL_SUB_TEXT_SIZE 32 +#define GENLIST_EMAIL_SUB_TEXT_SIZE 30 #define GENLIST_EMAIL_SUB_TEXT_COLOR_STYLE "#808080FF" #define GENLIST_EMAIL_COUNT_TEXT_SIZE 28 @@ -2691,17 +2551,20 @@ #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 28 +#define GENLIST_EMAIL_CONTENTS_TEXT_SIZE 26 +#define GENLIST_EMAIL_CONTENTS_TIME_TEXT_SIZE 24 #define GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE "#808080FF" +#define GENLIST_EMAIL_MATCH_TAG_COLOR "+ color=#1382FF" + #define STYLE_TAG \ tag: "br" "\n";\ tag: "ps" "ps";\ tag: "tab" "\t";\ tag: "b" "+ font=Tizen:style=Bold"; -#define STYLE_TAG_MATCH \ - tag: "match" GENLIST_PART_MATCH_TAG_COLOR; +#define STYLE_TAG_MATCH_EMAIL \ + tag: "match" GENLIST_EMAIL_MATCH_TAG_COLOR; #define STYLE_TAG_MATCH_EMAIL_FOCUS \ tag: "match" GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE; @@ -2711,22 +2574,22 @@ style { name: "email_style_main"; base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_UNREAD_COLOR_STYLE" text_class=list_item ellipsis=1.0"; STYLE_TAG - STYLE_TAG_MATCH + STYLE_TAG_MATCH_EMAIL } style { name: "email_style_main_dim"; base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE" text_class=list_item ellipsis=1.0"; STYLE_TAG - STYLE_TAG_MATCH + STYLE_TAG_MATCH_EMAIL } style { name: "email_style_main_read"; base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_READ_COLOR_STYLE" text_class=list_item ellipsis=1.0"; STYLE_TAG - STYLE_TAG_MATCH + STYLE_TAG_MATCH_EMAIL } style { name: "email_style_main_read_dim"; base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE" text_class=list_item ellipsis=1.0"; STYLE_TAG - STYLE_TAG_MATCH + STYLE_TAG_MATCH_EMAIL } style { name: "email_style_main_focus"; base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE" text_class=list_item ellipsis=1.0"; @@ -2736,7 +2599,7 @@ 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_TAG - STYLE_TAG_MATCH + STYLE_TAG_MATCH_EMAIL } style { name: "email_style_sub_focus"; base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_SUB_TEXT_SIZE" color="GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE" text_class=tizen ellipsis=1.0"; @@ -2746,7 +2609,17 @@ style { name: "email_style_contents"; base: "font=Tizen:style=Medium font_size="GENLIST_EMAIL_CONTENTS_TEXT_SIZE" color="GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE" text_class=tizen ellipsis=1.0"; STYLE_TAG - STYLE_TAG_MATCH + STYLE_TAG_MATCH_EMAIL + } + style { name: "email_style_contents_time"; + base: "font=Tizen:style=Medium font_size="GENLIST_EMAIL_CONTENTS_TIME_TEXT_SIZE" color="GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE" text_class=tizen ellipsis=1.0"; + STYLE_TAG + STYLE_TAG_MATCH_EMAIL + } + style { name: "email_style_contents_focus"; + base: "font=Tizen:style=Medium font_size="GENLIST_EMAIL_CONTENTS_TEXT_SIZE" color="GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE" text_class=tizen ellipsis=1.0"; + STYLE_TAG + STYLE_TAG_MATCH_EMAIL_FOCUS } } @@ -2820,26 +2693,35 @@ style: "email_style_contents"; \ } +#define PARAM_EMAIL_CONTENTS_TIME \ + text { \ + align: 0 0.5; \ + min: 0 1; \ + font: "Tizen:style=Medium"; \ + style: "email_style_contents_time"; \ + } + +#define DESCRIPTION_EMAIL_CONTENTS_OTHERS \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + text.style: "email_style_contents_focus"; \ + } + #define HEIGHT_EMAIL_MAIN 54 #define HEIGHT_EMAIL_SUB 42 #define HEIGHT_EMAIL_CONTENTS 38 // 2.2.3.5 (Email Style) - group { name: "elm/genlist/item/email.list/default"; - alias: "elm/genlist/item_odd/email.list/default"; - alias: "elm/genlist/item_compress/email.list/default"; - alias: "elm/genlist/item_compress_odd/email.list/default"; - alias: "elm/genlist/tree/email.list/default"; - alias: "elm/genlist/tree_odd/email.list/default"; - alias: "elm/genlist/tree_compress/email.list/default"; - alias: "elm/genlist/tree_compress_odd/email.list/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("email.list/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch"; + script { + public readed = 0; + } parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2859,9 +2741,16 @@ ) DESCRIPTION_EMAIL_MAIN_OTHERS ) + // FIXME: because script cannot be inherited, text.5 is defined here and can be inherited GENLIST_PART_TEXT("elm.text.5", - GENLIST_DESCRIPTION_LT("elm.text.1", "elm.padding.top", + GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.3", + PARAM_EMAIL_COUNT + min: 45 HEIGHT_EMAIL_MAIN; + max: 45 HEIGHT_EMAIL_MAIN; + text.min: 1 0; + text.align: 0.5 0.65; + fixed: 1 1; visible: 0; ) ) @@ -2870,28 +2759,32 @@ GENLIST_DESCRIPTION_R("elm.icon.3", min: 0 0; max: 0 0; + fixed: 1 0; ) ) GENLIST_PART_ICON("elm.icon.3", - GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3",) + GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3", + fixed: 1 0; + ) ) GENLIST_PART_PADDING_R("elm.padding.icon4.left", "elm.icon.4") GENLIST_PART_ICON("elm.icon.4", GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.3", min: 38 38; max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN; - fixed: 1 1; + fixed: 1 0; ) ) GENLIST_PART_ICON("elm.icon.4.touch", GENLIST_DESCRIPTION_ENVELOP("elm.icon.4", rel1.offset: -10 -17; rel2.offset: 26 10; - fixed: 1 1; ) ) GENLIST_PART_ICON("elm.icon.2", - GENLIST_DESCRIPTION_LT("elm.padding.icon1.right", "elm.text.1", ) + GENLIST_DESCRIPTION_LTB("elm.padding.icon1.right", "elm.text.1", "elm.text.2", + fixed: 1 0; + ) ) GENLIST_PART_TEXTBLOCK("elm.text.3", GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.text.4", "elm.text.1", @@ -2902,56 +2795,47 @@ DESCRIPTION_EMAIL_SUB_OTHERS ) GENLIST_PART_TEXTBLOCK("elm.text.4", - GENLIST_DESCRIPTION_RT("elm.padding.right", "elm.text.1", - PARAM_EMAIL_CONTENTS + GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.1", "elm.text.2", + PARAM_EMAIL_CONTENTS_TIME GENLIST_PARAM_TEXT_LIMIT_RT min: 0 HEIGHT_EMAIL_CONTENTS; - fixed: 0 1; + fixed: 1 0; ) + DESCRIPTION_EMAIL_CONTENTS_OTHERS ) GENLIST_PART_TEXTBLOCK("elm.text.2", GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.right", "elm.text.3", "elm.padding.bottom", PARAM_EMAIL_CONTENTS min: 0 HEIGHT_EMAIL_CONTENTS; ) + DESCRIPTION_EMAIL_CONTENTS_OTHERS ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; + GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; + target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5"; - target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; + target: "elm.swallow.colorbar"; target: "elm.icon.1"; + target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; ) } // email list with conversation text - group { name: "elm/genlist/item/email.list.conversation/default"; - alias: "elm/genlist/item_odd/email.list.conversation/default"; - alias: "elm/genlist/item_compress/email.list.conversation/default"; - alias: "elm/genlist/item_compress_odd/email.list.conversation/default"; - alias: "elm/genlist/tree/email.list.conversation/default"; - alias: "elm/genlist/tree_odd/email.list.conversation/default"; - alias: "elm/genlist/tree_compress/email.list.conversation/default"; - alias: "elm/genlist/tree_compress_odd/email.list.conversation/default"; + group { GENLIST_NAME("email.list.conversation/default") inherit: "elm/genlist/item/email.list/default"; data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4 elm.text.5"; parts { GENLIST_PART_TEXT("elm.text.5", - GENLIST_DESCRIPTION_LT("elm.text.1", "elm.padding.top", - PARAM_EMAIL_COUNT - min: 45 HEIGHT_EMAIL_MAIN; - max: 45 HEIGHT_EMAIL_MAIN; - text.min: 1 0; - text.align: 0.5 0.65; - fixed: 1 1; + GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.3", visible: 1; ) DESCRIPTION_EMAIL_COUNT_OTHERS ) // Virtual part for Maxmimum right X axis of TEXT GENLIST_PART_SPACER("elm.text.limit", - GENLIST_DESCRIPTION_RTB("elm.icon.3", "elm.padding.top", "elm.text.2", + GENLIST_DESCRIPTION_R("elm.icon.3", min: 45 HEIGHT_EMAIL_MAIN; max: 45 HEIGHT_EMAIL_MAIN; ) @@ -2961,21 +2845,16 @@ // 2.2.3.13 // email outbox style - group { name: "elm/genlist/item/email.outbox/default"; - alias: "elm/genlist/item_odd/email.outbox/default"; - alias: "elm/genlist/item_compress/email.outbox/default"; - alias: "elm/genlist/item_compress_odd/email.outbox/default"; - alias: "elm/genlist/tree/email.outbox/default"; - alias: "elm/genlist/tree_odd/email.outbox/default"; - alias: "elm/genlist/tree_compress/email.outbox/default"; - alias: "elm/genlist/tree_compress_odd/email.outbox/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("email.outbox/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch elm.icon.5"; + script { + public readed = 0; + } parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -2997,19 +2876,27 @@ ) // FIXME: because script cannot be inherited, text.5 is defined here and can be inherited GENLIST_PART_TEXT("elm.text.4", - GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.icon.5", + GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.3", + PARAM_EMAIL_COUNT + min: 0 HEIGHT_EMAIL_MAIN; + max: 0 HEIGHT_EMAIL_MAIN; + text.min: 1 0; + text.align: 0.5 0.65; + fixed: 1 0; visible: 0; ) ) // Virtual part for Maxmimum right X axis of TEXT GENLIST_PART_SPACER("elm.text.limit", - GENLIST_DESCRIPTION_RTB("elm.icon.3", "elm.padding.top", "elm.text.2", + GENLIST_DESCRIPTION_R("elm.icon.3", min: 0 0; max: 0 0; + fixed: 1 0; ) ) GENLIST_PART_ICON("elm.icon.3", GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3", + fixed: 1 0; ) ) GENLIST_PART_PADDING_R("elm.padding.icon4.left", "elm.icon.4") @@ -3017,19 +2904,18 @@ GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.3", min: 38 38; max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN; - fixed: 1 1; + fixed: 1 0; ) ) GENLIST_PART_ICON("elm.icon.4.touch", GENLIST_DESCRIPTION_ENVELOP("elm.icon.4", rel1.offset: -10 -17; rel2.offset: 26 10; - fixed: 1 1; ) ) GENLIST_PART_ICON("elm.icon.2", - GENLIST_DESCRIPTION_LT("elm.padding.icon1.right", "elm.text.1", + GENLIST_DESCRIPTION_LTB("elm.padding.icon1.right", "elm.text.1", "elm.text.2", fixed: 1 1; ) ) @@ -3046,6 +2932,7 @@ PARAM_EMAIL_CONTENTS min: 0 HEIGHT_EMAIL_CONTENTS; ) + DESCRIPTION_EMAIL_CONTENTS_OTHERS ) GENLIST_PART_PADDING_R("elm.padding.icon5.left", "elm.icon.5") GENLIST_PART_ICON("elm.icon.5", @@ -3057,7 +2944,7 @@ ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; + GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; @@ -3065,14 +2952,7 @@ } // email outbox style with conversation - group { name: "elm/genlist/item/email.outbox.conversation/default"; - alias: "elm/genlist/item_odd/email.outbox.conversation/default"; - alias: "elm/genlist/item_compress/email.outbox.conversation/default"; - alias: "elm/genlist/item_compress_odd/email.outbox.conversation/default"; - alias: "elm/genlist/tree/email.outbox.conversation/default"; - alias: "elm/genlist/tree_odd/email.outbox.conversation/default"; - alias: "elm/genlist/tree_compress/email.outbox.conversation/default"; - alias: "elm/genlist/tree_compress_odd/email.outbox.conversation/default"; + group { GENLIST_NAME("email.outbox.conversation/default") inherit: "elm/genlist/item/email.outbox/default"; data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; @@ -3080,96 +2960,28 @@ parts { GENLIST_PART_TEXT("elm.text.4", GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.icon.5", - PARAM_EMAIL_COUNT min: 45 HEIGHT_EMAIL_MAIN; max: 45 HEIGHT_EMAIL_MAIN; - text.min: 1 0; - text.align: 0.5 0.65; - fixed: 1 1; visible: 1; ) DESCRIPTION_EMAIL_COUNT_OTHERS ) GENLIST_PART_SPACER("elm.text.limit", - GENLIST_DESCRIPTION_RTB("elm.icon.3", "elm.padding.top", "elm.text.2", + GENLIST_DESCRIPTION_R("elm.icon.3", min: 45 HEIGHT_EMAIL_MAIN; max: 45 HEIGHT_EMAIL_MAIN; - fixed: 1 1; ) ) } } -// Reomve this later - group { name: "elm/genlist/item/3text.5icon/default"; - alias: "elm/genlist/item_odd/3text.5icon/default"; - alias: "elm/genlist/item_compress/3text.5icon/default"; - alias: "elm/genlist/item_compress_odd/3text.5icon/default"; - // FIXME: deprecated name, will be removed - alias: "elm/genlist/item/3text.4icon.2/default"; - alias: "elm/genlist/item_odd/3text.4icon.2/default"; - alias: "elm/genlist/item_compress/3text.4icon.2/default"; - alias: "elm/genlist/item_compress_odd/3text.4icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL - data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; - data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; - - parts { - GENLIST_PART_BG_IMAGE - GENLIST_PART_BASE - GENLIST_PART_BOTTOM_LINE - GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT_EDIT - GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_SIZE_TOP_3LINE ) - GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_SIZE_BOTTOM_3LINE ) - GENLIST_PART_COLORBAR - - GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon.1", "elm.padding.left") - GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1") - - GENLIST_PART_TEXT("elm.text.1", - GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.padding.icon3.left", "elm.padding.top", - GENLIST_PARAM_LISTITEM - min: 0 HEIGHT_EMAIL_MAIN; fixed:1 1;) - GENLIST_DESCRIPTION_LISTITEM_OTHERS - ) - GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3") - GENLIST_PART_ICON_SMALL_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.icon.4") - - GENLIST_PART_SUBITEM_("elm.text.2", HEIGHT_EMAIL_SUB, - "elm.padding.icon1.right", "elm.padding.icon4.left", "elm.text.1", "elm.text.3",) - - GENLIST_PART_ICON_SMALL_LTB("elm.icon.2", "elm.padding.icon1.right", "elm.text.2", "elm.padding.bottom") - GENLIST_PART_PADDING_L("elm.padding.icon2.right", "elm.icon.2") - GENLIST_PART_TEXTBLOCK("elm.text.3", - GENLIST_DESCRIPTION_LRB("elm.padding.icon2.right", "elm.padding.icon4.left", "elm.padding.bottom", - PARAM_EMAIL_CONTENTS - min: 0 HEIGHT_EMAIL_CONTENTS; fixed:1 1;) - ) - GENLIST_PART_PADDING_R("elm.padding.icon4.left", "elm.icon.4") - GENLIST_PART_ICON("elm.icon.4", - GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.1", "elm.padding.bottom", - min: 0 80; fixed: 1 1;) - ) - GENLIST_PART_FLIP - } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; - target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; - target: "elm.icon.3"; target: "elm.icon.4"; ) - } - // 2.2.4.1 - group { name: "elm/genlist/item/multiline/1title.2text/default"; - alias: "elm/genlist/item_odd/multiline/1title.2text/default"; - alias: "elm/genlist/item_compress/multiline/1title.2text/default"; - alias: "elm/genlist/item_compress_odd/multiline/1title.2text/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("multiline/1title.2text/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.title elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -3182,7 +2994,8 @@ GENLIST_DESCRIPTION_L("elm.padding.left", GENLIST_PARAM_LISTITEM min: 226 0; - fixed: 1 0;) + fixed: 1 0; + ) GENLIST_DESCRIPTION_LISTITEM_OTHERS ) GENLIST_PART_PADDING_L("elm.padding.title.right", "elm.title") @@ -3191,14 +3004,16 @@ GENLIST_PART_TEXTBLOCK("elm.text.1", GENLIST_DESCRIPTION_LRT("elm.divider.right", "elm.padding.right", "elm.padding.top", - GENLIST_PARAM_LISTITEM_TB_WRAP - min: 0 90; fixed: 1 1;) + GENLIST_PARAM_LISTITEM_TB_WRAP + min: 0 90; fixed: 0 1; + ) GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP ) GENLIST_PART_TEXTBLOCK("elm.text.2", GENLIST_DESCRIPTION("elm.divider.right", "elm.padding.right", "center_line2", "elm.padding.bottom", - GENLIST_PARAM_LISTITEM_TB_WRAP - min: 0 90; ) + GENLIST_PARAM_LISTITEM_TB_WRAP + min: 0 90; + ) GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP ) GENLIST_PART_CENTER_LINE_LT("elm.divider2", "elm.text.1") @@ -3211,16 +3026,12 @@ } // 2.2.4.2 - group { name: "elm/genlist/item/multiline/1title.1text/default"; - alias: "elm/genlist/item_odd/multiline/1title.1text/default"; - alias: "elm/genlist/item_compress/multiline/1title.1text/default"; - alias: "elm/genlist/item_compress_odd/multiline/1title.1text/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("multiline/1title.1text/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.title elm.text"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -3232,7 +3043,9 @@ GENLIST_PART_TEXT("elm.title", GENLIST_DESCRIPTION_L("elm.padding.left", GENLIST_PARAM_LISTITEM - min: 226 0; ) + min: 226 0; + fixed: 1 0; + ) GENLIST_DESCRIPTION_LISTITEM_OTHERS ) GENLIST_PART_PADDING_L("elm.padding.title.right", "elm.title") @@ -3241,28 +3054,26 @@ GENLIST_PART_TEXTBLOCK("elm.text", GENLIST_DESCRIPTION("elm.divider.right", "elm.padding.right", "elm.padding.top", "elm.padding.bottom", - GENLIST_PARAM_LISTITEM_TB_WRAP - min: 0 48; ) + GENLIST_PARAM_LISTITEM_TB_WRAP + //min: 0 48; + ) GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text"; + GENLIST_PROGRAMS_NORMAL( target: "elm.title"; + target: "elm.text"; target: "elm.divider1"; target:"elm.divider2"; ) } // 2.2.4.3 - group { name: "elm/genlist/item/multiline/2text/default"; - alias: "elm/genlist/item_odd/multiline/2ext/default"; - alias: "elm/genlist/item_compress/multiline/2text/default"; - alias: "elm/genlist/item_compress_odd/multiline/2text/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("multiline/2text/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -3273,14 +3084,17 @@ GENLIST_PART_TEXT("elm.text.1", GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top", GENLIST_PARAM_LISTITEM - min: 0 GENLIST_HEIGHT_2LINE_MAIN; ) + min: 0 GENLIST_HEIGHT_2LINE_MAIN; + fixed: 0 1; + ) GENLIST_DESCRIPTION_LISTITEM_OTHERS ) GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 16) GENLIST_PART_TEXTBLOCK("elm.text.2", GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.text1.bottom", "elm.padding.bottom", GENLIST_PARAM_SUBITEM_DEFAULT_TB_WRAP - min: 0 GENLIST_HEIGHT_MULTILINE_SUB; ) + min: 0 GENLIST_HEIGHT_MULTILINE_SUB; + ) GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP @@ -3289,22 +3103,19 @@ } // 2.2.4.4 - group { name: "elm/genlist/item/multiline/2text.5icon/default"; - alias: "elm/genlist/item_odd/multiline/2ext.5icon/default"; - alias: "elm/genlist/item_compress/multiline/2text.5icon/default"; - alias: "elm/genlist/item_compress_odd/multiline/2text.5icon/default"; + group { GENLIST_NAME("multiline/2text.5icon/default") // FIXME: deprecated name, wiil be removed alias: "elm/genlist/item/multiline/2text.1icon/default"; alias: "elm/genlist/item_odd/multiline/2ext.1icon/default"; alias: "elm/genlist/item_compress/multiline/2text.1icon/default"; alias: "elm/genlist/item_compress_odd/multiline/2text.1icon/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -3344,17 +3155,13 @@ } // 2.4.4.5 - group { name: "elm/genlist/item/multiline/2text.1icon.2/default"; - alias: "elm/genlist/item_odd/multiline/2ext.1icon.2/default"; - alias: "elm/genlist/item_compress/multiline/2text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/multiline/2text.1icon.2/default"; - - GENLIST_DATA_ITEM_NORMAL + group { GENLIST_NAME("multiline/2text.1icon.2/default") + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -3385,20 +3192,38 @@ /************************************************************/ /******************** Dialogue Group ************************/ /************************************************************/ +// 2.2.6.1 (Dialogue) + group { GENLIST_NAME("dialogue/editfield/default") + alias: "elm/layout/dialogue/editfield/default"; + inherit: "elm/genlist/item/editfield/default"; + + data.item: "contents" "elm.icon.entry elm.icon.rename elm.icon.eraser elm.icon.edit"; + + GENLIST_DIALOGUE_INHERIT_BODY( ; ) + GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.icon.rename"; target: "elm.icon.edit";) + } + +// 2.2.6.2 (Dialogue) + group { GENLIST_NAME("dialogue/editfield/title/default") + alias: "elm/layout/dialogue/editfield/title/default"; + inherit: "elm/genlist/item/editfield/title/default"; + + data.item: "contents" "elm.icon.entry elm.icon.rename elm.icon.eraser elm.icon.edit"; + GENLIST_DIALOGUE_INHERIT_BODY( ; ) + GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.icon.rename"; target: "elm.icon.edit";) + } // Dialogue Group Separators // default separator - group { name : "elm/genlist/item/dialogue/separator/default"; - alias: "elm/genlist/item_odd/dialogue/separator/default"; - alias: "elm/genlist/item_compress/dialogue/separator/default"; - alias: "elm/genlist/item_compress_odd/dialogue/separator/default"; + group { GENLIST_NAME("dialogue/separator/default") + alias: "elm/layout/dialogue/separator"; data.item: "stacking" "above"; data.item: "selectraise" "on"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG(0 0 0 0, 0 0 0 0, 0 0 0 0) GENLIST_PART_BASE GENLIST_PART_SPACER("separator", description { state: "default" 0.0; @@ -3411,16 +3236,14 @@ // Dialogue Group Separators // default separator - group { name : "elm/genlist/item/dialogue/separator.2/default"; - alias: "elm/genlist/item_odd/dialogue/separator.2/default"; - alias: "elm/genlist/item_compress/dialogue/separator.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/separator.2/default"; + group { GENLIST_NAME("dialogue/separator.2/default") + alias: "elm/layout/dialogue/separator.2"; data.item: "stacking" "above"; data.item: "selectraise" "on"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG(0 0 0 0, 0 0 0 0, 0 0 0 0) GENLIST_PART_BASE GENLIST_PART_SPACER("separator", description { state: "default" 0.0; @@ -3431,34 +3254,28 @@ } } - group { name: "elm/genlist/item/dialogue/1icon/default"; - alias: "elm/genlist/item_odd/dialogue/1icon/default"; - alias: "elm/genlist/item_compress/dialogue/1icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1icon/default"; + group { GENLIST_NAME("dialogue/1icon/default") alias: "elm/layout/dialogue/1icon"; inherit: "elm/genlist/item/1icon/default"; data.item: "contents" "elm.icon elm.icon.edit"; GENLIST_DIALOGUE_INHERIT_BODY( ; ) - GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon";) + GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon"; ) } // 2.4.1.1 // 2.5.2.1 (deprecated) - group { name: "elm/genlist/item/dialogue/1text/default"; - alias: "elm/genlist/item_odd/dialogue/1text/default"; - alias: "elm/genlist/item_compress/dialogue/1text/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text/default"; + group { GENLIST_NAME("dialogue/1text/default") alias: "elm/layout/dialogue/1text"; + inherit: "elm/genlist/item/1text/default"; + // FIXME: temporary alias for back-wrad compatibility alias: "elm/genlist/item/dialogue/1text/expandable2/default"; alias: "elm/genlist/item_odd/dialogue/1text/expandable2/default"; alias: "elm/genlist/item_compress/dialogue/1text/expandable2/default"; alias: "elm/genlist/item_compress_odd/dialogue/1text/expandable2/default"; - inherit: "elm/genlist/item/1text/default"; - data.item: "contents" "elm.icon.edit"; /* alias: "elm/genlist/item/dialogue.1text/default"; @@ -3471,10 +3288,7 @@ } // 2.4.1.2 - group { name: "elm/genlist/item/dialogue/1text.1icon/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon/default"; + group { GENLIST_NAME("dialogue/1text.1icon/default") alias: "elm/layout/dialogue/1text.1icon"; inherit: "elm/genlist/item/1text.1icon.6/default"; @@ -3486,17 +3300,14 @@ // 2.4.1.3 // 2.5.2.4 (expandable) - group { name: "elm/genlist/item/dialogue/1text.1icon.2/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.2/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.2/default"; + group { GENLIST_NAME("dialogue/1text.1icon.2/default") alias: "elm/layout/dialogue/1text.1icon.2"; + inherit: "elm/genlist/item/1text.1icon.2/default"; + // FIXME: deprecated, only for backward compatibility alias: "elm/genlist/item/dialogue/1text.1icon.2/expandable2/default"; alias: "elm/genlist/item_compress/dialogue/1text.1icon.2/expandable2/default"; - inherit: "elm/genlist/item/1text.1icon.2/default"; - data.item: "contents" "elm.icon elm.icon.edit"; GENLIST_DIALOGUE_INHERIT_BODY( ; ) @@ -3504,10 +3315,7 @@ } // 2.4.1.3 (TEXTBLOCK) - group { name: "elm/genlist/item/dialogue/1text.1icon.2.tb/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.2.tb/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.2.tb/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.2.tb/default"; + group { GENLIST_NAME("dialogue/1text.1icon.2.tb/default") alias: "elm/layout/dialogue/1text.1icon.2.tb"; inherit: "elm/genlist/item/1text.1icon.2.tb/default"; @@ -3518,10 +3326,7 @@ } // 2.4.1.4 - group { name: "elm/genlist/item/dialogue/1text.2icon/default"; - alias: "elm/genlist/item_odd/dialogue/1text.2icon/default"; - alias: "elm/genlist/item_compress/dialogue/1text.2icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.2icon/default"; + group { GENLIST_NAME("dialogue/1text.2icon/default") alias: "elm/layout/dialogue/1text.2icon"; inherit: "elm/genlist/item/1text.2icon.7/default"; @@ -3532,10 +3337,7 @@ } // 2.4.1.5 - group { name: "elm/genlist/item/dialogue/2text.1icon.6/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.6/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.6/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.6/default"; + group { GENLIST_NAME("dialogue/2text.1icon.6/default") alias: "elm/layout/dialogue/2text.1icon.6"; inherit: "elm/genlist/item/2text.1icon.6/default"; @@ -3548,17 +3350,14 @@ // 2.4.1.6 // 2.4.1.15 // 2.5.2.2 & 2.5.2.3 (expandable) - group { name: "elm/genlist/item/dialogue/1text.1icon.3/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.3/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.3/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.3/default"; + group { GENLIST_NAME("dialogue/1text.1icon.3/default") alias: "elm/layout/dialogue/1text.1icon.3"; + inherit: "elm/genlist/item/1text.1icon.3/default"; + // FIXME: deprecated, only for backward compatibility alias: "elm/genlist/item/dialogue/1text.1icon/expandable2/default"; alias: "elm/genlist/item_compress/dialogue/1text.1icon/expandable2/default"; - inherit: "elm/genlist/item/1text.1icon.3/default"; - data.item: "contents" "elm.icon elm.icon.edit"; GENLIST_DIALOGUE_INHERIT_BODY( ; ) @@ -3566,10 +3365,7 @@ } // 2.4.1.6 (textblock) - group { name: "elm/genlist/item/dialogue/1text.1icon.3.tb/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.3.tb/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.3.tb/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.3.tb/default"; + group { GENLIST_NAME("dialogue/1text.1icon.3.tb/default") alias: "elm/layout/dialogue/1text.1icon.3.tb"; inherit: "elm/genlist/item/1text.1icon.3.tb/default"; @@ -3581,10 +3377,7 @@ // 2.4.1.7 // 2.4.1.11 - group { name: "elm/genlist/item/dialogue/1text.2icon.2/default"; - alias: "elm/genlist/item_odd/dialogue/1text.2icon.2/default"; - alias: "elm/genlist/item_compress/dialogue/1text.2icon.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.2icon.2/default"; + group { GENLIST_NAME("dialogue/1text.2icon.2/default") alias: "elm/layout/dialogue/1text.2icon.2"; inherit: "elm/genlist/item/1text.2icon.4/default"; @@ -3595,10 +3388,7 @@ } // 2.4.1.8 - group { name: "elm/genlist/item/dialogue/1text.3icon/default"; - alias: "elm/genlist/item_odd/dialogue/1text.3icon/default"; - alias: "elm/genlist/item_compress/dialogue/1text.3icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.3icon/default"; + group { GENLIST_NAME("dialogue/1text.3icon/default") alias: "elm/layout/dialogue/1text.3icon"; inherit: "elm/genlist/item/1text.3icon.2/default"; @@ -3610,21 +3400,17 @@ } // 2.4.1.9 FIME: This style is not needed?? (slide has already 3icons style) - group { name: "elm/genlist/item/dialogue/3icon/default"; - alias: "elm/genlist/item_odd/dialogue/3icon/default"; - alias: "elm/genlist/item_compress/dialogue/3icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/3icon/default"; + group { GENLIST_NAME("dialogue/3icon/default") alias: "elm/layout/dialogue/3icon"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP GENLIST_PART_PADDING_BOTTOM @@ -3643,23 +3429,20 @@ } // 2.4.1.9 - group { name: "elm/genlist/item/dialogue/1text.1icon.5/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.5/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.5/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.5/default"; + group { GENLIST_NAME("dialogue/1text.1icon.5/default") + alias: "elm/layout/dialogue/1text.1icon.5"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text"; data.item: "contents" "elm.icon elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP_SIZE(0) - GENLIST_PART_PADDING_BOTTOM_SIZE(0) + GENLIST_PART_PADDING_RIGHT_EDIT + GENLIST_PART_PADDING_TOP + GENLIST_PART_PADDING_BOTTOM GENLIST_PART_SUBITEM_("elm.text", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.left", "elm.padding.right", "elm.padding.top", "elm.icon", @@ -3676,22 +3459,18 @@ } // 2.4.1.10 - group { name: "elm/genlist/item/dialogue/2text.1icon.4/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.4/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.4/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.4/default"; + group { GENLIST_NAME("dialogue/2text.1icon.4/default") alias: "elm/layout/dialogue/2text.1icon.4"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP_SIZE(16) GENLIST_PART_PADDING_BOTTOM_SIZE(16) @@ -3716,17 +3495,15 @@ } // 2.4.1.12 - group { name: "elm/genlist/item/dialogue/2text.6/default"; - alias: "elm/genlist/item_odd/dialogue/2text.6/default"; - alias: "elm/genlist/item_compress/dialogue/2text.6/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.6/default"; + group { GENLIST_NAME("dialogue/2text.6/default") alias: "elm/layout/dialogue/2text.6"; + inherit: "elm/genlist/item/2text.5/default"; + // FIXME: deprecated, will be removed alias: "elm/genlist/item/dialogue.1title.1text/default"; alias: "elm/genlist/item_odd/dialogue.1title.1text/default"; alias: "elm/genlist/item_compress/dialogue.1title.1text/default"; alias: "elm/genlist/item_compress_odd/dialogue.1title.1text/default"; - inherit: "elm/genlist/item/2text.5/default"; data.item: "contents" "elm.icon.edit"; @@ -3735,10 +3512,7 @@ } // 2.4.1.13 - group { name: "elm/genlist/item/dialogue/2text.9/default"; - alias: "elm/genlist/item_odd/dialogue/2text.9/default"; - alias: "elm/genlist/item_compress/dialogue/2text.9/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.9/default"; + group { GENLIST_NAME("dialogue/2text.9/default") alias: "elm/layout/dialogue/2text.9"; inherit: "elm/genlist/item/dialogue/2text.6/default"; @@ -3755,10 +3529,7 @@ } // 2.4.1.14 - group { name: "elm/genlist/item/dialogue/2text.4/default"; - alias: "elm/genlist/item_odd/dialogue/2text.4/default"; - alias: "elm/genlist/item_compress/dialogue/2text.4/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.4/default"; + group { GENLIST_NAME("dialogue/2text.4/default") alias: "elm/layout/dialogue/2text.4"; inherit: "elm/genlist/item/2text.4/default"; @@ -3770,10 +3541,7 @@ } // 2.4.1.14 (textblcok) - group { name: "elm/genlist/item/dialogue/2text.4.tb/default"; - alias: "elm/genlist/item_odd/dialogue/2text.4.tb/default"; - alias: "elm/genlist/item_compress/dialogue/2text.4.tb/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.4.tb/default"; + group { GENLIST_NAME("dialogue/2text.4.tb/default") alias: "elm/layout/dialogue/2text.4.tb"; inherit: "elm/genlist/item/2text.4.tb/default"; @@ -3788,10 +3556,7 @@ } // 2.4.1.16 - group { name: "elm/genlist/item/dialogue/1text.3icon.2/default"; - alias: "elm/genlist/item_odd/dialogue/1text.3icon.2/default"; - alias: "elm/genlist/item_compress/dialogue/1text.3icon.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.3icon.2/default"; + group { GENLIST_NAME("dialogue/1text.3icon.2/default") alias: "elm/layout/dialogue/1text.3icon.2"; inherit: "elm/genlist/item/1text.3icon/default"; @@ -3803,10 +3568,7 @@ } // 2.4.1.17 - group { name: "elm/genlist/item/dialogue/1text.1icon.4/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.4/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.4/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.4/default"; + group { GENLIST_NAME("dialogue/1text.1icon.4/default") alias: "elm/layout/dialogue/1text.1icon.4"; inherit: "elm/genlist/item/1text.1icon.5/default"; @@ -3818,10 +3580,7 @@ } // 2.4.1.18 - group { name: "elm/genlist/item/dialogue/2text.5/default"; - alias: "elm/genlist/item_odd/dialogue/2text.5/default"; - alias: "elm/genlist/item_compress/dialogue/2text.5/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.5/default"; + group { GENLIST_NAME("dialogue/2text.5/default") alias: "elm/layout/dialogue/2text.5"; inherit: "elm/genlist/item/2text.6/default"; @@ -3833,11 +3592,8 @@ // 2.4.1.19 - group { name: "elm/genlist/item/dialogue/multiline/1text.1icon/default"; - alias: "elm/genlist/item_odd/dialogue/multiline/1text.1icon/default"; - alias: "elm/genlist/item_compress/dialogue/multiline/1text.1icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/multiline/1text.1icon/default"; - alias: "elm/layout/dialogue/1text.1icon.flexible"; + group { GENLIST_NAME("dialogue/multiline/1text.1icon/default") + alias: "elm/layout/dialogue/multiline/1text.1icon.flexible"; inherit: "elm/genlist/item/1text.1icon.3.tb/default"; data.item: "contents" "elm.icon elm.icon.edit"; @@ -3859,10 +3615,7 @@ } // 2.4.1.20 - group { name: "elm/genlist/item/dialogue/1text.1icon.divider/default"; - alias: "elm/genlist/item_odd/dialogue/1text.1icon.divider/default"; - alias: "elm/genlist/item_compress/dialogue/1text.1icon.divider/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.divider/default"; + group { GENLIST_NAME("dialogue/1text.1icon.divider/default") alias: "elm/layout/dialogue/1text.1icon.divider"; inherit: "elm/genlist/item/1text.1icon.divider/default"; @@ -3873,10 +3626,7 @@ } // 2.4.1.21 - group { name: "elm/genlist/item/dialogue/1text.2icon.divider/default"; - alias: "elm/genlist/item_odd/dialogue/1text.2icon.divider/default"; - alias: "elm/genlist/item_compress/dialogue/1text.2icon.divider/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.2icon.divider/default"; + group { GENLIST_NAME("dialogue/1text.2icon.divider/default") alias: "elm/layout/dialogue/1text.2icon.divider"; inherit: "elm/genlist/item/1text.2icon.divider/default"; @@ -3890,10 +3640,7 @@ // 2.4.2.1 - group { name: "elm/genlist/item/dialogue/2text/default"; - alias: "elm/genlist/item_odd/dialogue/2text/default"; - alias: "elm/genlist/item_compress/dialogue/2text/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text/default"; + group { GENLIST_NAME("dialogue/2text/default") alias: "elm/layout/dialogue/2text"; inherit: "elm/genlist/item/2text.2/default"; @@ -3904,10 +3651,7 @@ } // 2.4.2.2 - group { name: "elm/genlist/item/dialogue/2text.2/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2/default"; + group { GENLIST_NAME("dialogue/2text.2/default") alias: "elm/layout/dialogue/2text.2"; inherit: "elm/genlist/item/2text.3/default"; @@ -3918,10 +3662,7 @@ } // 2.4.2.3 - group { name: "elm/genlist/item/dialogue/2text.3/default"; - alias: "elm/genlist/item_odd/dialogue/2text.3/default"; - alias: "elm/genlist/item_compress/dialogue/2text.3/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.3/default"; + group { GENLIST_NAME("dialogue/2text.3/default") alias: "elm/layout/dialogue/2text.3"; inherit: "elm/genlist/item/2text.7/default"; @@ -3932,10 +3673,7 @@ } // 2.4.2.4 - group { name: "elm/genlist/item/dialogue/2text.1icon.2/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.2/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.2/default"; + group { GENLIST_NAME("dialogue/2text.1icon.2/default") alias: "elm/layout/dialogue/2text.1icon.2"; inherit: "elm/genlist/item/2text.1icon.4/default"; @@ -3947,10 +3685,7 @@ } // 2.4.2.5 - group { name: "elm/genlist/item/dialogue/2text.1icon.3/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.3/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.3/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.3/default"; + group { GENLIST_NAME("dialogue/2text.1icon.3/default") alias: "elm/layout/dialogue/2text.1icon.3"; inherit: "elm/genlist/item/2text.1icon.8/default"; @@ -3961,10 +3696,7 @@ } // 2.4.2.6 - group { name: "elm/genlist/item/dialogue/2text.3icon/default"; - alias: "elm/genlist/item_odd/dialogue/2text.3icon/default"; - alias: "elm/genlist/item_compress/dialogue/2text.3icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.3icon/default"; + group { GENLIST_NAME("dialogue/2text.3icon/default") alias: "elm/layout/dialogue/2text.3icon"; inherit: "elm/genlist/item/2text.2icon.8/default"; @@ -3979,10 +3711,7 @@ } // 2.4.2.7 - group { name: "elm/genlist/item/dialogue/2text.2icon/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2icon/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon/default"; + group { GENLIST_NAME("dialogue/2text.2icon/default") alias: "elm/layout/dialogue/2text.2icon"; inherit: "elm/genlist/item/2text.2icon.5/default"; @@ -3997,10 +3726,7 @@ } // 2.4.2.8 - group { name: "elm/genlist/item/dialogue/2text.2icon.2/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2icon.2/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2icon.2/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.2/default"; + group { GENLIST_NAME("dialogue/2text.2icon.2/default") alias: "elm/layout/dialogue/2text.2icon.2"; inherit: "elm/genlist/item/2text.2icon.6/default"; @@ -4012,10 +3738,7 @@ } // 2.4.2.9 - group { name: "elm/genlist/item/dialogue/2text.2icon.3/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2icon.3/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2icon.3/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.3/default"; + group { GENLIST_NAME("dialogue/2text.2icon.3/default") alias: "elm/layout/dialogue/2text.2icon.3"; inherit: "elm/genlist/item/2text.2icon.4/default"; @@ -4027,10 +3750,7 @@ } // 2.4.2.9 (TEXTBLOCK) - group { name: "elm/genlist/item/dialogue/2text.2icon.3.tb/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2icon.3.tb/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2icon.3.tb/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.3.tb/default"; + group { GENLIST_NAME("dialogue/2text.2icon.3.tb/default") alias: "elm/layout/dialogue/2text.2icon.3.tb"; inherit: "elm/genlist/item/2text.2icon.4.tb/default"; @@ -4042,10 +3762,7 @@ } // 2.4.2.10 - group { name: "elm/genlist/item/dialogue/2text.1icon.5/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.5/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.5/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.5/default"; + group { GENLIST_NAME("dialogue/2text.1icon.5/default") alias: "elm/layout/dialogue/2text.1icon.5"; inherit: "elm/genlist/item/2text.1icon.5/default"; @@ -4058,134 +3775,123 @@ // 2.4.2.11 - group { name: "elm/genlist/item/dialogue/multiline/1title.1text/default"; - alias: "elm/genlist/item_odd/dialogue/multiline/1title.1text/default"; - alias: "elm/genlist/item_compress/dialogue/multiline/1title.1text/default"; - alias: "elm/genlist/item_compress_odd/dialogue/multiline/1title.1text/default"; + group { GENLIST_NAME("dialogue/multiline/1title.1text/default") alias: "elm/layout/dialogue/multiline/1title.1text/default"; + inherit: "elm/genlist/item/multiline/1title.1text/default"; + // FIXME: deprecated name, will be removed alias: "elm/genlist/item/dialogue/1title.1text.2/default"; alias: "elm/genlist/item_odd/dialogue/1title.1text.2/default"; alias: "elm/genlist/item_compress/dialogue/1title.1text.2/default"; alias: "elm/genlist/item_compress_odd/dialogue/1title.1text.2/default"; alias: "elm/layout/dialogue/1title.1text.2/default"; - inherit: "elm/genlist/item/multiline/1title.1text/default"; + data.item: "contents" "elm.icon.edit"; GENLIST_DIALOGUE_INHERIT_BODY( ; ) - GENLIST_PROGRAMS_DIALOGUE( target: "elm.title"; target: "elm.text"; + GENLIST_PROGRAMS_DIALOGUE( target: "elm.title"; + target: "elm.text"; target: "elm.divider1"; target:"elm.divider2"; ) } // 2.4.2.12 - group { name: "elm/genlist/item/dialogue/multiline/1title.2text/default"; - alias: "elm/genlist/item_odd/dialogue/multiline/1title.2text/default"; - alias: "elm/genlist/item_compress/dialogue/multiline/1title.2text/default"; - alias: "elm/genlist/item_compress_odd/dialogue/multiline/1title.2text/default"; + group { GENLIST_NAME("dialogue/multiline/1title.2text/default") alias: "elm/layout/dialogue/multiline/1title.2text/default"; inherit: "elm/genlist/item/multiline/1title.2text/default"; data.item: "contents" "elm.icon.edit"; GENLIST_DIALOGUE_INHERIT_BODY( ; ) - GENLIST_PROGRAMS_DIALOGUE( target: "elm.title"; target: "elm.text.1"; target: "elm.text.2"; + GENLIST_PROGRAMS_DIALOGUE( target: "elm.title"; + target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target:"elm.divider2"; target: "center_line"; target:"center_line2";) } +#define GENLIST_PART_PASSWORD_RTB(NAME, BG_NAME, RIGHT, TOP, BOTTOM) \ + GENLIST_PART_IMAGE(BG_NAME, \ + GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \ + GENLIST_PARAM_PASSWORD_IMAGE \ + fixed: 1 0; \ + ) \ + ) \ + GENLIST_PART_ICON(NAME, \ + GENLIST_DESCRIPTION_ENVELOP(BG_NAME, \ + rel1.offset: 1 1; \ + rel2.offset: -1 -1; \ + ) \ + ) + +#define GENLIST_PART_PASSWORD_LTB(NAME, BG_NAME, LEFT, TOP, BOTTOM) \ + GENLIST_PART_IMAGE(BG_NAME, \ + GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \ + GENLIST_PARAM_PASSWORD_IMAGE \ + fixed: 1 0; \ + ) \ + ) \ + GENLIST_PART_ICON(NAME, \ + GENLIST_DESCRIPTION_ENVELOP(BG_NAME, \ + rel1.offset: 1 1; \ + rel2.offset: -1 -1; \ + ) \ + ) + //2.4.2.13 (password style) - group { name: "elm/genlist/item/dialogue/1text.4icon/default"; - alias: "elm/genlist/item_odd/dialogue/1text.4icon/default"; - alias: "elm/genlist/item_compress/dialogue/1text.4icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/1text.4icon/default"; + group { GENLIST_NAME("dialogue/1text.4icon/default") alias: "elm/layout/dialogue/4icon"; - GENLIST_DATA_ITEM_NORMAL + data.item: "stacking" "above"; + data.item: "selectraise" "on"; data.item: "texts" "elm.text"; - data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.edit"; + data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; images { image : "00_search_edit_field_bg_02.png" COMP; } - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE GENLIST_PART_BASE - GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( 82+16 ) + GENLIST_PART_BG_DIALOGUE + GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT) + GENLIST_PART_PADDING_RIGHT_SIZE(DIALOGUE_PADDING_SIZE_RIGHT) GENLIST_PART_PADDING_TOP_SIZE(22) - GENLIST_PART_PADDING_BOTTOM_SIZE(29) - GENLIST_PART_SPACER("elm.padding.top2", - description { state: "default" 0.0; - min: 0 29; - max: -1 29; - fixed: 0 1; - rel1.to: "base"; - rel2.to: "base"; - rel2.relative: 1.0 0.0; - align: 0.5 0.0; - } - ) + GENLIST_PART_PADDING_BOTTOM_SIZE(18) GENLIST_PART_TEXT( "elm.text", - GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.icon1.bg", "elm.padding.top", - min: 212 0; - fixed: 1 1; + GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top", + fixed: 0 1; + min: 0 42; GENLIST_PARAM_PASSWORD_TITLE ) ) + GENLIST_PART_PADDING_T_SIZE("elm.padding.text.bottom", "elm.text", 18); - GENLIST_PART_IMAGE("elm.icon1.bg", - GENLIST_DESCRIPTION_RTB("elm.icon2.bg.left", "elm.padding.top2", "elm.padding.bottom", - GENLIST_PARAM_PASSWORD_IMAGE - fixed: 1 1;) + GENLIST_PART_PASSWORD_RTB("elm.icon.1", "elm.icon.1.bg", + "elm.padding.1", "elm.padding.text.bottom", "elm.padding.bottom" ) - GENLIST_PART_ICON("elm.icon.1", - GENLIST_DESCRIPTION_ENVELOP("elm.icon1.bg", - rel1.offset: 1 1; - rel2.offset: -1 -1; - ) + GENLIST_PART_PADDING_R_SIZE("elm.padding.1", "elm.icon.2.bg", 22) + GENLIST_PART_PASSWORD_RTB("elm.icon.2", "elm.icon.2.bg", + "elm.padding.center", "elm.padding.text.bottom", "elm.padding.bottom" ) - - GENLIST_PART_PADDING_R_SIZE("elm.icon2.bg.left", "elm.icon2.bg", 22) - GENLIST_PART_IMAGE("elm.icon2.bg", - GENLIST_DESCRIPTION_RTB("elm.icon3.bg.left", "elm.padding.top2", "elm.padding.bottom", - GENLIST_PARAM_PASSWORD_IMAGE - fixed: 1 1;) - ) - GENLIST_PART_ICON("elm.icon.2", - GENLIST_DESCRIPTION_ENVELOP("elm.icon2.bg", - rel1.offset: 1 1; - rel2.offset: -1 -1; - ) - ) - - GENLIST_PART_PADDING_R_SIZE("elm.icon3.bg.left", "elm.icon3.bg", 22) - GENLIST_PART_IMAGE("elm.icon3.bg", - GENLIST_DESCRIPTION_RTB("elm.icon4.bg.left", "elm.padding.top2", "elm.padding.bottom", - GENLIST_PARAM_PASSWORD_IMAGE - fixed: 1 1;) - ) - GENLIST_PART_ICON("elm.icon.3", - GENLIST_DESCRIPTION_ENVELOP("elm.icon3.bg", - rel1.offset: 1 1; - rel2.offset: -1 -1; - ) + GENLIST_PART_SPACER("elm.padding.center", + description { state: "default" 0.0.; + min: 22 0; + max: 22 0; + fixed: 1 1; + align: 0.5 0.5; + rel1 { + relative: 0.5 0; + } + rel2 { + relative: 0.5 1; + } + } ) - - GENLIST_PART_PADDING_R_SIZE("elm.icon4.bg.left", "elm.icon4.bg", 22) - GENLIST_PART_IMAGE("elm.icon4.bg", - GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top2", "elm.padding.bottom", - // Do not add fixed: 1 1; even thougn edje util error, - // For some reason, size calculation is not correct. - GENLIST_PARAM_PASSWORD_IMAGE) - + GENLIST_PART_PASSWORD_LTB("elm.icon.3", "elm.icon.3.bg", + "elm.padding.center", "elm.padding.text.bottom", "elm.padding.bottom" ) - GENLIST_PART_ICON("elm.icon.4", - GENLIST_DESCRIPTION_ENVELOP("elm.icon4.bg", - rel1.offset: 1 1; - rel2.offset: -1 -1; - ) + GENLIST_PART_PADDING_L_SIZE("elm.padding.2", "elm.icon.3.bg", 22) + GENLIST_PART_PASSWORD_LTB("elm.icon.4", "elm.icon.4.bg", + "elm.padding.2", "elm.padding.text.bottom", "elm.padding.bottom" ) } programs { @@ -4194,10 +3900,7 @@ } // 2.4.2.14 - group { name: "elm/genlist/item/dialogue/2text.2icon.4/default"; - alias: "elm/genlist/item_odd/dialogue/2text.2icon.4/default"; - alias: "elm/genlist/item_compress/dialogue/2text.2icon.4/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.4/default"; + group { GENLIST_NAME("dialogue/2text.2icon.4/default") alias: "elm/layout/dialogue/2text.2icon.4"; inherit: "elm/genlist/item/2text.2icon/default"; @@ -4209,10 +3912,7 @@ } // 2.4.2.15 - group { name: "elm/genlist/item/dialogue/2text.1icon.10/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.10/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.10/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.10/default"; + group { GENLIST_NAME("dialogue/2text.1icon.10/default") alias: "elm/layout/dialogue/2text.1icon.10"; inherit: "elm/genlist/item/2text.1icon.divider/default"; @@ -4238,10 +3938,7 @@ // 2.4.2.15 (textblock) - group { name: "elm/genlist/item/dialogue/2text.1icon.10.tb/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.10.tb/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.10.tb/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.10.tb/default"; + group { GENLIST_NAME("dialogue/2text.1icon.10.tb/default") alias: "elm/layout/dialogue/2text.1icon.10.tb"; inherit: "elm/genlist/item/2text.1icon.7.tb/default"; @@ -4253,10 +3950,7 @@ } // 2.4.2.16 - group { name: "elm/genlist/item/dialogue/2text.1icon.7/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.7/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.7/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.7/default"; + group { GENLIST_NAME("dialogue/2text.1icon.7/default") alias: "elm/layout/dialogue/2text.1icon.12"; inherit: "elm/genlist/item/2text.1icon.12/default"; @@ -4269,22 +3963,18 @@ // 2.4.2.17 - group { name: "elm/genlist/item/dialogue/2text.1icon.8/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.8/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.8/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.8/default"; + group { GENLIST_NAME("dialogue/2text.1icon.8/default") alias: "elm/layout/dialogue/2text.1icon.8"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE GENLIST_PART_BASE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE @@ -4293,7 +3983,7 @@ GENLIST_PART_LISTITEM_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN, "elm.padding.left", "elm.text2.limit", "elm.text.2", "elm.padding.bottom", - fixed: 1 1; align: 0 0.5; text.max: 1 0; // This limits text growing. + align: 0 0.5; text.max: 1 0; // This limits text growing. ) GENLIST_PART_PADDING_L("elm.padding.text1.right", "elm.text.1") GENLIST_PART_ICON_SMALL_LTB("elm.icon", @@ -4306,16 +3996,15 @@ ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; - target: "elm.icon"; ) + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; + target: "elm.text.2"; target: "elm.icon"; ) } // 2.4.2.18 - group { name: "elm/genlist/item/dialogue/multiline/2text/default"; - alias: "elm/genlist/item_odd/dialogue/multiline/2text/default"; - alias: "elm/genlist/item_compress/dialogue/multiline/2text/default"; - alias: "elm/genlist/item_compress_odd/dialogue/multiline/2text/default"; + group { GENLIST_NAME("dialogue/multiline/2text/default") alias: "elm/layout/dialogue/multiline/2text/default"; + inherit: "elm/genlist/item/multiline/2text/default"; + // FIXME: deprecated name, will be removed alias: "elm/genlist/item/multiline/dialogue/2text/default"; alias: "elm/genlist/item_odd/multiline/dialogue/2text/default"; @@ -4323,8 +4012,6 @@ alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default"; alias: "elm/layout/multiline/dialogue/2text/default"; - inherit: "elm/genlist/item/multiline/2text/default"; - data.item: "contents" "elm.icon.edit"; GENLIST_DIALOGUE_INHERIT_BODY( ; ) @@ -4332,22 +4019,18 @@ } // 2.4.2.19 - group { name: "elm/genlist/item/dialogue/2text.1icon.15/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.15/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.15/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.15/default"; + group { GENLIST_NAME("dialogue/2text.1icon.15/default") alias: "elm/layout/dialogue/2text.1icon.15/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE @@ -4372,10 +4055,7 @@ } // 2.4.2.20 - group { name: "elm/genlist/item/dialogue/2text.1icon.divider/default"; - alias: "elm/genlist/item_odd/dialogue/2text.1icon.divider/default"; - alias: "elm/genlist/item_compress/dialogue/2text.1icon.divider/default"; - alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.divider/default"; + group { GENLIST_NAME("dialogue/2text.1icon.divider/default") alias: "elm/layout/dialogue/2text.1icon.divider/default"; inherit: "elm/genlist/item/2text.1icon.divider/default"; @@ -4386,10 +4066,8 @@ } // 2.4.2.21 - group { name: "elm/genlist/item/dialogue/3text.2icon/default"; - alias: "elm/genlist/item_odd/dialogue/3text.2icon/default"; - alias: "elm/genlist/item_compress/dialogue/3text.2icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/3text.2icon/default"; +// FIXME: Why name is 3text ?? it's 2text + group { GENLIST_NAME("dialogue/3text.2icon/default") alias: "elm/layout/dialogue/3text.2icon/default"; inherit: "elm/genlist/item/2text.2icon/default"; @@ -4401,60 +4079,63 @@ } // 2.4.4.1 group title - group { name: "elm/genlist/item/dialogue/grouptitle/default"; - alias: "elm/genlist/item_odd/dialogue/grouptitle/default"; - alias: "elm/genlist/item_compress/dialogue/grouptitle/default"; - alias: "elm/genlist/item_compress_odd/dialogue/grouptitle/default"; + group { GENLIST_NAME("dialogue/grouptitle/default") alias: "elm/layout/dialogue/grouptitle"; + + // FIXME: deprecated name, will be removed alias : "elm/genlist/item/dialogue/title/default"; alias: "elm/genlist/item_odd/dialogue/title/default"; alias: "elm/genlist/item_compress/dialogue/title/default"; alias: "elm/genlist/item_compress_odd/dialogue/title/default"; alias: "elm/layout/dialogue/title"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; - parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) + GENLIST_PART_PADDING_TOP_SIZE( 0 ) + GENLIST_PART_PADDING_BOTTOM_SIZE( 0 ) GENLIST_PART_PADDING_RIGHT_SIZE( 26 ) GENLIST_PART_TEXT("elm.text", repeat_events: 0; - GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.icon", + GENLIST_DESCRIPTION("elm.padding.left", "elm.icon", + "elm.padding.top", "elm.padding.bottom", GENLIST_PARAM_DIALOGUE_GROUP_TITLE min: 0 GENLIST_HEIGHT_GROUPTITLE; ) ) GENLIST_PART_ICON("elm.icon", - GENLIST_DESCRIPTION_R("elm.padding.right", + GENLIST_DESCRIPTION_RTB("elm.padding.right", + "elm.padding.top", "elm.padding.bottom", min: 32 32; max: 32 32; fixed: 1 1; ) ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_INDEX( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; ) } // 2.4.4.2 Help Text - group { name: "elm/genlist/item/multiline/1text/default"; - alias: "elm/genlist/item_odd/multiline/1text/default"; - alias: "elm/genlist/item_compress/multiline/1text/default"; - alias: "elm/genlist/item_compress_odd/multiline/1text/default"; + group { GENLIST_NAME("multiline/1text/default"); + alias: "elm/layout/multiline/1text/default"; + + // FIXME: name is not correct... alias: "elm/layout/dialogue/multiline/1text/default"; - GENLIST_DATA_ITEM_NORMAL + data.item: "stacking" "above"; + data.item: "selectraise" "on"; data.item: "texts" "elm.text"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE(38) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(38) + GENLIST_PART_PADDING_RIGHT_SIZE(38) GENLIST_PART_PADDING_TOP_SIZE(0) GENLIST_PART_PADDING_BOTTOM_SIZE(0) @@ -4468,22 +4149,18 @@ } // 2.4.4.3 - group { name: "elm/genlist/item/dialogue/bg/2text.1icon/default"; - alias: "elm/genlist/item_odd/dialogue/bg/2text.1icon/default"; - alias: "elm/genlist/item_compress/dialogue/bg/2text.1icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/bg/2text.1icon/default"; + group { GENLIST_NAME("dialogue/bg/2text.1icon/default") alias: "elm/layout/dialogue/bg/2text.1icon/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP_SIZE(20) GENLIST_PART_PADDING_BOTTOM_SIZE(20) @@ -4511,22 +4188,18 @@ } // 2.4.4.4 - group { name: "elm/genlist/item/dialogue/bg/3text.2icon/default"; - alias: "elm/genlist/item_odd/dialogue/bg/3text.2icon/default"; - alias: "elm/genlist/item_compress/dialogue/bg/3text.2icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/bg/3text.2icon/default"; + group { GENLIST_NAME("dialogue/bg/3text.2icon/default") alias: "elm/layout/dialogue/bg/3text.2icon/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP_SIZE(20) GENLIST_PART_PADDING_BOTTOM_SIZE(20) @@ -4563,22 +4236,18 @@ } // 2.4.4.4 (Apps) - group { name: "elm/genlist/item/dialogue/bg/5text.6icon/default"; - alias: "elm/genlist/item_odd/dialogue/bg/5text.6icon/default"; - alias: "elm/genlist/item_compress/dialogue/bg/5text.6icon/default"; - alias: "elm/genlist/item_compress_odd/dialogue/bg/5text.6icon/default"; + group { GENLIST_NAME("dialogue/bg/5text.6icon/default") alias: "elm/layout/dialogue/bg/5text.6icon/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_DIALOGUE data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4 elm.text.5"; data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6 elm.icon.edit"; - GENLIST_IMAGES_DIALOGUE_BG_IMAGE parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_DIALOGUE GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) - GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_PADDING_TOP_SIZE(9) GENLIST_PART_PADDING_BOTTOM_SIZE(9) @@ -4662,8 +4331,8 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -4997,7 +4666,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.subject"; target: "elm.text.name"; target: "elm.text.date"; @@ -5007,7 +4676,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.subject"; target: "elm.text.name"; target: "elm.text.date"; @@ -5068,8 +4737,8 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT_EDIT part { name: "elm.icon"; @@ -5164,7 +4833,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS } @@ -5172,7 +4841,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; transition: LINEAR 0.1; } @@ -5207,8 +4876,8 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT_EDIT part { name: "elm.check"; @@ -5344,7 +5013,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS } @@ -5352,7 +5021,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; transition: LINEAR 0.1; } @@ -5414,13 +5083,13 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; } program { name: "go_passive"; signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; transition: LINEAR 0.1; }*/ program { name: "go_disabled"; @@ -5479,13 +5148,13 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; } program { name: "go_passive"; signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; transition: LINEAR 0.1; }*/ program { name: "go_disabled"; @@ -5613,7 +5282,7 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -5803,7 +5472,7 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -5996,7 +5665,7 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -6250,7 +5919,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -6335,7 +6004,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -6344,7 +6013,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -6378,7 +6047,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -6496,7 +6165,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -6505,7 +6174,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -6539,7 +6208,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -6657,7 +6326,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -6666,7 +6335,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -6700,7 +6369,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -6870,7 +6539,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -6879,7 +6548,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -6913,7 +6582,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -7074,7 +6743,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -7083,7 +6752,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -7113,7 +6782,7 @@ alias: "elm/layout/dialogue/2text.2icon.3"; inherit: "elm/genlist/item/2text.2icon.4/default"; parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_SIZE_RIGHT ) GENLIST_PART_DIALOGUE_ITEM GENLIST_PART_DIALOGUE_RIGHT_LINE @@ -7124,7 +6793,7 @@ alias: "elm/layout/dialogue/2text.2icon.3.tb"; inherit: "elm/genlist/item/2text.2icon.4.tb/default"; parts { - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_SIZE_RIGHT ) GENLIST_PART_DIALOGUE_ITEM GENLIST_PART_DIALOGUE_RIGHT_LINE @@ -7146,7 +6815,7 @@ color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; } } - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_21_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_22_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) @@ -7255,7 +6924,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.title"; target: "elm.text"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -7264,7 +6933,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.title"; target: "elm.text"; transition: LINEAR 0.1; @@ -7475,7 +7144,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -7591,7 +7260,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -7600,7 +7269,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -7634,7 +7303,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -7757,7 +7426,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -7766,7 +7435,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -7802,7 +7471,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) @@ -7925,7 +7594,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; } @@ -7933,7 +7602,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -8765,7 +8434,7 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -8947,7 +8616,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_454_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -9199,7 +8868,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_566_INC ) - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -10584,7 +10253,7 @@ parts { GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_BG_IMAGE_DIALOGUE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC ) GENLIST_PART_PADDING_RIGHT_EDIT GENLIST_PART_DIALOGUE_ITEM @@ -10616,14 +10285,14 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; } program { name: "go_passive"; signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; transition: LINEAR 0.1; }*/ @@ -10838,7 +10507,7 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -10911,7 +10580,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text"; transition: LINEAR 0.1; } @@ -10946,8 +10615,8 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -11271,7 +10940,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -11281,7 +10950,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -11341,7 +11010,7 @@ parts { GENLIST_PART_BASE_LIST_H( 129 ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( 10 ) GENLIST_PART_PADDING_BOTTOM_SIZE( 10 ) GENLIST_PART_PADDING_LEFT @@ -11441,7 +11110,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -11450,7 +11119,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -11484,7 +11153,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -11654,7 +11323,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -11663,7 +11332,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -11697,7 +11366,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -11843,7 +11512,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS } @@ -11851,7 +11520,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; transition: LINEAR 0.1; } @@ -11905,7 +11574,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -12066,7 +11735,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS @@ -12075,7 +11744,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; transition: LINEAR 0.1; @@ -12109,7 +11778,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -12219,7 +11888,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS } @@ -12227,7 +11896,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; transition: LINEAR 0.1; } @@ -12277,7 +11946,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -12491,7 +12160,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -12501,7 +12170,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -12559,7 +12228,7 @@ parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC ) GENLIST_PART_PADDING_LEFT @@ -12853,7 +12522,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -12863,7 +12532,7 @@ signal: "elm,state,unselected"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -12903,8 +12572,8 @@ } parts { GENLIST_PART_BASE_LIST_H( GENLIST_SIZE_160_INC ) - GENLIST_PART_BG - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_TOP_SIZE( 8 ) GENLIST_PART_PADDING_BOTTOM_SIZE( 8 ) GENLIST_PART_PADDING_LEFT @@ -13194,7 +12863,7 @@ signal: "elm,state,selected"; source: "elm"; action: STATE_SET "selected" 0.0; - target: "bg_image"; + target: "bg"; target: "elm.text.subject"; target: "elm.text.name"; target: "elm.text.date"; @@ -13206,7 +12875,7 @@ source: "elm"; transition: LINEAR 0.1; script { - set_state(PART:"bg_image", "default", 0.0); + set_state(PART:"bg", "default", 0.0); set_state(PART:"elm.text.name", "default", 0.0); set_state(PART:"elm.text.date", "default", 0.0); set_state(PART:"elm.text.preview", "default", 0.0); @@ -13287,7 +12956,7 @@ data.item: "contents" "elm.swallow.icon elm.swallow.end"; parts { GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_93_INC ) - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT_EDIT part { name: "elm.swallow.end"; @@ -13361,12 +13030,12 @@ alias: "elm/genlist/item_compress/4text.6icon.2/default"; alias: "elm/genlist/item_compress_odd/4text.6icon.2/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -13406,7 +13075,7 @@ ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; + GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; ) @@ -13424,12 +13093,12 @@ alias: "elm/genlist/item_compress/4text.5icon.2/default"; alias: "elm/genlist/item_compress_odd/4text.5icon.2/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -13466,7 +13135,7 @@ ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; + GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; ) @@ -13483,12 +13152,12 @@ alias: "elm/genlist/item_compress/4text.5icon.4/default"; alias: "elm/genlist/item_compress_odd/4text.5icon.4/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -13524,7 +13193,7 @@ ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; + GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; ) @@ -13541,12 +13210,12 @@ alias: "elm/genlist/item_compress/4text.4icon.2/default"; alias: "elm/genlist/item_compress_odd/4text.4icon.2/default"; - GENLIST_DATA_ITEM_NORMAL + GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT @@ -13580,7 +13249,7 @@ ) GENLIST_PART_FLIP } - GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; + GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) diff --git a/themes/widgets/genlist/genlist_sweep.edc b/themes/widgets/genlist/genlist_sweep.edc index 9af2c11..916c2d1 100644 --- a/themes/widgets/genlist/genlist_sweep.edc +++ b/themes/widgets/genlist/genlist_sweep.edc @@ -25,14 +25,14 @@ alias: "elm/genlist/item_odd/mode/slide/default"; alias: "elm/genlist/item_compress/mode/slide/default"; alias: "elm/genlist/item_compress_odd/mode/slide/default"; - data.item: "stacking" "above"; - data.item: "selectraise" "on"; + + GENLIST_PROLOG + data.item: "contents" "elm.slide.swallow.1"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { - GENLIST_PART_BG_IMAGE + GENLIST_PART_BG_NORMAL GENLIST_PART_BASE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT diff --git a/themes/widgets/index.edc b/themes/widgets/index.edc index 9e2e643..119d25a 100644 --- a/themes/widgets/index.edc +++ b/themes/widgets/index.edc @@ -27,13 +27,9 @@ } } images { + image: "00_fast_scroll_rollover_bg.png" COMP; image: "00_fast_scroll_popup_bg.png" COMP; } - data{ - item: "min_obj_height" "32"; - item: "min_1st_level_obj_height" "32"; - item: "special_char" "*"; - } parts { part { name: "clip"; scale: 1; @@ -63,6 +59,7 @@ } } part { name: "elm.dragable.index.1"; + type: RECT; mouse_events: 0; scale: 1; dragable { @@ -71,6 +68,7 @@ confine: "elm.swallow.index.0"; } description { state: "default" 0.0; + visible: 0; fixed: 1 1; min: 20 38; rel1 { @@ -85,114 +83,109 @@ } } } - part { name: "elm.swallow.index.1.padding.right"; + part { name: "index.top.padding"; type: RECT; scale: 1; - description { state: "default" 0.0; - min: INDEX_LEVEL_PADDING_INC 0; - fixed: 1 0; - align: 1.0 0.0; + description { + align: 0.5 0.0; + min: 0 INDEX_PADDING_SIZE_INC; + visible: 0; + fixed: 0 1; rel1 { - relative: 1.0 0.0; - offset: 0 0; + to_x: "elm.swallow.index.0"; + relative: 0.0 0.0; } rel2 { + to_x: "elm.swallow.index.0"; relative: 1.0 0.0; - offset: 0 0; } - color: 0 0 0 0; } } - part { name: "elm.swallow.index.1"; - type: SWALLOW; + part { name: "index.bottom.padding"; + type: RECT; scale: 1; - clip_to: "clip2"; - description { state: "default" 0.0; - align: 0.5 0.5; + description { + align: 0.5 1.0; + min: 0 INDEX_PADDING_SIZE_INC; + visible: 0; + fixed: 0 1; rel1 { - to_y: "elm.dragable.index.1"; - relative: 1.0 0.5; - offset: -1 0; + to_x: "elm.swallow.index.0"; + relative: 0.0 1.0; } rel2 { - to_y: "elm.dragable.index.1"; - relative: 1.0 0.5; - offset: -1 -1; + to_x: "elm.swallow.index.0"; + relative: 1.0 1.0; } - color: 255 255 255 0; } - description { state: "active" 0.0; - inherit: "default" 0.0; + } + part { name: "bg"; + type: IMAGE; + clip_to: "clip"; + scale: 1; + description { state: "default" 0.0; rel1 { - to_x: "elm.swallow.index.1.padding.right"; - relative: 0.0 0.5; - offset: 0 0; + to: "index.top.padding"; } rel2 { - to_x: "elm.swallow.index.1.padding.right"; - relative: 0.0 0.5; - offset: 0 -1; + to: "index.bottom.padding"; + } + image { + normal: "00_fast_scroll_rollover_bg.png"; } - color: 255 255 255 255; } } - part { name: "elm.swallow.index.0"; - type: SWALLOW; + part { name: "left.line"; + type: RECT; clip_to: "clip"; scale: 1; description { state: "default" 0.0; - visible: 1; - align: 1.0 0.5; + align: 0.0 0.5; + min: INDEX_LEFT_LINE_WIDTH_INC 0; fixed: 1 1; rel1 { - relative: 1.0 0.5; + to: "bg"; + relative: 0.0 0.0; } rel2 { - relative: 1.0 0.5; + to: "bg"; + relative: 0.0 1.0; } - color: 255 255 255 50; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + color: INDEX_LEFT_LINE_COLOR_INC; } } - part { name: "button_image_padding"; - mouse_events: 0; - scale: 1; + part { name: "elm.swallow.index.0"; + type: SWALLOW; clip_to: "clip"; - type: RECT; + scale: 1; description { state: "default" 0.0; - align: 0.0 0.0; - min: 0 0; - max: 0 0; - fixed: 0 1; + visible: 1; + align: 1.0 0.5; + fixed: 1 1; rel1 { - relative: 0.5 0.5; - offset: 0 0; + to_y: "index.top.padding"; + relative: 1.0 1.0; } rel2 { - relative: 0.5 0.5; - offset: 0 0; + to_y: "index.bottom.padding"; + relative: 1.0 0.0; } + color: 255 255 255 255; } } part { name: "button_image"; scale: 1; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; align: 0.5 0.5; - min: INDEX_1ST_LEVEL_POPUP_WIDTH_INC INDEX_POPUP_HEIGHT_INC; fixed: 1 1; rel1 { - to: "elm.text"; - relative: 0.0 0.0; - offset: -10 0; + to_x: "left.padding"; + to_y: "top.padding"; } rel2 { - to: "elm.text"; - relative: 1.067 1.083; - offset: 10 0; + to_x: "right.padding"; + to_y: "bottom.padding"; } image { normal: "00_fast_scroll_popup_bg.png"; @@ -201,17 +194,85 @@ } image.middle: 1; } - description { state: "invisible" 0.0; - inherit: "default" 0.0; + } + part { name: "top.padding"; + type: RECT; + scale: 1; + clip_to: "clip2"; + description { + state: "default" 0.0; + align: 0.5 1.0; + min: 0 INDEX_POPUP_TOP_PADDING_SIZE_INC; + fixed: 1 1; + rel1 { + to: "elm.text"; + relative: 0.0 0.0; + } + rel2 { + to: "elm.text"; + relative: 1.0 0.0; + } visible: 0; } - description { state: "index1" 0.0; - inherit: "default" 0.0; - min: INDEX_2ND_LEVEL_POPUP_WIDTH_INC INDEX_POPUP_HEIGHT_INC; + } + part { name: "bottom.padding"; + type: RECT; + scale: 1; + clip_to: "clip2"; + description { + state: "default" 0.0; + align: 0.5 0.0; + min: 0 INDEX_POPUP_BOTTOM_PADDING_SIZE_INC; + fixed: 1 1; + rel1 { + to: "elm.text"; + relative: 0.0 1.0; + } + rel2 { + to: "elm.text"; + relative: 1.0 1.0; + } + visible: 0; } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; + } + part { name: "left.padding"; + type: RECT; + scale: 1; + clip_to: "clip2"; + description { + state: "default" 0.0; + align: 1.0 0.5; + min: INDEX_POPUP_LEFT_PADDING_SIZE_INC 0; + fixed: 1 1; + rel1 { + to: "elm.text"; + relative: 0.0 0.0; + } + rel2 { + to: "elm.text"; + relative: 0.0 1.0; + } + visible: 0; + } + } + part { name: "right.padding"; + type: RECT; + scale: 1; + clip_to: "clip2"; + description { + state: "default" 0.0; + align: 0.0 0.5; + min: INDEX_POPUP_RIGHT_PADDING_SIZE_INC 0; + fixed: 1 1; + rel1 { + to: "elm.text"; + relative: 1.0 0.0; + } + rel2 { + to: "elm.text"; + relative: 1.0 1.0; + } + visible: 0; } } part { @@ -219,23 +280,19 @@ type: "TEXT"; mouse_events: 0; scale: 1; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; align: 0.5 0.5; fixed: 1 1; - min: 40 20; - visible: 0; + min: INDEX_POPUP_TEXT_WIDTH_INC INDEX_POPUP_TEXT_HEIGHT_INC; rel1 { - to_y: "button_image_padding"; - relative: 0.5 1.0; + relative: 0.5 0.5; } rel2 { - to_y: "button_image_padding"; - relative: 0.5 1.0; + relative: 0.5 0.5; } color: INDEX_POPUP_TEXT_COLOR_INC; - color3: 0 0 0 64; text { font: "Tizen:style=Medium"; size: INDEX_POPUP_TEXT_SIZE_INC; @@ -243,10 +300,6 @@ text_class: "tizen"; } } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } } part { name: "elm.dragable.pointer"; type: RECT; @@ -272,19 +325,6 @@ color: 0 0 0 0; } } - part { name: "elm.swallow.event.0.bottom.padding"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 SOFTKEY_H; - fixed: 0 1; - align: 0.5 1.0; - rel1{ - relative: 1.0 1.0; offset: 0 0; - } - color: 0 0 0 0; - } - } part { name: "elm.swallow.event.0"; type: SWALLOW; scale: 1; @@ -296,28 +336,29 @@ offset: -1 0; } rel2 { - relative: 1.0 0.0; + relative: 1.0 1.0; offset: -1 -1; - to_y: "elm.swallow.event.0.bottom.padding"; } } } - part { name: "elm.swallow.event.1"; - type: SWALLOW; - scale: 1; + part { + name: "access"; + type: RECT; description { state: "default" 0.0; - align: 1.0 0.5; fixed: 1 1; rel1 { - to: "elm.swallow.index.1"; - relative: 0.0 0.0; - offset: -1 0; + to: "elm.swallow.index.0"; + offset: -3 0; } rel2 { - to: "elm.swallow.index.1"; - relative: 0.0 1.0; - offset: -1 -1; + to: "elm.swallow.index.0"; } + color: 0 0 0 0; + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; } } } @@ -327,7 +368,6 @@ source: ""; script { run_program(PROGRAM:"initial.index0.active"); - run_program(PROGRAM:"button.image.hidden"); timer(2.0, "index_hide_timer", 0); } } @@ -346,15 +386,11 @@ signal: "elm,state,active"; source: "elm"; action: STATE_SET "active" 0.0; - transition: DECELERATE 0.3; - target: "elm.swallow.index.0"; target: "clip"; after: "disable_timer"; } program { name: "initial.index0.active"; action: STATE_SET "active" 0.0; - transition: DECELERATE 0.3; - target: "elm.swallow.index.0"; target: "clip"; after: "enable_timer"; } @@ -363,48 +399,34 @@ source: "elm"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.3; - target: "elm.swallow.index.0"; target: "clip"; } - program { name: "index1.inactive"; - signal: "elm,state,level,0"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "elm.swallow.index.1"; - target: "clip2"; - } - program { name: "index1.active"; - signal: "elm,state,level,1"; - source: "elm"; - action: STATE_SET "active" 0.0; - transition: DECELERATE 0.3; - target: "elm.swallow.index.1"; - target: "clip2"; - } program { name: "index.active"; signal: "elm,indicator,state,active"; source: "elm"; action: STATE_SET "active" 0.0; - transition: DECELERATE 0.5; target: "clip2"; - target: "elm.swallow.index.0"; - target: "clip"; - target: "elm.text"; - target: "button_image"; } program { name: "index.inactive"; signal: "elm,indicator,state,inactive"; source: "elm"; action: STATE_SET "default" 0.0; - transition: DECELERATE 0.5; + transition: DECELERATE 0.3; target: "clip2"; } - program { name: "button.image.hidden"; - signal: "elm,state,button,image,hide"; + program { + name: "access.active"; + signal: "elm,access,state,active"; + source: "elm"; + action: STATE_SET "active" 0.0; + target: "access"; + } + program { + name: "access.inactive"; + signal: "elm,access,state,inactive"; source: "elm"; - action: STATE_SET "invisible" 0.0; - target: "button_image"; + action: STATE_SET "default" 0.0; + target: "access"; } program { name: "disable_timer"; script { @@ -425,21 +447,22 @@ data.item: "selectraise" "on"; images { image: "00_fast_scroll_rollover_bg_focus.png" COMP; + image: "00_fast_scroll_rollover_bg_line_focus.png" COMP; } parts { part { name: "scroll.bg"; - type: RECT; + type: IMAGE; mouse_events: 0; scale: 1; - description { - state: "default" 0.0; - visible: 1; + description { state: "default" 0.0; rel1.to: "elm.text"; rel2.to: "elm.text"; - color: INDEX_SCROLL_BG_COLOR_INC; + image { + normal: "00_fast_scroll_rollover_bg_focus.png"; + } + visible: 0; } - description { - state: "active" 0.0; + description { state: "active" 0.0; inherit: "default" 0.0; visible: 1; } @@ -450,40 +473,79 @@ scale: 1; description { state: "default" 0.0; - visible: 1; + align: 0.5 1.0; + min: 0 INDEX_BOTTOM_LINE_WIDTH_INC; + fixed: 1 1; rel1 { - relative: 0.0 1.0; offset: 0 -1; + relative: 0.0 1.0; + offset: 6 0; } rel2 { relative: 1.0 1.0; + offset: -3 0; } color: INDEX_BOTTOM_LINE_COLOR_INC; } + description { + state: "inactive" 0.0; + inherit: "default" 0.0; + visible: 0; + } } - part { name: "left.line"; + part { name: "focus.top"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - visible: 1; + align: 0.5 1.0; + min: 0 INDEX_LEFT_LINE_WIDTH_INC; + fixed: 1 1; + visible: 0; rel1 { relative: 0.0 0.0; } rel2 { - relative: 0.0 1.0; offset: 1 0; + relative: 1.0 0.0; } - color: INDEX_LEFT_LINE_COLOR_INC; } + } + part { name: "focus.bottom"; + type: RECT; + mouse_events: 0; + scale: 1; description { - state: "active" 0.0; + state: "default" 0.0; + align: 0.5 0.0; + min: 0 INDEX_LEFT_LINE_WIDTH_INC; + fixed: 1 1; + visible: 0; rel1 { - relative: 0.0 0.0; offset: 0 -INDEX_ITEM_HEIGHT_INC; + to: "bottom.line"; + relative: 0.0 0.0; } rel2 { - relative: 0.0 1.0; offset: 1 +INDEX_ITEM_HEIGHT_INC; + to: "bottom.line"; + relative: 1.0 0.0; + } + } + } + part { name: "right.padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + align: 1.0 0.5; + min: INDEX_ITEM_PADDING_SIZE_INC 0; + fixed: 1 1; + visible: 0; + rel1 { + relative: 1.0 0.0; + } + rel2 { + relative: 1.0 1.0; } - color: INDEX_SCROLL_BG_COLOR_INC; } } part { name: "item.bg"; @@ -494,13 +556,15 @@ state: "default" 0.0; visible: 0; rel1 { - relative: 0.0 0.0; offset: 0 -INDEX_ITEM_HEIGHT_INC; + to_y: "focus.top"; } rel2 { - relative: 1.0 1.0; offset: 0 +INDEX_ITEM_HEIGHT_INC; + to_x: "right.padding"; + to_y: "focus.bottom"; + relative: 0.0 1.0; } image { - normal: "00_fast_scroll_rollover_bg_focus.png"; + normal: "00_fast_scroll_rollover_bg_line_focus.png"; border: INDEX_BG_NINEPATCH_INC; border_scale: 1; } @@ -548,7 +612,6 @@ transition: DECELERATE 0.0; target: "elm.text"; target: "item.bg"; - target: "left.line"; target: "scroll.bg"; } program { name: "inactive"; @@ -558,9 +621,14 @@ transition: DECELERATE 0.0; target: "elm.text"; target: "item.bg"; - target: "left.line"; target: "scroll.bg"; } + program { + signal: "elm,last,item"; + source: "elm"; + action: STATE_SET "inactive" 0.0; + target: "bottom.line"; + } } } group { diff --git a/themes/widgets/label.edc b/themes/widgets/label.edc index 05a4ad8..7138fe5 100644 --- a/themes/widgets/label.edc +++ b/themes/widgets/label.edc @@ -36,6 +36,46 @@ tag: "b" "+ font=Tizen:style=Bold"; tag: "tab" "\t"; } + style { name: "naviframe_maintitle_style"; + base: "font=Tizen:style=Medium font_size="NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC" color="NAVIFRAME_TITLE_STYLE_COLOR_INC" text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font=Tizen:style=Bold"; + tag: "b" "+ font=Tizen:style=Bold"; + tag: "tab" "\t"; + } + style { name: "naviframe_subtitle_style"; + base: "font=Tizen:style=Medium font_size="NAVIFRAME_SUBTITLE_FONT_SIZE_INC" color="NAVIFRAME_TITLE_STYLE_COLOR_INC" text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font=Tizen:style=Bold"; + tag: "b" "+ font=Tizen:style=Bold"; + tag: "tab" "\t"; + } + style { name: "naviframe_landscape_title_style"; + base: "font=Tizen:style=Medium font_size="NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC" color="NAVIFRAME_TITLE_STYLE_COLOR_INC" text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font=Tizen:style=Bold"; + tag: "b" "+ font=Tizen:style=Bold"; + tag: "tab" "\t"; + } + style { name: "naviframe_landscape_maintitle_style"; + base: "font=Tizen:style=Medium font_size="NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC" color="NAVIFRAME_TITLE_STYLE_COLOR_INC" text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font=Tizen:style=Bold"; + tag: "b" "+ font=Tizen:style=Bold"; + tag: "tab" "\t"; + } + style { name: "naviframe_landscape_subtitle_style"; + base: "font=Tizen:style=Medium font_size="NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC" color="NAVIFRAME_TITLE_STYLE_COLOR_INC" text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font=Tizen:style=Bold"; + tag: "b" "+ font=Tizen:style=Bold"; + tag: "tab" "\t"; + } /* label doesn't use it */ style { name: "textblock_charwrap_style"; base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT_BLOCK_STYLE_COLOR_INC" text_class=tizen"; @@ -74,7 +114,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT parts { part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 1; scale: 1; multiline: 1; description { state: "default" 0.0; @@ -114,7 +153,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT parts { part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; multiline: 1; description { state: "default" 0.0; @@ -169,7 +207,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT parts { part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; description { state: "default" 0.0; text { @@ -187,7 +224,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT parts { part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; multiline: 1; description { state: "default" 0.0; @@ -203,15 +239,15 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT group { name: "elm/label/base/slide_long"; script { - public g_duration, g_stopslide, g_timer_id, g_anim_id; + public g_duration = 0, g_stopslide, g_timer_id, g_anim_id; public message(Msg_Type:type, id, ...) { - if ((type == MSG_FLOAT_SET) && (id == 0)) { + if (type == MSG_FLOAT_SET) { new Float:duration; duration = getfarg(2); set_float(g_duration, duration); } - } + } public slide_to_end_anim(val, Float:pos) { new stopflag; new id; @@ -266,7 +302,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; clip_to: "label.text.clip"; description { state: "default" 0.0; @@ -323,10 +358,10 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT group { name: "elm/label/base/slide_short"; script { - public g_duration, g_stopslide, g_timer_id, g_anim_id; + public g_duration = 0, g_stopslide, g_timer_id, g_anim_id; public message(Msg_Type:type, id, ...) { - if ((type == MSG_FLOAT_SET) && (id == 0)) { + if (type == MSG_FLOAT_SET) { new Float:duration; duration = getfarg(2); set_float(g_duration, duration); @@ -386,7 +421,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; clip_to: "label.text.clip"; description { state: "default" 0.0; @@ -443,10 +477,10 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT group { name: "elm/label/base/slide_bounce"; script { - public g_duration, g_stopslide, g_timer_id, g_anim_id; + public g_duration = 0, g_stopslide, g_timer_id, g_anim_id; public message(Msg_Type:type, id, ...) { - if ((type == MSG_FLOAT_SET) && (id == 0)) { + if (type == MSG_FLOAT_SET) { new Float:duration; duration = getfarg(2); set_float(g_duration, duration); @@ -518,7 +552,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; clip_to: "label.text.clip"; description { state: "default" 0.0; @@ -575,7 +608,7 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT group { name: "elm/label/base/naviframe_title"; script { - public g_duration, g_stopslide, g_timer_id, g_anim_id; + public g_duration = 0, g_stopslide, g_timer_id, g_anim_id, g_landscape = 0; public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT_SET) && (id == 0)) { @@ -632,7 +665,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT set_state(PART:"elm.text", "default", 0.0); } } - parts { part { name: "label.text.clip"; type: RECT; @@ -641,7 +673,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } part { name: "elm.text"; type: TEXTBLOCK; - mouse_events: 0; scale: 1; clip_to: "label.text.clip"; description { state: "default" 0.0; @@ -650,6 +681,9 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT align: 0.0 0.0; text { style: "naviframe_title_style"; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; min: 0 1; } } @@ -660,6 +694,9 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT align: 1.0 0.0; text { style: "naviframe_title_style"; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; min: 1 1; } } @@ -670,6 +707,38 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT align: 0.0 0.0; text { style: "naviframe_title_style"; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; + min: 1 1; + } + } + description { state: "default_landscape" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_landscape_title_style"; + min: 0 1; + } + } + description { state: "slide_end_landscape" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + align: 1.0 0.0; + text { + style: "naviframe_landscape_title_style"; + min: 1 1; + } + } + description { state: "slide_begin_landscape" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_landscape_title_style"; min: 1 1; } } @@ -690,13 +759,418 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT stop_slide(); } } + program { name: "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + script { + set_int(g_landscape, 1); + } + } + program { name: "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + script { + set_int(g_landscape, 1); + } + } + program { name: "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + script { + set_int(g_landscape, 0); + } + } + program { name: "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + script { + set_int(g_landscape, 0); + } + } } } + group { name: "elm/label/base/naviframe_maintitle"; + script { + public g_duration = 0, g_stopslide, g_timer_id, g_anim_id, g_landscape = 0; + public message(Msg_Type:type, id, ...) { + if ((type == MSG_FLOAT_SET) && (id == 0)) { + new Float:duration; + duration = getfarg(2); + set_float(g_duration, duration); + } + } + public slide_end_pending(val, Float:pos) { + if (pos >= 1.0) { + stop_slide(); + emit("elm,state,slide,end", ""); + } + } + public slide_to_end_anim(val, Float:pos) { + new stopflag; + stopflag = get_int(g_stopslide); + if (stopflag == 1) return; + if (!get_int(g_landscape)) + set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0); + else + set_tween_state(PART:"elm.text", pos, "slide_begin_landscape", 0.0, "slide_end_landscape", 0.0); + if (pos >= 1.0) + anim(1, "slide_end_pending", 1); + } + public slide_to_end() { + new stopflag; + new id; + new Float:duration; + stopflag = get_int(g_stopslide); + if (stopflag == 1) return; + duration = get_float(g_duration); + id = anim(duration, "slide_to_end_anim", 1); + set_int(g_anim_id, id); + } + public slide_to_begin() { + new stopflag; + new id; + stopflag = get_int(g_stopslide); + if (stopflag == 1) return; + if (!get_int(g_landscape)) + set_state(PART:"elm.text", "slide_begin", 0.0); + else + set_state(PART:"elm.text", "slide_begin_landscape", 0.0); + id = timer(0.5, "slide_to_end", 1); + set_int(g_timer_id, id); + } + public start_slide() { + set_int(g_stopslide, 0); + if (!get_int(g_landscape)) + set_state(PART:"elm.text", "slide_begin", 0.0); + else + set_state(PART:"elm.text", "slide_begin_landscape", 0.0); + slide_to_end(); + } + public stop_slide() { + new id; + set_int(g_stopslide, 1); + id = get_int(g_anim_id); + cancel_anim(id); + id = get_int(g_timer_id); + cancel_timer(id); + if (!get_int(g_landscape)) + set_state(PART:"elm.text", "default", 0.0); + else + set_state(PART:"elm.text", "default_landscape", 0.0); + } + } + parts { + part { name: "label.text.clip"; + type: RECT; + description { state: "default" 0.0; + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + scale: 1; + clip_to: "label.text.clip"; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_maintitle_style"; + min: 0 1; + } + } + description { state: "slide_end" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + align: 1.0 0.0; + text { + style: "naviframe_maintitle_style"; + min: 1 1; + } + } + description { state: "slide_begin" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_maintitle_style"; + min: 1 1; + } + } + description { state: "default_landscape" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_landscape_maintitle_style"; + min: 0 1; + } + } + description { state: "slide_end_landscape" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + align: 1.0 0.0; + text { + style: "naviframe_landscape_maintitle_style"; + min: 1 1; + } + } + description { state: "slide_begin_landscape" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_landscape_maintitle_style"; + min: 1 1; + } + } + } + } + programs { + program { name: "start_slide"; + source: "elm"; + signal: "elm,state,slide,start"; + script { + start_slide(); + } + } + program { name: "stop_slide"; + source: "elm"; + signal: "elm,state,slide,stop"; + script { + stop_slide(); + } + } + program { name: "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + script { + set_int(g_landscape, 1); + } + } + program { name: "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + script { + set_int(g_landscape, 1); + } + } + program { name: "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + script { + set_int(g_landscape, 0); + } + } + program { name: "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + script { + set_int(g_landscape, 0); + } + } + } + } + group { name: "elm/label/base/naviframe_subtitle"; + script { + public g_duration = 0, g_stopslide, g_timer_id, g_anim_id, g_landscape = 0; + public message(Msg_Type:type, id, ...) { + if ((type == MSG_FLOAT_SET) && (id == 0)) { + new Float:duration; + duration = getfarg(2); + set_float(g_duration, duration); + } + } + public slide_end_pending(val, Float:pos) { + if (pos >= 1.0) { + stop_slide(); + emit("elm,state,slide,end", ""); + } + } + public slide_to_end_anim(val, Float:pos) { + new stopflag; + stopflag = get_int(g_stopslide); + if (stopflag == 1) return; + if (!get_int(g_landscape)) + set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0); + else + set_tween_state(PART:"elm.text", pos, "slide_begin_landscape", 0.0, "slide_end_landscape", 0.0); + if (pos >= 1.0) + anim(1, "slide_end_pending", 1); + } + public slide_to_end() { + new stopflag; + new id; + new Float:duration; + stopflag = get_int(g_stopslide); + if (stopflag == 1) return; + duration = get_float(g_duration); + id = anim(duration, "slide_to_end_anim", 1); + set_int(g_anim_id, id); + } + public slide_to_begin() { + new stopflag; + new id; + stopflag = get_int(g_stopslide); + if (stopflag == 1) return; + if (!get_int(g_landscape)) + set_state(PART:"elm.text", "slide_begin", 0.0); + else + set_state(PART:"elm.text", "slide_begin_landscape", 0.0); + id = timer(0.5, "slide_to_end", 1); + set_int(g_timer_id, id); + } + public start_slide() { + set_int(g_stopslide, 0); + if (!get_int(g_landscape)) + set_state(PART:"elm.text", "slide_begin", 0.0); + else + set_state(PART:"elm.text", "slide_begin_landscape", 0.0); + slide_to_end(); + } + public stop_slide() { + new id; + set_int(g_stopslide, 1); + id = get_int(g_anim_id); + cancel_anim(id); + id = get_int(g_timer_id); + cancel_timer(id); + if (!get_int(g_landscape)) + set_state(PART:"elm.text", "default", 0.0); + else + set_state(PART:"elm.text", "default_landscape", 0.0); + } + } + parts { + part { name: "label.text.clip"; + type: RECT; + description { state: "default" 0.0; + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + scale: 1; + clip_to: "label.text.clip"; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_subtitle_style"; + min: 0 1; + } + } + description { state: "slide_end" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + align: 1.0 0.0; + text { + style: "naviframe_subtitle_style"; + min: 1 1; + } + } + description { state: "slide_begin" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_subtitle_style"; + min: 1 1; + } + } + description { state: "default_landscape" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_landscape_subtitle_style"; + min: 0 1; + } + } + description { state: "slide_end_landscape" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + align: 1.0 0.0; + text { + style: "naviframe_landscape_subtitle_style"; + min: 1 1; + } + } + description { state: "slide_begin_landscape" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + align: 0.0 0.0; + text { + style: "naviframe_landscape_subtitle_style"; + min: 1 1; + } + } + } + } + programs { + program { name: "start_slide"; + source: "elm"; + signal: "elm,state,slide,start"; + script { + start_slide(); + } + } + program { name: "stop_slide"; + source: "elm"; + signal: "elm,state,slide,stop"; + script { + stop_slide(); + } + } + program { name: "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + script { + set_int(g_landscape, 1); + } + } + program { name: "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + script { + set_int(g_landscape, 1); + } + } + program { name: "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + script { + set_int(g_landscape, 0); + } + } + program { name: "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + script { + set_int(g_landscape, 0); + } + } + } + } group { name: "elm/label/base/datetime"; inherit: "elm/label/base/default"; parts { + part { name: "bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } part { name: "elm.text"; type: TEXT; scale: 1; diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc index a1152d0..e315287 100644 --- a/themes/widgets/layout.edc +++ b/themes/widgets/layout.edc @@ -489,7 +489,6 @@ group { name: "elm/layout/editfield/default"; images { image: "00_EditField_clear.png" COMP; - image: "00_EditField_clear_press.png" COMP; } parts { part { @@ -627,6 +626,7 @@ group { name: "elm/layout/editfield/default"; part { name: "eraser_image"; scale: 1; + clip_to: "eraser_image.clipper"; description { state: "default" 0.0; visible: 0; @@ -641,26 +641,24 @@ group { name: "elm/layout/editfield/default"; relative: 0.0 0.5; to_x : "right2"; } + image.normal: "00_EditField_clear.png"; } description { state: "elm.eraser.show" 0.0; inherit: "default" 0.0; visible: 1; - image { - normal: "00_EditField_clear.png"; - border: 10 10 10 10; - border_scale: 1; - } } - description { - state: "elm.eraser.pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image { - normal: "00_EditField_clear_press.png"; - border: 8 8 8 8; - border_scale: 1; - } + } + part { name: "eraser_image.clipper"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "elm.eraser.show" 0.0; + color: EDITFIELD_ERASER_DEFAULT_COLOR_INC; + } + description { state: "elm.eraser.pressed" 0.0; + color: EDITFIELD_ERASER_PRESSED_COLOR_INC; } } part { @@ -712,6 +710,7 @@ group { name: "elm/layout/editfield/default"; source: "elm"; action: STATE_SET "elm.eraser.show" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -720,6 +719,7 @@ group { name: "elm/layout/editfield/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -733,14 +733,14 @@ group { name: "elm/layout/editfield/default"; signal: "mouse,down,1"; source: "eraser"; action: STATE_SET "elm.eraser.pressed" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } program { name: "eraser_unpressed"; signal: "mouse,up,1"; source: "eraser"; action: STATE_SET "elm.eraser.show" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } } } @@ -748,7 +748,6 @@ group { name: "elm/layout/editfield/default"; group { name: "elm/layout/editfield/title"; images { image: "00_EditField_clear.png" COMP; - image: "00_EditField_clear_press.png" COMP; } parts { part { @@ -974,6 +973,7 @@ group { name: "elm/layout/editfield/title"; part { name: "eraser_image"; scale: 1; + clip_to: "eraser_image.clipper"; description { state: "default" 0.0; visible: 0; @@ -990,26 +990,24 @@ group { name: "elm/layout/editfield/title"; to_x : "right2"; to_y : "eraser_base"; } + image.normal: "00_EditField_clear.png"; } description { state: "elm.eraser.show" 0.0; inherit: "default" 0.0; visible: 1; - image { - normal: "00_EditField_clear.png"; - border: 10 10 10 10; - border_scale: 1; - } } - description { - state: "elm.eraser.pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image { - normal: "00_EditField_clear_press.png"; - border: 8 8 8 8; - border_scale: 1; - } + } + part { name: "eraser_image.clipper"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "elm.eraser.show" 0.0; + color: EDITFIELD_ERASER_DEFAULT_COLOR_INC; + } + description { state: "elm.eraser.pressed" 0.0; + color: EDITFIELD_ERASER_PRESSED_COLOR_INC; } } part { @@ -1063,6 +1061,7 @@ group { name: "elm/layout/editfield/title"; source: "elm"; action: STATE_SET "elm.eraser.show" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -1071,6 +1070,7 @@ group { name: "elm/layout/editfield/title"; source: "elm"; action: STATE_SET "default" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -1084,14 +1084,14 @@ group { name: "elm/layout/editfield/title"; signal: "mouse,down,1"; source: "eraser"; action: STATE_SET "elm.eraser.pressed" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } program { name: "eraser_unpressed"; signal: "mouse,up,1"; source: "eraser"; action: STATE_SET "elm.eraser.show" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } } } @@ -1099,7 +1099,6 @@ group { name: "elm/layout/editfield/title"; group { name: "elm/layout/searchbar/default"; images { image: "00_EditField_clear.png" COMP; - image: "00_EditField_clear_press.png" COMP; image: "00_search_edit_field_bg.png" COMP; image: "00_search_icon.png" COMP; } @@ -1173,6 +1172,7 @@ group { name: "elm/layout/searchbar/default"; type: IMAGE; scale: 1; ignore_flags: ON_HOLD; + clip_to: "image.clipper"; description { state: "default" 0.0; min: SEARCHBAR_ICON_MIN_W_INC SEARCHBAR_ICON_MIN_H_INC; fixed: 1 1; @@ -1190,6 +1190,12 @@ group { name: "elm/layout/searchbar/default"; image.normal: "00_search_icon.png"; } } + part { name: "image.clipper"; + type: RECT; + description { state: "default" 0.0; + color: SEARCHBAR_ICON_COLOR_INC; + } + } part { name: "left_padding_search_textfield"; type: RECT; scale: 1; @@ -1495,6 +1501,7 @@ group { name: "elm/layout/searchbar/default"; } part { name: "eraser_image"; scale: 1; + clip_to: "eraser_image.clipper"; description { state: "default" 0.0; visible: 0; min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC; @@ -1508,25 +1515,23 @@ group { name: "elm/layout/searchbar/default"; relative: 0.0 0.5; to_x : "right2"; } + image.normal: "00_EditField_clear.png"; } description { state: "elm.eraser.show" 0.0; inherit: "default" 0.0; visible: 1; - image { - normal: "00_EditField_clear.png"; - border: 10 10 10 10; - border_scale: 1; - } } - description { - state: "elm.eraser.pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image { - normal: "00_EditField_clear_press.png"; - border: 8 8 8 8; - border_scale: 1; - } + } + part { name: "eraser_image.clipper"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "elm.eraser.show" 0.0; + color: EDITFIELD_ERASER_DEFAULT_COLOR_INC; + } + description { state: "elm.eraser.pressed" 0.0; + color: EDITFIELD_ERASER_PRESSED_COLOR_INC; } } part { name: "eraser"; @@ -1575,6 +1580,7 @@ group { name: "elm/layout/searchbar/default"; source: "elm"; action: STATE_SET "elm.eraser.show" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -1583,6 +1589,7 @@ group { name: "elm/layout/searchbar/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -1629,14 +1636,14 @@ group { name: "elm/layout/searchbar/default"; signal: "mouse,down,1"; source: "eraser"; action: STATE_SET "elm.eraser.pressed" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } program { name: "eraser_unpressed"; signal: "mouse,up,1"; source: "eraser"; action: STATE_SET "elm.eraser.show" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } } } @@ -1644,8 +1651,8 @@ group { name: "elm/layout/searchbar/default"; group { name: "elm/layout/searchbar/cancel_button"; images { image: "00_EditField_clear.png" COMP; - image: "00_EditField_clear_press.png" COMP; image: "00_search_edit_field_bg.png" COMP; + image: "00_search_edit_field_bg_focus.png" COMP; image: "00_search_icon.png" COMP; } parts { @@ -1736,6 +1743,25 @@ group { name: "elm/layout/searchbar/cancel_button"; } } } + part { + name: "focus_image"; + mouse_events:1; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + image.normal: "00_search_edit_field_bg_focus.png"; + image.border: SEARCHBAR_INPUTFIELD_BORDER_INC; + image.border_scale: 1; + rel1.to: "inputfield_rect"; + rel2.to: "inputfield_rect"; + } + description { + state: "in" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "right_btn_padding_rect"; type: RECT; scale: 1; @@ -1773,6 +1799,7 @@ group { name: "elm/layout/searchbar/cancel_button"; type: IMAGE; scale: 1; ignore_flags: ON_HOLD; + clip_to: "image.clipper"; description { state: "default" 0.0; min: SEARCHBAR_ICON_MIN_W_INC SEARCHBAR_ICON_MIN_H_INC; fixed: 1 1; @@ -1790,6 +1817,12 @@ group { name: "elm/layout/searchbar/cancel_button"; image.normal: "00_search_icon.png"; } } + part { name: "image.clipper"; + type: RECT; + description { state: "default" 0.0; + color: SEARCHBAR_ICON_COLOR_INC; + } + } part { name: "left_padding_search_textfield"; type: RECT; scale: 1; @@ -2119,6 +2152,7 @@ group { name: "elm/layout/searchbar/cancel_button"; } part { name: "eraser_image"; scale: 1; + clip_to: "eraser_image.clipper"; description { state: "default" 0.0; visible: 0; min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC; @@ -2132,25 +2166,23 @@ group { name: "elm/layout/searchbar/cancel_button"; relative: 0.0 0.5; to_x : "right2"; } + image.normal: "00_EditField_clear.png"; } description { state: "elm.eraser.show" 0.0; inherit: "default" 0.0; visible: 1; - image { - normal: "00_EditField_clear.png"; - border: 10 10 10 10; - border_scale: 1; - } } - description { - state: "elm.eraser.pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image { - normal: "00_EditField_clear_press.png"; - border: 8 8 8 8; - border_scale: 1; - } + } + part { name: "eraser_image.clipper"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "elm.eraser.show" 0.0; + color: EDITFIELD_ERASER_DEFAULT_COLOR_INC; + } + description { state: "elm.eraser.pressed" 0.0; + color: EDITFIELD_ERASER_PRESSED_COLOR_INC; } } part { name: "eraser"; @@ -2199,6 +2231,7 @@ group { name: "elm/layout/searchbar/cancel_button"; source: "elm"; action: STATE_SET "elm.eraser.show" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -2207,6 +2240,7 @@ group { name: "elm/layout/searchbar/cancel_button"; source: "elm"; action: STATE_SET "default" 0.0; target: "eraser_image"; + target: "eraser_image.clipper"; target: "eraser"; } program { @@ -2249,6 +2283,7 @@ group { name: "elm/layout/searchbar/cancel_button"; action: STATE_SET "in" 0.0; target: "right_padding_rect"; target: "right_btn_padding_rect"; + target: "focus_image"; transition: LINEAR 0.3; } program { name: "cancel_out"; @@ -2257,12 +2292,14 @@ group { name: "elm/layout/searchbar/cancel_button"; action: STATE_SET "default" 0.0; target: "right_padding_rect"; target: "right_btn_padding_rect"; + target: "focus_image"; transition: LINEAR 0.3; } program { name: "cancel_show"; signal: "cancel,show"; source: ""; action: STATE_SET "in" 0.0; + target: "focus_image"; target: "right_padding_rect"; target: "right_btn_padding_rect"; } @@ -2270,6 +2307,7 @@ group { name: "elm/layout/searchbar/cancel_button"; signal: "cancel,hide"; source: ""; action: STATE_SET "default" 0.0; + target: "focus_image"; target: "right_padding_rect"; target: "right_btn_padding_rect"; } @@ -2283,14 +2321,14 @@ group { name: "elm/layout/searchbar/cancel_button"; signal: "mouse,down,1"; source: "eraser"; action: STATE_SET "elm.eraser.pressed" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } program { name: "eraser_unpressed"; signal: "mouse,up,1"; source: "eraser"; action: STATE_SET "elm.eraser.show" 0.0; - target: "eraser_image"; + target: "eraser_image.clipper"; } } } @@ -2317,18 +2355,14 @@ group { scale: 1; description { state: "default" 0.0; color: NOCONTENT_BG_COLOR_INC; - } - } - part { name: "image_bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - rel1.to: "nocontents.image"; - rel2.to: "nocontents.image"; - color: NOCONTENT_IMAGE_BG_COLOR_INC; + rel2 { + relative: 1.0 1.0; + to_y: "pad_b"; + } } } part { name: "nocontents.image"; + scale: 1; description { state: "default" 0.0; fixed: 1 1; min: NOCONTENT_IMAGE_WIDTH_HEIGHT_INC; @@ -2343,6 +2377,7 @@ group { image { normal: "00_Nocontents_picture.png"; } + color: NOCONTENT_IMAGE_COLOR_INC; aspect: 1.0 1.0; aspect_preference: BOTH; } @@ -2370,26 +2405,38 @@ group { scale: 1; description { state: "default" 0.0; min: NOCONTENT_TEXT_STYLE_BG_MIN_INC; - fixed: 0 1; + max: 9999 NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC; + fixed: 1 1; rel1 { - relative: 0.0 1.0; + relative: 0.14 1.0; to_x: "bg"; to_y: "middle.padding"; } rel2 { - relative: 1.0 1.0; + relative: 0.86 1.0; to_x: "bg"; to_y: "middle.padding"; } color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC; text { style: "nocontent_style"; - align: 0.5 0.5; - min: 0 0; + min: 0 1; max: 0 1; } } } + part { name: "pad_b"; + scale : 1; + mouse_events: 0; + type: RECT; + description { state: "default" 0.0; + align: 0.0 1.0; + min: 0 0; + visible: 0; + fixed: 0 1; + rel1.relative: 0.0 1.0; + } + } } } diff --git a/themes/widgets/map.edc b/themes/widgets/map.edc index 5b3954d..d0bdeac 100644 --- a/themes/widgets/map.edc +++ b/themes/widgets/map.edc @@ -20,36 +20,36 @@ /////////////////////////////////////////////////////////////////////////////// group { name: "elm/map/base/default"; images { - image: "00_winset_list_process_01.png" COMP; - image: "00_winset_list_process_02.png" COMP; - image: "00_winset_list_process_03.png" COMP; - image: "00_winset_list_process_04.png" COMP; - image: "00_winset_list_process_05.png" COMP; - image: "00_winset_list_process_06.png" COMP; - image: "00_winset_list_process_07.png" COMP; - image: "00_winset_list_process_08.png" COMP; - image: "00_winset_list_process_09.png" COMP; - image: "00_winset_list_process_10.png" COMP; - image: "00_winset_list_process_11.png" COMP; - image: "00_winset_list_process_12.png" COMP; - image: "00_winset_list_process_13.png" COMP; - image: "00_winset_list_process_14.png" COMP; - image: "00_winset_list_process_15.png" COMP; - image: "00_winset_list_process_16.png" COMP; - image: "00_winset_list_process_17.png" COMP; - image: "00_winset_list_process_18.png" COMP; - image: "00_winset_list_process_19.png" COMP; - image: "00_winset_list_process_20.png" COMP; - image: "00_winset_list_process_21.png" COMP; - image: "00_winset_list_process_22.png" COMP; - image: "00_winset_list_process_23.png" COMP; - image: "00_winset_list_process_24.png" COMP; - image: "00_winset_list_process_25.png" COMP; - image: "00_winset_list_process_26.png" COMP; - image: "00_winset_list_process_27.png" COMP; - image: "00_winset_list_process_28.png" COMP; - image: "00_winset_list_process_29.png" COMP; - image: "00_winset_list_process_30.png" COMP; + image: "process/63x63/00_list_process_01.png" COMP; + image: "process/63x63/00_list_process_02.png" COMP; + image: "process/63x63/00_list_process_03.png" COMP; + image: "process/63x63/00_list_process_04.png" COMP; + image: "process/63x63/00_list_process_05.png" COMP; + image: "process/63x63/00_list_process_06.png" COMP; + image: "process/63x63/00_list_process_07.png" COMP; + image: "process/63x63/00_list_process_08.png" COMP; + image: "process/63x63/00_list_process_09.png" COMP; + image: "process/63x63/00_list_process_10.png" COMP; + image: "process/63x63/00_list_process_11.png" COMP; + image: "process/63x63/00_list_process_12.png" COMP; + image: "process/63x63/00_list_process_13.png" COMP; + image: "process/63x63/00_list_process_14.png" COMP; + image: "process/63x63/00_list_process_15.png" COMP; + image: "process/63x63/00_list_process_16.png" COMP; + image: "process/63x63/00_list_process_17.png" COMP; + image: "process/63x63/00_list_process_18.png" COMP; + image: "process/63x63/00_list_process_19.png" COMP; + image: "process/63x63/00_list_process_20.png" COMP; + image: "process/63x63/00_list_process_21.png" COMP; + image: "process/63x63/00_list_process_22.png" COMP; + image: "process/63x63/00_list_process_23.png" COMP; + image: "process/63x63/00_list_process_24.png" COMP; + image: "process/63x63/00_list_process_25.png" COMP; + image: "process/63x63/00_list_process_26.png" COMP; + image: "process/63x63/00_list_process_27.png" COMP; + image: "process/63x63/00_list_process_28.png" COMP; + image: "process/63x63/00_list_process_29.png" COMP; + image: "process/63x63/00_list_process_30.png" COMP; } parts { part { name: "bg"; @@ -109,36 +109,36 @@ group { name: "elm/map/base/default"; offset: -9 -9; } image { - normal: "00_winset_list_process_30.png"; - tween: "00_winset_list_process_01.png"; - tween: "00_winset_list_process_02.png"; - tween: "00_winset_list_process_03.png"; - tween: "00_winset_list_process_04.png"; - tween: "00_winset_list_process_05.png"; - tween: "00_winset_list_process_06.png"; - tween: "00_winset_list_process_07.png"; - tween: "00_winset_list_process_08.png"; - tween: "00_winset_list_process_09.png"; - tween: "00_winset_list_process_10.png"; - tween: "00_winset_list_process_11.png"; - tween: "00_winset_list_process_12.png"; - tween: "00_winset_list_process_13.png"; - tween: "00_winset_list_process_14.png"; - tween: "00_winset_list_process_15.png"; - tween: "00_winset_list_process_16.png"; - tween: "00_winset_list_process_17.png"; - tween: "00_winset_list_process_18.png"; - tween: "00_winset_list_process_19.png"; - tween: "00_winset_list_process_20.png"; - tween: "00_winset_list_process_21.png"; - tween: "00_winset_list_process_22.png"; - tween: "00_winset_list_process_23.png"; - tween: "00_winset_list_process_24.png"; - tween: "00_winset_list_process_25.png"; - tween: "00_winset_list_process_26.png"; - tween: "00_winset_list_process_27.png"; - tween: "00_winset_list_process_28.png"; - tween: "00_winset_list_process_29.png"; + normal: "process/63x63/00_list_process_30.png"; + tween: "process/63x63/00_list_process_01.png"; + tween: "process/63x63/00_list_process_02.png"; + tween: "process/63x63/00_list_process_03.png"; + tween: "process/63x63/00_list_process_04.png"; + tween: "process/63x63/00_list_process_05.png"; + tween: "process/63x63/00_list_process_06.png"; + tween: "process/63x63/00_list_process_07.png"; + tween: "process/63x63/00_list_process_08.png"; + tween: "process/63x63/00_list_process_09.png"; + tween: "process/63x63/00_list_process_10.png"; + tween: "process/63x63/00_list_process_11.png"; + tween: "process/63x63/00_list_process_12.png"; + tween: "process/63x63/00_list_process_13.png"; + tween: "process/63x63/00_list_process_14.png"; + tween: "process/63x63/00_list_process_15.png"; + tween: "process/63x63/00_list_process_16.png"; + tween: "process/63x63/00_list_process_17.png"; + tween: "process/63x63/00_list_process_18.png"; + tween: "process/63x63/00_list_process_19.png"; + tween: "process/63x63/00_list_process_20.png"; + tween: "process/63x63/00_list_process_21.png"; + tween: "process/63x63/00_list_process_22.png"; + tween: "process/63x63/00_list_process_23.png"; + tween: "process/63x63/00_list_process_24.png"; + tween: "process/63x63/00_list_process_25.png"; + tween: "process/63x63/00_list_process_26.png"; + tween: "process/63x63/00_list_process_27.png"; + tween: "process/63x63/00_list_process_28.png"; + tween: "process/63x63/00_list_process_29.png"; } } } @@ -301,8 +301,10 @@ group { name: "elm/map/marker/empty/default"; } } part { name: "base"; + type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "elm.icon"; diff --git a/themes/widgets/multibuttonentry.edc b/themes/widgets/multibuttonentry.edc index af3fff5..9bb4ff8 100644 --- a/themes/widgets/multibuttonentry.edc +++ b/themes/widgets/multibuttonentry.edc @@ -22,6 +22,7 @@ group { data.item: "horizontal_pad" MULTIBUTTONENTRY_BOX_HORIZONTAL_PAD_INC; data.item: "vertical_pad" MULTIBUTTONENTRY_BOX_VERTICAL_PAD_INC; + data.item: "closed_button_type" "label"; /* image, label, default: label */ parts { part { @@ -53,7 +54,7 @@ group { } } part { - name: "elm.swallow.box"; + name: "box.swallow"; type: SWALLOW; description { state: "default" 0.0; @@ -98,14 +99,14 @@ group { program { name: "event_allow"; signal: "elm,state,event,allow"; - source: "elm"; + source: ""; action: STATE_SET "invisible" 0.0; target: "block_events"; } program { name: "event_block"; signal: "elm,state,event,block"; - source: "elm"; + source: ""; action: STATE_SET "default" 0.0; target: "block_events"; } @@ -113,59 +114,7 @@ group { } group { - name: "elm/multibuttonentry/label/default"; - - styles { - style { - name: "multibuttonentry_label_style"; - base: "font=SLP:style=Regular font_size="MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC" wrap=char text_class=slp"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "hilight" "+ font=SLP:style=Bold"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "tab" "\t"; - } - } - - parts { - part { - name: "right.pad"; - type: RECT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: MULTIBUTTONENTRY_LABEL_PAD_INC 0; - fixed: 1 0; - rel1.relative: 1.0 0.0; - align: 1.0 0.5; - color: 0 0 0 0; - } - } - part { - name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - multiline: 0; - scale: 1; - description { - state: "default" 0.0; - min: 0 MULTIBUTTONENTRY_LABEL_HEIGHT_INC; - text { - style: "multibuttonentry_label_style"; - min: 1 0; - } - rel2 { - relative: 0.0 1.0; - to: "right.pad"; - } - } - } - } -} - -group { - name: "elm/multibuttonentry/guide/default"; + name: "elm/multibuttonentry/guidetext/default"; styles { style { @@ -184,33 +133,29 @@ group { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; - multiline: 0; scale: 1; description { state: "default" 0.0; min: 0 MULTIBUTTONENTRY_GUIDE_HEIGHT_INC; - text { - style: "multibuttonentry_guide_style"; - min: 1 0; - } + text.style: "multibuttonentry_guide_style"; } } } } group { - name: "elm/multibuttonentry/button/default"; + name: "elm/multibuttonentry/btn/default"; images { image: "00_contacts_button.png" COMP; image: "00_contacts_button_press.png" COMP; } - data.item: "max_size" MULTIBUTTONENTRY_BUTTON_MAX_INC; + data.item: "button_max_size" MULTIBUTTONENTRY_BUTTON_MAX_INC; parts { part { - name: "bg"; + name: "elm.btn.bg"; type: IMAGE; mouse_events: 0; scale: 1; @@ -230,7 +175,7 @@ group { } } part { - name: "left.pad"; + name: "left.padding"; type: RECT; mouse_events: 0; scale: 1; @@ -244,7 +189,7 @@ group { } } part { - name: "right.pad"; + name: "right.padding"; type: RECT; mouse_events: 0; scale: 1; @@ -258,7 +203,7 @@ group { } } part { - name: "elm.text"; + name: "elm.btn.text"; type: TEXT; mouse_events: 0; scale: 1; @@ -273,11 +218,11 @@ group { } rel1 { relative: 1.0 0.0; - to: "left.pad"; + to: "left.padding"; } rel2 { relative: 0.0 1.0; - to: "right.pad"; + to: "right.padding"; } } description { @@ -300,24 +245,24 @@ group { program { name: "text_ellipsis"; signal: "elm,state,text,ellipsis"; - source: "elm"; + source: ""; action: STATE_SET "ellipsis" 0.0; - target: "elm.text"; + target: "elm.btn.text"; } program { name: "focused"; - signal: "elm,state,bg,focus"; - source: "elm"; + signal: "focused"; + source: ""; action: STATE_SET "focused" 0.0; - target: "bg"; + target: "elm.btn.bg"; after: "selected"; } program { name: "unfocused"; - signal: "elm,state,bg,unfocus"; - source: "elm"; + signal: "default"; + source: ""; action: STATE_SET "default" 0.0; - target: "bg"; + target: "elm.btn.bg"; } program { name: "clicked"; @@ -373,3 +318,85 @@ group { } } } + +group { + name: "elm/multibuttonentry/closedbutton/default"; + + images { + image: "00_circle_button.png" COMP; + image: "00_button_expand_closed.png" COMP; + } + + parts { + part { + name: "closed_button_bg"; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC; + image.normal: "00_circle_button.png"; + } + } + part { + name: "closed_button"; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + image.normal: "00_button_expand_closed.png"; + } + } + } +} + +group { + name: "elm/multibuttonentry/label/default"; + + styles { + style { + name: "multibuttonentry_label_style"; + base: "font=SLP:style=Regular font_size="MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC" wrap=char text_class=slp"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font=SLP:style=Bold"; + tag: "b" "+ font=SLP:style=Bold"; + tag: "tab" "\t"; + } + } + + parts { + part { + name: "mbe.label.right.padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: MULTIBUTTONENTRY_LABEL_PAD_INC 0; + fixed: 1 0; + rel1.relative: 1.0 0.0; + align: 1.0 0.5; + color: 0 0 0 0; + } + } + part { + name: "mbe.label"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: 0 MULTIBUTTONENTRY_LABEL_HEIGHT_INC; + text { + style: "multibuttonentry_label_style"; + min: 1 0; + } + rel2 { + relative: 0.0 1.0; + to: "mbe.label.right.padding"; + } + } + } + } +} diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc index f879e5a..004f779 100644 --- a/themes/widgets/naviframe.edc +++ b/themes/widgets/naviframe.edc @@ -19,27 +19,17 @@ #define NAVIFRAME_VIEW_TRANS_TIME 0.3 - group { name:"elm/naviframe/base/default"; - parts { - part { name: "base"; - description { state: "default" 0.0; - } - } - } - } - - group { name:"elm/naviframe/item/basic/default"; + group { name: "elm/naviframe/item/basic/default"; images { image: "00_badge_bg.png" COMP; } script { public tbar_bg = 0; //Toolbar BG Show call count public toolbar_buttons_visible = 0; //when both toolbar buttons are visible - public title_toolbar_buttons_visible = 0; //when both title toolbar buttons are visible public tbar_close = 0; //Toolbar lastest Open/Close status - public sip_visible = 0; //SIP latest visible/hidden status public title_badge_visible = 0; //Title badge visible/hidden status public title_slide_visible = 0; //Title slide visible/hidden status + public landscape = 0; //Landscape mode status } parts { part { name: "base"; @@ -59,107 +49,6 @@ rel2.relative: 2.0 1.0; } } - part { name: "title_toolbar_bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 0; - fixed: 0 1; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: 0 NAVIFRAME_TITLE_H_INC; - visible: 1; - } - } - part { name: "title_toolbar_top_padding"; - type: RECT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC; - fixed: 0 1; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "title_toolbar_bg"; } - rel2 { relative: 1.0 0.0; to: "title_toolbar_bg"; } - visible: 0; - } - } - part { name: "title_toolbar_bottom_padding"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC; - fixed: 0 1; - align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "title_toolbar_bg"; } - rel2 { relative: 1.0 1.0; to: "title_toolbar_bg"; } - visible: 0; - } - } - part { name: "title_more_btn_bg"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; - fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_top_padding"; } - rel2 { relative: 0.0 0.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_bottom_padding"; } - visible: 0; - } - } - part { name: "title_prev_btn_bg"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; - fixed: 1 1; - align: 1.0 0.0; - rel1 { relative: 1.0 1.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_top_padding"; } - rel2 { relative: 1.0 0.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_bottom_padding"; } - visible: 0; - } - } - part { name: "title_toolbar_btns_area"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "title_more_btn_bg"; } - rel2 { relative: 0.0 1.0; to: "title_prev_btn_bg"; } - visible: 0; - } - } - part { name: "title_toolbar_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { to: "title_toolbar_bg"; } - rel2 { to: "title_toolbar_bg"; } - } - } - part { name: "title_toolbar_button_padding"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0; - max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999; - fixed : 1 0; - visible: 0; - align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; - } - } part { name: "title_bg"; type: RECT; scale: 1; @@ -171,6 +60,10 @@ rel2 { relative: 1.0 0.0; to: "base"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: 1 NAVIFRAME_LANDSCAPE_TITLE_H_INC; + } description { state: "hide" 0.0; inherit: "default" 0.0; min: 0 0; @@ -199,6 +92,30 @@ rel2 { relative: 1.0 0.0; to: "title_bg"; } visible: 0; } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC; + } + } + part { name: "top_padding2"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: NAVIFRAME_TITLE_TOP_PADDING2_INC; + fixed: 0 1; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "title_bg"; } + rel2 { relative: 1.0 0.0; to: "title_bg"; } + visible: 0; + } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING2_INC; + } } part { name: "right_padding"; type: RECT; @@ -247,7 +164,7 @@ } description { state: "sip_visible" 0.0; inherit: "default" 0.0; - rel1.to_y: "title_toolbar_bg"; + rel1.to_y: "base"; } } part { name: "content_clip"; @@ -266,8 +183,8 @@ min: NAVIFRAME_PADDING2_INC; fixed: 1 0; align: 1.0 0.5; - rel1 { relative: 0.0 0.0; to: "title_left_btn_bg"; } - rel2 { relative: 0.0 1.0; to: "title_left_btn_bg"; } + rel1 { relative: 0.0 0.0; to: "title_left_btn"; } + rel2 { relative: 0.0 1.0; to: "title_left_btn"; } visible: 0; } } @@ -283,6 +200,10 @@ rel2 { relative: 1.0 1.0; to: "title_bg"; } visible: 0; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_BOTTOM_TEXT_PADDING_INC; + } } part { name: "badge_padding"; type: RECT; @@ -301,6 +222,21 @@ min: NAVIFRAME_BADGE_PADDING_INC; } } + part { name: "title_text_bg"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + visible: 0; + fixed: 1 1; + rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } + rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; } + } + description { state: "subtitle_is_set" 0.0; + inherit: "default" 0.0; + rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding2"; } + rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "subtitle_text_bg"; } + } + } part { name: "elm.text.title"; type: TEXT; effect: FAR_SHADOW BOTTOM; @@ -309,6 +245,8 @@ description { state: "default" 0.0; text { font: "Tizen:style=Medium"; size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; min: 0 0; max: 1 0; align: 0.0 0.5; @@ -316,10 +254,10 @@ } color: NAVIFRAME_TITLE_TEXT_COLOR_INC; color3: 255 255 255 255; - align: 0.0 0.5; fixed: 1 1; - rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } - rel2 { relative: 0.0 0.0; to_x: "badge_padding"; to_y: "padding_bottom_text"; } + align: 0.0 0.5; + rel1 { to: "title_text_bg"; } + rel2 { relative: 0.0 1.0; to_x: "badge_padding"; to_y: "title_text_bg"; } } description { state: "subtitle_is_set" 0.0; inherit: "default" 0.0; @@ -327,11 +265,50 @@ size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC; min: 0 0; max: 1 0; - align: 0.0 0.2; + align: 0.0 0.5; text_class: "tizen"; } - align: 0.0 0.0; - rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "top_padding"; } + } + description { state: "default_landscape" 0.0; + inherit: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + } + description { state: "subtitle_is_set_landscape" 0.0; + inherit: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + } + } + part { name: "subtitle_text_bg"; + type: RECT; + scale: 1; + repeat_events: 1; + description { state: "default" 0.0; + visible: 0; + min: 0 0; + fixed: 1 1; + align: 0.0 1.0; + rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "padding_bottom_text"; } + rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_SUBTITLE_HEIGHT_INC; + } + description { state: "visible_landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC; } } part { name: "elm.text.subtitle"; @@ -343,21 +320,23 @@ size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC; min: 0 0; max: 1 0; + align: 0.0 0.5; text_class: "tizen"; - align: 0.0 1.0; } color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC; - align: 0.0 1.0; - fixed: 1 0; - rel1 { - relative: 1.0 1.0; - to_x: "padding_center_text1"; - to_y: "elm.text.title"; - } - rel2 { - relative: 0.0 1.0; - to_x: "padding_center_text2"; - to_y: "elm.text.title"; + fixed: 1 1; + align: 0.0 0.5; + rel1.to: "subtitle_text_bg"; + rel2.to: "subtitle_text_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; } } } @@ -399,7 +378,7 @@ } description { state: "visible" 0.0; inherit: "default" 0.0; - min: NAVIFRAME_PADDING2_INC; + min: NAVIFRAME_PADDING_BADGE_INC; } description { state: "title_slide_is_set" 0.0; inherit: "visible" 0.0; @@ -510,22 +489,34 @@ } } part { name: "click_event_area"; + type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; rel1 { to: "title_bg"; } rel2 { to: "title_bg"; } + color: 0 0 0 0; } } part { name: "elm.swallow.title"; type: SWALLOW; scale: 1; + repeat_events: 1; clip_to: "title_clip"; + description { state: "default" 0.0; + fixed: 1 1; + rel1 { to: "title_text_bg"; } + rel2 { to: "title_text_bg"; } + } + } + part { name: "elm.swallow.subtitle"; + type: SWALLOW; + scale: 1; repeat_events: 1; + clip_to: "title_clip"; description { state: "default" 0.0; fixed: 1 1; - align: 0.0 0.5; - rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } - rel2 { relative: 0.0 0.0; to_x: "badge_padding"; to_y: "padding_bottom_text"; } + rel1 { to: "subtitle_text_bg"; } + rel2 { to: "subtitle_text_bg"; } } } part { name: "access.title"; @@ -538,47 +529,6 @@ color: 0 0 0 0; } } - part { name: "title_more_btn"; - type: SWALLOW; - scale: 1; - clip_to: "title_toolbar_clip"; - description { state: "default" 0.0; - max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_more_btn_bg"; - rel2.to: "title_more_btn_bg"; - } - } - part { name: "title_prev_btn"; - type: SWALLOW; - scale: 1; - clip_to: "title_toolbar_clip"; - description { state: "default" 0.0; - max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_prev_btn_bg"; - rel2.to: "title_prev_btn_bg"; - } - } - part { name: "title_left_btn_bg"; - type: RECT; - scale: 1; - clip_to: "title_clip"; - description { state: "default" 0.0; - visible: 0; - min: 0 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { relative: 0.0 0.0; to: "title_right_btn_bg"; } - rel2 { relative: 0.0 1.0; to: "title_right_btn_bg"; } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; - } - } part { name: "title_left_btn"; type: SWALLOW; scale: 1; @@ -586,47 +536,13 @@ description { state: "default" 0.0; max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; fixed: 1 1; - align: 0.5 0.5; - rel1 { to: "title_left_btn_bg"; } - rel2 { to: "title_left_btn_bg"; } - } - } - part { name: "title_toolbar_button1"; - type: SWALLOW; - scale: 1; - clip_to: "title_toolbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; - } - description { state: "buttons_set" 0.0; - inherit: "default" 0.0; align: 1.0 0.5; - rel2 { - relative: 0.0 1.0; - to: "title_toolbar_button_padding"; - } - } - } - part { name: "title_toolbar_button2"; - type: SWALLOW; - scale: 1; - clip_to: "title_toolbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; + rel1 { relative: 0.0 0.0; to: "title_right_btn"; } + rel2 { relative: 0.0 1.0; to: "title_right_btn"; } } - description { state: "buttons_set" 0.0; + description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to: "title_toolbar_button_padding"; - } + max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC; } } part { name: "elm.swallow.icon"; @@ -643,33 +559,20 @@ align: 1.0 0.5; } } - part { name: "title_right_btn_bg"; - type: RECT; + part { name: "title_right_btn"; + type: SWALLOW; scale: 1; clip_to: "title_clip"; description { state: "default" 0.0; - visible: 0; - min: 0 0; - fixed: 1 0; + max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 0.0 0.0; to: "right_padding"; } rel2 { relative: 0.0 1.0; to: "right_padding"; } } - description { state: "visible" 0.0; + description { state: "landscape" 0.0; inherit: "default" 0.0; - min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; - } - } - part { name: "title_right_btn"; - type: SWALLOW; - scale: 1; - clip_to: "title_clip"; - description { state: "default" 0.0; - max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; - align: 0.5 0.5; - fixed: 1 1; - rel1 { to: "title_right_btn_bg"; } - rel2 { to: "title_right_btn_bg"; } + max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC; } } part { name: "toolbar_bg"; @@ -691,8 +594,14 @@ max: 999999 NAVIFRAME_TOOLBAR_HEIGHT_INC; visible: 1; } - } - part { name: "more_btn_bg"; + description { state: "visible_landscape" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + visible: 1; + } + } + part { name: "more_btn_bg"; type: RECT; scale: 1; mouse_events: 0; @@ -715,6 +624,10 @@ rel1.to: "more_btn_bg"; rel2.to: "more_btn_bg"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } } part { name: "prev_btn_bg"; type: RECT; @@ -740,6 +653,10 @@ rel1.to: "prev_btn_bg"; rel2.to: "prev_btn_bg"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } } part { name: "toolbar_btns_area"; type: RECT; @@ -789,6 +706,11 @@ rel1.to: "toolbar_btns_area"; rel2.to: "toolbar_btns_area"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0; + max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999; + } } part { name: "toolbar_button2"; type: SWALLOW; @@ -877,34 +799,44 @@ signal: "elm,state,title,show"; source: "elm"; script { - if (get_int(sip_visible) == 0) + if (get_int(landscape) == 0) set_state(PART:"title_bg", "default", 0.0); else - set_state(PART:"title_toolbar_bg", "show", 0.0); + set_state(PART:"title_bg", "landscape", 0.0); } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; script { - if (get_int(sip_visible) == 0) - set_state(PART:"title_bg", "hide", 0.0); - else - set_state(PART:"title_toolbar_bg", "default", 0.0); + set_state(PART:"title_bg", "hide", 0.0); } } program { name: "subtitle_show"; signal: "elm,state,subtitle,show"; source: "elm"; script { - set_state(PART:"elm.text.title", "subtitle_is_set", 0.0); + set_state(PART:"title_text_bg", "subtitle_is_set", 0.0); + if (get_int(landscape) == 0) { + set_state(PART:"elm.text.title", "subtitle_is_set", 0.0); + set_state(PART:"subtitle_text_bg", "visible", 0.0); + } + else { + set_state(PART:"elm.text.title", "subtitle_is_set_landscape", 0.0); + set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0); + } } } program { name: "subtitle_hide"; signal: "elm,state,subtitle,hide"; source: "elm"; script { - set_state(PART:"elm.text.title", "default", 0.0); + set_state(PART:"title_text_bg", "default", 0.0); + set_state(PART:"subtitle_text_bg", "default", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"elm.text.title", "default", 0.0); + else + set_state(PART:"elm.text.title", "default_landscape", 0.0); } } program { name: "icon_show"; @@ -919,96 +851,6 @@ action: STATE_SET "default" 0.0; target: "padding_center_text1"; } - program { name: "left_btn_show"; - signal: "elm,state,title_left_btn,show"; - source: "elm"; - script { - set_state(PART:"title_left_btn_bg", "visible", 0.0); - } - } - program { name: "left_btn_hide"; - signal: "elm,state,title_left_btn,hide"; - source: "elm"; - script { - set_state(PART:"title_left_btn_bg", "default", 0.0); - } - } - program { name: "right_btn_show"; - signal: "elm,state,title_right_btn,show"; - source: "elm"; - script { - set_state(PART:"title_right_btn_bg", "visible", 0.0); - } - } - program { name: "right_btn_hide"; - signal: "elm,state,title_right_btn,hide"; - source: "elm"; - script { - set_state(PART:"title_right_btn_bg", "default", 0.0); - } - } - program { name: "sip_show"; - signal: "elm,state,sip,shown"; - source: ""; - script { - set_int(sip_visible, 1); - set_state(PART:"title_bg", "hide", 0.0); - set_state(PART:"elm.swallow.content", "sip_visible", 0.0); - set_state(PART:"title_toolbar_bg", "show", 0.0); - } - } - program { name: "sip_hide"; - signal: "elm,state,sip,hidden"; - source: ""; - script { - set_int(sip_visible, 0); - set_state(PART:"title_bg", "default", 0.0); - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"title_toolbar_bg", "default", 0.0); - } - } - program { name: "title_toolbar_button1_show"; - signal: "elm,state,title_toolbar_button1,show"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) + 1); - if (get_int(title_toolbar_buttons_visible) >= 2) - { - set_state(PART:"title_toolbar_button1", "buttons_set", 0.0); - set_state(PART:"title_toolbar_button2", "buttons_set", 0.0); - } - } - } - program { name: "title_toolbar_button1_hide"; - signal: "elm,state,title_toolbar_button1,hide"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) - 1); - set_state(PART:"title_toolbar_button1", "default", 0.0); - set_state(PART:"title_toolbar_button2", "default", 0.0); - } - } - program { name: "title_toolbar_button2_show"; - signal: "elm,state,title_toolbar_button2,show"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) + 1); - if (get_int(title_toolbar_buttons_visible) >= 2) - { - set_state(PART:"title_toolbar_button1", "buttons_set", 0.0); - set_state(PART:"title_toolbar_button2", "buttons_set", 0.0); - } - } - } - program { name: "title_toolbar_button2_hide"; - signal: "elm,state,title_toolbar_button2,hide"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) - 1); - set_state(PART:"title_toolbar_button1", "default", 0.0); - set_state(PART:"title_toolbar_button2", "default", 0.0); - } - } program { name: "prev_btn_show"; signal: "elm,state,prev_btn,show"; source: "elm"; @@ -1087,7 +929,10 @@ signal: "elm,state,toolbar_bg,show"; source: "elm"; script { - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); set_int(tbar_bg, get_int(tbar_bg) + 1); } } @@ -1105,7 +950,10 @@ source: "elm"; script { set_int(tbar_close, 0); - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); } } program { name: "toolbar_close_internal"; @@ -1119,8 +967,12 @@ program { name: "toolbar_open"; signal: "elm,state,toolbar,open"; source: ""; - action: STATE_SET "visible" 0.0; - target: "toolbar_bg"; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } transition: LINEAR 0.2; after: "toolbar_open_internal"; } @@ -1162,23 +1014,6 @@ action: SIGNAL_EMIT "elm,action,title,clicked" ""; } program { - name: "display_mode_compress"; - signal: "display,mode,compress"; - source: ""; - script { - set_state(PART:"toolbar_bg", "default", 0.0); - } - } - program { - name: "display_mode_default"; - signal: "display,mode,default"; - source: ""; - script { - if ((get_int(tbar_bg) > 0) && (get_int(tbar_close) == 0)) - set_state(PART:"toolbar_bg", "visible", 0.0); - } - } - program { name: "title_badge_show"; signal: "elm,state,title_badge,show"; source: "elm"; @@ -1229,6 +1064,127 @@ set_int(title_slide_visible, 0); } } + program { + name: "subtitle_slide_show"; + signal: "elm,state,elm.swallow.subtitle,show"; + source: "elm"; + script { + set_state(PART:"title_text_bg", "subtitle_is_set", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"subtitle_text_bg", "visible", 0.0); + else + set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0); + } + } + program { + name: "subtitle_slide_hide"; + signal: "elm,state,elm.swallow.subtitle,hide"; + source: "elm"; + script { + set_state(PART:"title_text_bg", "default", 0.0); + set_state(PART:"subtitle_text_bg", "default", 0.0); + } + } + program { + name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + script { + if (get_int(landscape) == 0) { + set_state(PART:"top_padding", "landscape", 0.0); + set_state(PART:"top_padding2", "landscape", 0.0); + set_state(PART:"padding_bottom_text", "landscape", 0.0); + set_state(PART:"elm.text.subtitle", "landscape", 0.0); + set_state(PART:"title_left_btn", "landscape", 0.0); + set_state(PART:"title_right_btn", "landscape", 0.0); + set_state(PART:"toolbar_more_btn", "landscape", 0.0); + set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); + set_state(PART:"toolbar_button_padding", "landscape", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"title_bg", "landscape", 0.0); + + get_state(PART:"elm.text.title", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"elm.text.title", "default_landscape", 0.0); + else + set_state(PART:"elm.text.title", "subtitle_is_set_landscape", 0.0); + + get_state(PART:"subtitle_text_bg", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + + set_int(landscape, 1); + } + } + } + program { + name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + script { + if (get_int(landscape) == 1) { + set_state(PART:"top_padding", "default", 0.0); + set_state(PART:"top_padding2", "default", 0.0); + set_state(PART:"padding_bottom_text", "default", 0.0); + set_state(PART:"elm.text.subtitle", "default", 0.0); + set_state(PART:"title_left_btn", "default", 0.0); + set_state(PART:"title_right_btn", "default", 0.0); + set_state(PART:"toolbar_more_btn", "default", 0.0); + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"toolbar_button_padding", "default", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"title_bg", "default", 0.0); + + get_state(PART:"elm.text.title", st, 30, vl); + if (!strcmp(st, "default_landscape")) + set_state(PART:"elm.text.title", "default", 0.0); + else + set_state(PART:"elm.text.title", "subtitle_is_set", 0.0); + + get_state(PART:"subtitle_text_bg", st, 30, vl); + if (!strcmp(st, "visible_landscape")) + set_state(PART:"subtitle_text_bg", "visible", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible_landscape")) + set_state(PART:"toolbar_bg", "visible", 0.0); + + set_int(landscape, 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"; + } } } @@ -1236,9 +1192,8 @@ script { public tbar_bg = 0; //Controlbar BG Show call count public toolbar_buttons_visible = 0; //when both toolbar buttons are visible - public title_toolbar_buttons_visible = 0; //when both title toolbar buttons are visible public tbar_close = 0; //Toolbar lastest Open/Close status - public sip_visible = 0; //SIP latest visible/hidden status + public landscape = 0; //Landscape mode status } parts { part { name: "base"; @@ -1258,107 +1213,6 @@ rel2.relative: 2.0 1.0; } } - part { name: "title_toolbar_bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 0; - fixed: 0 1; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: 0 NAVIFRAME_TITLE_H_INC; - visible: 1; - } - } - part { name: "title_toolbar_top_padding"; - type: RECT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC; - fixed: 0 1; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "title_toolbar_bg"; } - rel2 { relative: 1.0 0.0; to: "title_toolbar_bg"; } - visible: 0; - } - } - part { name: "title_toolbar_bottom_padding"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC; - fixed: 0 1; - align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "title_toolbar_bg"; } - rel2 { relative: 1.0 1.0; to: "title_toolbar_bg"; } - visible: 0; - } - } - part { name: "title_more_btn_bg"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; - fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_top_padding"; } - rel2 { relative: 0.0 0.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_bottom_padding"; } - visible: 0; - } - } - part { name: "title_prev_btn_bg"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; - fixed: 1 1; - align: 1.0 0.0; - rel1 { relative: 1.0 1.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_top_padding"; } - rel2 { relative: 1.0 0.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_bottom_padding"; } - visible: 0; - } - } - part { name: "title_toolbar_btns_area"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "title_more_btn_bg"; } - rel2 { relative: 0.0 1.0; to: "title_prev_btn_bg"; } - visible: 0; - } - } - part { name: "title_toolbar_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { to: "title_toolbar_bg"; } - rel2 { to: "title_toolbar_bg"; } - } - } - part { name: "title_toolbar_button_padding"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0; - max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999; - fixed : 1 0; - visible: 0; - align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; - } - } part { name: "title_bg"; type: RECT; scale: 1; @@ -1370,6 +1224,10 @@ rel2 { relative: 1.0 0.0; to: "base"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: 1 NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC; + } description { state: "hide" 0.0; inherit: "default" 0.0; min: 0 0; @@ -1401,7 +1259,7 @@ } description { state: "sip_visible" 0.0; inherit: "default" 0.0; - rel1.to_y: "title_toolbar_bg"; + rel1.to_y: "base"; } } part { name: "content_clip"; @@ -1412,7 +1270,24 @@ rel2.to: "elm.swallow.content"; } } - part { name: "text_left_padding"; + part { name: "top_padding"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "title_bg"; } + rel2 { relative: 1.0 0.0; to: "title_bg"; } + fixed: 0 1; + min: NAVIFRAME_TAB_TITLE_TOP_PADDING_INC; + visible: 0; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TAB_TITLE_TOP_PADDING_INC; + } + } + part { name: "left_padding"; type: RECT; scale: 1; mouse_events: 0; @@ -1434,9 +1309,13 @@ rel1 { relative: 1.0 0.0; to: "title_bg"; } rel2 { relative: 1.0 1.0; to: "title_bg"; } fixed: 1 0; - min: NAVIFRAME_PADDING3_INC; + min: NAVIFRAME_PADDING_INC; visible: 0; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_PADDING_INC; + } } part { name: "elm.text.title"; type: TEXT; @@ -1458,17 +1337,32 @@ color: NAVIFRAME_TITLE_TEXT_COLOR_INC; color3: 255 255 255 255; align: 0 0; - rel1.to: "text_left_padding"; - rel1.relative: 1.0 0.0; + rel1.to_x: "left_padding"; + rel1.to_y: "top_padding"; + rel1.relative: 1.0 1.0; rel2.to: "right_padding"; rel2.relative: 0.0 1.0; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.5 0.5; + text_class: "tizen"; + } + min: 0 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC; + max: 999999 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC; + } } part { name: "click_event_area"; + type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; rel1 { to: "title_bg"; } rel2 { to: "title_bg"; } + color: 0 0 0 0; } } part { name: "access.title"; @@ -1481,88 +1375,43 @@ color: 0 0 0 0; } } - part { name: "title_more_btn"; - type: SWALLOW; + part { name: "middle_padding"; + type: RECT; + mouse_events: 0; scale: 1; - clip_to: "title_toolbar_clip"; description { state: "default" 0.0; - max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_more_btn_bg"; - rel2.to: "title_more_btn_bg"; + min: NAVIFRAME_MIDDLE_PADDING_INC; + fixed: 0 1; + align: 0.0 0.0; + rel1 { relative: 0.0 1.0; to_x: "title_bg"; to_y: "elm.text.title"; } + rel2 { relative: 1.0 1.0; to_x: "title_bg"; to_y: "elm.text.title"; } + visible: 0; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; } } - part { name: "title_prev_btn"; + part { name: "tabbar"; type: SWALLOW; scale: 1; - clip_to: "title_toolbar_clip"; + clip_to: "title_clip"; description { state: "default" 0.0; - max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; + min: 0 NAVIFRAME_TITLE_TAB_H_INC; + max: 999999 NAVIFRAME_TITLE_TAB_H_INC; fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_prev_btn_bg"; - rel2.to: "title_prev_btn_bg"; + align: 0.5 0.0; + rel1.to_x: "title_bg"; + rel1.to_y: "middle_padding"; + rel1.relative: 0.0 1.0; + rel2.to_x: "title_bg"; + rel2.to_y: "bottom_padding"; + rel2.relative: 1.0 0.0; } } - part { name: "title_toolbar_button1"; - type: SWALLOW; - scale: 1; - clip_to: "title_toolbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; - } - description { state: "buttons_set" 0.0; - inherit: "default" 0.0; - align: 1.0 0.5; - rel2 { - relative: 0.0 1.0; - to: "title_toolbar_button_padding"; - } - } - } - part { name: "title_toolbar_button2"; - type: SWALLOW; - scale: 1; - clip_to: "title_toolbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; - } - description { state: "buttons_set" 0.0; - inherit: "default" 0.0; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to: "title_toolbar_button_padding"; - } - } - } - part { name: "tabbar"; - type: SWALLOW; - scale: 1; - clip_to: "title_clip"; - description { state: "default" 0.0; - min: 0 NAVIFRAME_TITLE_TAB_H_INC; - max: 999999 NAVIFRAME_TITLE_TAB_H_INC; - fixed: 1 1; - align: 0.5 0.0; - rel1.to_x: "title_bg"; - rel1.to_y: "elm.text.title"; - rel1.relative: 0.0 1.0; - rel2.to_x: "title_bg"; - rel2.to_y: "bottom_padding"; - rel2.relative: 1.0 0.0; - } - } - part { name: "bottom_padding"; - type: RECT; - mouse_events: 0; + part { name: "bottom_padding"; + type: RECT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; min: NAVIFRAME_BOTTOM_PADDING_INC; @@ -1572,6 +1421,10 @@ rel2 { relative: 1.0 1.0; to: "title_bg"; } visible: 0; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC; + } } part { name: "toolbar_bg"; type: RECT; @@ -1592,6 +1445,12 @@ max: 999999 NAVIFRAME_TOOLBAR_HEIGHT_INC; visible: 1; } + description { state: "visible_landscape" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + visible: 1; + } } part { name: "more_btn_bg"; type: RECT; @@ -1616,6 +1475,10 @@ rel1.to: "more_btn_bg"; rel2.to: "more_btn_bg"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } } part { name: "prev_btn_bg"; type: RECT; @@ -1641,6 +1504,10 @@ rel1.to: "prev_btn_bg"; rel2.to: "prev_btn_bg"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } } part { name: "toolbar_btns_area"; type: RECT; @@ -1691,6 +1558,11 @@ rel1.to: "toolbar_btns_area"; rel2.to: "toolbar_btns_area"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0; + max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999; + } } part { name: "toolbar_button2"; type: SWALLOW; @@ -1779,82 +1651,17 @@ signal: "elm,state,title,show"; source: "elm"; script { - if (get_int(sip_visible) == 0) + if (get_int(landscape) == 0) set_state(PART:"title_bg", "default", 0.0); else - set_state(PART:"title_toolbar_bg", "show", 0.0); + set_state(PART:"title_bg", "landscape", 0.0); } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; script { - if (get_int(sip_visible) == 0) - set_state(PART:"title_bg", "hide", 0.0); - else - set_state(PART:"title_toolbar_bg", "default", 0.0); - } - } - program { name: "sip_show"; - signal: "elm,state,sip,shown"; - source: ""; - script { - set_int(sip_visible, 1); set_state(PART:"title_bg", "hide", 0.0); - set_state(PART:"elm.swallow.content", "sip_visible", 0.0); - set_state(PART:"title_toolbar_bg", "show", 0.0); - } - } - program { name: "sip_hide"; - signal: "elm,state,sip,hidden"; - source: ""; - script { - set_int(sip_visible, 0); - set_state(PART:"title_bg", "default", 0.0); - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"title_toolbar_bg", "default", 0.0); - } - } - program { name: "title_toolbar_button1_show"; - signal: "elm,state,title_toolbar_button1,show"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) + 1); - if (get_int(title_toolbar_buttons_visible) >= 2) - { - set_state(PART:"title_toolbar_button1", "buttons_set", 0.0); - set_state(PART:"title_toolbar_button2", "buttons_set", 0.0); - } - } - } - program { name: "title_toolbar_button1_hide"; - signal: "elm,state,title_toolbar_button1,hide"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) - 1); - set_state(PART:"title_toolbar_button1", "default", 0.0); - set_state(PART:"title_toolbar_button2", "default", 0.0); - } - } - program { name: "title_toolbar_button2_show"; - signal: "elm,state,title_toolbar_button2,show"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) + 1); - if (get_int(title_toolbar_buttons_visible) >= 2) - { - set_state(PART:"title_toolbar_button1", "buttons_set", 0.0); - set_state(PART:"title_toolbar_button2", "buttons_set", 0.0); - } - } - } - program { name: "title_toolbar_button2_hide"; - signal: "elm,state,title_toolbar_button2,hide"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) - 1); - set_state(PART:"title_toolbar_button1", "default", 0.0); - set_state(PART:"title_toolbar_button2", "default", 0.0); } } program { name: "prev_btn_show"; @@ -1935,7 +1742,10 @@ signal: "elm,state,toolbar_bg,show"; source: "elm"; script { - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); set_int(tbar_bg, get_int(tbar_bg) + 1); } } @@ -1953,7 +1763,10 @@ source: "elm"; script { set_int(tbar_close, 0); - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); } } program { name: "toolbar_close_internal"; @@ -1967,8 +1780,12 @@ program { name: "toolbar_open"; signal: "elm,state,toolbar,open"; source: ""; - action: STATE_SET "visible" 0.0; - target: "toolbar_bg"; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } transition: LINEAR 0.2; after: "toolbar_open_internal"; } @@ -2010,32 +1827,92 @@ action: SIGNAL_EMIT "elm,action,title,clicked" ""; } program { - name: "display_mode_compress"; - signal: "display,mode,compress"; - source: ""; + name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; script { - set_state(PART:"toolbar_bg", "default", 0.0); + if (get_int(landscape) == 0) { + set_state(PART:"top_padding", "landscape", 0.0); + set_state(PART:"right_padding", "landscape", 0.0); + set_state(PART:"elm.text.title", "landscape", 0.0); + set_state(PART:"middle_padding", "hide", 0.0); + set_state(PART:"bottom_padding", "landscape", 0.0); + set_state(PART:"toolbar_more_btn", "landscape", 0.0); + set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); + set_state(PART:"toolbar_button_padding", "landscape", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"title_bg", "landscape", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + + set_int(landscape, 1); + } } } program { - name: "display_mode_default"; - signal: "display,mode,default"; - source: ""; + name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; script { - if ((get_int(tbar_bg) > 0) && (get_int(tbar_close) == 0)) - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 1) { + set_state(PART:"top_padding", "default", 0.0); + set_state(PART:"right_padding", "default", 0.0); + set_state(PART:"elm.text.title", "default", 0.0); + set_state(PART:"middle_padding", "default", 0.0); + set_state(PART:"bottom_padding", "default", 0.0); + set_state(PART:"toolbar_more_btn", "default", 0.0); + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"toolbar_button_padding", "default", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"title_bg", "default", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible_landscape")) + set_state(PART:"toolbar_bg", "visible", 0.0); + + set_int(landscape, 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"; + } } } - group { name:"elm/naviframe/item/empty/default"; + group { name: "elm/naviframe/item/tabbar/notitle/default"; script { public tbar_bg = 0; //Toolbar BG Show call count public toolbar_buttons_visible = 0; //when both toolbar buttons are visible - public title_toolbar_buttons_visible = 0; //when both title toolbar buttons are visible public tbar_close = 0; //Toolbar lastest Open/Close status - public sip_visible = 0; //SIP latest visible/hidden status + public landscape = 0; //Landscape mode status } parts { part { name: "base"; @@ -2055,138 +1932,194 @@ rel2.relative: 2.0 1.0; } } - part { name: "title_toolbar_bg"; + part { name: "title_bg"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 0 0; - fixed: 0 1; + min: 1 NAVIFRAME_TAB_TITLE_H_INC; align: 0.0 0.0; + fixed: 0 1; rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 0.0; to: "base"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; - visible: 0; } - description { state: "show" 0.0; + description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 NAVIFRAME_TITLE_H_INC; - visible: 1; + min: 1 NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; } } - part { name: "title_toolbar_top_padding"; + part { name: "title_clip"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + rel1 { to: "title_bg"; } + rel2 { to: "title_bg"; } + } + } + part { name: "tabbar"; + type: SWALLOW; scale: 1; - description { - state: "default" 0.0; - min: NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC; - fixed: 0 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + rel1.to: "title_bg"; + rel1.relative: 0.0 0.0; + rel2.to: "title_bg"; + rel2.relative: 1.0 1.0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + clip_to: "content_clip"; + description { state: "default" 0.0; align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "title_toolbar_bg"; } - rel2 { relative: 1.0 0.0; to: "title_toolbar_bg"; } - visible: 0; + rel1.relative: 0.0 1.0; + rel1.to_x: "base"; + rel1.to_y: "title_bg"; + rel2.relative: 1.0 0.0; + rel2.to_x: "base"; + rel2.to_y: "toolbar_bg"; + } + description { state: "sip_visible" 0.0; + inherit: "default" 0.0; + rel1.to_y: "base"; } } - part { name: "title_toolbar_bottom_padding"; + part { name: "content_clip"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + } + } + part { name: "toolbar_bg"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC; + min: 0 0; + max: 999999 0; fixed: 0 1; align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "title_toolbar_bg"; } - rel2 { relative: 1.0 1.0; to: "title_toolbar_bg"; } visible: 0; + rel1 { to: "base"; } + rel2 { to: "base"; } + color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_TOOLBAR_HEIGHT_INC; + visible: 1; + } + description { state: "visible_landscape" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + visible: 1; } } - part { name: "title_more_btn_bg"; + part { name: "more_btn_bg"; type: RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; - fixed: 1 1; + fixed: 1 0; align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_top_padding"; } - rel2 { relative: 0.0 0.0; to: "title_toolbar_bg"; to_y: "title_toolbar_bottom_padding"; } + rel1 { relative: 0.0 0.0; to: "toolbar_bg"; } + rel2 { relative: 0.0 1.0; to: "toolbar_bg"; } visible: 0; } } - part { name: "title_more_btn"; + part { name: "toolbar_more_btn"; type: SWALLOW; scale: 1; - clip_to: "title_toolbar_clip"; + clip_to: "toolbar_clip"; description { state: "default" 0.0; max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; fixed: 1 1; - align: 0.5 0.5; - rel1.to: "title_more_btn_bg"; - rel2.to: "title_more_btn_bg"; + rel1.to: "more_btn_bg"; + rel2.to: "more_btn_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; } } - part { name: "title_prev_btn_bg"; + part { name: "prev_btn_bg"; type: RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; - fixed: 1 1; + fixed: 1 0; align: 1.0 0.0; - rel1 { relative: 1.0 1.0; to_x: "title_toolbar_bg"; to_y: "title_toolbar_top_padding"; } - rel2 { relative: 1.0 0.0; to: "title_toolbar_bg"; to_y: "title_toolbar_bottom_padding"; } + rel1 { relative: 1.0 0.0; to: "toolbar_bg"; } + rel2.to: "toolbar_bg"; visible: 0; } } - part { name: "title_prev_btn"; + part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; - clip_to: "title_toolbar_clip"; + clip_to: "toolbar_clip"; description { state: "default" 0.0; max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; fixed: 1 1; align: 0.5 0.5; - rel1.to: "title_prev_btn_bg"; - rel2.to: "title_prev_btn_bg"; + rel1.to: "prev_btn_bg"; + rel2.to: "prev_btn_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; } } - part { name: "title_toolbar_btns_area"; + part { name: "toolbar_clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "title_more_btn_bg"; } - rel2 { relative: 0.0 1.0; to: "title_prev_btn_bg"; } - visible: 0; + rel1 { to: "toolbar_bg"; } + rel2 { to: "toolbar_bg"; } } } - part { name: "title_toolbar_clip"; + part { name: "toolbar_btns_area"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1 { to: "title_toolbar_bg"; } - rel2 { to: "title_toolbar_bg"; } + rel1 { relative: 1.0 0.0; to: "more_btn_bg"; } + rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; } + visible: 0; } } - part { name: "title_toolbar_button1"; + part { name: "toolbar_button1"; type: SWALLOW; scale: 1; - clip_to: "title_toolbar_clip"; + clip_to: "toolbar_clip"; description { state: "default" 0.0; fixed: 1 1; align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; + rel1.to: "toolbar_btns_area"; + rel2.to: "toolbar_btns_area"; } description { state: "buttons_set" 0.0; inherit: "default" 0.0; align: 1.0 0.5; rel2 { relative: 0.0 1.0; - to: "title_toolbar_button_padding"; + to: "toolbar_button_padding"; } } } - part { name: "title_toolbar_button_padding"; + part { name: "toolbar_button_padding"; type: RECT; scale : 1; description { state: "default" 0.0; @@ -2195,51 +2128,1097 @@ fixed : 1 0; visible: 0; align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; + rel1.to: "toolbar_btns_area"; + rel2.to: "toolbar_btns_area"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0; + max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999; } } - part { name: "title_toolbar_button2"; + part { name: "toolbar_button2"; type: SWALLOW; scale: 1; - clip_to: "title_toolbar_clip"; + clip_to: "toolbar_clip"; description { state: "default" 0.0; fixed: 1 1; align: 0.5 0.5; - rel1.to: "title_toolbar_btns_area"; - rel2.to: "title_toolbar_btns_area"; + rel1.to: "toolbar_btns_area"; + rel2.to: "toolbar_btns_area"; } description { state: "buttons_set" 0.0; inherit: "default" 0.0; align: 0.0 0.5; rel1 { relative: 1.0 0.0; - to: "title_toolbar_button_padding"; + to: "toolbar_button_padding"; } } } - part { name: "title_bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - rel1 { to: "title"; } - rel2 { to: "title"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - min: 0 0; - max: 0 0; - fixed: 1 1; - } + } + programs { + program { name: "content_new_pushed"; + signal: "elm,state,new,pushed,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "show_finished"; } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - repeat_events: 0; - clip_to: "content_clip"; - description { state: "default" 0.0; - align: 0.0 0.0; + program { name: "content_cur_pushed"; + signal: "elm,state,cur,pushed,deferred"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "pushed_finished"; + } + program { name: "content_prev_popped"; + signal: "elm,state,prev,popped,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "show_finished"; + } + program { name: "content_cur_popped"; + signal: "elm,state,cur,popped,deferred"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "popped_finished"; + } + program { name: "cur_pushed"; + signal: "elm,state,cur,pushed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "new_pushed"; + signal: "elm,state,new,pushed"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "base"; + } + program { name: "prev_popped"; + signal: "elm,state,prev,popped"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "base"; + } + program { name: "cur_popped"; + signal: "elm,state,cur,popped"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "title_show"; + signal: "elm,state,title,show"; + source: "elm"; + script { + if (get_int(landscape) == 0) + set_state(PART:"title_bg", "default", 0.0); + else + set_state(PART:"title_bg", "landscape", 0.0); + } + } + program { name: "title_hide"; + signal: "elm,state,title,hide"; + source: "elm"; + script { + set_state(PART:"title_bg", "hide", 0.0); + } + } + program { name: "prev_btn_show"; + signal: "elm,state,prev_btn,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + } + } + program { name: "prev_btn_hide"; + signal: "elm,state,prev_btn,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + } + } + program { name: "more_btn_show"; + signal: "elm,state,toolbar_more_btn,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + } + } + program { name: "more_btn_hide"; + signal: "elm,state,toolbar_more_btn,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + } + } + program { name: "toolbar_button1_show"; + signal: "elm,state,toolbar_button1,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1); + if (get_int(toolbar_buttons_visible) >= 2) + { + set_state(PART:"toolbar_button1", "buttons_set", 0.0); + set_state(PART:"toolbar_button2", "buttons_set", 0.0); + } + } + } + program { name: "toolbar_button1_hide"; + signal: "elm,state,toolbar_button1,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1); + set_state(PART:"toolbar_button1", "default", 0.0); + set_state(PART:"toolbar_button2", "default", 0.0); + } + } + program { name: "toolbar_button2_show"; + signal: "elm,state,toolbar_button2,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1); + if (get_int(toolbar_buttons_visible) >= 2) + { + set_state(PART:"toolbar_button1", "buttons_set", 0.0); + set_state(PART:"toolbar_button2", "buttons_set", 0.0); + } + } + } + program { name: "toolbar_button2_hide"; + signal: "elm,state,toolbar_button2,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1); + set_state(PART:"toolbar_button1", "default", 0.0); + set_state(PART:"toolbar_button2", "default", 0.0); + } + } + program { name: "toolbar_bg_show"; + signal: "elm,state,toolbar_bg,show"; + source: "elm"; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + set_int(tbar_bg, get_int(tbar_bg) + 1); + } + } + program { name: "toolbar_bg_hide"; + signal: "elm,state,toolbar_bg,hide"; + source: "elm"; + script { + set_int(tbar_bg, get_int(tbar_bg) - 1); + if (get_int(tbar_bg) <= 0) + set_state(PART:"toolbar_bg", "default", 0.0); + } + } + program { name: "toolbar_open_internal"; + signal: "elm,state,toolbar,open,internal"; + source: "elm"; + script { + set_int(tbar_close, 0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } + } + program { name: "toolbar_close_internal"; + signal: "elm,state,toolbar,close,internal"; + source: "elm"; + script { + set_int(tbar_close, 1); + set_state(PART:"toolbar_bg", "default", 0.0); + } + } + program { name: "toolbar_open"; + signal: "elm,state,toolbar,open"; + source: ""; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } + transition: LINEAR 0.2; + after: "toolbar_open_internal"; + } + program { name: "toolbar_close"; + signal: "elm,state,toolbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "toolbar_bg"; + transition: LINEAR 0.2; + after: "toolbar_close_internal"; + } + program { name: "toolbar_instant_open"; + signal: "elm,state,toolbar,instant_open"; + source: ""; + script { + emit("elm,state,toolbar,open,internal", "elm"); + } + } + program { name: "toolbar_instant_close"; + signal: "elm,state,toolbar,instant_close"; + source: ""; + script { + emit("elm,state,toolbar,close,internal", "elm"); + } + } + program { name: "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { name: "pushed_finished"; + action: SIGNAL_EMIT "elm,action,pushed,finished" ""; + } + program { name: "popped_finished"; + action: SIGNAL_EMIT "elm,action,popped,finished" ""; + } + program { + name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + script { + if (get_int(landscape) == 0) { + set_state(PART:"toolbar_more_btn", "landscape", 0.0); + set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); + set_state(PART:"toolbar_button_padding", "landscape", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"title_bg", "landscape", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + + set_int(landscape, 1); + } + } + } + program { + name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + script { + if (get_int(landscape) == 1) { + set_state(PART:"toolbar_more_btn", "default", 0.0); + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"toolbar_button_padding", "default", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible_landscape")) + set_state(PART:"toolbar_bg", "visible", 0.0); + + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"title_bg", "default", 0.0); + + set_int(landscape, 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"; + } + } + } + + group { name: "elm/naviframe/item/empty/default"; + script { + public tbar_bg = 0; //Toolbar BG Show call count + public toolbar_buttons_visible = 0; //when both toolbar buttons are visible + public tbar_close = 0; //Toolbar lastest Open/Close status + public landscape = 0; //Landscape mode status + } + parts { + part { name: "base"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + } + description { state: "left" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "right" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + } + } + part { name: "title_bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1 { to: "title"; } + rel2 { to: "title"; } + color: NAVIFRAME_TITLE_BG_COLOR_INC; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + clip_to: "content_clip"; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1.relative: 0.0 1.0; + rel1.to_x: "base"; + rel1.to_y: "title_bg"; + rel2.relative: 1.0 0.0; + rel2.to_x: "base"; + rel2.to_y: "toolbar_bg"; + } + description { state: "sip_visible" 0.0; + inherit: "default" 0.0; + rel1.to_y: "base"; + } + } + part { name: "content_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + } + } + part { name: "title"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.0; + fixed: 0 1; + rel1 { relative: 0.0 0.0; to: "base"; } + rel2 { relative: 1.0 0.0; to: "base"; } + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + visible: 0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } + } + part { name: "toolbar_bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 0 0; + max: 999999 0; + fixed: 0 1; + align: 0.0 1.0; + visible: 0; + rel1 { to: "base"; } + rel2 { to: "base"; } + color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_TOOLBAR_HEIGHT_INC; + visible: 1; + } + description { state: "visible_landscape" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + visible: 1; + } + } + part { name: "more_btn_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; + fixed: 1 0; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "toolbar_bg"; } + rel2 { relative: 0.0 1.0; to: "toolbar_bg"; } + visible: 0; + } + } + part { name: "toolbar_more_btn"; + type: SWALLOW; + scale: 1; + clip_to: "toolbar_clip"; + description { state: "default" 0.0; + max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; + fixed: 1 1; + rel1.to: "more_btn_bg"; + rel2.to: "more_btn_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } + } + part { name: "prev_btn_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC; + fixed: 1 0; + align: 1.0 0.0; + rel1 { relative: 1.0 0.0; to: "toolbar_bg"; } + rel2.to: "toolbar_bg"; + visible: 0; + } + } + part { name: "elm.swallow.prev_btn"; + type: SWALLOW; + scale: 1; + clip_to: "toolbar_clip"; + description { state: "default" 0.0; + max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC; + fixed: 1 1; + align: 0.5 0.5; + rel1.to: "prev_btn_bg"; + rel2.to: "prev_btn_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } + } + part { name: "toolbar_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { to: "toolbar_bg"; } + rel2 { to: "toolbar_bg"; } + } + } + part { name: "toolbar_btns_area"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { relative: 1.0 0.0; to: "more_btn_bg"; } + rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; } + visible: 0; + } + } + part { name: "toolbar_button1"; + type: SWALLOW; + scale: 1; + clip_to: "toolbar_clip"; + description { state: "default" 0.0; + fixed: 1 1; + align: 0.5 0.5; + rel1.to: "toolbar_btns_area"; + rel2.to: "toolbar_btns_area"; + } + description { state: "buttons_set" 0.0; + inherit: "default" 0.0; + align: 1.0 0.5; + rel2 { + relative: 0.0 1.0; + to: "toolbar_button_padding"; + } + } + } + part { name: "toolbar_button_padding"; + type: RECT; + scale : 1; + description { state: "default" 0.0; + min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0; + max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999; + fixed : 1 0; + visible: 0; + align: 0.5 0.5; + rel1.to: "toolbar_btns_area"; + rel2.to: "toolbar_btns_area"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0; + max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999; + } + } + part { name: "toolbar_button2"; + type: SWALLOW; + scale: 1; + clip_to: "toolbar_clip"; + description { state: "default" 0.0; + fixed: 1 1; + align: 0.5 0.5; + rel1.to: "toolbar_btns_area"; + rel2.to: "toolbar_btns_area"; + } + description { state: "buttons_set" 0.0; + inherit: "default" 0.0; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to: "toolbar_button_padding"; + } + } + } + } + programs { + program { name: "content_new_pushed"; + signal: "elm,state,new,pushed,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "show_finished"; + } + program { name: "content_cur_pushed"; + signal: "elm,state,cur,pushed,deferred"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "pushed_finished"; + } + program { name: "content_prev_popped"; + signal: "elm,state,prev,popped,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "show_finished"; + } + program { name: "content_cur_popped"; + signal: "elm,state,cur,popped,deferred"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "popped_finished"; + } + program { name: "cur_pushed"; + signal: "elm,state,cur,pushed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "new_pushed"; + signal: "elm,state,new,pushed"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "base"; + } + program { name: "prev_popped"; + signal: "elm,state,prev,popped"; + source: "elm"; + action: STATE_SET "left" 0.0; + target: "base"; + } + program { name: "cur_popped"; + signal: "elm,state,cur,popped"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "title_show"; + signal: "elm,state,title,show"; + source: "elm"; + script { + set_state(PART:"title_bg", "default", 0.0); + set_state(PART:"title", "default", 0.0); + } + } + program { name: "title_hide"; + signal: "elm,state,title,hide"; + source: "elm"; + script { + set_state(PART:"title_bg", "hide", 0.0); + set_state(PART:"title", "hide", 0.0); + } + } + program { name: "prev_btn_show"; + signal: "elm,state,prev_btn,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + } + } + program { name: "prev_btn_hide"; + signal: "elm,state,prev_btn,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + } + } + program { name: "more_btn_show"; + signal: "elm,state,toolbar_more_btn,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + } + } + program { name: "more_btn_hide"; + signal: "elm,state,toolbar_more_btn,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + } + } + program { name: "toolbar_button1_show"; + signal: "elm,state,toolbar_button1,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1); + if (get_int(toolbar_buttons_visible) >= 2) + { + set_state(PART:"toolbar_button1", "buttons_set", 0.0); + set_state(PART:"toolbar_button2", "buttons_set", 0.0); + } + } + } + program { name: "toolbar_button1_hide"; + signal: "elm,state,toolbar_button1,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1); + set_state(PART:"toolbar_button1", "default", 0.0); + set_state(PART:"toolbar_button2", "default", 0.0); + } + } + program { name: "toolbar_button2_show"; + signal: "elm,state,toolbar_button2,show"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,show", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1); + if (get_int(toolbar_buttons_visible) >= 2) + { + set_state(PART:"toolbar_button1", "buttons_set", 0.0); + set_state(PART:"toolbar_button2", "buttons_set", 0.0); + } + } + } + program { name: "toolbar_button2_hide"; + signal: "elm,state,toolbar_button2,hide"; + source: "elm"; + script { + emit("elm,state,toolbar_bg,hide", "elm"); + set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1); + set_state(PART:"toolbar_button1", "default", 0.0); + set_state(PART:"toolbar_button2", "default", 0.0); + } + } + program { name: "toolbar_bg_show"; + signal: "elm,state,toolbar_bg,show"; + source: "elm"; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + set_int(tbar_bg, get_int(tbar_bg) + 1); + } + } + program { name: "toolbar_bg_hide"; + signal: "elm,state,toolbar_bg,hide"; + source: "elm"; + script { + set_int(tbar_bg, get_int(tbar_bg) - 1); + if (get_int(tbar_bg) <= 0) + set_state(PART:"toolbar_bg", "default", 0.0); + } + } + program { name: "toolbar_open_internal"; + signal: "elm,state,toolbar,open,internal"; + source: "elm"; + script { + set_int(tbar_close, 0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } + } + program { name: "toolbar_close_internal"; + signal: "elm,state,toolbar,close,internal"; + source: "elm"; + script { + set_int(tbar_close, 1); + set_state(PART:"toolbar_bg", "default", 0.0); + } + } + program { name: "toolbar_open"; + signal: "elm,state,toolbar,open"; + source: ""; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } + transition: LINEAR 0.2; + after: "toolbar_open_internal"; + } + program { name: "toolbar_close"; + signal: "elm,state,toolbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "toolbar_bg"; + transition: LINEAR 0.2; + after: "toolbar_close_internal"; + } + program { name: "toolbar_instant_open"; + signal: "elm,state,toolbar,instant_open"; + source: ""; + script { + emit("elm,state,toolbar,open,internal", "elm"); + } + } + program { name: "toolbar_instant_close"; + signal: "elm,state,toolbar,instant_close"; + source: ""; + script { + emit("elm,state,toolbar,close,internal", "elm"); + } + } + program { name: "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { name: "pushed_finished"; + action: SIGNAL_EMIT "elm,action,pushed,finished" ""; + } + program { name: "popped_finished"; + action: SIGNAL_EMIT "elm,action,popped,finished" ""; + } + program { + name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + script { + if (get_int(landscape) == 0) { + set_state(PART:"toolbar_more_btn", "landscape", 0.0); + set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); + set_state(PART:"toolbar_button_padding", "landscape", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + + set_int(landscape, 1); + } + } + } + program { + name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + script { + if (get_int(landscape) == 1) { + set_state(PART:"toolbar_more_btn", "default", 0.0); + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"toolbar_button_padding", "default", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible_landscape")) + set_state(PART:"toolbar_bg", "visible", 0.0); + + set_int(landscape, 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"; + } + } + } + + group { name: "elm/naviframe/item/basic/uglib"; + parts { + part { name: "base"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 255; + } + description { state: "right" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + color: 255 255 255 0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + clip_to: "base"; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1.relative: 0.0 0.0; + rel1.to: "base"; + rel2.relative: 1.0 1.0; + rel2.to: "base"; + } + } + } + programs { + program { name: "content_new_pushed"; + signal: "elm,state,new,pushed,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "show_finished"; + } + program { name: "content_cur_pushed"; + signal: "elm,state,cur,pushed,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "pushed_finished"; + } + program { name: "content_prev_popped"; + signal: "elm,state,prev,popped,deferred"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "show_finished"; + } + program { name: "content_cur_popped"; + signal: "elm,state,cur,popped,deferred"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "base"; + transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; + after: "popped_finished"; + } + program { name: "cur_pushed"; + signal: "elm,state,cur,pushed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "new_pushed"; + signal: "elm,state,new,pushed"; + source: "elm"; + action: STATE_SET "right" 0.0; + target: "base"; + } + program { name: "prev_popped"; + signal: "elm,state,prev,popped"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "cur_popped"; + signal: "elm,state,cur,popped"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { name: "pushed_finished"; + action: SIGNAL_EMIT "elm,action,pushed,finished" ""; + } + program { name: "popped_finished"; + action: SIGNAL_EMIT "elm,action,popped,finished" ""; + } + } + } + + group { name: "elm/naviframe/item/dual_title/default"; + images { + image: "00_badge_bg.png" COMP; + image: "00_divider_line.png" COMP; + } + script { + public tbar_bg = 0; //Toolbar BG Show call count + public toolbar_buttons_visible = 0; //when both toolbar buttons are visible + public tbar_close = 0; //Toolbar lastest Open/Close status + public landscape = 0; //Landscape mode status + } + parts { + part { name: "base"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + } + description { state: "left" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "right" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + } + } + part { name: "title_bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 1 NAVIFRAME_TITLE_H_INC; + align: 0.0 0.0; + fixed: 0 1; + rel1 { relative: 0.0 0.0; to: "base"; } + rel2 { relative: 1.0 0.0; to: "base"; } + color: NAVIFRAME_TITLE_BG_COLOR_INC; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: 1 NAVIFRAME_LANDSCAPE_TITLE_H_INC; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } + } + part { name: "title_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { to: "title_bg"; } + rel2 { to: "title_bg"; } + } + } + part { name: "top_padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: NAVIFRAME_TITLE_TOP_PADDING_INC; + fixed: 0 1; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "title_bg"; } + rel2 { relative: 1.0 0.0; to: "title_bg"; } + visible: 0; + } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC; + } + } + part { name: "right_padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: NAVIFRAME_TITLE_RIGHT_PADDING_INC; + fixed: 1 0; + align: 1.0 0.0; + rel1 { relative: 1.0 0.0; to: "title_bg"; } + rel2 { relative: 1.0 1.0; to: "title_bg"; } + visible: 0; + } + } + part { name: "padding_center_text1"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + fixed: 1 0; + 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; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + clip_to: "content_clip"; + description { state: "default" 0.0; + align: 0.0 0.0; rel1.relative: 0.0 1.0; rel1.to_x: "base"; rel1.to_y: "title_bg"; @@ -2247,34 +3226,463 @@ rel2.to_x: "base"; rel2.to_y: "toolbar_bg"; } - description { state: "sip_visible" 0.0; + description { state: "sip_visible" 0.0; + inherit: "default" 0.0; + rel1.to_y: "base"; + } + } + part { name: "content_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + } + } + part { name: "padding_bottom_text"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: NAVIFRAME_BOTTOM_TEXT_PADDING_INC; + fixed: 0 1; + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "title_bg"; } + rel2 { relative: 1.0 1.0; to: "title_bg"; } + visible: 0; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_BOTTOM_TEXT_PADDING_INC; + } + } + part { name: "padding_center_text2"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING2_INC; + fixed: 1 0; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "title_left_btn"; } + rel2 { relative: 0.0 1.0; to: "title_left_btn"; } + visible: 0; + } + } + part { name: "text_area_center_padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + max: 30 -1; + align: 0.5 0.0; + fixed: 1 1; + rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } + rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; } + visible: 0; + } + } + part { name: "elm.text.title"; + type: TEXT; + effect: FAR_SHADOW BOTTOM; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC; + color3: 255 255 255 255; + align: 0.0 0.5; + fixed: 1 1; + rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } + rel2 { relative: 0.0 0.0; to_x: "text_area_center_padding"; to_y: "padding_bottom_text"; } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + } + description { state: "default_landscape" 0.0; + inherit: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + } + description { state: "selected_landscape" 0.0; + inherit: "default_landscape" 0.0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + } + } + part { name: "click_event_title1_area"; + type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1 { to: "elm.text.title"; } + rel2 { to: "elm.text.title"; } + color: 0 0 0 0; + } + } + part { name: "text.padding"; + type: RECT; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + min: 30 0; + align: 0.0 0.0; + fixed: 1 0; + rel1 { relative: 1.0 0.0; to: "elm.text.title"; } + rel2 { relative: 1.0 1.0; to: "elm.text.title"; } + visible: 0; + } + } + part { name: "separator"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + min: 4 26; + max: 4 26; + fixed: 1 1; + rel1.to: "text.padding"; + rel2.to: "text.padding"; + align: 0.5 0.5; + image { + normal: "00_divider_line.png"; + border: 0 0 2 2; + } + } + } + part { name: "elm.text.title2"; + type: TEXT; + effect: FAR_SHADOW BOTTOM; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC; + color3: 255 255 255 255; + align: 0.0 0.5; + fixed: 1 1; + rel1 { relative: 1.0 1.0; to_x: "text.padding"; to_y: "top_padding"; } + rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + } + description { state: "default_landscape" 0.0; + inherit: "default" 0.0; + text { font: "Tizen:style=Medium"; + size: NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + } + description { state: "selected_landscape" 0.0; + inherit: "default_landscape" 0.0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + } + } + part { name: "click_event_title2_area"; + type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1 { to: "elm.text.title2"; } + rel2 { to: "elm.text.title2"; } + color: 0 0 0 0; + } + } + part { name: "badge_top_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: NAVIFRAME_BADGE_TOP_PADDING_INC; + fixed: 0 1; + rel1 { relative: 0.0 0.0; to: "title_bg"; } + rel2 { relative: 1.0 0.0; to: "title_bg"; } + align: 0.0 0.0; + } + } + part { name: "badge_left_padding"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: 0 0; + fixed: 1 1; + rel1 { relative: 0.0 1.0; to_x: "separator"; to_y: "badge_top_padding"; } + rel2 { relative: 0.0 0.5; to_x: "separator"; to_y: "title_bg"; } + align: 0.0 0.5; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_PADDING_BADGE_INC; + } + } + part { name: "right.padding.text"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + fixed: 1 1; + min: 8 48; + rel1 { + to: "badge_left_padding"; + relative: 0.0 1.0; + } + rel2 { + to: "badge_left_padding"; + relative: 0.0 1.0; + } + align: 1.0 1.0; + } + } + part { name: "left.padding.text"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + fixed: 1 1; + min: 13 47; + rel1 { + to: "title_badge"; + relative: 0.0 1.0; + } + rel2 { + to: "title_badge"; + relative: 0.0 1.0; + } + align: 1.0 1.0; + } + } + part { name: "badge_bg"; + type: IMAGE; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + visible: 0; + fixed: 1 1; + rel1 { + to: "left.padding.text"; + relative: 0.0 0.0; + } + rel2 { + to: "right.padding.text"; + relative: 1.0 1.0; + } + image { + normal: "00_badge_bg.png"; + border: NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + min: NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC; + fixed: 1 1; + } + } + part { name: "title_badge"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + rel1 { + to: "right.padding.text"; + relative: 0.0 0.0; + } + rel2 { + to: "right.padding.text"; + relative: 0.0 1.0; + } + fixed: 1 0; + align: 1.0 0.5; + color: NAVIFRAME_BADGE_TEXT_COLOR_INC; + text { + font: "Tizen:style=Bold"; + size: NAVIFRAME_BADGE_TEXT_H_INC; + min: 1 1; + max: 1 0; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "badge_left_padding2"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + min: 0 0; + fixed: 1 1; + rel1 { relative: 1.0 1.0; to_x: "elm.text.title2"; to_y: "badge_top_padding"; } + rel2 { relative: 1.0 0.5; to_x: "elm.text.title2"; to_y: "title_bg"; } + align: 0.0 0.5; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + } + } + part { name: "right.padding.text2"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + fixed: 1 1; + min: 8 48; + rel1 { + to: "badge_left_padding2"; + relative: 1.0 1.0; + } + rel2 { + to: "badge_left_padding2"; + relative: 1.0 1.0; + } + align: 1.0 1.0; + } + } + part { name: "left.padding.text2"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + fixed: 1 1; + min: 13 47; + rel1 { + to: "title2_badge"; + relative: 0.0 1.0; + } + rel2 { + to: "title2_badge"; + relative: 0.0 1.0; + } + align: 1.0 1.0; + } + } + part { name: "badge2_bg"; + type: IMAGE; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + visible: 0; + fixed: 1 1; + rel1 { + to: "left.padding.text2"; + relative: 0.0 0.0; + } + rel2 { + to: "right.padding.text2"; + relative: 1.0 1.0; + } + image { + normal: "00_badge_bg.png"; + border: NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + min: NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC; + fixed: 1 1; + } + } + part { name: "title2_badge"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + rel1 { + to: "right.padding.text2"; + relative: 0.0 0.0; + } + rel2 { + to: "right.padding.text2"; + relative: 0.0 1.0; + } + fixed: 1 0; + align: 1.0 0.5; + color: NAVIFRAME_BADGE_TEXT_COLOR_INC; + text { + font: "Tizen:style=Bold"; + size: NAVIFRAME_BADGE_TEXT_H_INC; + min: 1 1; + max: 1 0; + } + } + description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.to_y: "title_toolbar_bg"; + visible: 1; } } - part { name: "content_clip"; + part { name: "access.title"; type: RECT; - mouse_events: 0; + repeat_events: 1; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + fixed: 1 1; + rel1.to: "title_bg"; + rel2.to: "title_bg"; + color: 0 0 0 0; } } - part { name: "title"; + part { name: "title_left_btn"; type: SWALLOW; scale: 1; + clip_to: "title_clip"; description { state: "default" 0.0; - align: 0.5 0.0; - fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } + max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; + fixed: 1 1; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "title_right_btn"; } + rel2 { relative: 0.0 1.0; to: "title_right_btn"; } } - description { state: "hide" 0.0; + description { state: "landscape" 0.0; inherit: "default" 0.0; - visible: 0; - min: 0 0; - max: 0 0; + max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC; + } + } + part { name: "title_right_btn"; + type: SWALLOW; + 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; + rel1 { relative: 0.0 0.0; to: "right_padding"; } + rel2 { relative: 0.0 1.0; to: "right_padding"; } + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC; } } part { name: "toolbar_bg"; @@ -2296,6 +3704,12 @@ max: 999999 NAVIFRAME_TOOLBAR_HEIGHT_INC; visible: 1; } + description { state: "visible_landscape" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + max: 999999 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC; + visible: 1; + } } part { name: "more_btn_bg"; type: RECT; @@ -2320,6 +3734,10 @@ rel1.to: "more_btn_bg"; rel2.to: "more_btn_bg"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; + } } part { name: "prev_btn_bg"; type: RECT; @@ -2345,13 +3763,9 @@ rel1.to: "prev_btn_bg"; rel2.to: "prev_btn_bg"; } - } - part { name: "toolbar_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { to: "toolbar_bg"; } - rel2 { to: "toolbar_bg"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC; } } part { name: "toolbar_btns_area"; @@ -2363,6 +3777,14 @@ visible: 0; } } + part { name: "toolbar_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { to: "toolbar_bg"; } + rel2 { to: "toolbar_bg"; } + } + } part { name: "toolbar_button1"; type: SWALLOW; scale: 1; @@ -2394,6 +3816,11 @@ rel1.to: "toolbar_btns_area"; rel2.to: "toolbar_btns_area"; } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0; + max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999; + } } part { name: "toolbar_button2"; type: SWALLOW; @@ -2482,88 +3909,17 @@ signal: "elm,state,title,show"; source: "elm"; script { - if (get_int(sip_visible) == 0) { + if (get_int(landscape) == 0) set_state(PART:"title_bg", "default", 0.0); - set_state(PART:"title", "default", 0.0); - } else - set_state(PART:"title_toolbar_bg", "show", 0.0); + set_state(PART:"title_bg", "landscape", 0.0); } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; script { - if (get_int(sip_visible) == 0) { - set_state(PART:"title_bg", "hide", 0.0); - set_state(PART:"title", "hide", 0.0); - } - else - set_state(PART:"title_toolbar_bg", "default", 0.0); - } - } - program { name: "sip_show"; - signal: "elm,state,sip,shown"; - source: ""; - script { - set_int(sip_visible, 1); set_state(PART:"title_bg", "hide", 0.0); - set_state(PART:"title", "hide", 0.0); - set_state(PART:"title_toolbar_bg", "show", 0.0); - set_state(PART:"elm.swallow.content", "sip_visible", 0.0); - } - } - program { name: "sip_hide"; - signal: "elm,state,sip,hidden"; - source: ""; - script { - set_int(sip_visible, 0); - set_state(PART:"title_bg", "default", 0.0); - set_state(PART:"title", "default", 0.0); - set_state(PART:"title_toolbar_bg", "default", 0.0); - set_state(PART:"elm.swallow.content", "default", 0.0); - } - } - program { name: "title_toolbar_button1_show"; - signal: "elm,state,title_toolbar_button1,show"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) + 1); - if (get_int(title_toolbar_buttons_visible) >= 2) - { - set_state(PART:"title_toolbar_button1", "buttons_set", 0.0); - set_state(PART:"title_toolbar_button2", "buttons_set", 0.0); - } - } - } - program { name: "title_toolbar_button1_hide"; - signal: "elm,state,title_toolbar_button1,hide"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) - 1); - set_state(PART:"title_toolbar_button1", "default", 0.0); - set_state(PART:"title_toolbar_button2", "default", 0.0); - } - } - program { name: "title_toolbar_button2_show"; - signal: "elm,state,title_toolbar_button2,show"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) + 1); - if (get_int(title_toolbar_buttons_visible) >= 2) - { - set_state(PART:"title_toolbar_button1", "buttons_set", 0.0); - set_state(PART:"title_toolbar_button2", "buttons_set", 0.0); - } - } - } - program { name: "title_toolbar_button2_hide"; - signal: "elm,state,title_toolbar_button2,hide"; - source: "elm"; - script { - set_int(title_toolbar_buttons_visible, get_int(title_toolbar_buttons_visible) - 1); - set_state(PART:"title_toolbar_button1", "default", 0.0); - set_state(PART:"title_toolbar_button2", "default", 0.0); } } program { name: "prev_btn_show"; @@ -2644,7 +4000,10 @@ signal: "elm,state,toolbar_bg,show"; source: "elm"; script { - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); set_int(tbar_bg, get_int(tbar_bg) + 1); } } @@ -2662,7 +4021,10 @@ source: "elm"; script { set_int(tbar_close, 0); - set_state(PART:"toolbar_bg", "visible", 0.0); + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); } } program { name: "toolbar_close_internal"; @@ -2676,8 +4038,12 @@ program { name: "toolbar_open"; signal: "elm,state,toolbar,open"; source: ""; - action: STATE_SET "visible" 0.0; - target: "toolbar_bg"; + script { + if (get_int(landscape) == 0) + set_state(PART:"toolbar_bg", "visible", 0.0); + else + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + } transition: LINEAR 0.2; after: "toolbar_open_internal"; } @@ -2713,127 +4079,256 @@ action: SIGNAL_EMIT "elm,action,popped,finished" ""; } program { - name: "display_mode_compress"; - signal: "display,mode,compress"; - source: ""; + name: "init_title_selection"; + signal: "elm,state,title_label,show"; + source: "elm"; script { - set_state(PART:"toolbar_bg", "default", 0.0); + new st[31]; + new Float:vl; + get_state(PART:"elm.text.title", st, 30, vl); + if (get_int(landscape) == 0) + { + set_state(PART:"elm.text.title", "selected", 0.0); + set_state(PART:"elm.text.title2", "default", 0.0); + } + else + { + set_state(PART:"elm.text.title", "selected_landscape", 0.0); + set_state(PART:"elm.text.title2", "default_landscape", 0.0); + } } } program { - name: "display_mode_default"; - signal: "display,mode,default"; - source: ""; + name: "title1_clicked"; + signal: "mouse,clicked,1"; + source: "click_event_title1_area"; script { - if ((get_int(tbar_bg) > 0) && (get_int(tbar_close) == 0)) - set_state(PART:"toolbar_bg", "visible", 0.0); + new st[31]; + new Float:vl; + get_state(PART:"elm.text.title", st, 30, vl); + if ((get_int(landscape) == 0) && !strcmp(st, "default")) + { + set_state(PART:"elm.text.title", "selected", 0.0); + set_state(PART:"elm.text.title2", "default", 0.0); + } + else if ((get_int(landscape) == 1) && !strcmp(st, "default_landscape")) + { + set_state(PART:"elm.text.title", "selected_landscape", 0.0); + set_state(PART:"elm.text.title2", "default_landscape", 0.0); + } + emit("elm,action,title1,clicked", ""); } } - } - } - - group { name:"elm/naviframe/item/basic/uglib"; - parts { - part { name: "base"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - color: 255 255 255 255; + program { + name: "title2_clicked"; + signal: "mouse,clicked,1"; + source: "click_event_title2_area"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text.title2", st, 30, vl); + if ((get_int(landscape) == 0) && !strcmp(st, "default")) + { + set_state(PART:"elm.text.title2", "selected", 0.0); + set_state(PART:"elm.text.title", "default", 0.0); + } + else if ((get_int(landscape) == 1) && !strcmp(st, "default_landscape")) + { + set_state(PART:"elm.text.title2", "selected_landscape", 0.0); + set_state(PART:"elm.text.title", "default_landscape", 0.0); + } + emit("elm,action,title2,clicked", ""); } - description { state: "right" 0.0; - inherit: "default" 0.0; - rel1.relative: 1.0 0.0; - rel2.relative: 2.0 1.0; - color: 255 255 255 0; + } + program { name: "title1_selected"; + signal: "elm,state,title1,selected"; + source: ""; + script { + if (get_int(landscape) == 0) + { + set_state(PART:"elm.text.title", "selected", 0.0); + set_state(PART:"elm.text.title2", "default", 0.0); + } + else + { + set_state(PART:"elm.text.title", "selected_landscape", 0.0); + set_state(PART:"elm.text.title2", "default_landscape", 0.0); + } + } + } + program { name: "title1_unselected"; + signal: "elm,state,title1,unselected"; + source: ""; + script { + if (get_int(landscape) == 0) + set_state(PART:"elm.text.title", "default", 0.0); + else + set_state(PART:"elm.text.title", "default_landscape", 0.0); } } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - repeat_events: 0; - clip_to: "base"; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1.relative: 0.0 0.0; - rel1.to: "base"; - rel2.relative: 1.0 1.0; - rel2.to: "base"; + program { name: "title2_selected"; + signal: "elm,state,title2,selected"; + source: ""; + script { + if (get_int(landscape) == 0) + { + set_state(PART:"elm.text.title2", "selected", 0.0); + set_state(PART:"elm.text.title", "default", 0.0); + } + else + { + set_state(PART:"elm.text.title2", "selected_landscape", 0.0); + set_state(PART:"elm.text.title", "default_landscape", 0.0); + } + } + } + program { name: "title2_unselected"; + signal: "elm,state,title2,unselected"; + source: ""; + script { + if (get_int(landscape) == 0) + set_state(PART:"elm.text.title2", "default", 0.0); + else + set_state(PART:"elm.text.title2", "default_landscape", 0.0); } } - } - programs { - program { name: "content_new_pushed"; - signal: "elm,state,new,pushed,deferred"; + program { + name: "badge_show"; + signal: "elm,state,title_badge,show"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; - after: "show_finished"; + script { + set_state(PART:"badge_bg", "visible", 0.0); + set_state(PART:"title_badge", "visible", 0.0); + } } - program { name: "content_cur_pushed"; - signal: "elm,state,cur,pushed,deferred"; + program { + name: "badge_hide"; + signal: "elm,state,title_badge,hide"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; - after: "pushed_finished"; + script { + set_state(PART:"badge_bg", "default", 0.0); + set_state(PART:"title_badge", "default", 0.0); + } } - program { name: "content_prev_popped"; - signal: "elm,state,prev,popped,deferred"; + program { + name: "badge2_show"; + signal: "elm,state,title2_badge,show"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; - after: "show_finished"; + script { + set_state(PART:"badge_left_padding2", "visible", 0.0); + set_state(PART:"badge2_bg", "visible", 0.0); + set_state(PART:"title2_badge", "visible", 0.0); + } } - program { name: "content_cur_popped"; - signal: "elm,state,cur,popped,deferred"; + program { + name: "badge2_hide"; + signal: "elm,state,title2_badge,hide"; source: "elm"; - action: STATE_SET "right" 0.0; - target: "base"; - transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; - after: "popped_finished"; + script { + set_state(PART:"badge_left_padding2", "default", 0.0); + set_state(PART:"badge2_bg", "default", 0.0); + set_state(PART:"title2_badge", "default", 0.0); + } } - program { name: "cur_pushed"; - signal: "elm,state,cur,pushed"; + program { + name: "change_to_landscape"; + signal: "elm,state,landscape"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; + script { + if (get_int(landscape) == 0) { + set_state(PART:"top_padding", "landscape", 0.0); + set_state(PART:"padding_bottom_text", "landscape", 0.0); + set_state(PART:"title_left_btn", "landscape", 0.0); + set_state(PART:"title_right_btn", "landscape", 0.0); + set_state(PART:"toolbar_more_btn", "landscape", 0.0); + set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); + set_state(PART:"toolbar_button_padding", "landscape", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"title_bg", "landscape", 0.0); + + get_state(PART:"elm.text.title", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"elm.text.title", "default_landscape", 0.0); + else + set_state(PART:"elm.text.title", "selected_landscape", 0.0); + + get_state(PART:"elm.text.title2", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"elm.text.title2", "default_landscape", 0.0); + else + set_state(PART:"elm.text.title2", "selected_landscape", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"toolbar_bg", "visible_landscape", 0.0); + + set_int(landscape, 1); + } + } } - program { name: "new_pushed"; - signal: "elm,state,new,pushed"; + program { + name: "change_to_portrait"; + signal: "elm,state,portrait"; source: "elm"; - action: STATE_SET "right" 0.0; - target: "base"; + script { + if (get_int(landscape) == 1) { + set_state(PART:"top_padding", "default", 0.0); + set_state(PART:"padding_bottom_text", "default", 0.0); + set_state(PART:"title_left_btn", "default", 0.0); + set_state(PART:"title_right_btn", "default", 0.0); + set_state(PART:"toolbar_more_btn", "default", 0.0); + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"toolbar_button_padding", "default", 0.0); + + new st[31]; + new Float:vl; + get_state(PART:"title_bg", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"title_bg", "default", 0.0); + + get_state(PART:"elm.text.title", st, 30, vl); + if (!strcmp(st, "default_landscape")) + set_state(PART:"elm.text.title", "default", 0.0); + else + set_state(PART:"elm.text.title", "selected", 0.0); + + get_state(PART:"elm.text.title2", st, 30, vl); + if (!strcmp(st, "default_landscape")) + set_state(PART:"elm.text.title2", "default", 0.0); + else + set_state(PART:"elm.text.title2", "selected", 0.0); + + get_state(PART:"toolbar_bg", st, 30, vl); + if (!strcmp(st, "visible_landscape")) + set_state(PART:"toolbar_bg", "visible", 0.0); + + set_int(landscape, 0); + } + } } - program { name: "prev_popped"; - signal: "elm,state,prev,popped"; + program { name: "landscape_mode"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; + signal: "elm,state,orient,90"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; } - program { name: "cur_popped"; - signal: "elm,state,cur,popped"; + program { name: "landscape_mode2"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; + signal: "elm,state,orient,270"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; } - program { name: "visible"; - signal: "elm,state,visible"; + program { name: "portrait_mode"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - } - program { name: "show_finished"; - action: SIGNAL_EMIT "elm,action,show,finished" ""; + signal: "elm,state,orient,0"; + action: SIGNAL_EMIT "elm,state,portrait" "elm"; } - program { name: "pushed_finished"; - action: SIGNAL_EMIT "elm,action,pushed,finished" ""; - } - program { name: "popped_finished"; - action: SIGNAL_EMIT "elm,action,popped,finished" ""; + program { name: "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + action: SIGNAL_EMIT "elm,state,portrait" "elm"; } } } - - diff --git a/themes/widgets/notify.edc b/themes/widgets/notify.edc index 70cbb22..e37560c 100644 --- a/themes/widgets/notify.edc +++ b/themes/widgets/notify.edc @@ -57,23 +57,27 @@ group { name: "elm/notify/top/default"; type: RECT; mouse_events: 0; repeat_events: 1; + /* description { state: "default" 0.0; color: 0 0 0 0; rel1.relative: 0.0 -1.0; rel2.relative: 1.0 0.0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + */ + description { state: "default" 0.0; + //inherit: "default" 0.0; color: 0 0 0 64; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -84,6 +88,7 @@ group { name: "elm/notify/top/default"; } } } + /* programs { program { name: "show_3"; signal: "show"; @@ -97,6 +102,7 @@ group { name: "elm/notify/top/default"; target: "base"; } } + */ } group { name: "elm/notify/center/default"; @@ -113,10 +119,12 @@ group { name: "elm/notify/center/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -143,16 +151,18 @@ group { name: "elm/notify/bottom/default"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 64; + color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -198,10 +208,12 @@ group { name: "elm/notify/left/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -247,10 +259,12 @@ group { name: "elm/notify/right/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -296,10 +310,12 @@ group { name: "elm/notify/top_left/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -345,10 +361,12 @@ group { name: "elm/notify/top_right/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -394,10 +412,12 @@ group { name: "elm/notify/bottom_left/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; @@ -443,10 +463,12 @@ group { name: "elm/notify/bottom_right/default"; } } part { name: "pop"; + type: RECT; mouse_events: 1; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; + color: 0 0 0 0; } } part { name: "elm.swallow.content"; diff --git a/themes/widgets/panes.edc b/themes/widgets/panes.edc index c60ff13..54846ca 100644 --- a/themes/widgets/panes.edc +++ b/themes/widgets/panes.edc @@ -259,15 +259,18 @@ } description { state: "disabled" 0.0; inherit: "default" 0.0; + visible: 0; } } part { name: "over2"; + type: RECT; mouse_events: 1; repeat_events: 1; ignore_flags: ON_HOLD; description { state: "default" 0.0; rel1.to: "elm.bar"; rel2.to: "elm.bar"; + color: 0 0 0 0; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -275,11 +278,13 @@ } } part { name: "over3"; + type: RECT; mouse_events: 1; repeat_events: 1; description { state: "default" 0.0; rel1.to: "elm.bar"; rel2.to: "elm.bar"; + color: 0 0 0 0; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -329,7 +334,7 @@ programs { program { name: "drag_effect_start"; - signal: "elm,panes,left,hide"; + signal: "left,hide,effect"; source: ""; script { new Float:x, Float:y; @@ -354,6 +359,11 @@ action: STATE_SET "default" 0.0; target: "elm.swallow.left"; target: "whole_left"; + after: "effect_finished"; + } + program { + name: "effect_finished"; + action: SIGNAL_EMIT "left,hide,effect,finished" ""; } program { name: "panes_pair"; @@ -447,6 +457,7 @@ source: "elm"; action: STATE_SET "disabled" 0.0; target: "bar_disabled"; + target: "bar_handler"; after: "after_fixed"; } program { @@ -465,6 +476,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "bar_disabled"; + target: "bar_handler"; after: "after_unfixed"; } program { @@ -712,15 +724,18 @@ } description { state: "disabled" 0.0; inherit: "default" 0.0; + visible: 0; } } part { name: "over2"; + type: RECT; mouse_events: 1; repeat_events: 1; ignore_flags: ON_HOLD; description { state: "default" 0.0; rel1.to: "elm.bar"; rel2.to: "elm.bar"; + color: 0 0 0 0; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -728,11 +743,13 @@ } } part { name: "over3"; + type: RECT; mouse_events: 1; repeat_events: 1; description { state: "default" 0.0; rel1.to: "elm.bar"; rel2.to: "elm.bar"; + color: 0 0 0 0; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -845,6 +862,7 @@ source: "elm"; action: STATE_SET "disabled" 0.0; target: "bar_disabled"; + target: "bar_handler"; after: "after_fixed"; } program { @@ -863,6 +881,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "bar_disabled"; + target: "bar_handler"; after: "after_unfixed"; } program { diff --git a/themes/widgets/photocam.edc b/themes/widgets/photocam.edc index 79cd66d..1319e52 100644 --- a/themes/widgets/photocam.edc +++ b/themes/widgets/photocam.edc @@ -49,36 +49,36 @@ group { name: "elm/photocam/base/default"; image: "bt_sm_hilight.png" COMP; image: "sb_runnerh.png" COMP; image: "sb_runnerv.png" COMP; - image: "00_winset_list_process_01.png" COMP; - image: "00_winset_list_process_02.png" COMP; - image: "00_winset_list_process_03.png" COMP; - image: "00_winset_list_process_04.png" COMP; - image: "00_winset_list_process_05.png" COMP; - image: "00_winset_list_process_06.png" COMP; - image: "00_winset_list_process_07.png" COMP; - image: "00_winset_list_process_08.png" COMP; - image: "00_winset_list_process_09.png" COMP; - image: "00_winset_list_process_10.png" COMP; - image: "00_winset_list_process_11.png" COMP; - image: "00_winset_list_process_12.png" COMP; - image: "00_winset_list_process_13.png" COMP; - image: "00_winset_list_process_14.png" COMP; - image: "00_winset_list_process_15.png" COMP; - image: "00_winset_list_process_16.png" COMP; - image: "00_winset_list_process_17.png" COMP; - image: "00_winset_list_process_18.png" COMP; - image: "00_winset_list_process_19.png" COMP; - image: "00_winset_list_process_20.png" COMP; - image: "00_winset_list_process_21.png" COMP; - image: "00_winset_list_process_22.png" COMP; - image: "00_winset_list_process_23.png" COMP; - image: "00_winset_list_process_24.png" COMP; - image: "00_winset_list_process_25.png" COMP; - image: "00_winset_list_process_26.png" COMP; - image: "00_winset_list_process_27.png" COMP; - image: "00_winset_list_process_28.png" COMP; - image: "00_winset_list_process_29.png" COMP; - image: "00_winset_list_process_30.png" COMP; + image: "process/63x63/00_list_process_01.png" COMP; + image: "process/63x63/00_list_process_02.png" COMP; + image: "process/63x63/00_list_process_03.png" COMP; + image: "process/63x63/00_list_process_04.png" COMP; + image: "process/63x63/00_list_process_05.png" COMP; + image: "process/63x63/00_list_process_06.png" COMP; + image: "process/63x63/00_list_process_07.png" COMP; + image: "process/63x63/00_list_process_08.png" COMP; + image: "process/63x63/00_list_process_09.png" COMP; + image: "process/63x63/00_list_process_10.png" COMP; + image: "process/63x63/00_list_process_11.png" COMP; + image: "process/63x63/00_list_process_12.png" COMP; + image: "process/63x63/00_list_process_13.png" COMP; + image: "process/63x63/00_list_process_14.png" COMP; + image: "process/63x63/00_list_process_15.png" COMP; + image: "process/63x63/00_list_process_16.png" COMP; + image: "process/63x63/00_list_process_17.png" COMP; + image: "process/63x63/00_list_process_18.png" COMP; + image: "process/63x63/00_list_process_19.png" COMP; + image: "process/63x63/00_list_process_20.png" COMP; + image: "process/63x63/00_list_process_21.png" COMP; + image: "process/63x63/00_list_process_22.png" COMP; + image: "process/63x63/00_list_process_23.png" COMP; + image: "process/63x63/00_list_process_24.png" COMP; + image: "process/63x63/00_list_process_25.png" COMP; + image: "process/63x63/00_list_process_26.png" COMP; + image: "process/63x63/00_list_process_27.png" COMP; + image: "process/63x63/00_list_process_28.png" COMP; + image: "process/63x63/00_list_process_29.png" COMP; + image: "process/63x63/00_list_process_30.png" COMP; } parts { part { name: "bg"; @@ -147,36 +147,36 @@ group { name: "elm/photocam/base/default"; offset: -9 -9; } image { - normal: "00_winset_list_process_30.png"; - tween: "00_winset_list_process_01.png"; - tween: "00_winset_list_process_02.png"; - tween: "00_winset_list_process_03.png"; - tween: "00_winset_list_process_04.png"; - tween: "00_winset_list_process_05.png"; - tween: "00_winset_list_process_06.png"; - tween: "00_winset_list_process_07.png"; - tween: "00_winset_list_process_08.png"; - tween: "00_winset_list_process_09.png"; - tween: "00_winset_list_process_10.png"; - tween: "00_winset_list_process_11.png"; - tween: "00_winset_list_process_12.png"; - tween: "00_winset_list_process_13.png"; - tween: "00_winset_list_process_14.png"; - tween: "00_winset_list_process_15.png"; - tween: "00_winset_list_process_16.png"; - tween: "00_winset_list_process_17.png"; - tween: "00_winset_list_process_18.png"; - tween: "00_winset_list_process_19.png"; - tween: "00_winset_list_process_20.png"; - tween: "00_winset_list_process_21.png"; - tween: "00_winset_list_process_22.png"; - tween: "00_winset_list_process_23.png"; - tween: "00_winset_list_process_24.png"; - tween: "00_winset_list_process_25.png"; - tween: "00_winset_list_process_26.png"; - tween: "00_winset_list_process_27.png"; - tween: "00_winset_list_process_28.png"; - tween: "00_winset_list_process_29.png"; + normal: "process/63x63/00_list_process_30.png"; + tween: "process/63x63/00_list_process_01.png"; + tween: "process/63x63/00_list_process_02.png"; + tween: "process/63x63/00_list_process_03.png"; + tween: "process/63x63/00_list_process_04.png"; + tween: "process/63x63/00_list_process_05.png"; + tween: "process/63x63/00_list_process_06.png"; + tween: "process/63x63/00_list_process_07.png"; + tween: "process/63x63/00_list_process_08.png"; + tween: "process/63x63/00_list_process_09.png"; + tween: "process/63x63/00_list_process_10.png"; + tween: "process/63x63/00_list_process_11.png"; + tween: "process/63x63/00_list_process_12.png"; + tween: "process/63x63/00_list_process_13.png"; + tween: "process/63x63/00_list_process_14.png"; + tween: "process/63x63/00_list_process_15.png"; + tween: "process/63x63/00_list_process_16.png"; + tween: "process/63x63/00_list_process_17.png"; + tween: "process/63x63/00_list_process_18.png"; + tween: "process/63x63/00_list_process_19.png"; + tween: "process/63x63/00_list_process_20.png"; + tween: "process/63x63/00_list_process_21.png"; + tween: "process/63x63/00_list_process_22.png"; + tween: "process/63x63/00_list_process_23.png"; + tween: "process/63x63/00_list_process_24.png"; + tween: "process/63x63/00_list_process_25.png"; + tween: "process/63x63/00_list_process_26.png"; + tween: "process/63x63/00_list_process_27.png"; + tween: "process/63x63/00_list_process_28.png"; + tween: "process/63x63/00_list_process_29.png"; } } } diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc index d36f2fc..24b4839 100644 --- a/themes/widgets/popup.edc +++ b/themes/widgets/popup.edc @@ -32,17 +32,15 @@ group { name: "elm/notify/center/popup"; alias: "elm/notify/center/volumebarstyle_text"; alias: "elm/notify/center/content_expand"; parts { - part { name: "base"; - type: RECT; - scale : 1; - mouse_events: 0; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - } - } + part { name: "base"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + } + } part { name: "persp"; type: RECT; description { state: "default" 0.0; @@ -71,47 +69,58 @@ group { name: "elm/notify/center/popup"; } } } - part { name: "pop"; - scale : 1; - mouse_events: 1; - description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; - image { - middle: DEFAULT; - border_scale: 0; - } - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale : 1; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - map { - on: 0; - backface_cull: 1; - perspective: "persp"; - } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + //clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + map { + on: 1; + backface_cull: 1; + perspective: "persp"; + smooth: 0; } - description { state: "visible" 0.0; - rel1.to: "base"; - rel2.to: "base"; - map { - on: 0; - backface_cull: 1; - perspective: "persp1"; - } + } + description { state: "visible" 0.0; + rel1.to: "base"; + rel2.to: "base"; + map { + on: 1; + backface_cull: 1; + perspective: "persp1"; + smooth: 0; } - description { state: "end" 0.0; - rel1.to: "base"; - rel2.to: "base"; - map { - on: 0; - } + } + description { state: "end" 0.0; + rel1.to: "base"; + rel2.to: "base"; + map { + on: 0; + smooth: 0; } - } + } + } + /* + part { name: "clipper"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default"; + color: 255 255 255 255; + } + description { state: "end" 0.0; + inherit: "default"; + color: 255 255 255 255; + } + } + */ } programs { program { name: "show"; @@ -120,14 +129,33 @@ group { name: "elm/notify/center/popup"; action: STATE_SET "default" 0.0; target: "elm.swallow.content"; } - program { name: "show_2"; + program { name: "show_1"; signal: "show"; - action: STATE_SET "visible" 0.0; + action: STATE_SET "default" 0.0; target: "elm.swallow.content"; - transition: ACCEL_FAC 0.5 0.8; + //target: "clipper"; after: "end"; + //after: "end1"; } program { name: "end"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.content"; + transition: SIN_FAC 0.33 1.4; + after: "end2"; + } + /* + program { name: "end1"; + action: STATE_SET "visible" 0.0; + //target: "clipper"; + transition: SIN_FAC 0.33 0.5; + after: "end3"; + } + program { name: "end3"; + action: STATE_SET "end" 0.0; + target: "clipper"; + } + */ + program { name: "end2"; action: STATE_SET "end" 0.0; target: "elm.swallow.content"; } @@ -154,7 +182,7 @@ group { name: "elm/notify/center/transparent"; parts { part { name: "elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; map.on: 0; } @@ -178,31 +206,58 @@ group { name: "elm/notify/block_events/popup"; alias: "elm/notify/block_events/volumebarstyle"; alias: "elm/notify/block_events/volumebarstyle_text"; alias: "elm/notify/block_events/content_expand"; + images { + image: "00_popup_dim_lighting.png" COMP; + } parts { part { name: "block_events"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + image.normal: "00_popup_dim_lighting.png"; + fill.smooth: 0; + } + description { state: "show" 0.0; + inherit: "default" 0.0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + } + } + part { name: "block_events_color"; type: RECT; + scale: 1; description { state: "default" 0.0; color: POPUP_DIM_BG_DEFAULT_COLOR_INC; } description { state: "show" 0.0; + inherit: "default" 0.0; color: POPUP_DIM_BG_COLOR_INC; } description { state: "clicked" 0.0; - color: POPUP_DIM_BG_CLICKED_COLOR_INC; + inherit: "default" 0.0; + color: POPUP_DIM_BG_COLOR_INC; } } } programs { - program { name: "load"; - signal: "load"; - source: ""; + program { name: "show"; + signal: "elm,action,show"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "block_events"; + target: "block_events_color"; + } + program { name: "show1"; + signal: "show"; action: STATE_SET "show" 0.0; - transition: ACCEL_FAC 0.5 0.8; + transition: SIN_FAC 0.33 0.5; target: "block_events"; + target: "block_events_color"; } program { name: "block_clicked"; signal: "mouse,clicked,1"; - source: "block_events"; + source: "block_events_color"; action: SIGNAL_EMIT "elm,action,click" "elm"; after: "deeper_block_color"; } @@ -210,6 +265,7 @@ group { name: "elm/notify/block_events/popup"; name: "deeper_block_color"; action: STATE_SET "clicked" 0.0; target: "block_events"; + source: "block_events_color"; transition: LINEAR 0.2; after: "default_block_color"; } @@ -217,6 +273,7 @@ group { name: "elm/notify/block_events/popup"; name: "default_block_color"; action: STATE_SET "show" 0.0; target: "block_events"; + target: "block_events_color"; transition: LINEAR 0.2; } } @@ -271,7 +328,7 @@ group { name: "elm/label/base/popup/default"; alias: "elm/label/base/popup/transparent"; styles { style { name: "popup_desc_style"; - base: "font=Tizen:style=Medium font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=left color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" linesize=54 text_class=slp wrap=mixed ellipsis=1"; + base: "font=Tizen:style=Medium font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=left color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=slp wrap=mixed ellipsis=1"; tag: "br" "\n"; tag: "ps" "ps"; tag: "whitecolor" "+ color=#ffffff"; @@ -314,33 +371,29 @@ group { name: "elm/popup/base/default"; parts { part { name:"shadow_left_top_padding"; - type:RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; min: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING; max: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING; align: 0 0; fixed: 1 1; - visible: 0; } } part { name:"shadow_right_bottom_padding"; - type:RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; align: 1 1; fixed: 1 1; - visible: 0; } } part { name: "base"; type: IMAGE; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC; max: POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC; @@ -349,18 +402,23 @@ group { name: "elm/popup/base/default"; border: POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC; border_scale: 1; } - align: 0.0 0.0; + fill.smooth: 0; + align: 0.5 0.5; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC; + max: POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC; } } part { name: "elm.bg.title"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC; max: POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 0.0; - visible: 0; rel1 { relative: 0.5 1.0; to_y: "shadow_left_top_padding"; @@ -372,18 +430,42 @@ group { name: "elm/popup/base/default"; } description { state: "visible" 0.0; inherit: "default" 0.0; - visible: 0; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC; + max: POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC; + } + description { state: "landscape_visible" 0.0; + inherit: "landscape" 0.0; + } + } + part { name: "action_top_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 0 POPUP_ACTION_DESC_TOP_PADDING; + max: 0 POPUP_ACTION_DESC_TOP_PADDING; + fixed: 1 1; + align: 0.5 0.0; + rel1 { + relative: 0.5 1.0; + to_y: "shadow_left_top_padding"; + } + rel2 { + relative: 0.5 1.0; + to_y: "shadow_left_top_padding"; + } } } part { name: "label_top_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; min: 0 (POPUP_LABEL_DESC_TOP_PADDING-POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC); max: 0 (POPUP_LABEL_DESC_TOP_PADDING-POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC); fixed: 1 1; align: 0.5 0.0; - visible: 0; rel1 { relative: 0.5 1.0; to_y: "shadow_left_top_padding"; @@ -395,14 +477,13 @@ group { name: "elm/popup/base/default"; } } part { name: "label_bottom_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; min: 0 (POPUP_LABEL_DESC_BOTTOM_PADDING-POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC); max: 0 (POPUP_LABEL_DESC_BOTTOM_PADDING-POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC); fixed: 1 1; align: 0.5 1.0; - visible: 0; rel1 { relative: 0.5 0.0; to_y: "shadow_right_bottom_padding"; @@ -414,37 +495,31 @@ group { name: "elm/popup/base/default"; } } part { name: "title_left_top_padding"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; align: 0.0 0.0; rel1.to: "elm.bg.title"; fixed: 1 1; - min: POPUP_DESC_LEFT_PADDING POPUP_TITLE_TOP_PADDING; - max: POPUP_DESC_LEFT_PADDING POPUP_TITLE_TOP_PADDING; - visible: 0; + min: 0 POPUP_TITLE_TOP_PADDING; + max: 0 POPUP_TITLE_TOP_PADDING; } } part { name: "title_right_bottom_padding"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; align: 1.0 1.0; rel2.to: "elm.bg.title"; fixed: 1 1; - min: POPUP_DESC_RIGHT_PADDING POPUP_TITLE_BOTTOM_PADDING; - max: POPUP_DESC_RIGHT_PADDING POPUP_TITLE_BOTTOM_PADDING; - visible: 0; + min: 0 POPUP_TITLE_BOTTOM_PADDING; + max: 0 POPUP_TITLE_BOTTOM_PADDING; } } part { name: "icon_rect"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; - visible: 0; min: 0 0; fixed: 1 1; rel1 { @@ -465,11 +540,9 @@ group { name: "elm/popup/base/default"; } } part { name: "padding_after_icon"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; - visible: 0; min: 0 0; fixed: 1 1; rel1 { @@ -514,62 +587,90 @@ group { name: "elm/popup/base/default"; align: 0.0 0.5; } } + part { name: "access.title"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "elm.bg.title"; + rel2.to:"elm.bg.title"; + color: 0 0 0 0; + } + } part { name: "elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; fixed: 1 0; rel1 { - relative: 0.5 1.0; - to: "label_top_padding"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "label_top_padding"; } rel2 { - relative: 0.5 0.0; - to: "label_bottom_padding"; + relative: 1.0 0.0; + to_x: "base"; + to_y: "label_bottom_padding"; } } description { state: "show_title_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to: "elm.bg.title"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "elm.bg.title"; } rel2 { - relative: 0.5 0.0; + relative: 1.0 0.0; + to_x: "base"; to_y: "shadow_right_bottom_padding"; } } description { state: "show_action_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to_y: "shadow_left_top_padding"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "action_top_padding"; } rel2 { - relative: 0.5 0.0; - to: "elm.swallow.action_area"; + relative: 1.0 0.0; + to_x: "base"; + to_y: "elm.swallow.action_area"; } } description { state: "show_action_title_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to: "elm.bg.title"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "elm.bg.title"; } rel2 { - relative: 0.5 0.0; - to: "elm.swallow.action_area"; + relative: 1.0 0.0; + to_x: "base"; + to_y: "elm.swallow.action_area"; } } } + part { name: "access.body"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + color: 0 0 0 0; + } + } part { name: "elm.swallow.action_area"; type: SWALLOW;; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 1.0; visible: 0; rel1 { @@ -615,7 +716,11 @@ group { name: "elm/popup/base/default"; set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); else set_state(PART:"elm.swallow.content", "show_title_area", 0.0); - set_state(PART:"elm.bg.title", "visible", 0.0); + get_state(PART:"base", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"elm.bg.title", "landscape_visible", 0.0); + else + set_state(PART:"elm.bg.title", "visible", 0.0); } } program { name: hide_title_area; @@ -630,7 +735,11 @@ group { name: "elm/popup/base/default"; set_state(PART:"elm.swallow.content", "show_action_area", 0.0); else set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"elm.bg.title", "default", 0.0); + get_state(PART:"base", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"elm.bg.title", "landscape", 0.0); + else + set_state(PART:"elm.bg.title", "default", 0.0); } } program { name: show_action_area; @@ -640,7 +749,7 @@ group { name: "elm/popup/base/default"; new st[31]; new Float:vl; get_state(PART:"elm.bg.title", st, 30, vl); - if (!strcmp(st, "visible")) + if ((!strcmp(st, "visible")) || (!strcmp(st, "landscape_visible"))) set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); else set_state(PART:"elm.swallow.content", "show_action_area", 0.0); @@ -655,30 +764,107 @@ group { name: "elm/popup/base/default"; new st[31]; new Float:vl; get_state(PART:"elm.bg.title", st, 30, vl); - if (!strcmp(st, "visible")) + if ((!strcmp(st, "visible")) || (!strcmp(st, "landscape_visible"))) set_state(PART:"elm.swallow.content", "show_title_area", 0.0); else set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"elm.swallow.action_area", "default", 0.0); } } + program { name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + action: STATE_SET "landscape" 0.0; + target: "base"; + target: "elm.bg.title"; + } + program { name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + target: "elm.bg.title"; + } + 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"; + } } /* end of programs */ } +group { name: "elm/popup/base/content_no_vhpad"; + inherit: "elm/popup/base/default"; + alias: "elm/popup/base/min_menustyle"; + parts { + part { name: "label_top_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + align: 0.5 0.0; + rel1 { + relative: 0.5 1.0; + to_y: "shadow_left_top_padding"; + } + rel2 { + relative: 0.5 1.0; + to_y: "shadow_left_top_padding"; + } + } + } + part { name: "label_bottom_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + align: 0.5 1.0; + rel1 { + relative: 0.5 0.0; + to_y: "shadow_right_bottom_padding"; + } + rel2 { + relative: 0.5 0.0; + to_y: "shadow_right_bottom_padding"; + } + } + } + } +} + group { name: "elm/popup/content/default"; alias: "elm/popup/content/transparent"; alias: "elm/popup/content/customstyle"; alias: "elm/popup/content/customstyle_transparent"; parts{ part { name: "pad_t"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; mouse_events: 0; description { state: "default" 0.0; align: 0.5 0.0; min: 0 POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC; + max: 0 POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC; fixed: 0 1; - visible: 0; rel1 { relative: 1.0 0.0; to_x: "pad_l"; @@ -690,52 +876,52 @@ group { name: "elm/popup/content/default"; } } part { name: "pad_l"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; - min : POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; + min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; + max: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; fixed: 1 0; rel2.relative: 0.0 1.0; - visible: 0; align: 0.0 0.0; } } part { name: "pad_r"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; - min : POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 0; + min: POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 0; + max: POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 0; fixed: 1 0; rel1.relative: 1.0 0.0; - visible: 0; align: 1.0 0.0; } } - part{ name:"elm.swallow.content"; + part { name:"elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; - min: POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { - relative: 0.5 1.0; - to: "pad_t"; + relative: 1.0 1.0; + to_x: "pad_l"; + to_y: "pad_t"; } rel2 { - relative: 0.5 0.0; - to: "pad_b"; + relative: 0.0 0.0; + to_x: "pad_r"; + to_y: "pad_b"; } } } part { name: "pad_b"; - type: RECT; - scale : 1; - mouse_events: 0; + type: SPACER; + scale: 1; description { state: "default" 0.0; align: 0.5 1.0; min: 0 POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC; + max: 0 POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC; fixed: 0 1; - visible: 0; rel1 { relative: 0.0 1.0; to_x: "pad_l"; @@ -746,6 +932,18 @@ group { name: "elm/popup/content/default"; } } +group { name: "elm/popup/content/content_no_vhpad"; + parts { + part { name:"elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + fixed: 1 0; + } + } + } +} + /////////////////////////////////////////////////////////////////////////////// group { name: "elm/popup/item/default"; @@ -755,12 +953,14 @@ group { name: "elm/popup/item/default"; } parts { part { name: "event_blocker"; + type: RECT; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "bg"; - mouse_events: 0; type: RECT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; color: GENLIST_LIST_BG_COLOR; @@ -772,27 +972,23 @@ group { name: "elm/popup/item/default"; } } part { name: "padding_left_top"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; align: 0.0 0.0; rel2.relative: 0.0 0.0; min: POPUP_ITEM_LEFT_MIN_PADDING_INC; fixed: 1 1; - visible: 0; } } part { name: "padding_right_bottom"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; align: 1.0 1.0; rel1.relative: 1.0 1.0; min: POPUP_ITEM_RIGHT_MIN_PADDING_INC; fixed: 1 1; - visible: 0; } } part { name: "separator"; @@ -807,9 +1003,8 @@ group { name: "elm/popup/item/default"; } } part { name: "padding_icon_text"; - type: RECT; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; //when only icon or no icon is there align: 0.0 0.0; rel1 { @@ -819,7 +1014,6 @@ group { name: "elm/popup/item/default"; rel2.to: "elm.swallow.content"; fixed: 1 0; min: 0 0; - visible: 0; } description { state: "visible" 0.0; //when icon is visible inherit: "default" 0.0; @@ -923,14 +1117,18 @@ group { name: "elm/popup/item/default"; } } part { name: "over1"; + type: RECT; repeat_events: 1; ignore_flags: ON_HOLD; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "over2"; + type: RECT; repeat_events: 1; description { state: "default" 0.0; + color: 0 0 0 0; } } part { name: "disclip"; @@ -1073,7 +1271,7 @@ group { name: "elm/label/base/popup/verticalbuttonstyle"; styles { style { name: "popup_desc_style_center"; - base: "font=Tizen:style=Medium font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" linesize=54 text_class=tizen"; + base: "font=Tizen:style=Medium font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "whitecolor" "+ color=#ffffff"; @@ -1102,21 +1300,20 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; data.item: "action_area_height" POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT; parts { part { name: "bg"; + type: SPACER; scale: 1; description { state: "default" 0.0; min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC; fixed: 1 0; - visible: 0; } } part { name: "elm.rect.pad_btn_top"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC; - fixed : 0 1; + fixed: 0 1; align: 0.0 0.0; - color: 0 0 0 0; rel1 { relative: 0.0 0.0; } @@ -1125,13 +1322,13 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; } } } - part{ name:"actionbtn1"; + part { name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 0.0; rel1 { relative: 0.0 1.0; to_y: "elm.rect.pad_btn_top"; @@ -1139,14 +1336,13 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; } } part { name: "elm.rect.pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC; max: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 0.0; - color: 0 0 0 0; rel1 { relative: 0.0 1.0; to: "actionbtn1"; } @@ -1155,26 +1351,25 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; } } } - part{ name:"actionbtn2"; + part { name:"actionbtn2"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 0.0; rel1 { relative: 0 1.0; to_y: "elm.rect.pad_btn"; } } } part { name: "elm.rect.pad_btn2"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC; max: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 0.0; - color: 0 0 0 0; rel1 { relative: 0.0 1.0; to: "actionbtn2"; } @@ -1183,13 +1378,13 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; } } } - part{ name:"actionbtn3"; + part { name:"actionbtn3"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 0.5 0.0; rel1 { relative: 0.0 1.0; to_y: "elm.rect.pad_btn2"; @@ -1203,11 +1398,10 @@ group { name: "elm/popup/content/menustyle"; alias: "elm/popup/content/menustyle_transparent"; parts{ part { name: "left_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 0.0 0.5; min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { @@ -1220,7 +1414,7 @@ group { name: "elm/popup/content/menustyle"; } part{ name:"elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC; max: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC; @@ -1237,11 +1431,10 @@ group { name: "elm/popup/content/menustyle"; } } part { name: "right_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 1.0 0.5; min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { @@ -1259,11 +1452,10 @@ group { name: "elm/popup/content/min_menustyle"; alias: "elm/popup/content/min_menustyle_transparent"; parts{ part { name: "left_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 0.0 0.5; min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { @@ -1276,7 +1468,7 @@ group { name: "elm/popup/content/min_menustyle"; } part{ name:"elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; @@ -1292,11 +1484,10 @@ group { name: "elm/popup/content/min_menustyle"; } } part { name: "right_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 1.0 0.5; min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { @@ -1314,11 +1505,10 @@ group { name: "elm/popup/content/liststyle"; alias: "elm/popup/content/liststyle_transparent"; parts{ part { name: "left_top_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; align: 0.0 0.0; min: POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC; max: POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC; @@ -1326,7 +1516,7 @@ group { name: "elm/popup/content/liststyle"; } part{ name:"elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC; max: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC; @@ -1343,11 +1533,10 @@ group { name: "elm/popup/content/liststyle"; } } part { name: "right_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 1.0 0.5; min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { @@ -1365,11 +1554,10 @@ group { name: "elm/popup/content/min_liststyle"; alias: "elm/popup/content/min_liststyle_transparent"; parts{ part { name: "left_top_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; align: 0.0 0.0; min: POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC; max: POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC; @@ -1377,7 +1565,7 @@ group { name: "elm/popup/content/min_liststyle"; } part{ name:"elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; @@ -1393,11 +1581,10 @@ group { name: "elm/popup/content/min_liststyle"; } } part { name: "right_padding"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 1.0 0.5; min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { @@ -1418,11 +1605,11 @@ group { name: "elm/popup/buttons1/default"; parts{ part{ name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC; max: POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC; - fixed : 1 1; + fixed: 1 1; rel1.relative: 0.5 0.0; rel2.relative: 0.5 1.0; } @@ -1435,34 +1622,32 @@ group { name: "elm/popup/buttons2/default"; data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT; parts{ part { name: "left_pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON2_DEFAULT_HEIGHT_INC; max: POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON2_DEFAULT_HEIGHT_INC; - fixed : 1 1; - visible: 0; + fixed: 1 1; align: 0 0.5; rel1.relative: 0.0 0.0; } } part { name: "right_pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON2_DEFAULT_HEIGHT_INC; max: POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON2_DEFAULT_HEIGHT_INC; - fixed : 1 1; - visible: 0; + fixed: 1 1; align: 1 0.5; rel2.relative: 1.0 1.0; } } - part{ name:"actionbtn1"; + part { name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; - fixed : 1 1; + fixed: 1 1; align: 1.0 0.5; rel1 { relative: 1.0 0.0; @@ -1475,22 +1660,21 @@ group { name: "elm/popup/buttons2/default"; } } part { name: "elm.rect.pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; max: POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; - fixed : 1 1; - visible: 0; + fixed: 1 1; rel1.relative: 0.5 0.0; rel2.relative: 0.5 1.0; } } - part{ name:"actionbtn2"; + part { name:"actionbtn2"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; - fixed : 1 1; + fixed: 1 1; align: 0.0 0.5; rel1 { relative: 1.0 0.0; @@ -1511,36 +1695,47 @@ group { name: "elm/popup/buttons3/default"; data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT; parts{ part { name: "left_pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON3_DEFAULT_HEIGHT_INC; max: POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON3_DEFAULT_HEIGHT_INC; - fixed : 1 1; - visible: 0; + fixed: 1 1; align: 0 0.5; rel1.relative: 0.0 0.0; } } part { name: "right_pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON3_DEFAULT_HEIGHT_INC; max: POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC POPUP_BUTTON3_DEFAULT_HEIGHT_INC; - fixed : 1 1; - visible: 0; + fixed: 1 1; align: 1 0.5; rel2.relative: 1.0 1.0; } } + part { name: "btn_area"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to: "left_pad_btn"; + } + rel2 { + relative: 0.0 1.0; + to: "right_pad_btn"; + } + } + } part{ name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; - min: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; - max: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 1.0 0.5; rel1 { relative: 1.0 0.0; @@ -1553,55 +1748,51 @@ group { name: "elm/popup/buttons3/default"; } } part { name: "elm.rect.pad_btn"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; max: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; - fixed : 1 1; - visible: 0; - rel1.to: "actionbtn2"; - rel2 { - relative: 0.0 1.0; - to: "actionbtn2"; - } - align: 1.0 0.5; + fixed: 1 1; + rel1.relative: 0.33 0.0; + rel1.to: "btn_area"; + rel2.relative: 0.33 1.0; + rel2.to: "btn_area"; } } part{ name:"actionbtn2"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; - min: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; - max: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; - fixed : 1 1; - rel1.relative: 0.5 0.0; - rel2.relative: 0.5 1.0; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to: "elm.rect.pad_btn"; + } + rel2 { + relative: 0.0 1.0; + to: "elm.rect.pad_btn2"; + } } } part { name: "elm.rect.pad_btn2"; - type: RECT; - scale : 1; + type: SPACER; + scale: 1; description { state: "default" 0.0; min: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; max: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; - fixed : 1 1; - visible: 0; - rel1 { - relative: 1.0 0.0; - to: "actionbtn2"; - } - rel2.to: "actionbtn2"; - align: 0.0 0.5; + fixed: 1 1; + rel1.relative: 0.67 0.0; + rel1.to: "btn_area"; + rel2.relative: 0.67 1.0; + rel2.to: "btn_area"; } } part{ name:"actionbtn3"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; - min: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; - max: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; - fixed : 1 1; + fixed: 1 1; align: 0.0 0.5; rel1 { relative: 1.0 0.0; @@ -1616,368 +1807,71 @@ group { name: "elm/popup/buttons3/default"; } } -group { name: "elm/popup/content/volumebarstyle"; - alias: "elm/popup/content/volumebarstyle_transparent"; - parts { - part { name:"elm.swallow.content"; - type: SWALLOW; - scale : 1; - description { state: "default" 0.0; - min: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC; - max: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC; - align: 0.5 0.5; - fixed: 1 1; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - } - } - } -} - -group { name: "elm/popup/content/volumebarstyle_text"; - alias: "elm/popup/content/volumebarstyle_text_transparent"; - parts { - part { name:"elm.swallow.content"; - type: SWALLOW; - scale : 1; - description { state: "default" 0.0; - min: POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC; - align: 0.5 0.5; - fixed: 1 1; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - } - } - } -} - group { name: "elm/popup/base/volumebarstyle"; + inherit: "elm/popup/base/default"; alias: "elm/popup/base/volumebarstyle_transparent"; images { image: "00_popup_bg.png" COMP; } parts { - part { - name:"shadow_left_top_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING; - max: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name:"shadow_right_bottom_padding"; - type:RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; - max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; - align: 1 1; - fixed: 1 1; - visible: 0; - } - } - part { name: "base"; - type: IMAGE; - scale : 1; - description { state: "default" 0.0; - min: POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC; - max: POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC; - image { - normal: "00_popup_bg.png"; - border: POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC; - border_scale: 1; - } - align: 0.0 0.0; - } - } - part { name: "elm.bg.title"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC; - max: POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC; - fixed : 1 1; - align: 0.5 0.0; - visible: 0; - rel1 { - relative: 0.5 1.0; - to_y: "shadow_left_top_padding"; - } - rel2 { - relative: 0.5 1.0; - to_y: "shadow_left_top_padding"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "title_left_top_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1.to: "elm.bg.title"; - fixed: 1 1; - min: POPUP_DESC_LEFT_PADDING POPUP_TITLE_TOP_PADDING; - max: POPUP_DESC_LEFT_PADDING POPUP_TITLE_TOP_PADDING; - visible: 0; - } - } - part { name: "title_right_bottom_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 1.0 1.0; - rel2.to: "elm.bg.title"; - fixed: 1 1; - min: POPUP_DESC_RIGHT_PADDING POPUP_TITLE_BOTTOM_PADDING; - max: POPUP_DESC_RIGHT_PADDING POPUP_TITLE_BOTTOM_PADDING; - visible: 0; - } - } - part { name: "icon_rect"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - min: 0 0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "title_left_top_padding"; - } - rel2 { - relative: 1.0 1.0; - to_x: "title_left_top_padding"; - to_y: "elm.bg.title"; - } - align: 0.0 0.5; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC; - max: POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC; - } - } - part { name: "padding_after_icon"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - min: 0 0; - fixed: 1 1; - rel1 { - relative: 1.0 0.0; - to: "icon_rect"; - } - rel2 { - relative: 1.0 0.0; - to: "icon_rect"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: POPUP_TITLE_ICON_TEXT_PADDING_INC; - } - } - part { name: "elm.swallow.title.icon"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - rel1.to: "icon_rect"; - rel2.to: "icon_rect"; - } - } - part { name: "elm.text.title"; - type: TEXTBLOCK; - scale:1; - description { state: "default" 0.0; - fixed: 1 1; - text { - style: "popup_title_style"; - align: 0.0 0.0; - } - rel1 { - relative: 1.0 0.0; - to: "padding_after_icon"; - } - rel2 { - relative: 0.0 1.0; - to: "title_right_bottom_padding"; - } - align: 0.0 0.5; - } - } part { name: "elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { - relative: 0.5 1.0; + relative: 0.0 1.0; + to_x: "base"; to_y: "shadow_left_top_padding"; } rel2 { - relative: 0.5 0.0; + relative: 1.0 0.0; + to_x: "base"; to_y: "shadow_right_bottom_padding"; } } description { state: "show_title_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to: "elm.bg.title"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "elm.bg.title"; } rel2 { - relative: 0.5 0.0; + relative: 1.0 0.0; + to_x: "base"; to_y: "shadow_right_bottom_padding"; } } description { state: "show_action_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; + relative: 0.0 1.0; + to_x: "base"; to_y: "shadow_left_top_padding"; } rel2 { - relative: 0.5 0.0; - to: "elm.bg.action_area"; + relative: 1.0 0.0; + to_x: "base"; + to_y: "elm.swallow.action_area"; } } description { state: "show_action_title_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to: "elm.bg.title"; - } - rel2 { - relative: 0.5 0.0; - to: "elm.bg.action_area"; - } - } - } - part { name: "elm.bg.action_area"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC; - fixed : 1 1; - align: 0.5 1.0; - visible: 0; - rel1 { - relative: 0.0 0.0; + relative: 0.0 1.0; to_x: "base"; - to_y: "shadow_right_bottom_padding"; + to_y: "elm.bg.title"; } rel2 { relative: 1.0 0.0; to_x: "base"; - to_y: "shadow_right_bottom_padding"; + to_y: "elm.swallow.action_area"; } } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "elm.swallow.action_area"; - type: SWALLOW; - scale : 1; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1.to: "elm.bg.action_area"; - rel2.to: "elm.bg.action_area"; - } } } - programs { - program { name: show_title_icon; - signal: "elm,state,title,icon,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "icon_rect"; - target: "padding_after_icon"; - } - program { name: hide_title_icon; - signal: "elm,state,title,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "padding_after_icon"; - target: "icon_rect"; - } - program { name: show_title_area; - signal: "elm,state,title_area,visible"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.action_area", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); - else - set_state(PART:"elm.swallow.content", "show_title_area", 0.0); - set_state(PART:"elm.bg.title", "visible", 0.0); - } - } - program { name: hide_title_area; - signal: "elm,state,title_area,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.action_area", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.content", "show_action_area", 0.0); - else - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"elm.bg.title", "default", 0.0); - } - } - program { name: show_action_area; - signal: "elm,state,action_area,visible"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.bg.title", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); - else - set_state(PART:"elm.swallow.content", "show_action_area", 0.0); - set_state(PART:"elm.bg.action_area", "visible", 0.0); - } - } - program { name: hide_action_area; - signal: "elm,state,action_area,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.bg.title", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.content", "show_title_area", 0.0); - else - set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"elm.bg.action_area", "default", 0.0); - } - } - } /* end of programs */ } group { name: "elm/popup/base/volumebarstyle_text"; @@ -1986,50 +1880,58 @@ group { name: "elm/popup/base/volumebarstyle_text"; parts { part { name: "elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { - relative: 0.5 1.0; + relative: 0.0 1.0; + to_x: "base"; to_y: "shadow_left_top_padding"; } rel2 { - relative: 0.5 0.0; + relative: 1.0 0.0; + to_x: "base"; to_y: "shadow_right_bottom_padding"; } } description { state: "show_title_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to: "elm.bg.title"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "elm.bg.title"; } rel2 { - relative: 0.5 0.0; + relative: 1.0 0.0; + to_x: "base"; to_y: "shadow_right_bottom_padding"; } } description { state: "show_action_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; + relative: 0.0 1.0; + to_x: "base"; to_y: "shadow_left_top_padding"; } rel2 { - relative: 0.5 0.0; - to: "elm.bg.action_area"; + relative: 1.0 0.0; + to_x: "base"; + to_y: "elm.swallow.action_area"; } } description { state: "show_action_title_area" 0.0; inherit: "default" 0.0; rel1 { - relative: 0.5 1.0; - to: "elm.bg.title"; + relative: 0.0 1.0; + to_x: "base"; + to_y: "elm.bg.title"; } rel2 { - relative: 0.5 0.0; - to: "elm.bg.action_area"; + relative: 1.0 0.0; + to_x: "base"; + to_y: "elm.swallow.action_area"; } } } @@ -2043,21 +1945,19 @@ group { name: "elm/popup/base/content_expand"; } parts { part { - name:"shadow_right_bottom_padding"; - type:RECT; + name: "shadow_right_bottom_padding"; + type: SPACER; scale: 1; - mouse_events: 0; description { state: "default" 0.0; min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; align: 1.0 1.0; fixed: 1 1; - visible: 0; } } part { name: "base"; type: IMAGE; - scale : 1; + scale: 1; description { state: "default" 0.0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.bg.action_area"; @@ -2066,15 +1966,16 @@ group { name: "elm/popup/base/content_expand"; border: POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC; border_scale: 1; } + fill.smooth: 0; align: 0.0 0.0; } } part { name: "elm.bg.title"; type: RECT; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC; - fixed : 0 1; + fixed: 0 1; align: 0.5 0.0; visible: 0; color: 0 0 0 0; @@ -2090,26 +1991,24 @@ group { name: "elm/popup/base/content_expand"; } } part { name: "left_pad"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; max: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.0; - visible: 0; rel1.to: "elm.bg.title"; } } part { name: "right_pad"; - type: RECT; + type: SPACER; scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; max: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; fixed: 1 1; align: 1.0 1.0; - visible: 0; rel2.to: "elm.bg.title"; } } @@ -2163,7 +2062,7 @@ group { name: "elm/popup/base/content_expand"; } part { name: "elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; @@ -2198,10 +2097,10 @@ group { name: "elm/popup/base/content_expand"; } part { name: "elm.bg.action_area"; type: RECT; - scale : 1; + scale: 1; description { state: "default" 0.0; min: POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC; - fixed : 0 1; + fixed: 0 1; align: 0.5 1.0; visible: 0; rel1 { @@ -2221,7 +2120,7 @@ group { name: "elm/popup/base/content_expand"; } part { name: "elm.swallow.action_area"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; rel1.to: "elm.bg.action_area"; rel2.to: "elm.bg.action_area"; @@ -2320,7 +2219,7 @@ group { name: "elm/popup/buttons1/content_expand"; parts{ part{ name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; rel1.relative: 0.2 0.1; rel2.relative: 0.8 0.9; @@ -2335,7 +2234,7 @@ group { name: "elm/popup/buttons2/content_expand"; parts{ part{ name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; rel1.relative: 0.1 0.1; @@ -2344,7 +2243,7 @@ group { name: "elm/popup/buttons2/content_expand"; } part{ name:"actionbtn2"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; rel1.relative: 0.55 0.1; @@ -2360,7 +2259,7 @@ group { name: "elm/popup/buttons3/content_expand"; parts{ part{ name:"actionbtn1"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; rel1.relative: 0.05 0.1; @@ -2369,7 +2268,7 @@ group { name: "elm/popup/buttons3/content_expand"; } part{ name:"actionbtn2"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; rel1.relative: 0.375 0.1; @@ -2378,7 +2277,7 @@ group { name: "elm/popup/buttons3/content_expand"; } part{ name:"actionbtn3"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; rel1.relative: 0.7 0.1; @@ -2412,7 +2311,7 @@ group { name: "elm/popup/content/content_expand"; parts{ part{ name:"elm.swallow.content"; type: SWALLOW; - scale : 1; + scale: 1; description { state: "default" 0.0; } } diff --git a/themes/widgets/progressbar.edc b/themes/widgets/progressbar.edc index e50eb32..6e55f19 100644 --- a/themes/widgets/progressbar.edc +++ b/themes/widgets/progressbar.edc @@ -547,7 +547,8 @@ } image { normal: "00_progress_bg.png"; - border: 17 17 0 0; + border: PROGRESS_BG_IMAGE_BORDER_INC; + border_scale: 1; } } } @@ -581,6 +582,62 @@ text.min: 1 1; } } + part { + name: "bar.image.left.padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1.to: "elm.swallow.bar"; + rel2 { + relative: 0.0 1.0; + to: "elm.swallow.bar"; + } + align: 0.0 0.5; + } + } + part { + name: "bar.image.right.padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to: "elm.swallow.bar"; + } + rel2.to: "elm.swallow.bar"; + align: 1.0 0.5; + } + } + part { name: "drag.background"; + mouse_events: 0; + type: RECT; + scale: 1; + clip_to: "elm.background.progressbar"; + description { + state: "default" 0.0; + visible: 0; + rel1 { + to_x: "bar.image.left.padding"; + to_y: "elm.swallow.bar"; + relative: 1.0 0.0; + } + rel2 { + to_x: "bar.image.right.padding"; + to_y: "elm.swallow.bar"; + relative: 0.0 1.0; + } + } + } part { name: "elm.progress.progressbar"; mouse_events: 0; scale: 1; @@ -590,8 +647,9 @@ min: 0 0; fixed: 1 1; rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; + to_x: "bar.image.left.padding"; + to_y: "elm.swallow.bar"; + relative: 1.0 0.0; } rel2 { to_y: "elm.swallow.bar"; @@ -600,7 +658,8 @@ } image { normal: "00_progress_bar.png"; - border: 17 17 0 0; + border: PROGRESS_BAR_IMAGE_BORDER_INC; + border_scale: 1; } } description { @@ -611,8 +670,9 @@ to_x: "elm.cur.progressbar"; } rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; + to_y: "elm.swallow.bar"; + to_x: "bar.image.right.padding"; + relative: 1.0 0.0; } } description { @@ -674,7 +734,7 @@ mouse_events: 0; scale: 1; dragable { - confine: "background"; + confine: "drag.background"; x: 1 1 1; y: 0 0 0; } @@ -682,11 +742,8 @@ min: 0 28; fixed: 1 1; visible: 0; - rel1 { - to: "background"; - relative: 0 0; - } - rel2.to: "background"; + rel1.to: "drag.background"; + rel2.to: "drag.background"; } } part { name: "progress-rect"; @@ -990,7 +1047,8 @@ } image { normal: "00_progress_bg.png"; - border: 17 17 0 0; + border: PROGRESS_BG_IMAGE_BORDER_INC; + border_scale: 1; } } } @@ -1024,6 +1082,62 @@ text.min: 1 1; } } + part { + name: "bar.image.left.padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1.to: "elm.swallow.bar"; + rel2 { + relative: 0.0 1.0; + to: "elm.swallow.bar"; + } + align: 0.0 0.5; + } + } + part { + name: "bar.image.right.padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to: "elm.swallow.bar"; + } + rel2.to: "elm.swallow.bar"; + align: 1.0 0.5; + } + } + part { name: "drag.background"; + mouse_events: 0; + type: RECT; + scale: 1; + clip_to: "elm.background.progressbar"; + description { + state: "default" 0.0; + visible: 0; + rel1 { + to_x: "bar.image.left.padding"; + to_y: "elm.swallow.bar"; + relative: 1.0 0.0; + } + rel2 { + to_x: "bar.image.right.padding"; + to_y: "elm.swallow.bar"; + relative: 0.0 1.0; + } + } + } part { name: "elm.progress.progressbar"; mouse_events: 0; scale: 1; @@ -1033,8 +1147,9 @@ min: 0 0; fixed: 1 1; rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; + to_x: "bar.image.left.padding"; + to_y: "elm.swallow.bar"; + relative: 1.0 0.0; } rel2 { to_y: "elm.swallow.bar"; @@ -1043,7 +1158,8 @@ } image { normal: "00_progress_bar.png"; - border: 17 17 0 0; + border: PROGRESS_BAR_IMAGE_BORDER_INC; + border_scale: 1; } } description { @@ -1054,8 +1170,9 @@ to_x: "elm.cur.progressbar"; } rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; + to_y: "elm.swallow.bar"; + to_x: "bar.image.right.padding"; + relative: 1.0 0.0; } } description { @@ -1117,7 +1234,7 @@ mouse_events: 0; scale: 1; dragable { - confine: "background"; + confine: "drag.background"; x: 1 1 1; y: 0 0 0; } @@ -1125,11 +1242,8 @@ min: 0 28; fixed: 1 1; visible: 0; - rel1 { - to: "background"; - relative: 0 0; - } - rel2.to: "background"; + rel1.to: "drag.background"; + rel2.to: "drag.background"; } } part { name: "progress-rect"; @@ -2979,52 +3093,103 @@ } } -#define PROGRESS_LOAD_IMAGEG( param_num ) \ - image: "00_winset_list_progress_"#param_num".png" COMP; +#define PROCESS_IMAGE(SIZE, NUM) \ + image: "process/"SIZE"/00_list_process_"NUM".png" COMP; -#define PROGRESS_BG_DESC( param_name, param_num ) \ - description { state: "pulse" 0.#param_num; \ +#define PROCESS_IMAGES(SIZE) \ + images { \ + PROCESS_IMAGE(SIZE, 01) \ + PROCESS_IMAGE(SIZE, 02) \ + PROCESS_IMAGE(SIZE, 03) \ + PROCESS_IMAGE(SIZE, 04) \ + PROCESS_IMAGE(SIZE, 05) \ + PROCESS_IMAGE(SIZE, 06) \ + PROCESS_IMAGE(SIZE, 07) \ + PROCESS_IMAGE(SIZE, 08) \ + PROCESS_IMAGE(SIZE, 09) \ + PROCESS_IMAGE(SIZE, 10) \ + PROCESS_IMAGE(SIZE, 11) \ + PROCESS_IMAGE(SIZE, 12) \ + PROCESS_IMAGE(SIZE, 13) \ + PROCESS_IMAGE(SIZE, 14) \ + PROCESS_IMAGE(SIZE, 15) \ + PROCESS_IMAGE(SIZE, 16) \ + PROCESS_IMAGE(SIZE, 17) \ + PROCESS_IMAGE(SIZE, 18) \ + PROCESS_IMAGE(SIZE, 19) \ + PROCESS_IMAGE(SIZE, 20) \ + PROCESS_IMAGE(SIZE, 21) \ + PROCESS_IMAGE(SIZE, 22) \ + PROCESS_IMAGE(SIZE, 23) \ + PROCESS_IMAGE(SIZE, 24) \ + PROCESS_IMAGE(SIZE, 25) \ + PROCESS_IMAGE(SIZE, 26) \ + PROCESS_IMAGE(SIZE, 27) \ + PROCESS_IMAGE(SIZE, 28) \ + PROCESS_IMAGE(SIZE, 29) \ + PROCESS_IMAGE(SIZE, 30) \ + } + +#define PROGRESS_DESC(SIZE, NUM ) \ + description { state: "pulse" 0.#NUM; \ inherit: "default" 0.0; \ image { \ - normal: "00_winset_"#param_name"_process_"#param_num".png"; \ + normal: "process/"SIZE"/00_list_process_"NUM".png"; \ } \ } +#define PROCESS_DESCS(SIZE, WIDTH, HEIGHT) \ + description { \ + state: "default" 0.0; \ + min: WIDTH HEIGHT; \ + max: WIDTH HEIGHT; \ + aspect: 1.0 1.0; \ + aspect_preference: BOTH; \ + image { \ + normal: "process/"SIZE"/00_list_process_01.png"; \ + } \ + } \ + description { state: "pulse" 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "process/"SIZE"/00_list_process_01.png"; \ + } \ + } \ + PROGRESS_DESC(SIZE, 01 ) \ + PROGRESS_DESC(SIZE, 03 ) \ + PROGRESS_DESC(SIZE, 04 ) \ + PROGRESS_DESC(SIZE, 05 ) \ + PROGRESS_DESC(SIZE, 06 ) \ + PROGRESS_DESC(SIZE, 07 ) \ + PROGRESS_DESC(SIZE, 08 ) \ + PROGRESS_DESC(SIZE, 09 ) \ + PROGRESS_DESC(SIZE, 10 ) \ + PROGRESS_DESC(SIZE, 11 ) \ + PROGRESS_DESC(SIZE, 12 ) \ + PROGRESS_DESC(SIZE, 13 ) \ + PROGRESS_DESC(SIZE, 14 ) \ + PROGRESS_DESC(SIZE, 15 ) \ + PROGRESS_DESC(SIZE, 16 ) \ + PROGRESS_DESC(SIZE, 17 ) \ + PROGRESS_DESC(SIZE, 18 ) \ + PROGRESS_DESC(SIZE, 19 ) \ + PROGRESS_DESC(SIZE, 20 ) \ + PROGRESS_DESC(SIZE, 21 ) \ + PROGRESS_DESC(SIZE, 22 ) \ + PROGRESS_DESC(SIZE, 23 ) \ + PROGRESS_DESC(SIZE, 24 ) \ + PROGRESS_DESC(SIZE, 25 ) \ + PROGRESS_DESC(SIZE, 26 ) \ + PROGRESS_DESC(SIZE, 27 ) \ + PROGRESS_DESC(SIZE, 28 ) \ + PROGRESS_DESC(SIZE, 29 ) \ + PROGRESS_DESC(SIZE, 30 ) + #define PROGRESSING_DELAY 0.07 group { name: "elm/progressbar/horizontal/list_process"; - images { - image: "00_winset_list_process_01.png" COMP; - image: "00_winset_list_process_02.png" COMP; - image: "00_winset_list_process_03.png" COMP; - image: "00_winset_list_process_04.png" COMP; - image: "00_winset_list_process_05.png" COMP; - image: "00_winset_list_process_06.png" COMP; - image: "00_winset_list_process_07.png" COMP; - image: "00_winset_list_process_08.png" COMP; - image: "00_winset_list_process_09.png" COMP; - image: "00_winset_list_process_10.png" COMP; - image: "00_winset_list_process_11.png" COMP; - image: "00_winset_list_process_12.png" COMP; - image: "00_winset_list_process_13.png" COMP; - image: "00_winset_list_process_14.png" COMP; - image: "00_winset_list_process_15.png" COMP; - image: "00_winset_list_process_16.png" COMP; - image: "00_winset_list_process_17.png" COMP; - image: "00_winset_list_process_18.png" COMP; - image: "00_winset_list_process_19.png" COMP; - image: "00_winset_list_process_20.png" COMP; - image: "00_winset_list_process_21.png" COMP; - image: "00_winset_list_process_22.png" COMP; - image: "00_winset_list_process_23.png" COMP; - image: "00_winset_list_process_24.png" COMP; - image: "00_winset_list_process_25.png" COMP; - image: "00_winset_list_process_26.png" COMP; - image: "00_winset_list_process_27.png" COMP; - image: "00_winset_list_process_28.png" COMP; - image: "00_winset_list_process_29.png" COMP; - image: "00_winset_list_process_30.png" COMP; - } + alias: "elm/progressbar/horizontal/process"; + PROCESS_IMAGES("63x63") parts { part { name: "elm.background.progressbar"; mouse_events: 0; @@ -3057,53 +3222,90 @@ mouse_events: 0; scale: 1; clip_to: "elm.background.progressbar"; + PROCESS_DESCS("63x63", 63, 63) + } + } + script { + public pulse_state; + } + programs { + program { name: "continue_pulse"; + script { + new Float:state; + state = get_float(pulse_state); + set_state(PART:"background", "pulse", state); + state += 0.01; + if( state > 0.30 ) + state = 0.01; + set_float(pulse_state, state); + } + after: "delay"; + } + program { name: "delay"; + action: STATE_SET "pulse" 0.10; + target: "background"; + in: PROGRESSING_DELAY 0.0; + after: "continue_pulse"; + } + program { name: "start_pulse"; + signal: "elm,state,pulse,start"; + source: "elm"; + script { + set_float(pulse_state, 0.0); + } + after: "continue_pulse"; + } + program { name: "stop_pulse"; + signal: "elm,state,pulse,stop"; + source: "elm"; + action: ACTION_STOP; + target: "continue_pulse"; + target: "delay"; + target: "start_pulse"; + after: "init_pulse"; + } + program { name: "init_pulse"; + action: STATE_SET "default" 0.0; + target: "background"; + } + } + } + + group { name: "elm/progressbar/horizontal/process_medium"; + PROCESS_IMAGES("54x54") + parts { + part { name: "elm.background.progressbar"; + mouse_events: 0; + scale: 1; + type: RECT; description { state: "default" 0.0; - min: PROGRESSBAR_LIST_PROCESS_WIDTH_INC PROGRESSBAR_LIST_PROCESS_HEIGHT_INC; - max: PROGRESSBAR_LIST_PROCESS_WIDTH_INC PROGRESSBAR_LIST_PROCESS_HEIGHT_INC; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image { - normal: "00_winset_list_process_01.png"; - } } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - image { - normal: "00_winset_list_process_01.png"; - } - } - PROGRESS_BG_DESC( list, 01 ) - PROGRESS_BG_DESC( list, 02 ) - PROGRESS_BG_DESC( list, 03 ) - PROGRESS_BG_DESC( list, 04 ) - PROGRESS_BG_DESC( list, 05 ) - PROGRESS_BG_DESC( list, 06 ) - PROGRESS_BG_DESC( list, 07 ) - PROGRESS_BG_DESC( list, 08 ) - PROGRESS_BG_DESC( list, 09 ) - PROGRESS_BG_DESC( list, 10 ) - PROGRESS_BG_DESC( list, 11 ) - PROGRESS_BG_DESC( list, 12 ) - PROGRESS_BG_DESC( list, 13 ) - PROGRESS_BG_DESC( list, 14 ) - PROGRESS_BG_DESC( list, 15 ) - PROGRESS_BG_DESC( list, 16 ) - PROGRESS_BG_DESC( list, 17 ) - PROGRESS_BG_DESC( list, 18 ) - PROGRESS_BG_DESC( list, 19 ) - PROGRESS_BG_DESC( list, 20 ) - PROGRESS_BG_DESC( list, 21 ) - PROGRESS_BG_DESC( list, 22 ) - PROGRESS_BG_DESC( list, 23 ) - PROGRESS_BG_DESC( list, 24 ) - PROGRESS_BG_DESC( list, 25 ) - PROGRESS_BG_DESC( list, 26 ) - PROGRESS_BG_DESC( list, 27 ) - PROGRESS_BG_DESC( list, 28 ) - PROGRESS_BG_DESC( list, 29 ) - PROGRESS_BG_DESC( list, 30 ) + } + 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: "background"; + mouse_events: 0; + scale: 1; + clip_to: "elm.background.progressbar"; + PROCESS_DESCS("54x54", 54, 54) } } script { @@ -3153,38 +3355,8 @@ } group { name: "elm/progressbar/horizontal/list_process_small"; - images { - image: "00_winset_list_process_01_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_02_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_03_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_04_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_05_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_06_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_07_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_08_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_09_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_10_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_11_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_12_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_13_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_14_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_15_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_16_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_17_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_18_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_19_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_20_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_21_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_22_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_23_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_24_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_25_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_26_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_27_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_28_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_29_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - image: "00_winset_list_process_30_"PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE".png" COMP; - } + alias: "elm/progressbar/horizontal/process_small"; + PROCESS_IMAGES("36x36") parts { part { name: "elm.background.progressbar"; mouse_events: 0; @@ -3217,53 +3389,7 @@ mouse_events: 0; scale: 1; clip_to: "elm.background.progressbar"; - description { - state: "default" 0.0; - min: PROGRESSBAR_LIST_PROCESS_SMALL_INC PROGRESSBAR_LIST_PROCESS_SMALL_INC; - max: PROGRESSBAR_LIST_PROCESS_SMALL_INC PROGRESSBAR_LIST_PROCESS_SMALL_INC; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image { - normal: "00_winset_list_process_01.png"; - } - } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - image { - normal: "00_winset_list_process_01.png"; - } - } - PROGRESS_BG_DESC( list, 01 ) - PROGRESS_BG_DESC( list, 02 ) - PROGRESS_BG_DESC( list, 03 ) - PROGRESS_BG_DESC( list, 04 ) - PROGRESS_BG_DESC( list, 05 ) - PROGRESS_BG_DESC( list, 06 ) - PROGRESS_BG_DESC( list, 07 ) - PROGRESS_BG_DESC( list, 08 ) - PROGRESS_BG_DESC( list, 09 ) - PROGRESS_BG_DESC( list, 10 ) - PROGRESS_BG_DESC( list, 11 ) - PROGRESS_BG_DESC( list, 12 ) - PROGRESS_BG_DESC( list, 13 ) - PROGRESS_BG_DESC( list, 14 ) - PROGRESS_BG_DESC( list, 15 ) - PROGRESS_BG_DESC( list, 16 ) - PROGRESS_BG_DESC( list, 17 ) - PROGRESS_BG_DESC( list, 18 ) - PROGRESS_BG_DESC( list, 19 ) - PROGRESS_BG_DESC( list, 20 ) - PROGRESS_BG_DESC( list, 21 ) - PROGRESS_BG_DESC( list, 22 ) - PROGRESS_BG_DESC( list, 23 ) - PROGRESS_BG_DESC( list, 24 ) - PROGRESS_BG_DESC( list, 25 ) - PROGRESS_BG_DESC( list, 26 ) - PROGRESS_BG_DESC( list, 27 ) - PROGRESS_BG_DESC( list, 28 ) - PROGRESS_BG_DESC( list, 29 ) - PROGRESS_BG_DESC( list, 30 ) + PROCESS_DESCS("36x36", 36, 36) } } script { @@ -3312,6 +3438,14 @@ } } +#define PROGRESS_BG_DESC( param_name, param_num ) \ + description { state: "pulse" 0.#param_num; \ + inherit: "default" 0.0; \ + image { \ + normal: "00_winset_"#param_name"_process_"#param_num".png"; \ + } \ + } + group { name: "elm/progressbar/horizontal/toolbar_process"; images { image: "00_winset_toolbar_process_01.png" COMP; diff --git a/themes/widgets/scroller.edc b/themes/widgets/scroller.edc index 1a9823c..0b5e5ba 100644 --- a/themes/widgets/scroller.edc +++ b/themes/widgets/scroller.edc @@ -23,7 +23,7 @@ group { name: "elm/scroller/base/default"; alias: "elm/carousel/base/default"; alias: "elm/scroller/base/map_bubble"; - alias: "elm/gengrid/base/default"; + alias: "elm/gengrid/base/no_effect"; alias: "elm/genlist/base/no_effect"; data { @@ -441,9 +441,6 @@ group { name: "elm/scroller/base/default"; } group { name: "elm/scroller/base/handler"; - - alias: "elm/list/base/handler"; - alias: "elm/genlist/base/handler"; alias: "elm/carousel/base/handler"; data { @@ -451,6 +448,7 @@ group { name: "elm/scroller/base/handler"; } script { public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; + public sh_timer, edge_timer; public timer0(val) { new v; v = get_int(sbvis_v); @@ -472,6 +470,18 @@ group { name: "elm/scroller/base/handler"; set_int(sbvis_timer, 0); return 0; } + public timer1(val) { + emit("do-hide-vshadow", ""); + emit("do-hide-hshadow", ""); + set_int(sh_timer, 0); + return 0; + } + public timer2(val) { + emit("do-hide-vshadow", ""); + emit("do-hide-hshadow", ""); + set_int(edge_timer, 0); + return 0; + } } images { image: "bt_sm_shine.png" COMP; @@ -590,19 +600,18 @@ group { name: "elm/scroller/base/handler"; align: 1.0 0.0; rel1 { relative: 1.0 0.0; - offset: SCROLLER_HANDLER_SCROLLBAR_PADDING_INC SCROLLER_HANDLER_SCROLLBAR_PADDING_INC; to_y: "elm.swallow.content"; to_x: "elm.swallow.content"; } rel2 { relative: 1.0 1.0; - offset: (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1) (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1); to_y: "sb_hbar"; to_x: "elm.swallow.content"; } } } part { name: "elm.dragable.vbar"; + type: RECT; clip_to: "sb_vbar_clip"; mouse_events: 1; scale: 1; @@ -613,6 +622,7 @@ group { name: "elm/scroller/base/handler"; } description { state: "default" 0.0; fixed: 1 1; + color: 0 0 0 0; min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC; max: 30 99999; rel1 { @@ -640,7 +650,7 @@ group { name: "elm/scroller/base/handler"; visible: 1; image { normal: "00_scroll_bar_handler_top.png"; - border: 5 5 5 0; + border: 11 24 31 0; border_scale: 1; } } @@ -659,7 +669,7 @@ group { name: "elm/scroller/base/handler"; min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC; image { normal: "00_scroll_bar_handler_middle.png"; - border: 5 5 0 0; + border: 11 24 0 0; border_scale: 1; } } @@ -677,7 +687,7 @@ group { name: "elm/scroller/base/handler"; visible: 1; image { normal: "00_scroll_bar_handler_bottom.png"; - border: SCROLLER_HANDLER_SCROLLBAR_VBAR_BOTTOM_BORDER; + border: 11 24 0 36; border_scale: 1; } } @@ -747,20 +757,19 @@ group { name: "elm/scroller/base/handler"; align: 0.0 1.0; rel1 { relative: 0.0 1.0; - offset: SCROLLER_HANDLER_SCROLLBAR_PADDING_INC SCROLLER_HANDLER_SCROLLBAR_PADDING_INC; to_x: "elm.swallow.content"; to_y: "elm.swallow.content"; } rel2 { relative: 0.0 1.0; offset: -1 -1; - offset: (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1) (-SCROLLER_HANDLER_SCROLLBAR_PADDING_INC-1); to_x: "sb_vbar"; to_y: "elm.swallow.content"; } } } part { name: "elm.dragable.hbar"; + type: RECT; clip_to: "sb_hbar_clip"; mouse_events: 1; scale: 1; @@ -771,6 +780,7 @@ group { name: "elm/scroller/base/handler"; } description { state: "default" 0.0; fixed: 1 1; + color: 0 0 0 0; min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC; max: 99999 30; rel1 { @@ -798,7 +808,7 @@ group { name: "elm/scroller/base/handler"; visible: 1; image { normal: "00_scroll_bar_handler_left.png"; - border: 5 0 5 5; + border: 31 0 11 24; border_scale: 1; } } @@ -817,7 +827,7 @@ group { name: "elm/scroller/base/handler"; min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC; image { normal: "00_scroll_bar_handler_hor.png"; - border: 0 0 5 5; + border: 0 0 11 24; border_scale: 1; } } @@ -835,7 +845,7 @@ group { name: "elm/scroller/base/handler"; visible: 1; image { normal: "00_scroll_bar_handler_right.png"; - border: SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER; + border: 0 36 11 24; border_scale: 1; } } @@ -943,6 +953,16 @@ group { name: "elm/scroller/base/handler"; } } } + program { name: "vbar_press"; + signal: "mouse,down,1"; + source: "elm.dragable.vbar"; + action: SIGNAL_EMIT "elm,vbar,press" "elm"; + } + program { name: "vbar_unpress"; + signal: "mouse,up,1"; + source: "elm.dragable.vbar"; + action: SIGNAL_EMIT "elm,vbar,unpress" "elm"; + } program { name: "sb_vbar_show"; signal: "do-show-vbar"; source: ""; @@ -999,6 +1019,16 @@ group { name: "elm/scroller/base/handler"; } } } + program { name: "hbar_press"; + signal: "mouse,down,1"; + source: "elm.dragable.hbar"; + action: SIGNAL_EMIT "elm,hbar,press" "elm"; + } + program { name: "hbar_unpress"; + signal: "mouse,up,1"; + source: "elm.dragable.hbar"; + action: SIGNAL_EMIT "elm,hbar,unpress" "elm"; + } program { name: "sb_hbar_show"; signal: "do-show-hbar"; source: ""; @@ -1098,6 +1128,7 @@ group { name: "elm/genlist/base/default"; clip_to: "shadow_clip"; type: IMAGE; scale: 1; + mouse_events: 0; description { state: "default" 0.0; min: 0 30; fixed: 1 1; @@ -1118,6 +1149,7 @@ group { name: "elm/genlist/base/default"; clip_to: "shadow_clip"; type: IMAGE; scale: 1; + mouse_events: 0; description { state: "default" 0.0; min: 0 30; fixed: 1 1; @@ -1138,6 +1170,7 @@ group { name: "elm/genlist/base/default"; clip_to: "shadow_clip"; type: IMAGE; scale: 1; + mouse_events: 0; description { state: "default" 0.0; min: 30 0; fixed: 1 1; @@ -1158,6 +1191,7 @@ group { name: "elm/genlist/base/default"; clip_to: "shadow_clip"; type: IMAGE; scale: 1; + mouse_events: 0; description { state: "default" 0.0; min: 30 0; fixed: 1 1; @@ -1174,6 +1208,66 @@ group { name: "elm/genlist/base/default"; color: 255 255 255 255; } } + part { name: "padding_jump_to_top"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_JUMP_TOP_PADDING_TO_SCROLLER_MIN_MAX_INC; + max: BUTTON_JUMP_TOP_PADDING_TO_SCROLLER_MIN_MAX_INC; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + fixed: 1 1; + align: 1.0 0.0; + } + } + part { name: "elm.swallow.jump_to_top"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + to: "padding_jump_to_top"; + relative: 0.0 1.0; + } + rel2 { + to: "padding_jump_to_top"; + relative: 0.0 1.0; + } + fixed: 1 1; + align: 1.0 0.0; + } + } + part { name: "padding_jump_to_left"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_JUMP_LEFT_PADDING_TO_SCROLLER_MIN_MAX_INC; + max: BUTTON_JUMP_LEFT_PADDING_TO_SCROLLER_MIN_MAX_INC; + rel1.relative: 0.0 1.0; + rel2.relative: 0.0 1.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + fixed: 1 1; + align: 0.0 1.0; + } + } + part { name: "elm.swallow.jump_to_left"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + to: "padding_jump_to_left"; + relative: 1.0 0.0; + } + rel2 { + to: "padding_jump_to_left"; + relative: 1.0 0.0; + } + fixed: 1 1; + align: 0.0 1.0; + } + } } programs { program { name: "load"; @@ -1306,3 +1400,306 @@ group { name: "elm/genlist/base/default"; } } } + +group { name: "elm/genlist/base/handler"; + alias: "elm/genscroller/base/handler"; + alias: "elm/gengrid/base/handler"; + alias: "elm/list/base/handler"; + inherit: "elm/scroller/base/handler"; + + images { + image: "00_overscrolling_top.png" COMP; + image: "00_overscrolling_bottom.png" COMP; + image: "00_overscrolling_left.png" COMP; + image: "00_overscrolling_right.png" COMP; + } + + parts { + part { name: "shadow_clip"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + } + description { state: "hidden" 0.0; + visible: 0; + color: 255 255 255 0; + } + } + part { name: "shadow_top"; + clip_to: "shadow_clip"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: 0 30; + fixed: 1 1; + align: 0.5 0.0; + color: 255 255 255 100; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + image.normal: "00_overscrolling_top.png"; + } + description { state: "edge" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "shadow_bottom"; + clip_to: "shadow_clip"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: 0 30; + fixed: 1 1; + align: 0.5 1.0; + color: 255 255 255 100; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + image.normal: "00_overscrolling_bottom.png"; + } + description { state: "edge" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "shadow_left"; + clip_to: "shadow_clip"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: 30 0; + fixed: 1 1; + align: 0.0 0.5; + color: 255 255 255 100; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + image.normal: "00_overscrolling_left.png"; + } + description { state: "edge" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "shadow_right"; + clip_to: "shadow_clip"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: 30 0; + fixed: 1 1; + align: 1.0 0.5; + color: 255 255 255 100; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + image.normal: "00_overscrolling_right.png"; + } + description { state: "edge" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + } + programs { + program { name: "load"; + signal: "load"; + source: ""; + script { + set_state(PART:"sb_hbar_clip", "hidden", 0.0); + set_state(PART:"sb_vbar_clip", "hidden", 0.0); + set_state(PART:"shadow_clip", "hidden", 0.0); + set_int(sbvis_h, 0); + set_int(sbvis_v, 0); + set_int(sbalways_v, 0); + set_int(sbalways_h, 0); + set_int(sbvis_timer, 0); + set_int(sh_timer, 0); + set_int(edge_timer, 0); + } + } + program { name: "vbar_show_always"; + signal: "elm,action,show_always,vbar"; + source: "elm"; + script { + new v; + v = get_int(sbvis_v); + v |= get_int(sbalways_v); + if (!v) { + set_int(sbalways_v, 1); + emit("do-show-vbar", ""); + set_int(sbvis_v, 1); + } + } + } + program { name: "vbar_show_notalways"; + signal: "elm,action,show_notalways,vbar"; + source: "elm"; + script { + new v; + v = get_int(sbalways_v); + if (v) { + set_int(sbalways_v, 0); + v = get_int(sbvis_v); + if (!v) { + emit("do-hide-vbar", ""); + set_int(sbvis_v, 0); + } + } + } + } + program { name: "hbar_show_always"; + signal: "elm,action,show_always,hbar"; + source: "elm"; + script { + new v; + v = get_int(sbvis_h); + v |= get_int(sbalways_h); + if (!v) { + set_int(sbalways_h, 1); + emit("do-show-hbar", ""); + set_int(sbvis_h, 1); + } + } + } + program { name: "hbar_show_notalways"; + signal: "elm,action,show_notalways,hbar"; + source: "elm"; + script { + new v; + v = get_int(sbalways_h); + if (v) { + set_int(sbalways_h, 0); + v = get_int(sbvis_h); + if (!v) { + emit("do-hide-hbar", ""); + set_int(sbvis_h, 0); + } + } + } + } + program { name: "vshadow_show"; + signal: "do-show-vshadow"; + source: ""; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.5; + target: "shadow_clip"; + } + program { name: "vshadow_hide"; + signal: "do-hide-vshadow"; + source: ""; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 0.5; + target: "shadow_clip"; + } + program { name: "scroll"; + signal: "elm,action,scroll"; + source: "elm"; + script { + new v; + v = get_int(sbvis_v); + v |= get_int(sbalways_v); + if (!v) { + emit("do-show-vbar", ""); + set_int(sbvis_v, 1); + } + v = get_int(sbvis_h); + v |= get_int(sbalways_h); + if (!v) { + emit("do-show-hbar", ""); + set_int(sbvis_h, 1); + } + v = get_int(sbvis_timer); + if (v > 0) cancel_timer(v); + v = timer(1.0, "timer0", 0); + set_int(sbvis_timer, v); + + v = get_int(edge_timer); + if (!v) { + set_state(PART:"shadow_top", "default", 0.0); + set_state(PART:"shadow_bottom", "default", 0.0); + set_state(PART:"shadow_left", "default", 0.0); + set_state(PART:"shadow_right", "default", 0.0); + emit("do-show-vshadow", ""); + v = get_int(sh_timer); + if (v > 0) cancel_timer(v); + v = timer(0.2, "timer1", 0); + set_int(sh_timer, v); + } + } + } + program { name: "edge_top"; + signal: "elm,edge,top"; + source: "elm"; + after: "edge"; + } + program { name: "edge_bottom"; + signal: "elm,edge,bottom"; + source: "elm"; + after: "edge"; + } + program { name: "edge_left"; + signal: "elm,edge,left"; + source: "elm"; + after: "edge"; + } + program { name: "edge_right"; + signal: "elm,edge,right"; + source: "elm"; + after: "edge"; + } + program { name: "edge"; + script { + new v; + v = get_int(sh_timer); + if (v > 0) cancel_timer(v); + set_state(PART:"shadow_top", "edge", 0.0); + set_state(PART:"shadow_bottom", "edge", 0.0); + set_state(PART:"shadow_left", "edge", 0.0); + set_state(PART:"shadow_right", "edge", 0.0); + v = get_int(edge_timer); + if (!v) { + emit("do-show-vshadow", ""); + } + if (v > 0) cancel_timer(v); + v = timer(0.2, "timer2", 0); + set_int(edge_timer, v); + } + } + program { name: "show"; + signal: "show"; + source: ""; + script { + new v; + emit("do-show-vbar", ""); + set_int(sbvis_v, 1); + v = get_int(sbalways_v); + if (!v) { + v = get_int(sbvis_timer); + if (v > 0) cancel_timer(v); + v = timer(1.0, "timer0", 0); + set_int(sbvis_timer, v); + } + emit("do-show-hbar", ""); + set_int(sbvis_h, 1); + v = get_int(sbalways_h); + if (!v) { + v = get_int(sbvis_timer); + if (v > 0) cancel_timer(v); + v = timer(1.0, "timer0", 0); + set_int(sbvis_timer, v); + } + } + } + } +} diff --git a/themes/widgets/selectioninfo.edc b/themes/widgets/selectioninfo.edc index f68cc9c..b25f738 100644 --- a/themes/widgets/selectioninfo.edc +++ b/themes/widgets/selectioninfo.edc @@ -36,11 +36,11 @@ group { name: "elm/standard/selectioninfo/default"; } part { name: "bottom.popup.shadow"; type: IMAGE; + mouse_events: 0; scale: 1; description { state: "default" 0.0; min: SELECTION_INFO_SHADOW_VER_W_INC SELECTION_INFO_SHADOW_VER_H_INC; align: 0.5 1.0; - fixed: 1 1; image.normal: "00_bottom_popup_shadow.png"; rel2 { to: "bg"; @@ -50,6 +50,7 @@ group { name: "elm/standard/selectioninfo/default"; } part { name: "padding_left"; scale: 1; + mouse_events: 0; description { state: "default" 0.0; min: SELECTION_INFO_LEFT_PADDING_INC 0; diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc index fa97bc3..fe7fc32 100644 --- a/themes/widgets/slider.edc +++ b/themes/widgets/slider.edc @@ -19,8 +19,8 @@ group { name: "elm/slider/horizontal/tap_to_drag"; images { - image: "00_winset_list_progress_bg.png" COMP; - image: "00_winset_list_progress_bar.png" COMP; + image: "00_progress_bg.png" COMP; + image: "00_progress_bar.png" COMP; } script { public invert_on = 0; @@ -60,26 +60,66 @@ rel2 { to: "bg"; offset: -5 -1; } - image.normal: "00_winset_list_progress_bg.png"; - image.border: 0 0 4 4; + image.normal: "00_progress_bg.png"; + image.border: PROGRESS_BG_IMAGE_BORDER_INC; image.border_scale: 1; } } + part { + name: "bar_image_left_padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1.to: "base"; + rel2 { + relative: 0.0 1.0; + to: "base"; + } + align: 0.0 0.5; + } + } + part { + name: "bar_image_right_padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to: "base"; + } + rel2.to: "base"; + align: 1.0 0.5; + } + } part { name: "level"; mouse_events: 0; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; + rel1 { + to_x: "bar_image_left_padding"; + to_y: "base"; + relative: 1.0 0.0; + } rel2 { to_y: "base"; to_x: "elm.dragable.slider"; offset: -5 -1; relative: 0.5 1.0; } - image.normal: "00_winset_list_progress_bar.png"; - image.border: 0 0 4 4; + image.normal: "00_progress_bar.png"; + image.border: PROGRESS_BAR_IMAGE_BORDER_INC; image.border_scale: 1; } description { state: "inverted" 0.0; @@ -88,7 +128,6 @@ } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_winset_list_progress_bar.png"; } } part { name: "level2"; @@ -103,12 +142,15 @@ to_x: "elm.dragable.slider"; relative: 0.5 0.0; } - rel2.to: "base"; - rel2.offset: -2 -1; - image.normal: "00_winset_list_progress_bg.png"; - image.border: 0 0 4 4; - image.border_scale: 1; + rel1 { + to_x: "bar_image_right_padding"; + to_y: "base"; + relative: 0.0 1.0; } + image.normal: "00_progress_bg.png"; + image.border: PROGRESS_BG_IMAGE_BORDER_INC; + image.border_scale: 1; + } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 1; @@ -116,7 +158,6 @@ description { state: "pressed" 0.0; inherit: "default" 0.0; visible: 1; - image.normal: "00_winset_list_progress_bg.png"; } } part { name: "bg"; @@ -2582,24 +2623,64 @@ rel1.to: "bg"; rel2.to: "bg"; image.normal: "00_progress_bg.png"; - image.border: 17 17 0 0; + image.border: PROGRESS_BG_IMAGE_BORDER_INC; image.border_scale: 1; } } + part { + name: "bar_image_left_padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1.to: "base"; + rel2 { + relative: 0.0 1.0; + to: "base"; + } + align: 0.0 0.5; + } + } + part { + name: "bar_image_right_padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to: "base"; + } + rel2.to: "base"; + align: 1.0 0.5; + } + } part { name: "level"; mouse_events: 0; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; + rel1 { + to_x: "bar_image_left_padding"; + to_y: "base"; + relative: 1.0 0.0; + } rel2 { to_y: "base"; to_x: "elm.dragable.slider"; relative: 0.5 1.0; } image.normal: "00_progress_bar.png"; - image.border: 17 17 0 0; + image.border: PROGRESS_BAR_IMAGE_BORDER_INC; image.border_scale: 1; } description { state: "inverted" 0.0; @@ -2608,7 +2689,6 @@ } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_progress_bar.png"; } } part { name: "level2"; @@ -2623,9 +2703,13 @@ to_x: "elm.dragable.slider"; relative: 0.5 0.0; } - rel2.to: "base"; + rel2 { + to_y: "base"; + to_x: "bar_image_left_padding"; + relative: 0.0 1.0; + } image.normal: "00_progress_bar.png"; - image.border: 0 0 4 4; + image.border: PROGRESS_BAR_IMAGE_BORDER_INC; image.border_scale: 1; } description { state: "inverted" 0.0; @@ -2635,7 +2719,6 @@ description { state: "pressed" 0.0; inherit: "default" 0.0; visible: 1; - image.normal: "00_progress_bar.png"; } } part { name: "bg"; @@ -3005,8 +3088,8 @@ group { name: "elm/slider/vertical/default"; alias: "elm/slider/vertical/disabled"; images { - image: "00_winset_list_progress_bg.png" COMP; - image: "00_winset_list_progress_bar.png" COMP; + image: "00_progress_bg.png" COMP; + image: "00_progress_bar.png" COMP; } parts { part { name: "base"; @@ -3018,27 +3101,67 @@ group { name: "elm/slider/vertical/default"; rel1.to: "bg"; rel2.to: "bg"; image { - normal: "00_winset_list_progress_bg.png"; - border: 0 0 4 4; + normal: "00_progress_bg.png"; + border: PROGRESS_BG_IMAGE_BORDER_INC; border_scale: 1; } } } + part { + name: "bar_image_top_padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC; + fixed: 0 1; + rel1.to: "base"; + rel2 { + relative: 1.0 0.0; + to: "base"; + } + align: 0.5 0.0; + } + } + part { + name: "bar_image_bottom_padding"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC; + max: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC; + fixed: 0 1; + rel1 { + relative: 0.0 1.0; + to: "base"; + } + rel2.to: "base"; + align: 0.5 1.0; + } + } part { name: "level"; mouse_events: 0; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; + rel1 { + to_x: "base"; + to_y: "bar_image_top_padding"; + relative: 0.0 1.0; + } rel2 { to_x: "base"; to_y: "elm.dragable.slider"; relative: 1.0 0.5; } image { - normal: "00_winset_list_progress_bar.png"; - border: 0 0 4 4; + normal: "00_progress_bar.png"; + border: PROGRESS_BAR_IMAGE_BORDER_INC; border_scale: 1; } } @@ -3059,10 +3182,14 @@ group { name: "elm/slider/vertical/default"; to_y: "elm.dragable.slider"; relative: 0.0 0.5; } - rel2.to: "base"; + rel2 { + to_x: "base"; + to_y: "bar_image_bottom_padding"; + relative: 1.0 0.0; + } image { - normal: "00_winset_list_progress_bar.png"; - border: 0 0 4 4; + normal: "00_progress_bar.png"; + border: PROGRESS_BAR_IMAGE_BORDER_INC; border_scale: 1; } } diff --git a/themes/widgets/tickernoti.edc b/themes/widgets/tickernoti.edc index 5d17b59..81e6256 100644 --- a/themes/widgets/tickernoti.edc +++ b/themes/widgets/tickernoti.edc @@ -168,6 +168,7 @@ } part { name: "event"; + type: RECT; mouse_events: 1; repeat_events: 1; description {state: "default" 0.0; @@ -393,6 +394,7 @@ } part { name: "event"; + type: RECT; mouse_events: 1; repeat_events: 1; description { @@ -494,7 +496,7 @@ styles { style { name: "style_textonly"; - base: "font=Tizen:style=Bold font_size="TICKERNOTI_DEFAULT_TEXT2_FONT_SIZE_INC" color="TICKER_NOTI_DEFAULT_TEXT_COLOR_INC" wrap=mixed ellipsis=1.0 linesize=32 text_class=tizen"; + base: "font=Tizen:style=Bold font_size="TICKERNOTI_DEFAULT_TEXT2_FONT_SIZE_INC" color="TICKER_NOTI_DEFAULT_TEXT_COLOR_INC" wrap=mixed ellipsis=1.0 text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "b" "+ font=Tizen:style=Bold"; diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc index b154722..b190def 100644 --- a/themes/widgets/toolbar.edc +++ b/themes/widgets/toolbar.edc @@ -1027,6 +1027,23 @@ group { name: "elm/toolbar/object/default"; } group { name: "elm/toolbar/base/tabbar"; + images { + image: "00_effect_tab_bounce_left.png" COMP; + image: "00_effect_tab_bounce_right.png" COMP; + } + script { + public left_timer, right_timer; + public l_timer(val) { + emit("do-hide-left-shadow", ""); + set_int(left_timer, 0); + return 0; + } + public r_timer(val) { + emit("do-hide-right-shadow", ""); + set_int(right_timer, 0); + return 0; + } + } parts { part { name: "base"; type: RECT; @@ -1089,13 +1106,120 @@ group { name: "elm/toolbar/base/tabbar"; rel2.to: "clipper"; } } - part { name: "event"; + part { name: "left_shadow_clip"; type: RECT; - mouse_events: 1; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } + description { state: "show" 0.0; + } + } + part { name: "right_shadow_clip"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } + description { state: "show" 0.0; + } + } + part { name: "shadow_left"; + clip_to: "left_shadow_clip"; + type: IMAGE; + scale: 1; repeat_events: 1; + description { state: "default" 0.0; + min: 162 0; + fixed: 1 1; + align: 0.0 0.5; + color: 255 255 255 255; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + image.normal: "00_effect_tab_bounce_left.png"; + } + } + part { name: "shadow_right"; + clip_to: "right_shadow_clip"; + type: IMAGE; scale: 1; + repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; + min: 162 0; + fixed: 1 1; + align: 1.0 0.5; + color: 255 255 255 255; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + image.normal: "00_effect_tab_bounce_right.png"; + } + } + } + programs { + program { name: "load"; + script { + set_int(left_timer, 0); + set_int(right_timer, 0); + } + } + program { name: "left_shadow_show"; + signal: "do-show-left-shadow"; + source: ""; + action: STATE_SET "show" 0.0; + transition: LINEAR 0.3; + target: "left_shadow_clip"; + } + program { name: "left_shadow_hide"; + signal: "do-hide-left-shadow"; + source: ""; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.3; + target: "left_shadow_clip"; + } + program { name: "right_shadow_show"; + signal: "do-show-right-shadow"; + source: ""; + action: STATE_SET "show" 0.0; + transition: LINEAR 0.3; + target: "right_shadow_clip"; + } + program { name: "right_shadow_hide"; + signal: "do-hide-right-shadow"; + source: ""; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.3; + target: "right_shadow_clip"; + } + program { name: "edge_left"; + signal: "elm,edge,left"; + source: "elm"; + script { + new v; + v = get_int(left_timer); + if (!v) { + emit("do-show-left-shadow", ""); + } + if (v > 0) cancel_timer(v); + v = timer(0.5, "l_timer", 0); + set_int(left_timer, v); + } + } + program { name: "edge_right"; + signal: "elm,edge,right"; + source: "elm"; + script { + new v; + v = get_int(right_timer); + if (!v) { + emit("do-show-right-shadow", ""); + } + if (v > 0) cancel_timer(v); + v = timer(0.5, "r_timer", 0); + set_int(right_timer, v); } } } @@ -1271,7 +1395,6 @@ group { name: "elm/toolbar/more/tabbar"; group { name: "elm/toolbar/item/tabbar"; images { image: "00_tab_press.png" COMP; - image: "00_divider_line.png" COMP; image: "00_badge_bg.png" COMP; } @@ -1287,16 +1410,12 @@ group { name: "elm/toolbar/item/tabbar"; mouse_events: 0; description { state: "default" 0.0; min: 172 0; - color: 248 246 239 255; + visible: 0; } description { state: "icon_text" 0.0; inherit: "default" 0.0; min: 229 0; } - description { state: "moving" 0.0; - inherit: "default" 0.0; - visible: 0; - } } part { name: "bg_cover"; type: IMAGE; @@ -1879,7 +1998,7 @@ group { name: "elm/toolbar/item/tabbar"; } } part { name: "divider"; - type: IMAGE; + type: RECT; scale: 1; description { state: "default" 0.0; min: 4 26; @@ -1893,19 +2012,49 @@ group { name: "elm/toolbar/item/tabbar"; relative: 1.0 0.5; to_y: "elm.swallow.icon"; } - image { - normal: "00_divider_line.png"; - border: 0 0 2 2; - } } description { state: "hidden" 0.0; inherit: "default" 0.0; visible: 0; } } + part { name: "divider_left"; + type: RECT; + clip_to: "divider"; + description { state: "default" 0.0; + color: TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC; + rel1 { + relative: 0.0 0.0; + to: "divider"; + } + rel2 { + relative: 0.5 1.0; + to: "divider"; + } + } + } + part { name: "divider_right"; + type: RECT; + clip_to: "divider"; + description { state: "default" 0.0; + color: TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC; + rel1 { + relative: 0.5 0.0; + to: "divider"; + } + rel2 { + relative: 1.0 1.0; + to: "divider"; + } + } + } part { name: "event"; type: RECT; mouse_events: 1; + dragable { + x: 1 0 0; + y: 1 0 0; + } description { state: "default" 0.0; color: 0 0 0 0; } @@ -1950,20 +2099,42 @@ group { name: "elm/toolbar/item/tabbar"; signal: "elm,state,moving"; source: "elm"; action: STATE_SET "moving" 0.0; - target: "bg"; target: "bg_cover"; } - program { name: "pressed"; + program { name: "pressed"; signal: "mouse,down,1"; source: "event"; action: STATE_SET "pressed" 0.0; target: "bg_cover"; } + program { + name: "drag"; + signal: "drag"; + source: "event"; + script { + new st[31]; + new Float:vl; + new Float:dx, Float:dy; + get_state(PART:"bg_cover", st, 30, vl); + if (strcmp(st, "moving")) + { + get_drag(PART:"event", dx, dy); + if ((abs(dx)*abs(dx))+(abs(dy)*abs(dy)) > 400) + { + set_drag(PART:"event", 0.0, 0.0); + set_state(PART:"bg_cover", "default", 0.0); + } + set_drag(PART:"event", 0.0, 0.0); + } + } + } program { name: "unpressed"; signal: "mouse,up,1"; source: "event"; - action: STATE_SET "default" 0.0; - target: "bg_cover"; + script { + set_drag(PART:"event", 0.0, 0.0); + set_state(PART:"bg_cover", "default", 0.0); + } } program { name: "go"; signal: "mouse,clicked,1";