[UX version 1.5] Implementation for button,check and radio widget.
authorAmit Kamboj <amit.kamboj@samsung.com>
Wed, 25 Apr 2012 11:12:09 +0000 (16:42 +0530)
committerAmit Kamboj <amit.kamboj@samsung.com>
Wed, 25 Apr 2012 11:12:09 +0000 (16:42 +0530)
Change-Id: Iac3224e62af39982b336e2d21df9c0777daa9419

13 files changed:
themes/images/tizen-black-hd/00_button_cancel_pressed.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_button_plus_pressed.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_title_icon_search.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_title_icon_search_press.png [new file with mode: 0644]
themes/images/tizen-black-hd/00_winset_more_press.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_cancel_pressed.png [new file with mode: 0644]
themes/images/tizen-hd/00_button_plus_pressed.png [new file with mode: 0644]
themes/images/tizen-hd/00_title_icon_search.png [new file with mode: 0644]
themes/images/tizen-hd/00_title_icon_search_press.png [new file with mode: 0644]
themes/images/tizen-hd/00_winset_more_press.png [new file with mode: 0644]
themes/inc/tizen-black-hd-inc.edc
themes/inc/tizen-hd-inc.edc
themes/widgets/button.edc

diff --git a/themes/images/tizen-black-hd/00_button_cancel_pressed.png b/themes/images/tizen-black-hd/00_button_cancel_pressed.png
new file mode 100644 (file)
index 0000000..40c0d4f
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_cancel_pressed.png differ
diff --git a/themes/images/tizen-black-hd/00_button_plus_pressed.png b/themes/images/tizen-black-hd/00_button_plus_pressed.png
new file mode 100644 (file)
index 0000000..e5f4cd4
Binary files /dev/null and b/themes/images/tizen-black-hd/00_button_plus_pressed.png differ
diff --git a/themes/images/tizen-black-hd/00_title_icon_search.png b/themes/images/tizen-black-hd/00_title_icon_search.png
new file mode 100644 (file)
index 0000000..ff46fa3
Binary files /dev/null and b/themes/images/tizen-black-hd/00_title_icon_search.png differ
diff --git a/themes/images/tizen-black-hd/00_title_icon_search_press.png b/themes/images/tizen-black-hd/00_title_icon_search_press.png
new file mode 100644 (file)
index 0000000..f2c8e57
Binary files /dev/null and b/themes/images/tizen-black-hd/00_title_icon_search_press.png differ
diff --git a/themes/images/tizen-black-hd/00_winset_more_press.png b/themes/images/tizen-black-hd/00_winset_more_press.png
new file mode 100644 (file)
index 0000000..e4d27f2
Binary files /dev/null and b/themes/images/tizen-black-hd/00_winset_more_press.png differ
diff --git a/themes/images/tizen-hd/00_button_cancel_pressed.png b/themes/images/tizen-hd/00_button_cancel_pressed.png
new file mode 100644 (file)
index 0000000..40c0d4f
Binary files /dev/null and b/themes/images/tizen-hd/00_button_cancel_pressed.png differ
diff --git a/themes/images/tizen-hd/00_button_plus_pressed.png b/themes/images/tizen-hd/00_button_plus_pressed.png
new file mode 100644 (file)
index 0000000..e5f4cd4
Binary files /dev/null and b/themes/images/tizen-hd/00_button_plus_pressed.png differ
diff --git a/themes/images/tizen-hd/00_title_icon_search.png b/themes/images/tizen-hd/00_title_icon_search.png
new file mode 100644 (file)
index 0000000..ff46fa3
Binary files /dev/null and b/themes/images/tizen-hd/00_title_icon_search.png differ
diff --git a/themes/images/tizen-hd/00_title_icon_search_press.png b/themes/images/tizen-hd/00_title_icon_search_press.png
new file mode 100644 (file)
index 0000000..f2c8e57
Binary files /dev/null and b/themes/images/tizen-hd/00_title_icon_search_press.png differ
diff --git a/themes/images/tizen-hd/00_winset_more_press.png b/themes/images/tizen-hd/00_winset_more_press.png
new file mode 100644 (file)
index 0000000..e4d27f2
Binary files /dev/null and b/themes/images/tizen-hd/00_winset_more_press.png differ
index 337cdc8..855f324 100644 (file)
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 108 115 118 255
 #define BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC 180 180 1 255
 
-#define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 211 211 211 255
-#define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 249 249 249 255
-#define BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC 249 249 249 255
-#define BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC 211 211 211 255
-
 #define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 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 204 200 188 255
 
+#define BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_DISABLED_COLOR_INC 108 115 118 255
+
 #define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 249 249 249 255
 #define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 249 249 249 255
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC 0 0 0 128
 
+#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 108 115 118 255
+
+#define BUTTON_NAVIFRAME_BG_COLOR_PRESSED_INC 109 159 238 255
+
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 249 249 249 255
 
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXT_SIZE_INC 28
 #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 5 5 5 5
-#define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 20 5
+#define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 16 3
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 32
+#define BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC 28
 
 #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 5 5 5 5
-#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 5 5
+#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 16 3
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
+#define BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC 28
 
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 64 64
 
 #define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 74
 #define BUTTON_POPUP_BG_BORDER_INC 5 5 5 5
-#define BUTTON_POPUP_PADDING_MIN_INC 8 5
+#define BUTTON_POPUP_PADDING_MIN_INC 16 3
 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38
 #define BUTTON_POPUP_TEXT_MIN_INC 64 20
 #define BUTTON_POPUP_TEXT_FONT_SIZE_INC 32
+#define BUTTON_POPUP_MULTILINE_TEXT_FONT_SIZE_INC 28
 
 #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_EXTENDED_MIN_WIDTH_INC 64
 #define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 80
 
-#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 12 60
+#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 12 74
 #define BUTTON_SWEEP_BG_BORDER_INC 5 5 5 5
-#define BUTTON_SWEEP_PADDING_MIN_INC 5 5
+#define BUTTON_SWEEP_PADDING_MIN_INC 16 3
 #define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 28
 #define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
 #define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 28 28
 #define BUTTON_SWEEP_TEXT_MIN_INC 90 28
 #define BUTTON_SWEEP_FONT_SIZE_INC 32
+#define BUTTON_SWEEP_MULTILINE_FONT_SIZE_INC 28
 
 #define BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC 12 74
 #define BUTTON_SEARCHBAR_BG_BORDER_INC 6 6 6 6
 
 #define BUTTON_HIDDEN_BG_NORMAL_MIN_INC 12 60
 #define BUTTON_HIDDEN_BG_BORDER_INC 5 5 5 5
-#define BUTTON_HIDDEN_PADDING_MIN_INC 5 5
+#define BUTTON_HIDDEN_PADDING_MIN_INC 16 5
 #define BUTTON_HIDDEN_ICON_RECT_MIN_INC 0 28
 #define BUTTON_HIDDEN_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
 #define BUTTON_HIDDEN_ICON_ICONONLY_MIN_INC 28 28
 #define BUTTON_HIDDEN_TEXT_MIN_INC 90 28
 #define BUTTON_HIDDEN_FONT_SIZE_INC 38
 
+#define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30
+
 #define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 108 44
 #define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 5 5 5 5
 #define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 16 1
 #define BUTTON_CONTACT_DELETE_ICON_ICONONLY_MIN_INC 42 42
 #define BUTTON_CONTACT_DELETE_FONT_SIZE_INC 32
 
-#define BUTTON_CONTACT_BG_NORMAL_MIN_INC 66 44
+#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_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_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_PLUS_MIN_WIDTH_INC 64
+#define BUTTON_NAVIFRAME_TITLE_ICON_PLUS_MIN_HEIGHT_INC 64
+#define BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_WIDTH_INC 64
+#define BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_HEIGHT_INC 64
+#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_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_TITLE_ICONONLY_ICON_MIN_MAX_INC 56 56
+#define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 50 65 74 255
+
 #define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC 22 46
 #define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC 16 2
 #define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 24
 
-#define BUTTON_NAVIFRAME_BG_MIN_INC 124 74
-#define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 124 74
-#define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 74 74
-#define BUTTON_NAVIFRAME_BG_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIFRAME_PADDING_MIN_INC 5 5
-#define BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
-#define BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC 38 38
-#define BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 28
-#define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 124 74
-
-#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 64
-#define BUTTON_NAVIFRAME_MORE_BG_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 50 50
+#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 90 84
+#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 56 56
+#define BUTTON_NAVIFRAME_MORE_BG_COLOR_INC 50 65 74 255
 
 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
index 9d6ae4a..345a503 100644 (file)
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 185 185 185 255
 #define BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC 160 151 1 255
 
-#define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 78 73 69 255
-#define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC 185 185 185 255
-
 #define BUTTON_ICON_TEXT_NORMAL_COLOR_INC 90 73 40 255
 #define BUTTON_ICON_TEXT_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_ICON_TEXT_FOCUSED_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 87 87 87 255
 
+#define BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_DISABLED_COLOR_INC 108 115 118 255
+
 #define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 78 73 69 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_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC 0 0 0 128
 
+#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 78 73 69 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 185 185 185 255
+
+#define BUTTON_NAVIFRAME_BG_COLOR_PRESSED_INC 109 159 238 255
+
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 78 73 69 255
 
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXT_SIZE_INC 28
 #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 5 5 5 5
-#define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 20 5
+#define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 16 3
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 32
+#define BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC 28
 
 #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 5 5 5 5
-#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 5 5
+#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 16 3
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
+#define BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC 28
 
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 64 64
 
 #define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 74
 #define BUTTON_POPUP_BG_BORDER_INC 5 5 5 5
-#define BUTTON_POPUP_PADDING_MIN_INC 8 5
+#define BUTTON_POPUP_PADDING_MIN_INC 16 3
 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38
 #define BUTTON_POPUP_TEXT_MIN_INC 64 20
 #define BUTTON_POPUP_TEXT_FONT_SIZE_INC 32
+#define BUTTON_POPUP_MULTILINE_TEXT_FONT_SIZE_INC 28
 
 #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_EXTENDED_MIN_WIDTH_INC 64
 #define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 80
 
-#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 12 60
+#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 12 74
 #define BUTTON_SWEEP_BG_BORDER_INC 5 5 5 5
-#define BUTTON_SWEEP_PADDING_MIN_INC 5 5
+#define BUTTON_SWEEP_PADDING_MIN_INC 16 3
 #define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 28
 #define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
 #define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 28 28
 #define BUTTON_SWEEP_TEXT_MIN_INC 90 28
 #define BUTTON_SWEEP_FONT_SIZE_INC 32
+#define BUTTON_SWEEP_MULTILINE_FONT_SIZE_INC 28
 
 #define BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC 12 74
 #define BUTTON_SEARCHBAR_BG_BORDER_INC 6 6 6 6
 
 #define BUTTON_HIDDEN_BG_NORMAL_MIN_INC 12 60
 #define BUTTON_HIDDEN_BG_BORDER_INC 5 5 5 5
-#define BUTTON_HIDDEN_PADDING_MIN_INC 5 5
+#define BUTTON_HIDDEN_PADDING_MIN_INC 16 5
 #define BUTTON_HIDDEN_ICON_RECT_MIN_INC 0 28
 #define BUTTON_HIDDEN_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
 #define BUTTON_HIDDEN_ICON_ICONONLY_MIN_INC 28 28
 #define BUTTON_HIDDEN_TEXT_MIN_INC 90 28
 #define BUTTON_HIDDEN_FONT_SIZE_INC 38
 
+#define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30
+
 #define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 108 44
 #define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 5 5 5 5
 #define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 16 1
 #define BUTTON_CONTACT_DELETE_ICON_ICONONLY_MIN_INC 42 42
 #define BUTTON_CONTACT_DELETE_FONT_SIZE_INC 32
 
-#define BUTTON_CONTACT_BG_NORMAL_MIN_INC 66 44
+#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_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_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_PLUS_MIN_WIDTH_INC 64
+#define BUTTON_NAVIFRAME_TITLE_ICON_PLUS_MIN_HEIGHT_INC 64
+#define BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_WIDTH_INC 64
+#define BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_HEIGHT_INC 64
+#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_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_TITLE_ICONONLY_ICON_MIN_MAX_INC 56 56
+#define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 219 201 174 255
+
 #define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC 22 46
 #define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
 #define BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC 16 2
 #define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 24
 
-#define BUTTON_NAVIFRAME_BG_MIN_INC 124 74
-#define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 124 74
-#define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 74 74
-#define BUTTON_NAVIFRAME_BG_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIFRAME_PADDING_MIN_INC 5 5
-#define BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
-#define BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC 38 38
-#define BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 28
-#define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 124 74
-
-#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 64
-#define BUTTON_NAVIFRAME_MORE_BG_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 50 50
+#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 90 84
+#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 56 56
+#define BUTTON_NAVIFRAME_MORE_BG_COLOR_INC 219 201 174 255
 
 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
index 74af454..fc17950 100644 (file)
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/style2";
-      alias: "elm/button/base/text_only/style2";
+//////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/style1/multiline";
       images {
-         image: "00_button_04_normal.png" COMP;
-         image: "00_button_04_press.png" COMP;
-         image: "00_button_04_dim.png" COMP;
+         image: "00_button_01_normal.png" COMP;
+         image: "00_button_01_normal_press.png" COMP;
+         image: "00_button_01_normal_dim.png" COMP;
+      }
+      styles{
+         style { name: "btn_style1_multiline";
+            base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
             scale: 1;
             description { state: "default" 0.0;
                image {
-                  normal: "00_button_04_normal.png";
-                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
+                  normal: "00_button_01_normal.png";
+                  border: BUTTON_TEXT_STYLE1_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_01_normal_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_dim.png";
+               image.normal: "00_button_01_normal_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_01_normal_press.png";
             }
          }
          part { name: "padding_left_top";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_BG_MIN_INC;
                visible: 0;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC;
             }
          }
          part { name: "padding_right_bottom";
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
             }
             description { state: "visible" 0.0;
                visible: 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: 0 0;
+               min: 5 0;
                visible: 0;
             }
             description { state: "visible" 0.0;
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 {
                   relative: 0.0 1.0;
                }
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+               min: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
                }
                color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_TEXT_STYLE2_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
+                   style: "btn_style1_multiline";
+                   min: 0 0;
+                   max: 0 1;
                }
             }
             description { state: "visible" 0.0;
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep";
-      alias: "elm/button/base/text_only/sweep";
+   group { name: "elm/button/base/style2";
+      alias: "elm/button/base/text_only/style2";
       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_04_normal.png" COMP;
+         image: "00_button_04_press.png" COMP;
+         image: "00_button_04_dim.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_sweep.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  normal: "00_button_04_normal.png";
+                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_04_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_dim.png";
+               image.normal: "00_button_04_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_04_press.png";
             }
          }
          part { name: "padding_left_top";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+            }
+         }
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
+               visible: 0;
+               min: 0 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_after_icon";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_TEXT_STYLE2_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_STYLE1_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_TEXT_STYLE1_DISABLED_COLOR_INC;
+               visible: 1;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            repeat_events: 1;
+            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: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         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";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+            }
+         }
+         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.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               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";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
+         }
+         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);
+            }
+         }
+         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";
+            //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";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/style2/multiline";
+      images {
+         image: "00_button_04_normal.png" COMP;
+         image: "00_button_04_press.png" COMP;
+         image: "00_button_04_dim.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";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               image {
+                  normal: "00_button_04_normal.png";
+                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_04_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_04_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_04_press.png";
+            }
+         }
+         part { name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+            }
+         }
+         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_TEXT_STYLE2_PADDING_MIN_INC;
+               fixed: 1 1;
+               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 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_after_icon";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+               text {
+                  style: "btn_style2_multiline";
+                  min: 0 0;
+                  max: 1 0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_STYLE1_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_TEXT_STYLE1_DISABLED_COLOR_INC;
+               visible: 1;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            repeat_events: 1;
+            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: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         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";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+            }
+         }
+         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.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               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";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
+         }
+         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);
+            }
+         }
+         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";
+            //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";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/sweep";
+      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_dim.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
+               image {
+                  normal: "00_button_sweep.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_sweep_press.png";
+            }
+            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";
+            }
+         }
+         part { name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         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_SWEEP_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
+               fixed: 1 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "padding_icon_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               color: 0 0 0 0;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_SWEEP_FONT_SIZE_INC;
+                  min: 0 0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_SWEEP_TEXT_MIN_INC;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_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_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               visible: 1;
+               min: BUTTON_SWEEP_TEXT_MIN_INC;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC;
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            repeat_events: 1;
+            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: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         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";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+            }
+         }
+         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.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               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";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "padding_icon_text";
+         }
+         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);
+            }
+         }
+         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";
+            //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";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   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_dim.png" COMP;
+      }
+      styles{
+         style { name: "btn_sweep_multiline";
+            base: "font=SLP:style=Roman font_size="BUTTON_SWEEP_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
+               image {
+                  normal: "00_button_sweep.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_sweep_press.png";
+            }
+            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";
+            }
+         }
+         part { name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         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_SWEEP_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
+               fixed: 1 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "padding_icon_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               color: 0 0 0 0;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               text {
+                  style: "btn_sweep_multiline";
+                  min: 0 0;
+                  max: 0 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_SWEEP_TEXT_MIN_INC;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_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_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               visible: 1;
+               min: BUTTON_SWEEP_TEXT_MIN_INC;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC;
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            repeat_events: 1;
+            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: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         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";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+            }
+         }
+         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.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               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";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "padding_icon_text";
+         }
+         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);
+            }
+         }
+         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";
+            //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";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+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_dim.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC;
+               image {
+                  normal: "00_search_input_field_bg.png";
+                  border: BUTTON_SEARCHBAR_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_button_sweep_press.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_button_sweep_dim.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_button_sweep_press.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+         }
+         part { name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_SEARCHBAR_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         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_SEARCHBAR_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_SEARCHBAR_ICON_RECT_MIN_INC;
                fixed: 1 0;
                rel1 {
                   relative: 0.0 1.0;
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               min: BUTTON_SEARCHBAR_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
          }
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
+               min: BUTTON_SEARCHBAR_ICONONLY_ICON_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
                color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_SWEEP_FONT_SIZE_INC;
+                  size: BUTTON_SEARCHBAR_FONT_SIZE_INC;
                   min: 0 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
+               min: BUTTON_SEARCHBAR_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
          }
       }
    }
+
 ///////////////////////////////////////////////////////////////////////////////////////
-group { name: "elm/button/base/searchbar/default";
+   group { name: "elm/button/base/sweep/delete";
       images {
-         image: "00_search_input_field_bg.png" COMP;
+         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;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -1824,36 +3589,24 @@ group { name: "elm/button/base/searchbar/default";
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC;
+               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_search_input_field_bg.png";
-                  border: BUTTON_SEARCHBAR_BG_BORDER_INC;
+                  normal: "00_button_sweep_delete.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_press.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_sweep_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_dim.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_sweep_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_press.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_sweep_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -1863,7 +3616,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_SEARCHBAR_PADDING_MIN_INC;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -1875,7 +3628,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_SEARCHBAR_PADDING_MIN_INC;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -1885,7 +3638,7 @@ group { name: "elm/button/base/searchbar/default";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_SEARCHBAR_ICON_RECT_MIN_INC;
+               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
                fixed: 1 0;
                rel1 {
                   relative: 0.0 1.0;
@@ -1927,7 +3680,7 @@ group { name: "elm/button/base/searchbar/default";
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_SEARCHBAR_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
          }
@@ -1965,7 +3718,7 @@ group { name: "elm/button/base/searchbar/default";
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_SEARCHBAR_ICONONLY_ICON_MIN_INC;
+               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -1983,7 +3736,6 @@ group { name: "elm/button/base/searchbar/default";
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
-               visible: 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "padding_icon_text";
@@ -1996,19 +3748,17 @@ group { name: "elm/button/base/searchbar/default";
                color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_SEARCHBAR_FONT_SIZE_INC;
-                  min: 0 0;
+                  size: BUTTON_SWEEP_FONT_SIZE_INC;
+                  min: 1 0;
+                  text: "Delete";
+                  max: 1 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_SEARCHBAR_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
                color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
@@ -2018,8 +3768,6 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
@@ -2228,12 +3976,17 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep/delete";
+   group { name: "elm/button/base/popup_button/default";
+      alias: "elm/button/base/popup_button/menustyle";
+      alias: "elm/button/base/popup_button/liststyle";
+      alias: "elm/button/base/popup_button/volumebarstyle";
+      alias: "elm/button/base/popup_button/customstyle";
+      alias: "elm/button/base/popup_button/verticalbuttonstyle";
       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_popup_normal.png" COMP;
+         image: "00_button_popup_press.png" COMP;
+         image: "00_button_popup_focus.png" COMP;
+         image: "00_button_popup_dim.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -2242,24 +3995,24 @@ group { name: "elm/button/base/searchbar/default";
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
+               min: BUTTON_POPUP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_sweep_delete.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  normal: "00_button_popup_normal.png";
+                  border: BUTTON_POPUP_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_popup_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_dim.png";
+               image.normal: "00_button_popup_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_popup_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -2269,7 +4022,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               min: BUTTON_POPUP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -2277,64 +4030,34 @@ group { name: "elm/button/base/searchbar/default";
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
+               align: 1.0 0.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               min: BUTTON_POPUP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part { name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
          part { name: "padding_icon_text";
             type: RECT;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to: "icon_rect";
+                  to: "elm.swallow.content";
                }
-               rel2.to: "icon_rect";
+               rel2.to: "elm.swallow.content";
                fixed: 1 0;
                min: 0 0;
-               color: 0 0 0 0;
+               visible: 0;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "visible" 0.0; //when icon is visible
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2.to: "icon_rect";
-               fixed: 1 0;
-               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-               color: 0 0 0 0;
+               inherit: "default" 0.0;
+               min: BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
             }
          }
          part { name: "elm.swallow.content";
@@ -2356,22 +4079,14 @@ group { name: "elm/button/base/searchbar/default";
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
+               inherit: "default" 0.0;
                fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
+               visible: 1;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
+               min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -2389,6 +4104,7 @@ group { name: "elm/button/base/searchbar/default";
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
+               visible: 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "padding_icon_text";
@@ -2398,21 +4114,23 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_SWEEP_FONT_SIZE_INC;
-                  min: 1 0;
-                  text: "Delete";
-                  max: 1 0;
+                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
+                  min: 0 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_POPUP_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2420,13 +4138,15 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               visible: 1;
+               min: BUTTON_POPUP_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               color: BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -2608,15 +4328,11 @@ 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";
@@ -2627,20 +4343,22 @@ group { name: "elm/button/base/searchbar/default";
          }
       }
    }
-
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/popup_button/default";
-      alias: "elm/button/base/popup_button/menustyle";
-      alias: "elm/button/base/popup_button/liststyle";
-      alias: "elm/button/base/popup_button/volumebarstyle";
-      alias: "elm/button/base/popup_button/customstyle";
-      alias: "elm/button/base/popup_button/verticalbuttonstyle";
+   group { name: "elm/button/base/popup_button/default/multiline";
       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_dim.png" COMP;
       }
+      styles{
+         style { name: "btn_popup_multiline_style";
+            base: "font=SLP:style=Roman font_size="BUTTON_POPUP_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
@@ -2752,7 +4470,7 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -2769,9 +4487,9 @@ group { name: "elm/button/base/searchbar/default";
                }
                color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
+                  style: "btn_popup_multiline_style";
                   min: 0 0;
+                  max: 0 1;
                }
             }
             description { state: "visible" 0.0;
@@ -3185,10 +4903,14 @@ 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;
@@ -3223,6 +4945,44 @@ 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;
+               }
+            }
+            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;
@@ -3259,46 +5019,104 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
          }
-         program { name: "button_unclick";
+         program { name: "button_unpress";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+         }
+         program { name: "button_mouseout_clicked";
             signal: "mouse,up,1";
             source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
+            script {
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
          }
-         program { name: "button_unclick_anim";
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over1";
+            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: "button_image";
+            target: "elm.text";
          }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,click" "";
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "icononly" 0.0;
+            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";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "disabler";
             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);
+            }
          }
          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: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
+         program { name: "unfocused";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            after: "unfocus_text";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
          }
       }
    }
@@ -5954,12 +7772,15 @@ group { name: "elm/button/base/searchbar/default";
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/contact";
       alias: "elm/button/base/text_only/contact";
+      images {
+         image: "00_contacts_button_bg.png" COMP;
+         image: "00_contacts_button_bg_press.png" COMP;
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
@@ -5970,12 +7791,16 @@ group { name: "elm/button/base/searchbar/default";
                   to_x: "padding.right";
                   to_y: "elm.text";
                }
-               min: BUTTON_CONTACT_BG_NORMAL_MIN_INC;
-               color: BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC;
+               min: BUTTON_CONTACT_BG_MIN_INC;
+               image {
+                  normal: "00_contacts_button_bg.png";
+                  border: BUTTON_CONTACT_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC ;
+               image.normal: "00_contacts_button_bg_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -7532,36 +9357,27 @@ group { name: "elm/button/base/searchbar/default";
 
 //////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe/title/default";
-      images {
-         image: "00_Title_btn.png" COMP;
-         image: "00_Title_btn_press.png" COMP;
-      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC;
-               image {
-                  normal: "00_Title_btn.png";
-                  border: BUTTON_NAVIFRAME_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
+               color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
+               color: BUTTON_NAVIFRAME_BG_COLOR_PRESSED_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 0 0 0 128;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -7571,28 +9387,11 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIFRAME_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_BG_MIN_INC;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC;
-            }
-         }
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
@@ -7600,7 +9399,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_NAVIFRAME_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7626,8 +9425,8 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                visible: 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
@@ -7668,7 +9467,7 @@ group { name: "elm/button/base/searchbar/default";
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
@@ -7691,7 +9490,7 @@ group { name: "elm/button/base/searchbar/default";
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
@@ -7715,8 +9514,8 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 {
                   relative: 0.0 1.0;
@@ -7730,8 +9529,8 @@ group { name: "elm/button/base/searchbar/default";
                }
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
@@ -7750,10 +9549,10 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC;
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                }
@@ -7765,7 +9564,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -7773,13 +9572,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -7873,7 +9672,6 @@ group { name: "elm/button/base/searchbar/default";
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
                     set_state(PART:"icon_rect", "visible", 0.0);
                     set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
                  }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
@@ -7893,7 +9691,6 @@ group { name: "elm/button/base/searchbar/default";
                     set_state(PART:"elm.swallow.content", "icononly", 0.0);
                     set_state(PART:"icon_rect", "icononly", 0.0);
                     set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
                  }
                set_state(PART:"elm.text", "default", 0.0);
             }
@@ -7910,14 +9707,12 @@ group { name: "elm/button/base/searchbar/default";
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
                     set_state(PART:"icon_rect", "visible", 0.0);
                     set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
                  }
                else
                  {
                     set_state(PART:"elm.swallow.content", "icononly", 0.0);
                     set_state(PART:"icon_rect", "icononly", 0.0);
                     set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
                  }
             }
          }
@@ -7928,7 +9723,6 @@ group { name: "elm/button/base/searchbar/default";
             target: "elm.swallow.content";
             target: "padding_after_icon";
             target: "icon_rect";
-            target: "bg";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -7991,38 +9785,158 @@ group { name: "elm/button/base/searchbar/default";
       }
    }
 
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_NAVIFRAME_TITLE_ICON_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+   group { name: "elm/button/base/naviframe/title/icon/"style_name; \
+      images { \
+         image: image_normal COMP; \
+         image: image_press 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; \
+               color: 0 0 0 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: "icon_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: min_width min_height; \
+               max: min_width min_height; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+               image.normal: image_normal; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_press; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 127 127 127 127; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               min: min_width min_height; \
+            } \
+         } \
+         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: "icon_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: "icon_part"; \
+         } \
+         program { name: "button_unclick2"; \
+            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: "disabler"; \
+            target: "button_image"; \
+            target: "icon_part"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "icon_part"; \
+         } \
+      } \
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("cancel", "00_button_cancel.png", "00_button_cancel_pressed.png", BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("plus", "00_button_plus.png", "00_button_plus_pressed.png", BUTTON_NAVIFRAME_TITLE_ICON_PLUS_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_PLUS_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("more", "00_winset_more.png", "00_winset_more_press.png", BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("search", "00_title_icon_search.png", "00_title_icon_search_press.png", BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_HEIGHT_INC)
+
 /////////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe/more/default";
       images {
-         image: "00_Title_btn.png" COMP;
-         image: "00_Title_btn_press.png" COMP;
          image: "00_winset_more.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
+         image: "00_winset_more_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;
                max: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
-               image {
-                  normal: "00_Title_btn.png";
-                  border: BUTTON_NAVIFRAME_MORE_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
             }
          }
          part { name: "more_image";
@@ -8037,6 +9951,11 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_winset_more_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 127;
             }
          }
          part { name: "over2";
@@ -8076,20 +9995,20 @@ group { name: "elm/button/base/searchbar/default";
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "more_image";
          }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
+         program { name: "button_unclick";
             signal: "mouse,up,1";
             source: "over3";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         program { name: "button_unclick3";
+         program { name: "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "more_image";
+         }
+         program { name: "button_unclick2";
             signal: "mouse,clicked,1";
             source: "over2";
             action: SIGNAL_EMIT "elm,action,click" "";
@@ -8098,27 +10017,17 @@ group { name: "elm/button/base/searchbar/default";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "button_image";
             target: "disabler";
-            after: "disable_button";
-         }
-         program { name: "disable_button";
-            script {
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
+            target: "button_image";
+            target: "more_image";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
             target: "disabler";
-            after: "enable_button";
-         }
-         program { name: "enable_button";
-            script {
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
+            target: "button_image";
+            target: "more_image";
          }
       }
    }