From: shaheba.m Date: Wed, 26 Jun 2013 06:27:34 +0000 (+0530) Subject: [Button] Apply changes of UX 0.7 X-Git-Tag: accepted/tizen/20131029.210118~108 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3df5ed5e5de1a7c8d40a259cd7be56ca66a62c21;p=profile%2Fivi%2Fefl-theme-tizen.git [Button] Apply changes of UX 0.7 Change-Id: I881756045797e02ed6349f10823784a3c3e08685 --- diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow.png b/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow.png deleted file mode 100644 index 22e180b..0000000 Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow.png and /dev/null differ diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow_press.png b/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow_press.png deleted file mode 100644 index f622c7b..0000000 Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow_press.png and /dev/null differ diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button.png b/themes/images/HD/dark/Naviframe/00_toolbar_button.png deleted file mode 100755 index 2780c2d..0000000 Binary files a/themes/images/HD/dark/Naviframe/00_toolbar_button.png and /dev/null differ diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png b/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png deleted file mode 100755 index ccec54f..0000000 Binary files a/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png and /dev/null differ diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png b/themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png deleted file mode 100755 index d91ce4c..0000000 Binary files a/themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png and /dev/null differ diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png b/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png deleted file mode 100755 index b91ad0a..0000000 Binary files a/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png and /dev/null differ diff --git a/themes/images/HD/light/Controls/Button/00_button_add.png b/themes/images/HD/light/Controls/Button/00_button_add.png index a3420f5..47417c9 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_add.png and b/themes/images/HD/light/Controls/Button/00_button_add.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_add_press.png b/themes/images/HD/light/Controls/Button/00_button_add_press.png index 016022d..47417c9 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_add_press.png and b/themes/images/HD/light/Controls/Button/00_button_add_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_call.png b/themes/images/HD/light/Controls/Button/00_button_call.png index 5dda0d1..a374e6d 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_call.png and b/themes/images/HD/light/Controls/Button/00_button_call.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_call_press.png b/themes/images/HD/light/Controls/Button/00_button_call_press.png index 68213a2..a374e6d 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_call_press.png and b/themes/images/HD/light/Controls/Button/00_button_call_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_contact.png b/themes/images/HD/light/Controls/Button/00_button_contact.png index d51ed97..25f07f0 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_contact.png and b/themes/images/HD/light/Controls/Button/00_button_contact.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_contact_press.png b/themes/images/HD/light/Controls/Button/00_button_contact_press.png index 17498b2..25f07f0 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_contact_press.png and b/themes/images/HD/light/Controls/Button/00_button_contact_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_delete.png b/themes/images/HD/light/Controls/Button/00_button_delete.png index 39260e5..b1ce778 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_delete.png and b/themes/images/HD/light/Controls/Button/00_button_delete.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_delete_press.png b/themes/images/HD/light/Controls/Button/00_button_delete_press.png index 39260e5..b1ce778 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_delete_press.png and b/themes/images/HD/light/Controls/Button/00_button_delete_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png b/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png index e24612a..4dd5215 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png and b/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png index e2cd2f0..4dd5215 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png and b/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_closed.png b/themes/images/HD/light/Controls/Button/00_button_expand_closed.png index 41ee73f..ac3aef3 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_closed.png and b/themes/images/HD/light/Controls/Button/00_button_expand_closed.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png index 2098db2..ac3aef3 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png and b/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_opened.png b/themes/images/HD/light/Controls/Button/00_button_expand_opened.png index 547f884..9d17f5a 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_opened.png and b/themes/images/HD/light/Controls/Button/00_button_expand_opened.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png index d539fd0..9d17f5a 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png and b/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_send.png b/themes/images/HD/light/Controls/Button/00_button_expand_send.png index eccd335..d60d26d 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_send.png and b/themes/images/HD/light/Controls/Button/00_button_expand_send.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png index d4b4f9b..d60d26d 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png and b/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_info.png b/themes/images/HD/light/Controls/Button/00_button_info.png index 76d3cdc..3b57fd2 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_info.png and b/themes/images/HD/light/Controls/Button/00_button_info.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_info_press.png b/themes/images/HD/light/Controls/Button/00_button_info_press.png index bba8850..3b57fd2 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_info_press.png and b/themes/images/HD/light/Controls/Button/00_button_info_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_left.png b/themes/images/HD/light/Controls/Button/00_button_left.png index dc60109..baa8955 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_left.png and b/themes/images/HD/light/Controls/Button/00_button_left.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_left_press.png b/themes/images/HD/light/Controls/Button/00_button_left_press.png index 67c04fc..baa8955 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_left_press.png and b/themes/images/HD/light/Controls/Button/00_button_left_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_rename.png b/themes/images/HD/light/Controls/Button/00_button_rename.png index 862cc38..5c87a4c 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_rename.png and b/themes/images/HD/light/Controls/Button/00_button_rename.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_rename_press.png b/themes/images/HD/light/Controls/Button/00_button_rename_press.png index c9c514e..5c87a4c 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_rename_press.png and b/themes/images/HD/light/Controls/Button/00_button_rename_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_right.png b/themes/images/HD/light/Controls/Button/00_button_right.png index 397221f..93e3395 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_right.png and b/themes/images/HD/light/Controls/Button/00_button_right.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_right_press.png b/themes/images/HD/light/Controls/Button/00_button_right_press.png index c3613ec..93e3395 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_right_press.png and b/themes/images/HD/light/Controls/Button/00_button_right_press.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_warning.png b/themes/images/HD/light/Controls/Button/00_button_warning.png index a07d6b8..057b20f 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_warning.png and b/themes/images/HD/light/Controls/Button/00_button_warning.png differ diff --git a/themes/images/HD/light/Controls/Button/00_button_warning_press.png b/themes/images/HD/light/Controls/Button/00_button_warning_press.png index a07d6b8..057b20f 100644 Binary files a/themes/images/HD/light/Controls/Button/00_button_warning_press.png and b/themes/images/HD/light/Controls/Button/00_button_warning_press.png differ diff --git a/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow.png b/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow.png deleted file mode 100644 index 22e180b..0000000 Binary files a/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow.png and /dev/null differ diff --git a/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow_press.png b/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow_press.png deleted file mode 100644 index f622c7b..0000000 Binary files a/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow_press.png and /dev/null differ diff --git a/themes/images/HD/light/Naviframe/00_toolbar_button.png b/themes/images/HD/light/Naviframe/00_toolbar_button.png deleted file mode 100644 index 269c1cc..0000000 Binary files a/themes/images/HD/light/Naviframe/00_toolbar_button.png and /dev/null differ diff --git a/themes/images/HD/light/Naviframe/00_toolbar_button_dim.png b/themes/images/HD/light/Naviframe/00_toolbar_button_dim.png deleted file mode 100644 index 269c1cc..0000000 Binary files a/themes/images/HD/light/Naviframe/00_toolbar_button_dim.png and /dev/null differ diff --git a/themes/images/HD/light/Naviframe/00_toolbar_button_focus.png b/themes/images/HD/light/Naviframe/00_toolbar_button_focus.png deleted file mode 100755 index 5a80838..0000000 Binary files a/themes/images/HD/light/Naviframe/00_toolbar_button_focus.png and /dev/null differ diff --git a/themes/images/HD/light/Naviframe/00_toolbar_button_press.png b/themes/images/HD/light/Naviframe/00_toolbar_button_press.png deleted file mode 100644 index 17251d8..0000000 Binary files a/themes/images/HD/light/Naviframe/00_toolbar_button_press.png and /dev/null differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 910187d..b2fcf26 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -308,9 +308,13 @@ #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#6E6F76FF" #define GENLIST_PART_MATCH_TAG_COLOR "+ color=#1382FF" -#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 191 +#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192 #define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255 -#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255 +#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192 + +#define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#000000C0" +#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FFFFFFFF" +#define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0" #define BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192 #define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 163 @@ -320,14 +324,19 @@ #define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#FFFFFFA3" #define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000A3" -#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 -#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 +#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192 +#define BUTTON_TICKER_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192 #define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 250 250 250 255 #define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 250 250 250 255 #define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 250 250 250 255 #define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 250 250 250 128 +#define BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#FAFAFA80" + #define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 250 250 250 255 #define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 250 250 250 255 #define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 250 250 250 128 @@ -367,11 +376,24 @@ #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 250 250 250 255 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 250 250 250 128 +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80" + #define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 0 0 0 255 #define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255 #define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 #define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 128 +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#000000FF" +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#00000080" + +#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAC0" +#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0" + #define BUTTON_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 @@ -392,10 +414,26 @@ #define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128 -#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255 -#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 -#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 -#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76 +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80" + +#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255 +#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255 +#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255 +#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 255 + +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF" + +#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192 +#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192 + +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0" #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 250 250 250 255 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 93 131 255 255 @@ -573,18 +611,6 @@ #define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1228 72 #define BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC 612 81 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 36 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 72 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC 9999 72 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC 40 40 40 40 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC 28 5 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC 28 5 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 18 18 - -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 250 250 250 255 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 250 250 250 255 - #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index a1812ca..c964d29 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -339,6 +339,10 @@ #define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255 #define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255 +#define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#000000C0" +#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FFFFFFFF" +#define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0" + #define BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 163 #define BUTTON_NAVIFRAME_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163 @@ -347,14 +351,19 @@ #define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#FFFFFFA3" #define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000A3" -#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 -#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127 +#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192 +#define BUTTON_TICKER_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192 #define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 58 58 58 255 #define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 255 255 255 255 #define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 58 58 58 76 +#define BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#FAFAFA80" + #define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 58 58 58 255 #define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 255 255 255 255 #define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 58 58 58 76 @@ -394,11 +403,30 @@ #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 58 58 58 76 +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80" + #define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255 #define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 #define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76 +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#000000FF" +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#00000080" + +#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAC0" +#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0" + +#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192 +#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192 + +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0" + #define BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC 249 249 249 255 #define BUTTON_EXPAND_BUTTON_PRESSED_COLOR_INC 249 249 249 255 #define BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC 249 249 249 255 @@ -419,11 +447,21 @@ #define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 255 +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80" + #define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255 #define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76 +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF" +#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF" + #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 115 115 115 255 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 64 127 247 255 @@ -602,18 +640,6 @@ #define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1012 72 #define BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC 274 70 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 32 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 70 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC 9999 70 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC 35 35 35 35 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC 28 5 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC 30 5 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 16 16 - -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 250 250 250 255 -#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 250 250 250 255 - #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index 589e1c8..df9502f 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -29,6 +29,13 @@ alias: "elm/button/base/icon_and_text/center"; alias: "elm/button/base/nocontents/search_button"; alias: "elm/button/base/style1/multiline"; + alias: "elm/button/base/sweep"; + alias: "elm/button/base/text_only/sweep"; + alias: "elm/button/base/hidden"; + alias: "elm/button/base/sweep/multiline"; + alias: "elm/button/base/style2"; + alias: "elm/button/base/text_only/style2"; + alias: "elm/button/base/style2/multiline"; data { item: "focus_highlight" "on"; } @@ -38,6 +45,20 @@ image: "00_button_01_dim.png" COMP; image: "00_button_01_focus.png" COMP; } + styles{ + style { name: "btn_base_style1"; + base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "btn_base_style1_pressed"; + base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } script { public button_state = BUTTON_STATE_ENABLED; } @@ -236,9 +257,8 @@ } } part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; @@ -251,15 +271,9 @@ rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; - } - color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; + } text { - font: "Tizen:style=Regular"; - size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC; - min: 0 0; - max: 1 0; - text_class: "tizen"; + style: "btn_base_style1"; } } description { state: "visible" 0.0; @@ -269,7 +283,9 @@ description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; - color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; + text { + style: "btn_base_style1_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -508,9 +524,8 @@ inherit: "elm/button/base/style1"; parts { part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; @@ -524,14 +539,10 @@ relative: 0.0 0.0; to: "padding_right_bottom"; } - color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; text { - font: "Tizen:style=Regular"; - size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC; + style: "btn_base_style1"; min: 1 0; max: 1 0; - text_class: "tizen"; } } description { state: "visible" 0.0; @@ -541,7 +552,9 @@ description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; - color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; + text { + style: "btn_base_style1_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -606,18 +619,18 @@ } } part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; visible: 0; fixed: 1 1; - color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; - text.size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC; - text.min: 1 1; + text { + style: "btn_base_style1"; + size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC; + min: 1 1; + } } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -626,7 +639,9 @@ description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; - color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC; + text { + style: "btn_base_style1_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -647,6 +662,8 @@ /////////////////////////////////////////////////////////////////////////////////////// group { name: "elm/button/base/style1/delete"; + alias: "elm/button/base/sweep/delete"; + alias: "elm/button/base/sweep/delete/multiline"; inherit: "elm/button/base/style1"; images { image: "00_button_01_delete.png" COMP; @@ -677,9 +694,8 @@ } } part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; @@ -693,14 +709,8 @@ relative: 0.0 0.0; to: "padding_right_bottom"; } - color: BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; text { - font: "Tizen:style=Regular"; - size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC; - min: 0 0; - max: 1 0; - text_class: "tizen"; + style: "btn_base_style1"; } } description { state: "visible" 0.0; @@ -710,7 +720,9 @@ description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; - color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC; + text { + style: "btn_base_style1_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -1034,7 +1046,7 @@ } /////////////////////////////////////////////////////////////////////////////////////// - group { name: "elm/button/base/style2"; +/* group { name: "elm/button/base/style2"; alias: "elm/button/base/text_only/style2"; alias: "elm/button/base/style2/multiline"; data { @@ -1512,47 +1524,52 @@ } /////////////////////////////////////////////////////////////////////////////////////// - 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"; - alias: "elm/button/base/popup_button/default/multiline"; + group { name: "elm/button/base/sweep"; + alias: "elm/button/base/text_only/sweep"; + alias: "elm/button/base/hidden"; + alias: "elm/button/base/sweep/multiline"; data { item: "focus_highlight" "on"; } images { - image: "00_popup_button.png" COMP; - image: "00_popup_button_dim.png" COMP; - image: "00_popup_button_press.png" COMP; - image: "00_popup_button_focus.png" COMP; + image: "00_button_01.png" COMP; + image: "00_button_01_press.png" COMP; + image: "00_button_01_dim.png" COMP; + image: "00_button_01_focus.png" COMP; } script { public button_state = BUTTON_STATE_ENABLED; } + styles{ + style { name: "btn_sweep_multiline"; + base: "font=Tizen:style=Regular font_size="BUTTON_SWEEP_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed linegap=-7 ellipsis=1.0 text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } parts { part { name: "button_image"; scale: 1; description { state: "default" 0.0; - min: BUTTON_POPUP_BG_NORMAL_MIN_INC; + min: BUTTON_SWEEP_BG_NORMAL_MIN_INC; image { - normal: "00_popup_button.png"; - border: BUTTON_POPUP_BG_BORDER_INC; + normal: "00_button_01.png"; + border: BUTTON_SWEEP_BG_BORDER_INC; border_scale: 1; } } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "00_popup_button_press.png"; + image.normal: "00_button_01_press.png"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "00_popup_button_dim.png"; + image.normal: "00_button_01_dim.png"; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "00_popup_button_focus.png"; + image.normal: "00_button_01_press.png"; } } part { name: "focus_image"; @@ -1564,8 +1581,8 @@ rel1.to : "button_image"; rel2.to : "button_image"; image { - normal: "00_popup_button_focus.png"; - border: BUTTON_POPUP_BG_BORDER_INC; + normal: "00_button_01_focus.png"; + border: BUTTON_SWEEP_BG_BORDER_INC; border_scale: 1; } } @@ -1581,7 +1598,7 @@ description { state: "default" 0.0; align: 0.0 0.0; rel2.relative: 0.0 0.0; - min: BUTTON_POPUP_PADDING_MIN_INC; + min: BUTTON_SWEEP_PADDING_MIN_INC; fixed: 1 1; visible: 0; } @@ -1589,34 +1606,57 @@ part { name: "padding_right_bottom"; type: RECT; scale: 1; + mouse_events: 0; description { state: "default" 0.0; - align: 1.0 0.0; + align: 1.0 1.0; rel1.relative: 1.0 1.0; - min: BUTTON_POPUP_PADDING_MIN_INC; + min: BUTTON_SWEEP_PADDING_MIN_INC; fixed: 1 1; visible: 0; } } - part { name: "padding_icon_text"; + part { name: "icon_rect"; type: RECT; scale: 1; - description { state: "default" 0.0; //when only icon or no icon is there - align: 0.0 0.0; + 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: "elm.swallow.content"; + to_x: "elm.swallow.content"; + to_y: "padding_right_bottom"; } - rel2.to: "elm.swallow.content"; + 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 + visible: 0; fixed: 1 0; min: 0 0; - visible: 0; + rel1 { + relative: 1.0 0.0; + to: "icon_rect"; + } + rel2.to: "icon_rect"; + align: 0.0 0.0; } - description { state: "icononly" 0.0; + description { state: "visible" 0.0; //when icon is visible inherit: "default" 0.0; + min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC; } - description { state: "visible" 0.0; //when icon is visible + description { state: "icononly" 0.0; inherit: "default" 0.0; - min: BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC; } } part { name: "elm.swallow.content"; @@ -1639,25 +1679,25 @@ } description { state: "visible" 0.0; inherit: "default" 0.0; - fixed: 1 0; + min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC; + max: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC; visible: 1; aspect: 1.0 1.0; aspect_preference: VERTICAL; } description { state: "icononly" 0.0; - inherit: "default" 0.0; - min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC; - visible: 1; - align: 0.5 0.5; + min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC; + max: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC; } } part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; + effect: SHADOW BOTTOM; scale: 1; clip_to: "clipper"; - effect: SHADOW BOTTOM; description { state: "default" 0.0; + fixed: 1 1; visible: 0; rel1 { relative: 1.0 1.0; @@ -1668,40 +1708,38 @@ relative: 0.0 0.0; to: "padding_right_bottom"; } - color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC; + color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC; color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; text { - font: "Tizen:style=Bold"; - size: BUTTON_POPUP_TEXT_FONT_SIZE_INC; - min: 0 0; - text_class: "tizen"; + style: "btn_sweep_multiline"; + align: 0.5 0.45; } } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - min: BUTTON_POPUP_TEXT_MIN_INC; + min: BUTTON_SWEEP_TEXT_MIN_INC; } description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; min: 0 0; - color: BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC; + color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; - color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC; + color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC; visible: 1; - min: BUTTON_POPUP_TEXT_MIN_INC; + min: BUTTON_SWEEP_TEXT_MIN_INC; } description { state: "focused" 0.0; inherit: "default" 0.0; visible: 1; min: 0 0; - color: BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC; + color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC; } } part { name: "over2"; @@ -1913,113 +1951,621 @@ } /////////////////////////////////////////////////////////////////////////////////////// -#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \ - group { name: "elm/button/base/"style_name; \ - data { \ - item: "focus_highlight" "on"; \ - } \ - images { \ - image: "00_circle_button.png" COMP; \ - image: "00_circle_button_press.png" COMP; \ - image: "00_circle_button_dim.png" COMP; \ - image: image_normal COMP; \ - image: image_press COMP; \ - image: 00_circle_button_focus.png COMP; \ - } \ - parts { \ - part { name: "button_image"; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ - max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ - image.normal: "00_circle_button.png"; \ - } \ - description { \ - state: "clicked" 0.0; \ - inherit: "default" 0.0; \ - image.normal: "00_circle_button_press.png"; \ - } \ - description { \ - state: "disabled" 0.0; \ - inherit: "default" 0.0; \ - image.normal: "00_circle_button_dim.png"; \ - } \ - } \ - part { name: "left_top_padding"; \ - scale: 1; \ - type: SPACER; \ - description { state: "default" 0.0; \ - min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \ - max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \ - fixed: 1 1; \ - align: 0.0 0.0; \ - rel1.to: "button_image"; \ - rel2.to: "button_image"; \ - } \ - } \ - part { name: "right_bottom_padding"; \ - scale: 1; \ - type: SPACER; \ - description { state: "default" 0.0; \ - min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \ - max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \ - fixed: 1 1; \ - align: 1.0 1.0; \ - rel1 { \ - relative: 1.0 1.0; \ - to: "button_image"; \ - } \ - rel2.to: "button_image"; \ - } \ - } \ - part { name: "button_center_part"; \ - scale: 1; \ - clip_to: "icon_clipper"; \ - description { state: "default" 0.0; \ - min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \ - max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \ - image.normal: image_normal; \ - rel1 { \ - relative: 1.0 1.0; \ - to: "left_top_padding"; \ - } \ - rel2 { \ - relative: 0.0 0.0; \ - to: "right_bottom_padding"; \ - } \ - } \ - description { state: "clicked" 0.0; \ - inherit: "default"; \ - image.normal: image_press; \ - } \ - description { state: "disabled" 0.0; \ - inherit: "default"; \ - } \ - } \ - part { name: "icon_clipper"; \ - type: RECT; \ - scale: 1; \ - description { state: "default" 0.0; \ - color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC; \ - } \ - description { state: "clicked" 0.0; \ - color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC; \ - } \ - description { state: "disabled" 0.0; \ - color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; \ - } \ - } \ - part { name: "focus_image"; \ - scale: 1; \ - mouse_events: 0; \ - repeat_events: 1; \ - description { state: "default" 0.0; \ - min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ - max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ - visible: 0; \ - rel1.to : "button_image"; \ - rel2.to : "button_image"; \ - image { \ + group { name: "elm/button/base/sweep/delete"; + inherit: "elm/button/base/sweep"; + alias: "elm/button/base/sweep/delete/multiline"; + images { + image: "00_button_01_delete_press.png" COMP; + image: "00_button_01_delete.png" COMP; + image: "00_button_01_delete_dim.png" COMP; + } + styles{ + style { name: "btn_sweep_delete_multiline"; + base: "font=Tizen:style=Regular font_size="BUTTON_SWEEP_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed linegap=-7 ellipsis=1.0 text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } + parts { + part { name: "button_image"; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_SWEEP_BG_NORMAL_MIN_INC; + image { + normal: "00_button_01_delete.png"; + border: BUTTON_SWEEP_BG_BORDER_INC; + border_scale: 1; + } + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + image.normal: "00_button_01_delete_press.png"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + image.normal: "00_button_01_delete_dim.png"; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + image.normal: "00_button_01_delete_press.png"; + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 0; + effect: SHADOW BOTTOM; + scale: 1; + clip_to: "clipper"; + description { state: "default" 0.0; + fixed: 1 1; + 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_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC; + color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; + text { + style: "btn_sweep_multiline"; + align: 0.5 0.45; + } + } + 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_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: BUTTON_DELETE_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_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC; + } + } + } + } +*/ +/////////////////////////////////////////////////////////////////////////////////////// + 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"; + alias: "elm/button/base/popup_button/default/multiline"; + data { + item: "focus_highlight" "on"; + } + images { + image: "00_popup_button.png" COMP; + image: "00_popup_button_dim.png" COMP; + image: "00_popup_button_press.png" COMP; + image: "00_popup_button_focus.png" COMP; + } + styles{ + style { name: "btn_base_popup_button"; + base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "btn_base_popup_button_pressed"; + base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } + script { + public button_state = BUTTON_STATE_ENABLED; + } + parts { + part { name: "button_image"; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_POPUP_BG_NORMAL_MIN_INC; + image { + normal: "00_popup_button.png"; + border: BUTTON_POPUP_BG_BORDER_INC; + border_scale: 1; + } + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + image.normal: "00_popup_button_press.png"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + image.normal: "00_popup_button_dim.png"; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + image.normal: "00_popup_button_focus.png"; + } + } + part { name: "focus_image"; + scale: 1; + mouse_events: 0; + repeat_events: 1; + description { state: "default" 0.0; + visible: 0; + rel1.to : "button_image"; + rel2.to : "button_image"; + image { + normal: "00_popup_button_focus.png"; + border: BUTTON_POPUP_BG_BORDER_INC; + border_scale: 1; + } + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 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_POPUP_PADDING_MIN_INC; + fixed: 1 1; + visible: 0; + } + } + part { name: "padding_right_bottom"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + align: 1.0 0.0; + rel1.relative: 1.0 1.0; + min: BUTTON_POPUP_PADDING_MIN_INC; + fixed: 1 1; + visible: 0; + } + } + part { name: "padding_icon_text"; + type: RECT; + scale: 1; + 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: "elm.swallow.content"; + } + rel2.to: "elm.swallow.content"; + fixed: 1 0; + min: 0 0; + visible: 0; + } + description { state: "icononly" 0.0; + inherit: "default" 0.0; + } + description { state: "visible" 0.0; //when icon is visible + inherit: "default" 0.0; + min: BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC; + } + } + 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; + inherit: "default" 0.0; + fixed: 1 0; + visible: 1; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + } + description { state: "icononly" 0.0; + inherit: "default" 0.0; + min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC; + visible: 1; + align: 0.5 0.5; + } + } + 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"; + } + text { + style: "btn_base_popup_button"; + 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; + visible: 1; + text { + style: "btn_base_popup_button_pressed"; + min: 0 0; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + 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_POPUP_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: BUTTON_DISCLIP_NORMAL_COLOR_INC; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: BUTTON_DISCLIP_DISABLED_COLOR_INC; + } + } + 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_double_click"; + signal: "mouse,down,1,double"; + source: "over2"; + after: "button_click_anim"; + } + program { name: "button_unpress"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + } + program { name: "button_mouseout_clicked"; + signal: "mouse,up,1"; + source: "over3"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.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: "touch_snd"; + signal: "mouse,clicked,1"; + source: "over2"; + action: PLAY_SAMPLE "touch_sound" 1.0; + after: button_unclick3; + } + program { name: "button_unclick3"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + script { + 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: "clipper"; + 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: "clipper"; + 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: "action_focus"; + signal: "elm,action,focus_highlight,show"; + source: "elm"; + action: STATE_SET "focused" 0.0; + target: "focus_image"; + } + program { name: "action_unfocus"; + signal: "elm,action,focus_highlight,hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "focus_image"; + } + } + } + +/////////////////////////////////////////////////////////////////////////////////////// +#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \ + group { name: "elm/button/base/"style_name; \ + data { \ + item: "focus_highlight" "on"; \ + } \ + images { \ + image: "00_circle_button.png" COMP; \ + image: "00_circle_button_press.png" COMP; \ + image: "00_circle_button_dim.png" COMP; \ + image: image_normal COMP; \ + image: image_press COMP; \ + image: 00_circle_button_focus.png COMP; \ + } \ + parts { \ + part { name: "button_image"; \ + scale: 1; \ + description { state: "default" 0.0; \ + min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ + max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ + image.normal: "00_circle_button.png"; \ + } \ + description { \ + state: "clicked" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "00_circle_button_press.png"; \ + } \ + description { \ + state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "00_circle_button_dim.png"; \ + } \ + } \ + part { name: "left_top_padding"; \ + scale: 1; \ + type: SPACER; \ + description { state: "default" 0.0; \ + min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \ + max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \ + fixed: 1 1; \ + align: 0.0 0.0; \ + rel1.to: "button_image"; \ + rel2.to: "button_image"; \ + } \ + } \ + part { name: "right_bottom_padding"; \ + scale: 1; \ + type: SPACER; \ + description { state: "default" 0.0; \ + min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \ + max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \ + fixed: 1 1; \ + align: 1.0 1.0; \ + rel1 { \ + relative: 1.0 1.0; \ + to: "button_image"; \ + } \ + rel2.to: "button_image"; \ + } \ + } \ + part { name: "button_center_part"; \ + scale: 1; \ + clip_to: "icon_clipper"; \ + description { state: "default" 0.0; \ + min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \ + max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \ + image.normal: image_normal; \ + rel1 { \ + relative: 1.0 1.0; \ + to: "left_top_padding"; \ + } \ + rel2 { \ + relative: 0.0 0.0; \ + to: "right_bottom_padding"; \ + } \ + } \ + description { state: "clicked" 0.0; \ + inherit: "default"; \ + image.normal: image_press; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default"; \ + } \ + } \ + part { name: "icon_clipper"; \ + type: RECT; \ + scale: 1; \ + description { state: "default" 0.0; \ + color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC; \ + } \ + description { state: "clicked" 0.0; \ + color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC; \ + } \ + description { state: "disabled" 0.0; \ + color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; \ + } \ + } \ + part { name: "focus_image"; \ + scale: 1; \ + mouse_events: 0; \ + repeat_events: 1; \ + description { state: "default" 0.0; \ + min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ + max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \ + visible: 0; \ + rel1.to : "button_image"; \ + rel2.to : "button_image"; \ + image { \ normal: "00_circle_button_focus.png"; \ border_scale: 1; \ } \ @@ -2958,6 +3504,20 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") image: "00_button_01_dim.png" COMP; image: "00_button_01_focus.png" COMP; } + styles{ + style { name: "btn_base_default"; + base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "btn_base_default_pressed"; + base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } script { public button_state = BUTTON_STATE_ENABLED; } @@ -3090,11 +3650,10 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } } part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; scale: 1; clip_to: "disclip"; - effect: SHADOW BOTTOM; description { state: "default" 0.0; visible: 0; align: 0.0 0.5; @@ -3107,13 +3666,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") relative: 0.0 0.0; to: "padding_right_bottom"; } - color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; text { - font: "Tizen:style=Regular"; - size: BUTTON_DEFAULT_STYLE_FONT_SIZE_INC; - min: 0 0; - text_class: "tizen"; + style: "btn_base_default"; } } description { state: "visible" 0.0; @@ -3125,7 +3679,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") inherit: "default" 0.0; visible: 1; min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC; - color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC; + text { + style: "btn_base_default_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -3669,6 +4225,20 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") image: "00_contacts_button_press.png" COMP; image: "00_contacts_button_focus.png" COMP; } + styles{ + style { name: "btn_base_multibuttonentry"; + base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "btn_base_multibuttonentry_pressed"; + base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } script { public button_state = BUTTON_STATE_ENABLED; } @@ -3752,19 +4322,16 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") align: 0.0 0.0; } } - part { name: "elm.text"; - type: TEXT; + part { name: "elm.text"; + type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible: 0; fixed: 1 1; - color: BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC; text { - font: "Tizen:style=Regular"; - size: BUTTON_CONTACT_FONT_SIZE_INC; + style: "btn_base_multibuttonentry"; min: 1 1; - text_class: "tizen"; } } description { state: "visible" 0.0; @@ -3776,7 +4343,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") inherit: "default" 0.0; visible: 1; min: 1 1; - color: BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC; + text { + style: "btn_base_multibuttonentry_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -4163,7 +4732,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } ////////////////////////////////////////////////////////////// - group { name: "elm/button/base/naviframe/toolbar/default"; +/* group { name: "elm/button/base/naviframe/toolbar/default"; alias: "elm/button/base/naviframe/title/default"; data { item: "focus_highlight" "on"; @@ -4594,199 +5163,89 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") set_state(PART:"elm.text", "default", 0.0); else set_state(PART:"elm.text", "visible", 0.0); - } - set_int(button_state, BUTTON_STATE_ENABLED); - } - } - program { name: "change_to_landscape"; - signal: "elm,state,landscape"; - source: "elm"; - script { - new st[31]; - new Float:vl; - set_int(landscape_state, BUTTON_LANDSCAPE_ENABLED); - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "default")) - set_state(PART:"elm.text", "landscape", 0.0); - else if (!strcmp(st, "clicked")) - set_state(PART:"elm.text", "landscape_clicked", 0.0); - else if (!strcmp(st, "disabled")) - set_state(PART:"elm.text", "landscape_disabled", 0.0); - else if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.text", "landscape_disabled_visible", 0.0); - else - set_state(PART:"elm.text", "landscape_visible", 0.0); - set_state(PART:"button_bg", "landscape", 0.0); - } - } - program { name: "change_to_portrait"; - signal: "elm,state,portrait"; - source: "elm"; - script { - new st[31]; - new Float:vl; - set_int(landscape_state, BUTTON_LANDSCAPE_DISABLED); - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "landscape")) - set_state(PART:"elm.text", "default", 0.0); - else if (!strcmp(st, "landscape_clicked")) - set_state(PART:"elm.text", "clicked", 0.0); - else if (!strcmp(st, "landscape_disabled")) - set_state(PART:"elm.text", "disabled", 0.0); - else if (!strcmp(st, "landscape_disabled_visible")) - set_state(PART:"elm.text", "disabled_visible", 0.0); - else - set_state(PART:"elm.text", "visible", 0.0); - set_state(PART:"button_bg", "default", 0.0); - } - } - program { name: "landscape_mode"; - source: "elm"; - signal: "elm,state,orient,90"; - action: SIGNAL_EMIT "elm,state,landscape" "elm"; - } - program { name: "landscape_mode2"; - source: "elm"; - signal: "elm,state,orient,270"; - action: SIGNAL_EMIT "elm,state,landscape" "elm"; - } - program { name: "portrait_mode"; - source: "elm"; - signal: "elm,state,orient,0"; - action: SIGNAL_EMIT "elm,state,portrait" "elm"; - } - program { name: "portrait_mode2"; - source: "elm"; - signal: "elm,state,orient,180"; - action: SIGNAL_EMIT "elm,state,portrait" "elm"; - } - program { name: "action_focus"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "focus_image"; - } - program { name: "action_unfocus"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "focus_image"; - } - } - } - -////////////////////////////////////////////////////////////// - group { name: "elm/button/base/naviframe/toolbar/left"; - inherit: "elm/button/base/naviframe/toolbar/default"; - parts { - part { name: "button_bg"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC; - max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC; - fixed: 1 1; - rel1.to: "padding_text_left_top"; - rel2.to: "padding_text_right_bottom"; - align: 1.0 0.5; - } - description { state: "landscape" 0.0; - inherit: "default" 0.0; - min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC; - max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC; - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - clip_to: "disclip"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC; - rel1 { - relative: 1.0 1.0; - to: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to: "padding_right_bottom"; - } - align: 1.0 0.5; - text { - min: 0 1; - max: 1 1; - align: 0.5 0.54; - style: "btn_naviframe_toolbar"; - } - } - description { state: "landscape" 0.0; - inherit: "default" 0.0; - min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "landscape_visible" 0.0; - inherit: "landscape" 0.0; - visible: 1; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - text { - style: "btn_naviframe_toolbar_pressed"; - } - } - description { state: "landscape_clicked" 0.0; - inherit: "landscape" 0.0; - visible: 1; - text { - style: "btn_naviframe_toolbar_pressed"; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { state: "landscape_disabled" 0.0; - inherit: "landscape" 0.0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text { - style: "btn_naviframe_toolbar_disabled"; - } - } - description { state: "landscape_disabled_visible" 0.0; - inherit: "landscape" 0.0; - visible: 1; - text { - style: "btn_naviframe_toolbar_disabled"; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - visible: 1; - text { - style: "btn_naviframe_toolbar_pressed"; - } + } + set_int(button_state, BUTTON_STATE_ENABLED); } - description { state: "landscape_focused" 0.0; - inherit: "landscape" 0.0; - visible: 1; - text { - style: "btn_naviframe_toolbar_pressed"; - } + } + program { name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + script { + new st[31]; + new Float:vl; + set_int(landscape_state, BUTTON_LANDSCAPE_ENABLED); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "default")) + set_state(PART:"elm.text", "landscape", 0.0); + else if (!strcmp(st, "clicked")) + set_state(PART:"elm.text", "landscape_clicked", 0.0); + else if (!strcmp(st, "disabled")) + set_state(PART:"elm.text", "landscape_disabled", 0.0); + else if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "landscape_disabled_visible", 0.0); + else + set_state(PART:"elm.text", "landscape_visible", 0.0); + set_state(PART:"button_bg", "landscape", 0.0); + } + } + program { name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + script { + new st[31]; + new Float:vl; + set_int(landscape_state, BUTTON_LANDSCAPE_DISABLED); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "landscape")) + set_state(PART:"elm.text", "default", 0.0); + else if (!strcmp(st, "landscape_clicked")) + set_state(PART:"elm.text", "clicked", 0.0); + else if (!strcmp(st, "landscape_disabled")) + set_state(PART:"elm.text", "disabled", 0.0); + else if (!strcmp(st, "landscape_disabled_visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"button_bg", "default", 0.0); } } + program { name: "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; + } + program { name: "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; + } + program { name: "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + action: SIGNAL_EMIT "elm,state,portrait" "elm"; + } + program { name: "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + action: SIGNAL_EMIT "elm,state,portrait" "elm"; + } + program { name: "action_focus"; + signal: "elm,action,focus_highlight,show"; + source: "elm"; + action: STATE_SET "focused" 0.0; + target: "focus_image"; + } + program { name: "action_unfocus"; + signal: "elm,action,focus_highlight,hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "focus_image"; + } } } ////////////////////////////////////////////////////////////// - group { name: "elm/button/base/naviframe/toolbar/right"; + group { name: "elm/button/base/naviframe/toolbar/left"; inherit: "elm/button/base/naviframe/toolbar/default"; parts { part { name: "button_bg"; @@ -4798,7 +5257,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") fixed: 1 1; rel1.to: "padding_text_left_top"; rel2.to: "padding_text_right_bottom"; - align: 0.0 0.5; + align: 1.0 0.5; } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -4823,7 +5282,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") relative: 0.0 0.0; to: "padding_right_bottom"; } - align: 0.0 0.5; + align: 1.0 0.5; text { min: 0 1; max: 1 1; @@ -4895,409 +5354,116 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } } -//////////////////////////////////////////////////////////////////// - group { name: "elm/button/base/toolbar/segmentedcontrol"; - images { - image: "00_toolbar_button.png" COMP; - image: "00_toolbar_button_press.png" COMP; - image: "00_toolbar_button_dim.png" COMP; - image: "00_button_icon_arrow.png" COMP; - image: "00_button_icon_arrow_press.png" COMP; - image: "00_toolbar_button_focus.png" COMP; - } - data { - item: "focus_highlight" "on"; - } - data { - item: "focus_highlight" "on"; - } - styles{ - style { name: "btn_toolbar_segmentedcontrol"; - base: "font=Tizen:style=Bold font_size="BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC" align=center color=#ffffff ellipsis=1.0 wrap=none text_class=tizen"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "tab" "\t"; - } - } - script { - public button_state = BUTTON_STATE_ENABLED; - } +////////////////////////////////////////////////////////////// + group { name: "elm/button/base/naviframe/toolbar/right"; + inherit: "elm/button/base/naviframe/toolbar/default"; parts { - part { name: "button_image"; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC; - max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC; - fixed: 1 1; - rel1.to: "padding_text_left_top"; - rel2.to: "padding_text_right_bottom"; - image { - normal: "00_toolbar_button.png"; - border: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC; - border_scale: 1; - } - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_press.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_dim.png"; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_press.png"; - } - } - part { name: "focus_image"; - scale: 1; - mouse_events: 0; - repeat_events: 1; - description { state: "default" 0.0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC; - max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC; - visible: 0; - rel1.to : "button_image"; - rel2.to : "button_image"; - image { - normal: "00_toolbar_button_focus.png"; - border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC; - border_scale: 1; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "padding_left_top"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - align: 0.0 0.0; - rel2.relative: 0.0 0.0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC; - fixed: 1 1; - } - } - part { name: "padding_right_bottom"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 1.0 1.0; - rel1.relative: 1.0 1.0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC; - fixed: 1 1; - visible: 0; - } - } - part { name: "padding_text_left_top"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC; - fixed: 1 1; - rel1.to: "elm.text"; - rel2 { - relative: 0.0 0.0; - to: "elm.text"; - } - align: 1.0 0.0; - } - } - part { name: "padding_text_right_bottom"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC; - fixed: 1 1; - visible: 0; - rel1 { - relative: 1.0 1.0; - to_x: "icon"; - to_y: "elm.text"; - } - rel2 { - relative: 1.0 1.0; - to_x: "icon"; - to_y: "elm.text"; - } - align: 0.0 0.0; - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - clip_to: "disclip"; - mouse_events: 0; - effect: FAR_SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC; - rel1 { - relative: 1.0 1.0; - to: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to: "padding_right_bottom"; - } - color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_NORMAL_COLOR_INC; - color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC; - text { - min: 0 1; - max: 1 1; - style: "btn_toolbar_segmentedcontrol"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PRESSED_COLOR_INC; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_DISABLED_COLOR_INC; - visible: 1; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - visible: 1; - color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_FOCUSED_COLOR_INC; - } - } - part { name: "icon_padding"; + part { name: "button_bg"; + type: SPACER; scale: 1; - type: RECT; description { state: "default" 0.0; - min: 6 5; + min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC; + max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC; fixed: 1 1; + rel1.to: "padding_text_left_top"; + rel2.to: "padding_text_right_bottom"; align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to: "elm.text"; - } - visible: 0; - rel2.to: "elm.text"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC; + max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC; } } - part { name: "icon"; + part { name: "elm.text"; + type: TEXTBLOCK; + clip_to: "disclip"; + mouse_events: 0; scale: 1; - clip_to: "icon_clipper"; description { state: "default" 0.0; - min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC; - max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC; + visible: 0; fixed: 1 1; - align: 0.0 0.5; + min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC; rel1 { - relative: 1.0 0.0; - to_x: "icon_padding"; - to_y: "elm.text"; - offset: 0 6; + relative: 1.0 1.0; + to: "padding_left_top"; } rel2 { - relative: 1.0 1.0; - to_x: "icon_padding"; - to_y: "elm.text"; + relative: 0.0 0.0; + to: "padding_right_bottom"; + } + align: 0.0 0.5; + text { + min: 0 1; + max: 1 1; + align: 0.5 0.54; + style: "btn_naviframe_toolbar"; } - image.normal: "00_button_icon_arrow.png"; } - description { state: "clicked" 0.0; + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC; + } + description { state: "visible" 0.0; inherit: "default" 0.0; - image.normal: "00_button_icon_arrow_press.png"; + visible: 1; } - } - part { name: "icon_clipper"; - type: RECT; - description { state: "default" 0.0; - color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC; + description { state: "landscape_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } } - } - part { name: "disclip"; - type: RECT; - description { state: "default" 0.0; - color: BUTTON_DISCLIP_NORMAL_COLOR_INC; + description { state: "landscape_clicked" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: BUTTON_DISCLIP_DISABLED_COLOR_INC; - } - } - part { name: "over2"; - type: RECT; - repeat_events: 1; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - color: 0 0 0 0; - } - } - part { name: "over3"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - color: 0 0 0 0; } - } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - color: 0 0 0 0; - visible: 0; + description { state: "landscape_disabled" 0.0; + inherit: "landscape" 0.0; } - description { state: "disabled" 0.0; + description { state: "disabled_visible" 0.0; inherit: "default" 0.0; visible: 1; + text { + style: "btn_naviframe_toolbar_disabled"; + } } - } - } - programs { - program { name: "button_click"; - signal: "mouse,down,1"; - source: "over2"; - action: SIGNAL_EMIT "elm,action,press" ""; - after: "button_click_anim"; - } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "elm.text"; - target: "icon"; - target: "icon_clipper"; - } - program { name: "button_double_click"; - signal: "mouse,down,1,double"; - source: "over2"; - after: "button_click_anim"; - } - program { name: "button_unpress"; - action: SIGNAL_EMIT "elm,action,unpress" ""; - } - program { name: "button_mouseout_clicked"; - signal: "mouse,up,1"; - source: "over3"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "clicked") || !strcmp(st, "focused")) - { - emit("elm,action,default,text,set", ""); - set_state(PART:"elm.text", "visible", 0.0); - } - if (get_int(button_state) != BUTTON_STATE_DISABLED) - set_state(PART:"button_image", "default", 0.0); - set_state(PART:"icon", "default", 0.0); - set_state(PART:"icon_clipper", "default", 0.0); - } - after: button_unpress; - } - program { name: "touch_snd"; - signal: "mouse,clicked,1"; - source: "over2"; - action: PLAY_SAMPLE "touch_sound" 1.0; - after: button_unclick3; - } - program { name: "button_unclick3"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - script { - if (get_int(button_state) != BUTTON_STATE_DISABLED) - set_state(PART:"elm.text", "visible", 0.0); - else - set_state(PART:"elm.text", "disabled_visible", 0.0); + description { state: "landscape_disabled_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_disabled"; + } } - } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button_image"; - target: "disclip"; - target: "disabler"; - after: "disable_text"; - } - program { name: "disable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "disabled_visible", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); - set_int(button_state, BUTTON_STATE_DISABLED); + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } } - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "disclip"; - target: "disabler"; - after: "enable_text"; - } - program { name: "enable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.text", "visible", 0.0); - else - set_state(PART:"elm.text", "default", 0.0); - set_int(button_state, BUTTON_STATE_ENABLED); + description { state: "landscape_focused" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } } } - program { name: "action_focus"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "focus_image"; - } - program { name: "action_unfocus"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "focus_image"; - } } } - +*/ //////////////////////////////////////////////////////////////////// group { name: "elm/button/base/naviframe/title_icon"; data { @@ -6362,6 +6528,20 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") image: "00_arrow_expand.png" COMP; image: "00_button_01_focus.png" COMP; } + styles{ + style { name: "btn_base_exapandable_number"; + base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "btn_base_exapandable_number_pressed"; + base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } script { public button_state = BUTTON_STATE_ENABLED; } @@ -6471,9 +6651,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } } part { name: "elm.text"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; min: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC; @@ -6489,15 +6668,11 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") to_y:"padding_right_bottom"; } align: 0.0 0.5; - color: BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC; - color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC; text { - font: "Tizen:style=Regular"; - size: BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC; + style: "btn_base_exapandable_number"; min: 0 0; fit: 1 1; size_range: 28 32; - text_class: "tizen"; } } description { state: "visible" 0.0; @@ -6505,7 +6680,12 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC; + text { + style: "btn_base_exapandable_number_pressed"; + min: 0 0; + fit: 1 1; + size_range: 28 32; + } } description { state: "disabled" 0.0; inherit: "default" 0.0;