[UX version 1.8]Implementation of Button, Check and Radio Widget.
authorAmit Kamboj <amit.kamboj@samsung.com>
Thu, 17 May 2012 11:42:18 +0000 (17:12 +0530)
committerAmit Kamboj <amit.kamboj@samsung.com>
Fri, 18 May 2012 03:53:41 +0000 (09:23 +0530)
Change-Id: I4e606d09e1b3f3799b5d45dd32c017107fe18387

52 files changed:
themes/images/tizen-black-hd/00_Option_header_bt_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_01_normal_Focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_04_normal_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_05_normal_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_06_normal_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_edit_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_popup_dim.png
themes/images/tizen-black-hd/00_button_popup_normal.png
themes/images/tizen-black-hd/00_button_popup_normal_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_popup_press.png
themes/images/tizen-black-hd/00_button_radio_press1.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_radio_press2.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_sweep.png
themes/images/tizen-black-hd/00_button_sweep_delete.png
themes/images/tizen-black-hd/00_button_sweep_delete_press.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_sweep_dim.png
themes/images/tizen-black-hd/00_button_sweep_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_sweep_press.png
themes/images/tizen-black-hd/00_contacts_button_bg.png [changed mode: 0755->0644]
themes/images/tizen-black-hd/00_contacts_button_bg_press.png [changed mode: 0755->0644]
themes/images/tizen-black-hd/00_contacts_circle_bg.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_picker_btn_normal_focus.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_title_btn_bg_press.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_winset_Back_btn_normal_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_Option_header_bt_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_01_normal_Focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_04_normal_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_05_normal_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_06_normal_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_edit_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_popup_dim.png
themes/images/tizen-hd/00_button_popup_normal.png
themes/images/tizen-hd/00_button_popup_normal_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_popup_press.png
themes/images/tizen-hd/00_button_radio_press1.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_radio_press2.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_sweep.png
themes/images/tizen-hd/00_button_sweep_delete.png
themes/images/tizen-hd/00_button_sweep_delete_press.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_sweep_dim.png
themes/images/tizen-hd/00_button_sweep_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_sweep_press.png
themes/images/tizen-hd/00_contacts_button_bg.png [changed mode: 0755->0644]
themes/images/tizen-hd/00_contacts_button_bg_press.png [changed mode: 0755->0644]
themes/images/tizen-hd/00_contacts_circle_bg.png [new file with mode: 0644]
themes/images/tizen-hd/00_picker_btn_normal_focus.png [new file with mode: 0644]
themes/images/tizen-hd/00_title_btn_bg_press.png [new file with mode: 0644]
themes/images/tizen-hd/00_winset_Back_btn_normal_focus.png [new file with mode: 0644]
themes/inc/tizen-black-hd-inc.edc
themes/inc/tizen-hd-inc.edc
themes/widgets/button.edc
themes/widgets/check.edc

diff --git a/themes/images/tizen-black-hd/00_Option_header_bt_focus.png b/themes/images/tizen-black-hd/00_Option_header_bt_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-black-hd/00_Option_header_bt_focus.png differ
diff --git a/themes/images/tizen-black-hd/00_button_01_normal_Focus.png b/themes/images/tizen-black-hd/00_button_01_normal_Focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_01_normal_Focus.png differ
diff --git a/themes/images/tizen-black-hd/00_button_04_normal_focus.png b/themes/images/tizen-black-hd/00_button_04_normal_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_04_normal_focus.png differ
diff --git a/themes/images/tizen-black-hd/00_button_05_normal_focus.png b/themes/images/tizen-black-hd/00_button_05_normal_focus.png
new file mode 100644 (file)
index 0000000..37a8f40
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_05_normal_focus.png differ
diff --git a/themes/images/tizen-black-hd/00_button_06_normal_focus.png b/themes/images/tizen-black-hd/00_button_06_normal_focus.png
new file mode 100644 (file)
index 0000000..b63a031
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_06_normal_focus.png differ
diff --git a/themes/images/tizen-black-hd/00_button_edit_focus.png b/themes/images/tizen-black-hd/00_button_edit_focus.png
new file mode 100644 (file)
index 0000000..20c1764
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_edit_focus.png differ
index 974ac3a..3ce2fd2 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_popup_dim.png and b/themes/images/tizen-black-hd/00_button_popup_dim.png differ
index 65b0895..bcfb7fa 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_popup_normal.png and b/themes/images/tizen-black-hd/00_button_popup_normal.png differ
diff --git a/themes/images/tizen-black-hd/00_button_popup_normal_focus.png b/themes/images/tizen-black-hd/00_button_popup_normal_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_popup_normal_focus.png differ
index 829554a..3468f48 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_popup_press.png and b/themes/images/tizen-black-hd/00_button_popup_press.png differ
diff --git a/themes/images/tizen-black-hd/00_button_radio_press1.png b/themes/images/tizen-black-hd/00_button_radio_press1.png
new file mode 100644 (file)
index 0000000..4ba1c87
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_radio_press1.png differ
diff --git a/themes/images/tizen-black-hd/00_button_radio_press2.png b/themes/images/tizen-black-hd/00_button_radio_press2.png
new file mode 100644 (file)
index 0000000..1c4fafe
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_radio_press2.png differ
index 638a16b..070c4ad 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_sweep.png and b/themes/images/tizen-black-hd/00_button_sweep.png differ
index 87d7185..632f52b 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_sweep_delete.png and b/themes/images/tizen-black-hd/00_button_sweep_delete.png differ
diff --git a/themes/images/tizen-black-hd/00_button_sweep_delete_press.png b/themes/images/tizen-black-hd/00_button_sweep_delete_press.png
new file mode 100644 (file)
index 0000000..e27bf6a
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_sweep_delete_press.png differ
index c53e775..dacfd1c 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_sweep_dim.png and b/themes/images/tizen-black-hd/00_button_sweep_dim.png differ
diff --git a/themes/images/tizen-black-hd/00_button_sweep_focus.png b/themes/images/tizen-black-hd/00_button_sweep_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_sweep_focus.png differ
index 451bf38..3468f48 100644 (file)
Binary files a/themes/images/tizen-black-hd/00_button_sweep_press.png and b/themes/images/tizen-black-hd/00_button_sweep_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 2cac510..e85472f
Binary files a/themes/images/tizen-black-hd/00_contacts_button_bg.png and b/themes/images/tizen-black-hd/00_contacts_button_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index a6a5d71..2ca9209
Binary files a/themes/images/tizen-black-hd/00_contacts_button_bg_press.png and b/themes/images/tizen-black-hd/00_contacts_button_bg_press.png differ
diff --git a/themes/images/tizen-black-hd/00_contacts_circle_bg.png b/themes/images/tizen-black-hd/00_contacts_circle_bg.png
new file mode 100644 (file)
index 0000000..43b16e4
Binary files /dev/null and b/themes/images/tizen-black-hd/00_contacts_circle_bg.png differ
diff --git a/themes/images/tizen-black-hd/00_picker_btn_normal_focus.png b/themes/images/tizen-black-hd/00_picker_btn_normal_focus.png
new file mode 100644 (file)
index 0000000..9f8d3f0
Binary files /dev/null and b/themes/images/tizen-black-hd/00_picker_btn_normal_focus.png differ
diff --git a/themes/images/tizen-black-hd/00_title_btn_bg_press.png b/themes/images/tizen-black-hd/00_title_btn_bg_press.png
new file mode 100644 (file)
index 0000000..90a71c7
Binary files /dev/null and b/themes/images/tizen-black-hd/00_title_btn_bg_press.png differ
diff --git a/themes/images/tizen-black-hd/00_winset_Back_btn_normal_focus.png b/themes/images/tizen-black-hd/00_winset_Back_btn_normal_focus.png
new file mode 100644 (file)
index 0000000..8ab92c6
Binary files /dev/null and b/themes/images/tizen-black-hd/00_winset_Back_btn_normal_focus.png differ
diff --git a/themes/images/tizen-hd/00_Option_header_bt_focus.png b/themes/images/tizen-hd/00_Option_header_bt_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-hd/00_Option_header_bt_focus.png differ
diff --git a/themes/images/tizen-hd/00_button_01_normal_Focus.png b/themes/images/tizen-hd/00_button_01_normal_Focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-hd/00_button_01_normal_Focus.png differ
diff --git a/themes/images/tizen-hd/00_button_04_normal_focus.png b/themes/images/tizen-hd/00_button_04_normal_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-hd/00_button_04_normal_focus.png differ
diff --git a/themes/images/tizen-hd/00_button_05_normal_focus.png b/themes/images/tizen-hd/00_button_05_normal_focus.png
new file mode 100644 (file)
index 0000000..37a8f40
Binary files /dev/null and b/themes/images/tizen-hd/00_button_05_normal_focus.png differ
diff --git a/themes/images/tizen-hd/00_button_06_normal_focus.png b/themes/images/tizen-hd/00_button_06_normal_focus.png
new file mode 100644 (file)
index 0000000..b63a031
Binary files /dev/null and b/themes/images/tizen-hd/00_button_06_normal_focus.png differ
diff --git a/themes/images/tizen-hd/00_button_edit_focus.png b/themes/images/tizen-hd/00_button_edit_focus.png
new file mode 100644 (file)
index 0000000..20c1764
Binary files /dev/null and b/themes/images/tizen-hd/00_button_edit_focus.png differ
index aee9895..3ce2fd2 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_popup_dim.png and b/themes/images/tizen-hd/00_button_popup_dim.png differ
index 33ce4d6..bcfb7fa 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_popup_normal.png and b/themes/images/tizen-hd/00_button_popup_normal.png differ
diff --git a/themes/images/tizen-hd/00_button_popup_normal_focus.png b/themes/images/tizen-hd/00_button_popup_normal_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-hd/00_button_popup_normal_focus.png differ
index 6e364e8..3468f48 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_popup_press.png and b/themes/images/tizen-hd/00_button_popup_press.png differ
diff --git a/themes/images/tizen-hd/00_button_radio_press1.png b/themes/images/tizen-hd/00_button_radio_press1.png
new file mode 100644 (file)
index 0000000..4ba1c87
Binary files /dev/null and b/themes/images/tizen-hd/00_button_radio_press1.png differ
diff --git a/themes/images/tizen-hd/00_button_radio_press2.png b/themes/images/tizen-hd/00_button_radio_press2.png
new file mode 100644 (file)
index 0000000..1c4fafe
Binary files /dev/null and b/themes/images/tizen-hd/00_button_radio_press2.png differ
index caac03f..070c4ad 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_sweep.png and b/themes/images/tizen-hd/00_button_sweep.png differ
index 87d7185..632f52b 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_sweep_delete.png and b/themes/images/tizen-hd/00_button_sweep_delete.png differ
diff --git a/themes/images/tizen-hd/00_button_sweep_delete_press.png b/themes/images/tizen-hd/00_button_sweep_delete_press.png
new file mode 100644 (file)
index 0000000..e27bf6a
Binary files /dev/null and b/themes/images/tizen-hd/00_button_sweep_delete_press.png differ
index 3d24f58..dacfd1c 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_sweep_dim.png and b/themes/images/tizen-hd/00_button_sweep_dim.png differ
diff --git a/themes/images/tizen-hd/00_button_sweep_focus.png b/themes/images/tizen-hd/00_button_sweep_focus.png
new file mode 100644 (file)
index 0000000..6ee6ae8
Binary files /dev/null and b/themes/images/tizen-hd/00_button_sweep_focus.png differ
index a73e219..3468f48 100644 (file)
Binary files a/themes/images/tizen-hd/00_button_sweep_press.png and b/themes/images/tizen-hd/00_button_sweep_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 2cac510..e85472f
Binary files a/themes/images/tizen-hd/00_contacts_button_bg.png and b/themes/images/tizen-hd/00_contacts_button_bg.png differ
old mode 100755 (executable)
new mode 100644 (file)
index a6a5d71..2ca9209
Binary files a/themes/images/tizen-hd/00_contacts_button_bg_press.png and b/themes/images/tizen-hd/00_contacts_button_bg_press.png differ
diff --git a/themes/images/tizen-hd/00_contacts_circle_bg.png b/themes/images/tizen-hd/00_contacts_circle_bg.png
new file mode 100644 (file)
index 0000000..43b16e4
Binary files /dev/null and b/themes/images/tizen-hd/00_contacts_circle_bg.png differ
diff --git a/themes/images/tizen-hd/00_picker_btn_normal_focus.png b/themes/images/tizen-hd/00_picker_btn_normal_focus.png
new file mode 100644 (file)
index 0000000..9f8d3f0
Binary files /dev/null and b/themes/images/tizen-hd/00_picker_btn_normal_focus.png differ
diff --git a/themes/images/tizen-hd/00_title_btn_bg_press.png b/themes/images/tizen-hd/00_title_btn_bg_press.png
new file mode 100644 (file)
index 0000000..90a71c7
Binary files /dev/null and b/themes/images/tizen-hd/00_title_btn_bg_press.png differ
diff --git a/themes/images/tizen-hd/00_winset_Back_btn_normal_focus.png b/themes/images/tizen-hd/00_winset_Back_btn_normal_focus.png
new file mode 100644 (file)
index 0000000..8ab92c6
Binary files /dev/null and b/themes/images/tizen-hd/00_winset_Back_btn_normal_focus.png differ
index 908b8d9..888c59f 100644 (file)
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
 #define BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC 28
 
+#define BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC 64 64
+#define BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC 64 64
+
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 35 35
 #define BUTTON_CONTACT_DELETE_ICON_ICONONLY_MIN_INC 42 42
 #define BUTTON_CONTACT_DELETE_FONT_SIZE_INC 32
 
-#define BUTTON_CONTACT_BG_MIN_INC 12 48
-#define BUTTON_CONTACT_BG_BORDER_INC 5 5 5 5
-#define BUTTON_CONTACT_PADDING_MIN_INC 16 1
-#define BUTTON_CONTACT_FONT_SIZE_INC 38
+#define BUTTON_CONTACT_BG_MIN_INC 58 56
+#define BUTTON_CONTACT_BG_BORDER_INC 28 28 2 2
+#define BUTTON_CONTACT_PADDING_MIN_INC 20 1
+#define BUTTON_CONTACT_FONT_SIZE_INC 36
 
 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 106 74
 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC 5 5 5 5
 #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_NORMAL_MIN_INC 136 84
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC 136 108
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_MIN_INC 130 92
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_TITLE_ICON_PADDING_MIN_INC 10 3
 #define BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_WIDTH_INC 56
 #define BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_HEIGHT_INC 56
 #define BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_WIDTH_INC 56
 #define BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_HEIGHT_INC 56
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 136 84
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 136 108
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_MIN_INC 130 92
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 10 3
 #define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 30
 #define BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC 56 56
 #define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 24
 
-#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 90 84
+#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 90 108
+#define BUTTON_NAVIFRAME_MORE_BG_PRESSED_MIN_MAX_INC 86 92
+#define BUTTON_NAVIFRAME_MORE_BG_PRESSED_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 56 56
 #define BUTTON_NAVIFRAME_MORE_BG_COLOR_INC 50 65 74 255
 
 
 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 74 66
 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5
-#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 16 5
 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_ICON_RECT_MIN_INC 0 56
 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_CONTENT_ICON_ONLY_MIN_INC 56 56
index 346f288..93b05c2 100644 (file)
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
 #define BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC 28
 
+#define BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC 64 64
+#define BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC 64 64
+
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 35 35
 #define BUTTON_CONTACT_DELETE_ICON_ICONONLY_MIN_INC 42 42
 #define BUTTON_CONTACT_DELETE_FONT_SIZE_INC 32
 
-#define BUTTON_CONTACT_BG_MIN_INC 12 48
-#define BUTTON_CONTACT_BG_BORDER_INC 5 5 5 5
-#define BUTTON_CONTACT_PADDING_MIN_INC 16 1
-#define BUTTON_CONTACT_FONT_SIZE_INC 38
+#define BUTTON_CONTACT_BG_MIN_INC 58 56
+#define BUTTON_CONTACT_BG_BORDER_INC 28 28 2 2
+#define BUTTON_CONTACT_PADDING_MIN_INC 20 1
+#define BUTTON_CONTACT_FONT_SIZE_INC 36
 
 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 106 74
 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC 5 5 5 5
 #define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 255 255 255 255
 #define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 255 255 255 255
 
-#define BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC 136 84
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC 136 108
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_MIN_INC 130 92
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_TITLE_ICON_PADDING_MIN_INC 10 3
 #define BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_WIDTH_INC 56
 #define BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_HEIGHT_INC 56
 #define BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_WIDTH_INC 56
 #define BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_HEIGHT_INC 56
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 136 84
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 136 108
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_MIN_INC 130 92
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 10 3
 #define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 30
 #define BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC 56 56
 #define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 24
 
-#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 90 84
+#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 90 108
+#define BUTTON_NAVIFRAME_MORE_BG_PRESSED_MIN_MAX_INC 86 92
+#define BUTTON_NAVIFRAME_MORE_BG_PRESSED_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 56 56
 #define BUTTON_NAVIFRAME_MORE_BG_COLOR_INC 219 201 174 255
 
index 730d56d..01aee23 100644 (file)
@@ -36,6 +36,7 @@
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -60,7 +61,7 @@
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       styles{
          style { name: "btn_style1_multiline";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
          image: "00_button_04_normal.png" COMP;
          image: "00_button_04_press.png" COMP;
          image: "00_button_04_dim.png" COMP;
+         image: "00_button_04_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_04_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
          image: "00_button_04_normal.png" COMP;
          image: "00_button_04_press.png" COMP;
          image: "00_button_04_dim.png" COMP;
+         image: "00_button_04_normal_focus.png" COMP;
       }
       styles{
          style { name: "btn_style2_multiline";
-base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_roman";
+            base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_roman";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -1936,7 +1941,7 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_04_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -2374,8 +2379,9 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
       alias: "elm/button/base/text_only/sweep";
       images {
          image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         image: "00_button_sweep_press.png" COMP;
          image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -2401,7 +2407,7 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -2784,8 +2790,9 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
    group { name: "elm/button/base/sweep/multiline";
       images {
          image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         image: "00_button_sweep_press.png" COMP;
          image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
       }
       styles{
          style { name: "btn_sweep_multiline";
@@ -2819,7 +2826,7 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -3200,8 +3207,9 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
 group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_search_input_field_bg.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         image: "00_button_sweep_press.png" COMP;
          image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3236,7 +3244,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                image {
-                  normal: "00_button_sweep_press.png";
+                  normal: "00_button_sweep_focus.png";
                   border: BUTTON_SWEEP_BG_BORDER_INC;
                   border_scale: 1;
                }
@@ -3621,10 +3629,10 @@ group { name: "elm/button/base/searchbar/default";
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/sweep/delete";
       images {
-         image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
          image: "00_button_sweep_dim.png" COMP;
          image: "00_button_sweep_delete.png" COMP;
+         image: "00_button_sweep_delete_press.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3642,7 +3650,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_delete_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3650,7 +3658,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4034,7 +4042,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_button_popup_normal.png" COMP;
          image: "00_button_popup_press.png" COMP;
-         image: "00_button_popup_focus.png" COMP;
+         image: "00_button_popup_normal_focus.png" COMP;
          image: "00_button_popup_dim.png" COMP;
       }
       script {
@@ -4061,7 +4069,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_focus.png";
+               image.normal: "00_button_popup_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4382,11 +4390,15 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          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";
             after: "unfocus_text";
@@ -4402,7 +4414,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_button_popup_normal.png" COMP;
          image: "00_button_popup_press.png" COMP;
-         image: "00_button_popup_focus.png" COMP;
+         image: "00_button_popup_normal_focus.png" COMP;
          image: "00_button_popup_dim.png" COMP;
       }
       styles{
@@ -4437,7 +4449,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_focus.png";
+               image.normal: "00_button_popup_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4757,11 +4769,15 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          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";
             after: "unfocus_text";
@@ -4965,14 +4981,10 @@ group { name: "elm/button/base/searchbar/default";
    BUTTON_CIRCLE_STYLES("send/extended", "00_button_send.png", "00_button_send_press.png", 60, 70)
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/circle/empty";
-      alias: "elm/button/base/expand_text";
       images {
          image: "00_btn_circle_bg_normal.png" COMP;
          image: "00_btn_circle_bg_press.png" COMP;
       }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
       parts {
          part { name: "button_image";
             scale: 1;
@@ -5007,45 +5019,6 @@ group { name: "elm/button/base/searchbar/default";
                color: 255 255 255 128;
             }
          }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC;
-                  min: 1 1;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_EXPAND_BUTTON_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_EXPAND_BUTTON_DISABLED_COLOR_INC;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC;
-            }
-         }
          part { name: "over1";
             type: RECT;
             ignore_flags: ON_HOLD;
@@ -5082,108 +5055,50 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
          }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over2";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over1";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
+            after: button_unclick2;
          }
-         program { name: "button_unclick3";
+         program { name: "button_unclick2";
             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: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "icononly" 0.0;
-            target: "elm.swallow.content";
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
+         program { name: "button_unclick_anim";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "button_image";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "button_image";
             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);
-            }
+            target: "button_image";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
             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";
-            action: STATE_SET "focused" 0.0;
             target: "button_image";
-            target: "elm.text";
          }
-         program { name: "unfocused";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
             action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "elm.swallow.content";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
          }
       }
    }
@@ -5198,6 +5113,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_edit.png" COMP; \
          image: "00_button_edit_press.png" COMP; \
          image: "00_button_edit_dim.png" COMP; \
+         image: "00_button_edit_focus.png" COMP; \
       } \
       parts { \
          part { name: "button_image"; \
@@ -5221,6 +5137,11 @@ group { name: "elm/button/base/searchbar/default";
                inherit: "default" 0.0; \
                image.normal: "00_button_edit_dim.png"; \
             } \
+            description { \
+               state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_edit_focus.png"; \
+            } \
          } \
          part { name: "button_center_part"; \
             mouse_events: 0; \
@@ -5345,6 +5266,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_edit.png" COMP;
          image: "00_button_edit_press.png" COMP;
          image: "00_button_edit_dim.png" COMP;
+         image: "00_button_edit_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -5370,7 +5292,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_edit_press.png";
+               image.normal: "00_button_edit_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -5723,6 +5645,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_04_normal.png" COMP;
          image: "00_button_04_press.png" COMP;
          image: "00_button_04_dim.png" COMP;
+         image: "00_button_04_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -5756,7 +5679,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_04_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -6142,6 +6065,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -6167,7 +6091,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -6643,7 +6567,9 @@ group { name: "elm/button/base/searchbar/default";
    group { name: "elm/button/base/hidden";
       images {
          image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         image: "00_button_sweep_press.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
+         image: "00_button_sweep_dim.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -6665,10 +6591,11 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_button_sweep_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -7054,6 +6981,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -7078,7 +7006,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -7466,6 +7394,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -7491,7 +7420,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -7874,6 +7803,136 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_CONTACT_STYLES(style_name, image_normal, image_press) \
+   group { name: "elm/button/base/contact/"style_name; \
+      images { \
+         image: "00_contacts_circle_bg.png" COMP; \
+         image: image_normal COMP; \
+         image: image_press COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC; \
+               max: BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC; \
+               image.normal: "00_contacts_circle_bg.png"; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_contacts_circle_bg.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC; \
+               max: BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC; \
+               image.normal: image_normal; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_press; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "over2"; \
+            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: "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: "button_center_part"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            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: "button_center_part"; \
+         } \
+         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: "disabler"; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+      } \
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CONTACT_STYLES("expand_closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png")
+
+   BUTTON_CONTACT_STYLES("expand_opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png")
+
+   BUTTON_CONTACT_STYLES("plus", "00_button_plus.png", "00_button_plus_press.png")
+
+///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/contact";
       alias: "elm/button/base/text_only/contact";
       images {
@@ -8145,6 +8204,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_winset_Back_btn_normal.png" COMP;
          image: "00_winset_Back_btn_press.png" COMP;
+         image: "00_winset_Back_btn_normal_focus.png" COMP;
          image: "00_winset_Back.png" COMP;
       }
       script {
@@ -8171,7 +8231,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_winset_Back_btn_press.png";
+               image.normal: "00_winset_Back_btn_normal_focus.png";
             }
          }
          part { name: "back_button";
@@ -8279,6 +8339,18 @@ group { name: "elm/button/base/searchbar/default";
                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";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
       }
    }
 
@@ -8287,6 +8359,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
          image: "00_picker_arrow_left.png" COMP;
          image: "00_picker_arrow_left_press.png" COMP;
       }
@@ -8314,7 +8387,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -8467,6 +8540,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
          image: "00_picker_arrow_right.png" COMP;
          image: "00_picker_arrow_right_press.png" COMP;
       }
@@ -8494,7 +8568,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -8652,6 +8726,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_Option_header_bt.png" COMP;
          image: "00_Option_header_bt_dim.png" COMP;
          image: "00_Option_header_bt_press.png" COMP;
+         image: "00_Option_header_bt_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
@@ -8675,6 +8750,10 @@ group { name: "elm/button/base/searchbar/default";
                inherit: "default" 0.0;
                image.normal: "00_Option_header_bt_press.png";
             }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_Option_header_bt_focus.png";
+            }
          }
          part { name: "padding_left_top";
             type: RECT;
@@ -9067,11 +9146,15 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          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";
             after: "unfocus_text";
@@ -9092,6 +9175,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_Option_header_bt.png" COMP;
          image: "00_Option_header_bt_dim.png" COMP;
          image: "00_Option_header_bt_press.png" COMP;
+         image: "00_Option_header_bt_focus.png" COMP;
       }
       styles{
          style { name: "btn_multiline_naviframe_controlbar_style";
@@ -9122,6 +9206,10 @@ group { name: "elm/button/base/searchbar/default";
                inherit: "default" 0.0;
                image.normal: "00_Option_header_bt_press.png";
             }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_Option_header_bt_focus.png";
+            }
          }
          part { name: "padding_left_top";
             type: RECT;
@@ -9469,11 +9557,15 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          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";
             after: "unfocus_text";
@@ -9490,6 +9582,9 @@ group { name: "elm/button/base/searchbar/default";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
+      images {
+         image: "00_title_btn_bg_press.png" COMP;
+      }
       styles{
          style { name: "btn_naviframe_style";
             base: "font=SLP:style=Medium font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_medium";
@@ -9500,7 +9595,6 @@ group { name: "elm/button/base/searchbar/default";
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
@@ -9508,8 +9602,13 @@ group { name: "elm/button/base/searchbar/default";
                color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_BG_COLOR_PRESSED_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_MIN_INC;
+               image {
+                  normal: "00_title_btn_bg_press.png";
+                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -9932,11 +10031,11 @@ group { name: "elm/button/base/searchbar/default";
       images { \
          image: image_normal COMP; \
          image: image_press COMP; \
+         image: "00_title_btn_bg_press.png" COMP; \
       } \
       parts { \
          part { name: "button_image"; \
             scale: 1; \
-            type: RECT; \
             description { state: "default" 0.0; \
                min: BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC; \
                max: BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC; \
@@ -9944,7 +10043,13 @@ group { name: "elm/button/base/searchbar/default";
             } \
             description { \
                state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_MIN_INC; \
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_MIN_INC; \
+               image { \
+                  normal: "00_title_btn_bg_press.png"; \
+                  border: BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_BORDER_INC; \
+                  border_scale: 1; \
+               } \
             } \
             description { \
                state: "disabled" 0.0; \
@@ -10064,10 +10169,10 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_winset_more.png" COMP;
          image: "00_winset_more_press.png" COMP;
+         image: "00_title_btn_bg_press.png" COMP;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
@@ -10075,7 +10180,13 @@ group { name: "elm/button/base/searchbar/default";
                color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_MORE_BG_PRESSED_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_MORE_BG_PRESSED_MIN_MAX_INC;
+               image {
+                  normal: "00_title_btn_bg_press.png";
+                  border: BUTTON_NAVIFRAME_MORE_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -10187,6 +10298,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_06_normal.png" COMP;
          image: "00_button_06_press.png" COMP;
          image: "00_button_06_dim.png" COMP;
+         image: "00_button_06_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -10211,7 +10323,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_06_press.png";
+               image.normal: "00_button_06_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -10653,6 +10765,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_05_normal.png" COMP;
          image: "00_button_05_press.png" COMP;
          image: "00_button_05_dim.png" COMP;
+         image: "00_button_05_normal_focus.png" COMP;
          image: "00_arrow_expand.png" COMP;
          image: "00_arrow_expand_press.png" COMP;
          image: "00_arrow_expand_dim.png" COMP;
@@ -10682,7 +10795,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_05_press.png";
+               image.normal: "00_button_05_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
index e99eecb..8191292 100644 (file)
@@ -1620,6 +1620,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
          image: "00_button_edit.png" COMP;
          image: "00_button_edit_press.png" COMP;
          image: "00_button_edit_dim.png" COMP;
+         image: "00_button_edit_focus.png" COMP;
       }
       script {
          public button_state = 0; //0:enabled, 1: disabled
@@ -1653,6 +1654,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                inherit: "default" 0.0;
                image.normal: "00_button_edit_dim.png";
             }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_edit_focus.png";
+            }
          }
          part { name: "bg2";
             scale: 1;