Merge "[scroller] removed scroller's bounce effect" into tizen_2.2
authorHosang Kim <hosang12.kim@samsung.com>
Thu, 27 Jun 2013 08:00:13 +0000 (08:00 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Thu, 27 Jun 2013 08:00:13 +0000 (08:00 +0000)
98 files changed:
packaging/efl-theme-tizen-hd.spec
themes/images/HD/dark/Content_views/00_picker_arrow_down.png [moved from themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow.png with 83% similarity]
themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png [new file with mode: 0644]
themes/images/HD/dark/Content_views/00_picker_arrow_up.png [moved from themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow.png with 84% similarity]
themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png [new file with mode: 0644]
themes/images/HD/dark/Naviframe/00_toolbar_button.png [deleted file]
themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png [deleted file]
themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png [deleted file]
themes/images/HD/dark/Naviframe/00_toolbar_button_press.png [deleted file]
themes/images/HD/dark/Popup/00_popup_button_bg.png
themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png [deleted file]
themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png [deleted file]
themes/images/HD/dark/Popup/00_popup_title_bg.png
themes/images/HD/light/Content_views/00_picker_arrow_down.png [moved from themes/images/HD/dark/Popup/00_bottom_popup_shadow.png with 83% similarity]
themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png [new file with mode: 0644]
themes/images/HD/light/Content_views/00_picker_arrow_up.png [moved from themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow_press.png with 84% similarity]
themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png [new file with mode: 0644]
themes/images/HD/light/Controls/Button/00_button_add.png
themes/images/HD/light/Controls/Button/00_button_add_press.png
themes/images/HD/light/Controls/Button/00_button_call.png
themes/images/HD/light/Controls/Button/00_button_call_press.png
themes/images/HD/light/Controls/Button/00_button_contact.png
themes/images/HD/light/Controls/Button/00_button_contact_press.png
themes/images/HD/light/Controls/Button/00_button_delete.png
themes/images/HD/light/Controls/Button/00_button_delete_press.png
themes/images/HD/light/Controls/Button/00_button_expand_cancel.png
themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png
themes/images/HD/light/Controls/Button/00_button_expand_closed.png
themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png
themes/images/HD/light/Controls/Button/00_button_expand_opened.png
themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png
themes/images/HD/light/Controls/Button/00_button_expand_send.png
themes/images/HD/light/Controls/Button/00_button_expand_send_press.png
themes/images/HD/light/Controls/Button/00_button_info.png
themes/images/HD/light/Controls/Button/00_button_info_press.png
themes/images/HD/light/Controls/Button/00_button_left.png
themes/images/HD/light/Controls/Button/00_button_left_press.png
themes/images/HD/light/Controls/Button/00_button_rename.png
themes/images/HD/light/Controls/Button/00_button_rename_press.png
themes/images/HD/light/Controls/Button/00_button_right.png
themes/images/HD/light/Controls/Button/00_button_right_press.png
themes/images/HD/light/Controls/Button/00_button_warning.png
themes/images/HD/light/Controls/Button/00_button_warning_press.png
themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow_press.png [deleted file]
themes/images/HD/light/Naviframe/00_toolbar_button.png [deleted file]
themes/images/HD/light/Naviframe/00_toolbar_button_dim.png [deleted file]
themes/images/HD/light/Naviframe/00_toolbar_button_focus.png [deleted file]
themes/images/HD/light/Naviframe/00_toolbar_button_press.png [deleted file]
themes/images/HD/light/Popup/00_bottom_popup_shadow.png [deleted file]
themes/images/HD/light/Popup/00_popup_dim_lighting_h.png [deleted file]
themes/images/HD/light/Popup/00_popup_dim_lighting_v.png [deleted file]
themes/inc/tizen-dark-inc.edc
themes/inc/tizen-light-inc.edc
themes/sounds/List_reorder.wav [moved from themes/sounds/S_Touch_30ms.wav with 65% similarity, mode: 0755]
themes/sounds/Slider_sweep.wav [new file with mode: 0755]
themes/sounds/Tizen_Touch.wav [new file with mode: 0755]
themes/sounds/Waterdrop.wav [deleted file]
themes/sounds/button-pressed.wav [deleted file]
themes/sounds/button-toggle-off.wav [deleted file]
themes/sounds/button-toggle-on.wav [deleted file]
themes/sounds/dialog-cancel.wav [deleted file]
themes/sounds/dialog-error.wav [deleted file]
themes/sounds/dialog-information.wav [deleted file]
themes/sounds/dialog-ok.wav [deleted file]
themes/sounds/dialog-question.wav [deleted file]
themes/sounds/dialog-warning.wav [deleted file]
themes/sounds/drag-accept.wav [deleted file]
themes/sounds/drag-fail.wav [deleted file]
themes/sounds/drag-start.wav [deleted file]
themes/sounds/link-pressed.wav [deleted file]
themes/sounds/menu-click.wav [deleted file]
themes/sounds/menu-popup.wav [deleted file]
themes/sounds/tooltip-popup.wav [deleted file]
themes/sounds/window-new.wav [deleted file]
themes/tizen.edc
themes/widgets/button.edc
themes/widgets/check.edc
themes/widgets/colorselector.edc
themes/widgets/ctxpopup.edc
themes/widgets/datetime.edc
themes/widgets/entry.edc
themes/widgets/gengrid.edc
themes/widgets/genlist/genlist_decorate.edc
themes/widgets/genlist/genlist_macro.edc
themes/widgets/genlist/genlist_sweep.edc
themes/widgets/index.edc
themes/widgets/label.edc
themes/widgets/layout.edc
themes/widgets/multibuttonentry.edc
themes/widgets/multisense_haptic.edc [deleted file]
themes/widgets/multisense_sound.edc [deleted file]
themes/widgets/multisense_ui.edc [deleted file]
themes/widgets/naviframe.edc
themes/widgets/panes.edc
themes/widgets/popup.edc
themes/widgets/progressbar.edc
themes/widgets/radio.edc
themes/widgets/toolbar.edc

index 128fddb..502f8e8 100644 (file)
@@ -1,6 +1,6 @@
 Name:          efl-theme-tizen-hd
 Summary:       Tizen theme files
-Version:       1.0.189r02
+Version:       1.0.196
 Release:       1
 Group:         TO_BE/FILLED_IN
 License:       APLv2
similarity index 83%
rename from themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow.png
rename to themes/images/HD/dark/Content_views/00_picker_arrow_down.png
index 22e180b..e08bd51 100644 (file)
Binary files a/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow.png and b/themes/images/HD/dark/Content_views/00_picker_arrow_down.png differ
diff --git a/themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png b/themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png
new file mode 100644 (file)
index 0000000..8fd0805
Binary files /dev/null and b/themes/images/HD/dark/Content_views/00_picker_arrow_down_press_web.png differ
similarity index 84%
rename from themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow.png
rename to themes/images/HD/dark/Content_views/00_picker_arrow_up.png
index 22e180b..b115233 100644 (file)
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow.png and b/themes/images/HD/dark/Content_views/00_picker_arrow_up.png differ
diff --git a/themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png b/themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png
new file mode 100644 (file)
index 0000000..6393a84
Binary files /dev/null and b/themes/images/HD/dark/Content_views/00_picker_arrow_up_press_web.png 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 (executable)
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 (executable)
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 (executable)
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 (executable)
index b91ad0a..0000000
Binary files a/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png and /dev/null differ
index a3b92e6..10c7466 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_popup_button_bg.png and b/themes/images/HD/dark/Popup/00_popup_button_bg.png differ
diff --git a/themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png b/themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png
deleted file mode 100644 (file)
index d489652..0000000
Binary files a/themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png and /dev/null differ
diff --git a/themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png b/themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png
deleted file mode 100644 (file)
index 51ee8e3..0000000
Binary files a/themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png and /dev/null differ
index ce8289d..d982805 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_popup_title_bg.png and b/themes/images/HD/dark/Popup/00_popup_title_bg.png differ
similarity index 83%
rename from themes/images/HD/dark/Popup/00_bottom_popup_shadow.png
rename to themes/images/HD/light/Content_views/00_picker_arrow_down.png
index 74fe293..e08bd51 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_bottom_popup_shadow.png and b/themes/images/HD/light/Content_views/00_picker_arrow_down.png differ
diff --git a/themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png b/themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png
new file mode 100644 (file)
index 0000000..8fd0805
Binary files /dev/null and b/themes/images/HD/light/Content_views/00_picker_arrow_down_press_web.png differ
similarity index 84%
rename from themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow_press.png
rename to themes/images/HD/light/Content_views/00_picker_arrow_up.png
index f622c7b..b115233 100644 (file)
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_button_icon_arrow_press.png and b/themes/images/HD/light/Content_views/00_picker_arrow_up.png differ
diff --git a/themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png b/themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png
new file mode 100644 (file)
index 0000000..6393a84
Binary files /dev/null and b/themes/images/HD/light/Content_views/00_picker_arrow_up_press_web.png differ
index a3420f5..47417c9 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_add.png and b/themes/images/HD/light/Controls/Button/00_button_add.png differ
index 016022d..47417c9 100644 (file)
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
index 5dda0d1..a374e6d 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_call.png and b/themes/images/HD/light/Controls/Button/00_button_call.png differ
index 68213a2..a374e6d 100644 (file)
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
index d51ed97..25f07f0 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_contact.png and b/themes/images/HD/light/Controls/Button/00_button_contact.png differ
index 17498b2..25f07f0 100644 (file)
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
index 39260e5..b1ce778 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_delete.png and b/themes/images/HD/light/Controls/Button/00_button_delete.png differ
index 39260e5..b1ce778 100644 (file)
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
index e24612a..4dd5215 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png and b/themes/images/HD/light/Controls/Button/00_button_expand_cancel.png differ
index e2cd2f0..4dd5215 100644 (file)
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
index 41ee73f..ac3aef3 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_closed.png and b/themes/images/HD/light/Controls/Button/00_button_expand_closed.png differ
index 2098db2..ac3aef3 100644 (file)
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
index 547f884..9d17f5a 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_opened.png and b/themes/images/HD/light/Controls/Button/00_button_expand_opened.png differ
index d539fd0..9d17f5a 100644 (file)
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
index eccd335..d60d26d 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_send.png and b/themes/images/HD/light/Controls/Button/00_button_expand_send.png differ
index d4b4f9b..d60d26d 100644 (file)
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
index 76d3cdc..3b57fd2 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_info.png and b/themes/images/HD/light/Controls/Button/00_button_info.png differ
index bba8850..3b57fd2 100644 (file)
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
index dc60109..baa8955 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_left.png and b/themes/images/HD/light/Controls/Button/00_button_left.png differ
index 67c04fc..baa8955 100644 (file)
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
index 862cc38..5c87a4c 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_rename.png and b/themes/images/HD/light/Controls/Button/00_button_rename.png differ
index c9c514e..5c87a4c 100644 (file)
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
index 397221f..93e3395 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_right.png and b/themes/images/HD/light/Controls/Button/00_button_right.png differ
index c3613ec..93e3395 100644 (file)
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
index a07d6b8..057b20f 100644 (file)
Binary files a/themes/images/HD/light/Controls/Button/00_button_warning.png and b/themes/images/HD/light/Controls/Button/00_button_warning.png differ
index a07d6b8..057b20f 100644 (file)
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_press.png b/themes/images/HD/light/GUI_Style_Guide/00_button_icon_arrow_press.png
deleted file mode 100644 (file)
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 (file)
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 (file)
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 (executable)
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 (file)
index 17251d8..0000000
Binary files a/themes/images/HD/light/Naviframe/00_toolbar_button_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Popup/00_bottom_popup_shadow.png b/themes/images/HD/light/Popup/00_bottom_popup_shadow.png
deleted file mode 100644 (file)
index 74fe293..0000000
Binary files a/themes/images/HD/light/Popup/00_bottom_popup_shadow.png and /dev/null differ
diff --git a/themes/images/HD/light/Popup/00_popup_dim_lighting_h.png b/themes/images/HD/light/Popup/00_popup_dim_lighting_h.png
deleted file mode 100644 (file)
index d489652..0000000
Binary files a/themes/images/HD/light/Popup/00_popup_dim_lighting_h.png and /dev/null differ
diff --git a/themes/images/HD/light/Popup/00_popup_dim_lighting_v.png b/themes/images/HD/light/Popup/00_popup_dim_lighting_v.png
deleted file mode 100644 (file)
index 51ee8e3..0000000
Binary files a/themes/images/HD/light/Popup/00_popup_dim_lighting_v.png and /dev/null differ
index 76b7c22..b2fcf26 100755 (executable)
@@ -36,8 +36,8 @@
 #define NAVIFRAME_TAB_TITLE_H2_INC 126
 #define NAVIFRAME_TOOLBAR_HEIGHT_INC 98
 #define NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC 85
-#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 115 96
-#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 115 91
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 183 96
+#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 183 91
 #define NAVIFRAME_PREV_FUNC_BTN_SIZE_INC 85 98
 #define NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC 85 85
 #define NAVIFRAME_TITLE_TAB_H_INC 75
@@ -57,7 +57,6 @@
 #define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
 #define NAVIFRAME_BADGE_TOP_PADDING_INC 0 10
 #define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
-#define NAVIFRAME_BADGE_TEXT_RIGHT_PADDING_INC 10 54
 #define NAVIFRAME_BADGE_TEXT_H_INC 34
 #define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
 #define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
@@ -83,9 +82,9 @@
 
 #define CTXPOPUP_WIDTH_MIN_INC 386
 #define CTXPOPUP_WIDTH_MAX_INC 692
-#define CTXPOPUP_TEXT_MAX_INC 660
-#define CTXPOPUP_ICON_TEXT_MAX_INC 603
-#define CTXPOPUP_MORE_TEXT_MAX_INC 603
+#define CTXPOPUP_TEXT_MAX_INC 652
+#define CTXPOPUP_ICON_TEXT_MAX_INC 595
+#define CTXPOPUP_MORE_TEXT_MAX_INC 599
 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26
 #define CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER 26 26 25 0
 #define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255
 #define CTXPOPUP_SEPARATOR_PADDING_INC 20
 #define CTXPOPUP_SEPARATOR_COLOR_INC 29 38 60 255
 #define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 0
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 255 255 255 64
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 96
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 96
 #define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
 #define CTXPOPUP_TP_BG_IMAGE_BORDER 8 8 8 8
 #define CTXPOPUP_TP_ARROW_SIZE_INC 27 18
 #define CTXPOPUP_TP_HEIGHT_INC 102
-#define CTXPOPUP_MORE_WIDTH_MIN_INC 502
+#define CTXPOPUP_MORE_WIDTH_MIN_INC 412
 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720
 #define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280
 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16
 #define CTXPOPUP_MORE_ICON_WIDTH_INC 45
 #define CTXPOPUP_MORE_ICON_HEIGHT_INC 45
 #define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40
-#define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20
 #define CTXPOPUP_MOVE_PAD_INC 40
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 334
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720
 #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
 #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
 #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
 #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
 #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 115 91
 #define BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC 63 63
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC 124 96
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC 124 91
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC 0 96
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC 183 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC 0 91
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC 183 91
+#define BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 16
+#define BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MIN_INC 0 96
+#define BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MAX_INC 151 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MIN_INC 0 91
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MAX_INC 151 91
 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 8 8 8 8
-#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 38
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_TITLE_TEXT_MIN_FONT_SIZE_INC 32
 #define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC "#FAFAFA"
 #define BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC "#000000"
 #define BUTTON_NAVIFRAME_TOOLBAR_TEXT_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
 #define BUTTON_DISCLIP_NORMAL_COLOR_INC           255 255 255 255
 #define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 76
 
-#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        58 58 58 255
-#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC       255 255 255 255
-#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      58 58 58 76
+#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        "#FAFAFAFF"
+#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      "#FAFAFA7F"
 #define CHECK_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
 #define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
 
-#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        58 58 58 255
-#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC       255 255 255 255
-#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      58 58 58 76
+#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        "#FAFAFAFF"
+#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      "#FAFAFA7F"
 #define RADIO_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
 #define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
 
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 30 31
-#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 30 31
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 652 78
-#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78
-#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 28 0
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 12 13 30 31
+#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 12 13 30 31
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 620 78
+#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 800 78
+#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 300
 #define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 300
 #define POPUP_LABEL_DESC_TOP_PADDING 32
 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32
 #define POPUP_ACTION_DESC_TOP_PADDING 11
-#define POPUP_TITLE_LEFT_PADDING 42
-#define POPUP_TITLE_RIGHT_PADDING 42
+#define POPUP_TITLE_LEFT_PADDING 26
+#define POPUP_TITLE_RIGHT_PADDING 26
 #define POPUP_TITLE_TOP_PADDING 0
 #define POPUP_TITLE_BOTTOM_PADDING 0
 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 10
 #define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 96
 #define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 78
 
-#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 568 296
+#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 596 296
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10
 #define POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT "296"
 #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134
 
 #define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96"
-#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 396 76
-#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 604 76
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 394 76
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 596 76
 #define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 76
 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 76
 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 76
 #define DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC   69
 #define DATETIME_LABEL_DATE_FIELD_HEIGHT_INC      48
 
+#define DATETIME_POPUP_CONTENT_SIZE_INC 652 216
+#define DATETIME_POPUP_CONTENT_LEFT_PADDING_WIDTH_INC 62
+#define DATETIME_POPUP_CONTENT_RIGHT_PADDING_WIDTH_INC 62
+#define DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 24
+#define DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 160
+#define DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC 64
+#define DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC 250 250 250 255
+
+#define DATETIME_POPUP_ENTRY_HEIGHT_INC 100
+#define DATETIME_POPUP_ENTRY_MIN_WIDTH_INC 84
+#define DATETIME_POPUP_ENTRY_TEXT_SIZE_INC 64
+#define DATETIME_POPUP_ENTRY_TEXT_COLOR_INC 250 250 250 255;
+
+#define SPINNER_UP_DOWN_IMAGE_SIZE_INC 84 58
+#define SPINNER_UP_DOWN_IMAGE_BORDER_SIZE_INC 13 13 15 15
+#define SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC 54 54
+#define SPINNER_TEXT_HEIGHT_INC 100
+#define SPINNER_ENTRY_TEXT_SIZE_INC 64
+#define SPINNER_ENTRY_TEXT_COLOR_INC 250 250 250 255
+
+#define ENTRY_DATETIME_POPUP_TEXT_SIZE_INC 64
+
 #define COLORSELECTOR_MIN_W_INC 688
 #define COLORSELECTOR_MIN_H_INC 336
 #define COLORSELECTOR_MAX_W_INC 1014
 #define TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC 255 255 255 82
 #define TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 255 255 255 82
 
-#define CONFORMANT_INDICATOR_BG_DEFAULT_COLOR_INC 52 52 50 255
+#define CONFORMANT_INDICATOR_BG_DEFAULT_COLOR_INC 30 30 30 255
 #define CONFORMANT_INDICATOR_BG_TRANSLUCENT_COLOR_INC 0 0 0 125
 #define CONFORMANT_INDICATOR_BG_TRANSPARENT_COLOR_INC 0 0 0 0
index 315b188..c964d29 100755 (executable)
 #define NAVIFRAME_BOTTOM_PADDING_INC 0 12
 #define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
 #define NAVIFRAME_BADGE_PADDING_INC 85 0
-#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 54
 #define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
 #define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
-#define NAVIFRAME_BADGE_TEXT_RIGHT_PADDING_INC 10 54
 #define NAVIFRAME_BADGE_TEXT_H_INC 26
 #define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
 #define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
 
 #define CTXPOPUP_WIDTH_MIN_INC 386
 #define CTXPOPUP_WIDTH_MAX_INC 692
-#define CTXPOPUP_TEXT_MAX_INC 660
-#define CTXPOPUP_ICON_TEXT_MAX_INC 603
-#define CTXPOPUP_MORE_TEXT_MAX_INC 603
+#define CTXPOPUP_TEXT_MAX_INC 652
+#define CTXPOPUP_ICON_TEXT_MAX_INC 595
+#define CTXPOPUP_MORE_TEXT_MAX_INC 599
 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26
 #define CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER 26 26 25 0
 #define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255
 #define CTXPOPUP_TP_BG_IMAGE_BORDER 8 8 8 8
 #define CTXPOPUP_TP_ARROW_SIZE_INC 27 18
 #define CTXPOPUP_TP_HEIGHT_INC 102
-#define CTXPOPUP_MORE_WIDTH_MIN_INC 502
+#define CTXPOPUP_MORE_WIDTH_MIN_INC 412
 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720
 #define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280
 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16
 #define CTXPOPUP_MORE_ICON_WIDTH_INC 45
 #define CTXPOPUP_MORE_ICON_HEIGHT_INC 45
 #define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40
-#define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20
 #define CTXPOPUP_MOVE_PAD_INC 40
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 334
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720
 #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
 #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
 #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
 #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
 #define BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC 0 34
 #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC 0 17
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC 124 96
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC 124 91
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC 124 96
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC 124 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC 124 91
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC 124 91
+#define BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 16
+#define BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MIN_INC 0 96
+#define BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MAX_INC 151 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MIN_INC 0 91
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MAX_INC 151 91
 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 8 8 8 8
 #define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 38
 #define BUTTON_NAVIFRAME_TITLE_TEXT_MIN_FONT_SIZE_INC 32
 #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
 #define BUTTON_DISCLIP_NORMAL_COLOR_INC           255 255 255 255
 #define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 76
 
-#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        58 58 58 255
-#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC       255 255 255 255
-#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      58 58 58 76
+#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        "#3A3A3AFF"
+#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC      "#3A3A3A7F"
 #define CHECK_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
 #define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
 
-#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        58 58 58 255
-#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC       255 255 255 255
-#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      58 58 58 76
+#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        "#3A3A3AFF"
+#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      "#3A3A3A7F"
 #define RADIO_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
 #define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
 
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 30 31
-#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 30 31
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 652 78
-#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78
-#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 28 0
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 12 13 30 31
+#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 12 13 30 31
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 620 78
+#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 800 78
+#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 0
 #define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 0
-#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96
+#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96
 
 #define POPUP_DESC_LEFT_PADDING 16
 #define POPUP_DESC_RIGHT_PADDING 16
 #define POPUP_LABEL_DESC_TOP_PADDING 32
 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32
 #define POPUP_ACTION_DESC_TOP_PADDING 11
-#define POPUP_TITLE_LEFT_PADDING 42
-#define POPUP_TITLE_RIGHT_PADDING 42
+#define POPUP_TITLE_LEFT_PADDING 26
+#define POPUP_TITLE_RIGHT_PADDING 26
 #define POPUP_TITLE_TOP_PADDING 0
 #define POPUP_TITLE_BOTTOM_PADDING 0
 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 10
 #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134
 
 #define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96"
-#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 396 76
-#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 604 76
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 394 76
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 596 76
 #define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 76
 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 76
 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 76
 #define DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC   69
 #define DATETIME_LABEL_DATE_FIELD_HEIGHT_INC      48
 
+#define DATETIME_POPUP_CONTENT_SIZE_INC 652 216
+#define DATETIME_POPUP_CONTENT_LEFT_PADDING_WIDTH_INC 62
+#define DATETIME_POPUP_CONTENT_RIGHT_PADDING_WIDTH_INC 62
+#define DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 24
+#define DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 160
+#define DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC 64
+#define DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC 250 250 250 255
+
+#define DATETIME_POPUP_ENTRY_HEIGHT_INC 100
+#define DATETIME_POPUP_ENTRY_MIN_WIDTH_INC 84
+#define DATETIME_POPUP_ENTRY_TEXT_SIZE_INC 64
+#define DATETIME_POPUP_ENTRY_TEXT_COLOR_INC 250 250 250 255;
+
+#define SPINNER_UP_DOWN_IMAGE_SIZE_INC 84 58
+#define SPINNER_UP_DOWN_IMAGE_BORDER_SIZE_INC 13 13 15 15
+#define SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC 54 54
+#define SPINNER_TEXT_HEIGHT_INC 100
+#define SPINNER_ENTRY_TEXT_SIZE_INC 64
+#define SPINNER_ENTRY_TEXT_COLOR_INC 250 250 250 255
+
+#define ENTRY_DATETIME_POPUP_TEXT_SIZE_INC 64
+
 #define COLORSELECTOR_MIN_W_INC 688
 #define COLORSELECTOR_MIN_H_INC 336
 #define COLORSELECTOR_MAX_W_INC 1014
old mode 100644 (file)
new mode 100755 (executable)
similarity index 65%
rename from themes/sounds/S_Touch_30ms.wav
rename to themes/sounds/List_reorder.wav
index 99ba74d..5ab6958
Binary files a/themes/sounds/S_Touch_30ms.wav and b/themes/sounds/List_reorder.wav differ
diff --git a/themes/sounds/Slider_sweep.wav b/themes/sounds/Slider_sweep.wav
new file mode 100755 (executable)
index 0000000..11b657c
Binary files /dev/null and b/themes/sounds/Slider_sweep.wav differ
diff --git a/themes/sounds/Tizen_Touch.wav b/themes/sounds/Tizen_Touch.wav
new file mode 100755 (executable)
index 0000000..ef6e6ae
Binary files /dev/null and b/themes/sounds/Tizen_Touch.wav differ
diff --git a/themes/sounds/Waterdrop.wav b/themes/sounds/Waterdrop.wav
deleted file mode 100755 (executable)
index adb7da0..0000000
Binary files a/themes/sounds/Waterdrop.wav and /dev/null differ
diff --git a/themes/sounds/button-pressed.wav b/themes/sounds/button-pressed.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/button-pressed.wav and /dev/null differ
diff --git a/themes/sounds/button-toggle-off.wav b/themes/sounds/button-toggle-off.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/button-toggle-off.wav and /dev/null differ
diff --git a/themes/sounds/button-toggle-on.wav b/themes/sounds/button-toggle-on.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/button-toggle-on.wav and /dev/null differ
diff --git a/themes/sounds/dialog-cancel.wav b/themes/sounds/dialog-cancel.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/dialog-cancel.wav and /dev/null differ
diff --git a/themes/sounds/dialog-error.wav b/themes/sounds/dialog-error.wav
deleted file mode 100755 (executable)
index 9ce5f26..0000000
Binary files a/themes/sounds/dialog-error.wav and /dev/null differ
diff --git a/themes/sounds/dialog-information.wav b/themes/sounds/dialog-information.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/dialog-information.wav and /dev/null differ
diff --git a/themes/sounds/dialog-ok.wav b/themes/sounds/dialog-ok.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/dialog-ok.wav and /dev/null differ
diff --git a/themes/sounds/dialog-question.wav b/themes/sounds/dialog-question.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/dialog-question.wav and /dev/null differ
diff --git a/themes/sounds/dialog-warning.wav b/themes/sounds/dialog-warning.wav
deleted file mode 100755 (executable)
index 9ce5f26..0000000
Binary files a/themes/sounds/dialog-warning.wav and /dev/null differ
diff --git a/themes/sounds/drag-accept.wav b/themes/sounds/drag-accept.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/drag-accept.wav and /dev/null differ
diff --git a/themes/sounds/drag-fail.wav b/themes/sounds/drag-fail.wav
deleted file mode 100755 (executable)
index 9ce5f26..0000000
Binary files a/themes/sounds/drag-fail.wav and /dev/null differ
diff --git a/themes/sounds/drag-start.wav b/themes/sounds/drag-start.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/drag-start.wav and /dev/null differ
diff --git a/themes/sounds/link-pressed.wav b/themes/sounds/link-pressed.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/link-pressed.wav and /dev/null differ
diff --git a/themes/sounds/menu-click.wav b/themes/sounds/menu-click.wav
deleted file mode 100755 (executable)
index 99ba74d..0000000
Binary files a/themes/sounds/menu-click.wav and /dev/null differ
diff --git a/themes/sounds/menu-popup.wav b/themes/sounds/menu-popup.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/menu-popup.wav and /dev/null differ
diff --git a/themes/sounds/tooltip-popup.wav b/themes/sounds/tooltip-popup.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/tooltip-popup.wav and /dev/null differ
diff --git a/themes/sounds/window-new.wav b/themes/sounds/window-new.wav
deleted file mode 100755 (executable)
index cac3185..0000000
Binary files a/themes/sounds/window-new.wav and /dev/null differ
index 1b6a157..188763d 100644 (file)
@@ -49,6 +49,24 @@ externals {
 }
 
 collections {
+   sounds {
+      sample {
+         name: "touch_sound" RAW;
+         source: "Tizen_Touch.wav";
+      }
+   }
+   sounds {
+      sample {
+         name: "sweep_sound" RAW;
+         source: "Slider_sweep.wav";
+      }
+   }
+   sounds {
+      sample {
+         name: "reorder_sound" RAW;
+         source: "List_reorder.wav";
+      }
+   }
 #include "widgets/access.edc"
 #include "widgets/badge.edc"
 #include "widgets/bg.edc"
@@ -70,7 +88,6 @@ collections {
 #include "widgets/layout.edc"
 #include "widgets/map.edc"
 #include "widgets/multibuttonentry.edc"
-//#include "widgets/multisense_ui.edc"
 #include "widgets/naviframe.edc"
 #include "widgets/notify.edc"
 #include "widgets/panes.edc"
@@ -110,6 +127,8 @@ collections {
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
+               rel1.offset: -4 -4;
+               rel2.offset: 4 4;
                image {
                   normal: "00_focus.png";
                   border: 7 7 7 7;
@@ -145,40 +164,5 @@ collections {
          }
       }
    }
-
-/*
-sounds{
-        sound : "drag-start.wav" 0 100;
-        sound :"drag-accept.wav" 0 100;
-        sound :"button-pressed.wav" 0 100;
-       sound :"Waterdrop.wav" 0 100;
-}
-
-haptics{
-    haptic {
-      name:"1_haptic" ;
-      magnitude: 8000 ;
-      duration: 120 ;
-      attack_level: 123 ;
-      attack_time: 122 ;
-      fade_level: 16 ;
-     fade_time: 12 ;
-     type: MAGSWEEP ;
-     pattern:"01,00,01,00,0A,00,14,00,00,00,20,01,00,00,7F,00,00,E1,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-   }
-   haptic{
-        name: "2_haptic" ;
-        magnitude: 10000 ;
-        duration: 12 ;
-        attack_level: 123 ;
-        attack_time: 120 ;
-        fade_level: 16 ;
-        fade_time: 12 ;
-        type: MAGSWEEP ;
-        pattern: "01,00,03,00,38,00,42,00,00,00,19,00,21,00,F1,E0,01,E2,00,00,F1, E0, 02, E2, 01,1D,F1,E0,01,E2,03,BA,F1,E0,02,E2,04,E0,FF,20,17,00,00,7F,D1,2F,81,30,00,00,F4,01,00,00,00,20,1F,00,00,40,01,96,41,00,00,00,12,00,24,00,54,00,69,00,6D,00,65,00,6C,00,69,00,6E,00,65,00,00,00,50,00,65,00,72,00,69,00,6F,00,64,00,69,00,63,00,00,00,50,00,65,00,72,00,69,00,6F,00,64,00,69,00,63,00,20,00,23,00,31,00,00,00" ;
-   }
-}
-*/
-
 }
 
index e7a4da9..df9502f 100644 (file)
 #define BUTTON_LANDSCAPE_DISABLED 0
 #define BUTTON_LANDSCAPE_ENABLED 1
 
-   sounds {
-      sample {
-         name: "touch_sound" AS_IS;
-         source: "S_Touch_30ms.wav";
-      }
-   }
-
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/style1";
       alias: "elm/button/base/text_only/style1";
       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";
       }
          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;
       }
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                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;
             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;
       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;
                   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;
             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;
             }
          }
          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;
             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;
 
 ///////////////////////////////////////////////////////////////////////////////////////
    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;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                   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;
             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;
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   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 {
          }
       }
    }
-
+*/
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/popup_button/default";
       alias: "elm/button/base/popup_button/menustyle";
          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;
       }
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
-            effect: SHADOW BOTTOM;
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Bold";
-                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_popup_button";
                   min: 0 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_popup_button_pressed";
+                  min: 0 0;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3488,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;
       }
@@ -3620,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;
@@ -3637,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;
@@ -3655,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;
@@ -4199,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;
       }
@@ -4282,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;
@@ -4306,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;
@@ -4693,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";
@@ -5424,60 +5463,28 @@ 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";
-      }
+   group { name: "elm/button/base/naviframe/title_icon";
       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;
+      images {
+         image: "00_icon_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
+            type: RECT;
             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";
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
+            description { state: "landscape" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
             }
          }
          part { name: "focus_image";
@@ -5485,14 +5492,11 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             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;
+                  normal: "00_icon_focus.png";
                   border_scale: 1;
                }
             }
@@ -5501,420 +5505,52 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                visible: 1;
             }
          }
-         part { name: "padding_left_top";
-            type: RECT;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
-            mouse_events: 0;
+            clip_to: "elm.icon.clipper";
             description { state: "default" 0.0;
                visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC;
-               fixed: 1 1;
+               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
+               align: 0.5 0.5;
+               rel1 { to: "button_image"; }
+               rel2 { to: "button_image"; }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_right_bottom";
+         part { name: "elm.icon.clipper";
             type: RECT;
-            scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
-         part { name: "padding_text_left_top";
+         part { name: "over2";
             type: RECT;
-            scale: 1;
-            mouse_events: 0;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_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;
+               color: 0 0 0 0;
             }
          }
-         part { name: "padding_text_right_bottom";
+         part { name: "over3";
             type: RECT;
-            scale: 1;
-            mouse_events: 0;
+            repeat_events: 1;
             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;
+               color: 0 0 0 0;
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
-            scale: 1;
+         part { name: "disabler";
+            type: RECT;
             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";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               min: 6 5;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "elm.text";
-               }
-               visible: 0;
-               rel2.to: "elm.text";
-            }
-         }
-         part { name: "icon";
-            scale: 1;
-            clip_to: "icon_clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC;
-               max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "icon_padding";
-                  to_y: "elm.text";
-                  offset: 0 6;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "icon_padding";
-                  to_y: "elm.text";
-               }
-               image.normal: "00_button_icon_arrow.png";
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_arrow_press.png";
-            }
-         }
-         part { name: "icon_clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC;
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "elm.text";
-            target: "icon";
-            target: "icon_clipper";
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-               set_state(PART:"icon", "default", 0.0);
-               set_state(PART:"icon_clipper", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "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 {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_icon_focus.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-            }
-            description { state: "landscape" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_icon_focus.png";
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "elm.icon.clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
-               align: 0.5 0.5;
-               rel1 { to: "button_image"; }
-               rel2 { to: "button_image"; }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.icon.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            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;
+               color: 0 0 0 0;
                visible: 0;
             }
             description { state: "disabled" 0.0;
@@ -6052,12 +5688,12 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC;
             }
             description { state: "landscape" 0.0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC;
             }
          }
          part { name: "button_image";
@@ -6078,22 +5714,53 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                }
             }
          }
+         part { name: "left_padding";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC -1;
+               align: 0.0 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "button_bg"; }
+               rel2 { relative: 0.0 1.0; to: "button_bg"; }
+            }
+         }
+         part { name: "right_padding";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC -1;
+               align: 1.0 0.5;
+               fixed: 1 0;
+               rel1 { relative: 1.0 0.0; to: "button_bg"; }
+               rel2 { relative: 1.0 1.0; to: "button_bg"; }
+            }
+         }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "button_bg";
             description { state: "default" 0.0;
-               rel1.to: "button_bg";
-               rel2.to: "button_bg";
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MAX_INC;
+               rel1 { relative: 1.0 0.0; to: "left_padding"; }
+               rel2 { relative: 0.0 1.0; to: "right_padding"; }
                text {
                   style: "btn_naviframe_title_text";
                   size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
-                  size_range: BUTTON_NAVIFRAME_TITLE_TEXT_MIN_FONT_SIZE_INC BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
-                  fit: 1 0;
-                  min: 0 1;
+                  min: 1 0;
                }
             }
+            description { state: "landscape" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MIN_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MAX_INC;
+            }
          }
          part { name: "over2";
             type: RECT;
@@ -6161,14 +5828,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "change_to_landscape";
             signal: "elm,state,landscape";
             source: "elm";
-            action: STATE_SET "landscape" 0.0;
-            target: "button_bg";
+            script {
+               set_state(PART:"button_bg", "landscape", 0.0);
+               set_state(PART:"elm.text", "landscape", 0.0);
+            }
          }
          program { name: "change_to_portrait";
             signal: "elm,state,portrait";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_bg";
+            script {
+               set_state(PART:"button_bg", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
          }
          program { name: "landscape_mode";
             source: "elm";
@@ -6857,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;
       }
@@ -6966,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;
@@ -6984,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;
@@ -7000,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;
index 784e577..13c9a2a 100644 (file)
 
 #define CHECK_HIDE 0
 #define CHECK_SHOW 1
+
+   styles {
+      style { name: "check_label_textblock_style";
+         base: "font=Tizen:style=Regular font_size="CHECK_DEFAULT_TEXT_FONT_SIZE_INC" color="CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC" wrap=char text_class=tizen";
+         tag: "br" "\n";
+         tag: "ps" "ps";
+         tag: "hilight" "+ font=Tizen:style=Bold";
+         tag: "b" "+ font=Tizen:style=Bold";
+         tag: "whitecolor" "+ color=#ffffff";
+         tag: "tab" "\t";
+      }
+      style { name: "check_label_textblock_style_disable";
+         base: "font=Tizen:style=Regular font_size="CHECK_DEFAULT_TEXT_FONT_SIZE_INC" color="CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC" wrap=char text_class=tizen";
+         tag: "br" "\n";
+         tag: "ps" "ps";
+         tag: "hilight" "+ font=Tizen:style=Bold";
+         tag: "b" "+ font=Tizen:style=Bold";
+         tag: "whitecolor" "+ color=#ffffff";
+         tag: "tab" "\t";
+      }
+   }
+
 ////////////////////////////////////////////////////////////////////////////////
 #define CHECK_STYLE_DEFAULT(style_name, min_width, min_height) \
    group { name: "elm/check/base/"style_name; \
@@ -68,7 +90,6 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_check_press_bg.png"; \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
                inherit: "visible" 0.0; \
             } \
          } \
+         part { name: "pressed_effect"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "bg"; \
+               rel2.to: "bg"; \
+               visible: 0; \
+               image.normal: "00_check_press_bg.png"; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "sequence_clip"; \
             type: RECT; \
             mouse_events: 0; \
                   style: "check_label_textblock_style"; \
                   min: 0 0; \
                } \
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \
             } \
             description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
             description { state: "disabled_visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
-               text.min: 1 1; \
-               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; \
+               text { \
+                  style: "check_label_textblock_style_disable"; \
+                  min: 1 1; \
+               } \
             } \
          } \
          part { name: "events1"; \
             action: STATE_SET "default" 0.0; \
             target: "bg"; \
             target: "check"; \
+            target: "pressed_effect"; \
          } \
          program { name: "pressed"; \
             signal: "mouse,down,1"; \
             action: STATE_SET "pressed" 0.0; \
             target: "bg"; \
             target: "check"; \
+            target: "pressed_effect"; \
          } \
          program { name: "mouse,out"; \
             signal: "mouse,out"; \
@@ -419,6 +457,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
       images { \
          image: "00_check_bg.png" COMP; \
          image: "00_check_dim_bg.png" COMP; \
+         image: "00_check_press_bg.png" COMP; \
          image: "00_check_activated_dim.png" COMP; \
          image: "00_check_activated.png" COMP; \
       } \
@@ -455,7 +494,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_check_press_bg.png"; \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
@@ -488,6 +526,20 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                inherit: "visible" 0.0; \
             } \
          } \
+         part { name: "pressed_effect"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "bg"; \
+               rel2.to: "bg"; \
+               visible: 0; \
+               image.normal: "00_check_press_bg.png"; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "sequence_clip"; \
             type: RECT; \
             mouse_events: 0; \
@@ -557,7 +609,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                   style: "check_label_textblock_style"; \
                   min: 0 0; \
                } \
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \
             } \
             description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
@@ -570,8 +621,10 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
             description { state: "disabled_visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
-               text.min: 1 1; \
-               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; \
+               text { \
+                  style: "check_label_textblock_style_disable"; \
+                  min: 1 1; \
+               } \
             } \
          } \
          part { name: "disclip"; \
@@ -623,6 +676,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                     set_state(PART:"check", "default", 0.0); \
                  } \
                set_state(PART:"bg", "default", 0.0); \
+               set_state(PART:"pressed_effect", "default", 0.0); \
             } \
          } \
          program { name: "pressed"; \
@@ -635,6 +689,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                     set_state(PART:"check", "pressed", 0.0); \
                  } \
                set_state(PART:"bg", "pressed", 0.0); \
+               set_state(PART:"pressed_effect", "pressed", 0.0); \
             } \
          } \
          program { name: "mouse,out"; \
@@ -904,7 +959,6 @@ CHECK_STYLE_DEFAULT_GENLIST("default/genlist", CHECK_STYLE_DEFAULT_DEFAULT_BG_IM
                   style: "check_label_textblock_style"; \
                   min: 0 0; \
                } \
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \
             } \
             description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
@@ -917,8 +971,10 @@ CHECK_STYLE_DEFAULT_GENLIST("default/genlist", CHECK_STYLE_DEFAULT_DEFAULT_BG_IM
             description { state: "disabled_visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
-               text.min: 1 1; \
-               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; \
+               text { \
+                  style: "check_label_textblock_style_disable"; \
+                  min: 1 1; \
+               } \
             } \
          } \
          part { name: "events1"; \
@@ -1082,18 +1138,6 @@ CHECK_STYLE_DEFAULT_GENLIST("default/genlist", CHECK_STYLE_DEFAULT_DEFAULT_BG_IM
 ////////////////////////////////////////////////////////////////////////////////
 CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC)
 ////////////////////////////////////////////////////////////////////////////////
-   styles {
-      style { name: "check_label_textblock_style";
-         base: "font=Tizen:style=Roman font_size="CHECK_DEFAULT_TEXT_FONT_SIZE_INC" color=#ffffff wrap=char text_class=tizen";
-         tag: "br" "\n";
-         tag: "ps" "ps";
-         tag: "hilight" "+ font=Tizen:style=Bold";
-         tag: "b" "+ font=Tizen:style=Bold";
-         tag: "whitecolor" "+ color=#ffffff";
-         tag: "tab" "\t";
-      }
-   }
-
    group { name: "elm/check/base/on&off";
       images {
          image: "00_button_on_handler.png" COMP;
@@ -1439,7 +1483,6 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_
                   style: "check_label_textblock_style";
                   min: 0 0;
                }
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -1452,7 +1495,10 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               text.min: 1 1;
+               text {
+                  style: "check_label_textblock_style_disable";
+                  min: 1 1;
+               }
             }
          }
          part { name: "disclip";
@@ -1669,16 +1715,18 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_
                else
                  set_state(PART:"elm.text", "default", 0.0);
                get_state(PART:"bg_image", st, 30, vl);
-               if (!strcmp(st, "visible_disable"))
+               if (!strcmp(st, "visible_disable")) {
                  set_state(PART:"bg_image", "visible", 0.0);
-               else
+                 set_state(PART:"button", "on", 0.0);
+               } else {
                  set_state(PART:"bg_image", "default", 0.0);
+                 set_state(PART:"button", "default", 0.0);
+               }
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (!strcmp(st, "visible"))
                  set_state(PART:"elm.swallow.content", "visible", 0.0);
                else
                  set_state(PART:"elm.swallow.content", "default", 0.0);
-               set_state(PART:"button", "default", 0.0);
             }
          }
          program { name: "to_rtl";
@@ -1811,7 +1859,6 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_
                  style: "check_label_textblock_style"; \
                  min: 0 0; \
                } \
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \
             } \
             description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
@@ -1824,8 +1871,10 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_
             description { state: "disabled_visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
-               text.min: 1 1; \
-               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; \
+               text { \
+                 style: "check_label_textblock_style_disable"; \
+                 min: 1 1; \
+               } \
             } \
          } \
          part { name: "disclip"; \
@@ -1967,10 +2016,13 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
 ////////////////////////////////////////////////////////////////////////////////
 
    group { name: "elm/check/base/grid";
-      images.image: "00_check_bg.png" COMP;
-      images.image: "00_check_dim_bg.png" COMP;
-      images.image: "00_check_activated_dim.png" COMP;
-      images.image: "00_check_activated.png" COMP;
+      images {
+         image: "00_check_bg.png" COMP;
+         image: "00_check_dim_bg.png" COMP;
+         image: "00_check_activated_dim.png" COMP;
+         image: "00_check_activated.png" COMP;
+         image: "00_check_press_bg.png" COMP;
+      }
       script {
          public check_state = CHECK_STATE_DEFAULT;
          public check_visible = CHECK_HIDE;
@@ -2052,6 +2104,20 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                image.normal: "00_check_activated_dim.png";
             }
          }
+         part { name: "pressed_effect";
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "bg2";
+               rel2.to: "bg2";
+               visible: 0;
+               image.normal: "00_check_press_bg.png";
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "sequence_clip";
             type: RECT;
             mouse_events: 0;
@@ -2126,7 +2192,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                   style: "check_label_textblock_style";
                   min: 0 0;
                }
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -2139,8 +2204,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               text.min: 1 1;
-               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC;
+               text {
+                  style: "check_label_textblock_style_disable";
+                  min: 1 1;
+               }
             }
          }
          part { name: "events";
@@ -2186,6 +2253,12 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                set_state(PART:"bg2", "default", 0.0);
             }
          }
+         program { name: "unpress";
+            signal: "mouse,up,1";
+            source: "events";
+            action: STATE_SET "default" 0.0;
+            target: "pressed_effect";
+         }
          program { name: "pressed";
             signal: "mouse,down,1";
             source: "events";
@@ -2198,6 +2271,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                     set_state(PART:"check", "pressed", 0.0);
                     set_state(PART:"bg2", "visible", 0.0);
                  }
+              set_state(PART:"pressed_effect", "pressed", 0.0);
             }
          }
          program { name: "mouse,out";
@@ -2216,6 +2290,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                     set_state(PART:"sequence_clip", "default", 0.0);
                     set_state(PART:"bg2", "default", 0.0);
                  }
+              set_state(PART:"pressed_effect", "default", 0.0);
             }
          }
          program { name: "check_on";
index 6930820..aa24cbd 100644 (file)
  * limitations under the License.
  */
 
-   sounds {
-      sample {
-         name: "touch_sound" AS_IS;
-         source: "S_Touch_30ms.wav";
-      }
-   }
-
 group {
    name: "elm/colorselector/palette/default";
    data.item: "horizontal_pad" COLORSELECTOR_PORTRAIT_HOR_PAD_INC;
index 8e5b3b2..784587a 100644 (file)
 #define CTXPOPUP_LIST_SHADOW_PADDING 3
 
 ///////////////////////////////////////////////////////////////////////////////
-sounds {
-   sample {
-      name: "touch_sound" RAW;
-      source: "button-pressed.wav";
-   }
-}
+
 group {
    name: "elm/ctxpopup/layout/default";
    alias: "elm/ctxpopup/layout/copypaste";
@@ -2731,7 +2726,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            color: CTXPOPUP_SEPARATOR_COLOR_INC;
+            color: CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC;
             align: 0 0.5;
             min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC;
             max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC;
@@ -2750,7 +2745,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            color: CTXPOPUP_SEPARATOR2_COLOR_INC;
+            color: CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC;
             rel1 { relative: 1.0 0.0; to_x: "separator1"; }
             align: 0 0.5;
             min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC;
@@ -3678,8 +3673,8 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC;
-            max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
+            min: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC;
+            max: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
             fixed: 1 0;
             align: 1.0 0.5;
          }
@@ -4212,357 +4207,3 @@ group {
       }
    }
 }
-///////////////////////////////////////////////////////////////////////////////
-group {
-   name: "elm/ctxpopup/text_style_item/toolbar_segmentedcontrol";
-
-   images {
-      image: "00_more_popup_press.png" COMP;
-   }
-
-   data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC;
-
-   parts {
-      part {
-         name: "event_blocker";
-         type: RECT;
-         mouse_events: 1;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "bg";
-         mouse_events: 0;
-         type: IMAGE;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) 1;
-            max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
-         }
-         description {
-            state: "clicked" 0.0;
-            visible: 1;
-            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
-            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
-            image {
-               normal: "00_more_popup_press.png";
-               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
-               border_scale: 1;
-            }
-         }
-      }
-      part {
-         name: "bg_press_left_padding";
-         mouse_events: 0;
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
-            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
-            align: 0 0.5;
-         }
-      }
-      part {
-         name: "bg_press_right_padding";
-         mouse_events: 0;
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
-            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
-            align: 1 0.5;
-         }
-      }
-      part {
-         name: "bg_press_top_padding";
-         mouse_events: 0;
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
-            max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
-            rel1 {to: "separator2"; relative: 0.0 1.0;}
-            align: 0.5 0;
-         }
-      }
-      part {
-         name: "bg_press_bottom_padding";
-         mouse_events: 0;
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
-            max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
-            align: 0.5 1;
-         }
-      }
-      part {
-         name: "separator1";
-         mouse_events: 0;
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            color: CTXPOPUP_SEPARATOR_COLOR_INC;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
-            align: 0.5 0;
-            min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC;
-            max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC;
-            visible: 0;
-         }
-         description {
-            state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "separator2";
-         mouse_events: 0;
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            color: CTXPOPUP_SEPARATOR2_COLOR_INC;
-            rel1 { relative: 0.0 1.0; to: "separator1";}
-            rel2 { relative: 1.0 1.0; to: "separator1"; offset: 0 0; }
-            align: 0.5 0;
-            fixed: 0 1;
-            min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC;
-            max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC;
-            visible: 0;
-         }
-         description {
-            state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part {
-         name: "left_padding";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
-            max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
-            align: 0 0;
-            fixed: 1 1;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
-            align: 0.5 0.5;
-            rel1 {relative: 1.0 0.0; to_x: "left_padding"; to_y: "bg";}
-            rel2 {relative: 0.0 1.0; to_x: "right_padding"; to_y: "bg";}
-            color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC;
-            text {
-               font: "Tizen:style=Regular";
-               size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC;
-               size_range: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC;
-               align: 0.5 0.5;
-               min: 1 1;
-               text_class: "list_item";
-            }
-         }
-         description {
-            state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC;
-            text.min: 0 1;
-         }
-         description {
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
-         }
-         description {
-            state: "ellipsis" 0.0;
-            inherit: "default" 0.0;
-            min: CTXPOPUP_TEXT_MAX_INC CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
-            text.min: 0 1;
-         }
-         description {
-            state: "ellipsis_disabled" 0.0;
-            inherit: "ellipsis" 0.0;
-            color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
-         }
-      }
-      part {
-         name: "right_padding";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
-            max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
-            fixed: 1 1;
-            align: 1.0 1.0;
-         }
-      }
-      part {
-         name: "over1";
-         type: RECT;
-         mouse_events: 1;
-         repeat_events: 1;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "over2";
-         type: RECT;
-         mouse_events: 1;
-         repeat_events: 1;
-         dragable {
-            x: 1 1 0;
-            y: 1 1 0;
-         }
-         description {
-            state: "default" 0.0;
-            rel1.to:"bg";
-            rel2.to:"bg";
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "disclip";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "disabled" 0.0;
-            visible: 1;
-            color: CTXPOPUP_ITEM_DISABLED_COLOR;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "text_ellipsis";
-         signal: "elm,state,text,ellipsis";
-         source: "elm";
-         action: STATE_SET "ellipsis" 0.0;
-         target: "elm.text";
-      }
-      program {
-         name: "item_unclick";
-         signal: "mouse,clicked,1";
-         source: "over1";
-         action: SIGNAL_EMIT "elm,action,click" "";
-         after: "touch_snd";
-      }
-      program {
-         name: "touch_snd";
-         action: PLAY_SAMPLE "touch_sound" 1.0;
-      }
-      program {
-         name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled")))
-              set_state(PART:"elm.text", "ellipsis_disabled", 0.0);
-            else
-              set_state(PART:"elm.text", "disabled", 0.0);
-
-            set_state(PART:"disclip", "disabled", 0.0);
-         }
-      }
-      program {
-         name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled")))
-              set_state(PART:"elm.text", "ellipsis", 0.0);
-            else
-              set_state(PART:"elm.text", "default", 0.0);
-
-            set_state(PART:"disclip", "default", 0.0);
-         }
-      }
-      program {
-         name: "default";
-         signal: "elm,state,default";
-         source: "elm";
-         script {
-            set_state(PART:"separator1", "default", 0.0);
-            set_state(PART:"separator2", "default", 0.0);
-         }
-      }
-      program {
-         name: "separator";
-         signal: "elm,state,separator";
-         source: "elm";
-         script {
-            set_state(PART:"separator1", "visible", 0.0);
-            set_state(PART:"separator2", "visible", 0.0);
-         }
-      }
-      program {
-         name: "item_click2";
-         signal: "mouse,down,1";
-         source: "over2";
-         script {
-            set_state(PART:"elm.text", "clicked", 0.0);
-            set_state(PART:"bg", "clicked", 0.0);
-         }
-      }
-      program {
-         name: "drag";
-         signal: "drag";
-         source: "over2";
-         script {
-            new Float:dx, Float:dy;
-            get_drag(PART:"over2", dx, dy);
-            if ((abs(dx) > 20) || (abs(dy) > 20)) {
-               set_drag(PART:"over2", 0.0, 0.0);
-               set_state(PART:"bg", "default", 0.0);
-            }
-            set_drag(PART:"over2", 0.0, 0.0);
-         }
-      }
-      program {
-         name: "item_unclick2";
-         signal: "mouse,up,1";
-         source: "over2";
-         script {
-            set_drag(PART:"over2", 0.0, 0.0);
-            set_state(PART:"bg", "default", 0.0);
-         }
-      }
-   }
-}
index 5095804..0665a46 100644 (file)
@@ -282,3 +282,461 @@ group { name: "elm/datetime/base/default";
       }
    }
 }
+group { name: "elm/spinner/base/default";
+   alias: "elm/spinner/base/datetime_popup";
+   alias: "elm/spinner/base/datetime_popup/year";
+   alias: "elm/spinner/base/datetime_popup/month";
+   alias: "elm/spinner/base/datetime_popup/date";
+   alias: "elm/spinner/base/datetime_popup/hour";
+   alias: "elm/spinner/base/datetime_popup/minute";
+   images {
+      image: "00_picker_arrow_down.png" COMP;
+      image: "00_picker_arrow_up.png" COMP;
+      image: "00_picker_arrow_down_press_web.png" COMP;
+      image: "00_picker_arrow_up_press_web.png" COMP;
+      image: "00_button_01.png" COMP;
+      image: "00_button_01_press.png" COMP;
+   }
+   parts {
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "up.image";
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            min: SPINNER_UP_DOWN_IMAGE_SIZE_INC;
+            max: SPINNER_UP_DOWN_IMAGE_SIZE_INC;
+            image {
+               normal: "00_button_01.png";
+               border: SPINNER_UP_DOWN_IMAGE_BORDER_SIZE_INC;
+               border_scale: 1;
+            }
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "00_button_01_press.png";
+         }
+      }
+      part { name: "up.image.arrow";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "up.image";
+            rel2.to: "up.image";
+            min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
+            max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
+            image.normal: "00_picker_arrow_up.png";
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "00_picker_arrow_up_press_web.png";
+         }
+      }
+      part { name: "down.image";
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.5 1.0;
+            min: SPINNER_UP_DOWN_IMAGE_SIZE_INC;
+            max: SPINNER_UP_DOWN_IMAGE_SIZE_INC;
+            image {
+               normal: "00_button_01.png";
+               border: SPINNER_UP_DOWN_IMAGE_BORDER_SIZE_INC;
+               border_scale: 1;
+            }
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "00_button_01_press.png";
+         }
+      }
+      part { name: "down.image.arrow";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "down.image";
+            rel2.to: "down.image";
+            min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
+            max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
+            image.normal: "00_picker_arrow_down.png";
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "00_picker_arrow_down_press_web.png";
+         }
+      }
+      part { name: "elm.text";
+         type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 1;
+            color: SPINNER_ENTRY_TEXT_COLOR_INC;
+            min: 0 SPINNER_TEXT_HEIGHT_INC;
+            max: -1 SPINNER_TEXT_HEIGHT_INC;
+            text {
+               font: "Tizen:style=Regular";
+               size: SPINNER_ENTRY_TEXT_SIZE_INC;
+               min: 0 0;
+               max: 1 0;
+               text_class: "tizen";
+            }
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "button.events";
+         type: RECT;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            fixed: 1 1;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "elm.swallow.entry";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            fixed: 1 1;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "up.btn";
+         type: RECT;
+         repeat_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+           rel1.to: "up.image";
+           rel2.to: "up.image";
+           color: 0 0 0 0;
+         }
+      }
+      part { name: "down.btn";
+         type: RECT;
+         repeat_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+           rel1.to: "down.image";
+           rel2.to: "down.image";
+           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: "text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         action:  STATE_SET "visible" 0.0;
+         target: "elm.text";
+      }
+      program { name: "text_hide";
+         signal: "elm,state,text,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "dec_start_signal_emit";
+         action: SIGNAL_EMIT "elm,action,decrement,start" "";
+      }
+      program { name: "dec_stop_signal_emit";
+         action: SIGNAL_EMIT "elm,action,decrement,stop" "";
+      }
+      program { name: "inc_start_signal_emit";
+         action: SIGNAL_EMIT "elm,action,increment,start" "";
+      }
+      program { name: "inc_stop_signal_emit";
+         action: SIGNAL_EMIT "elm,action,increment,stop" "";
+      }
+      program { name: "dec";
+         signal: "mouse,down,1*";
+         source: "down.btn";
+         action:  STATE_SET "pressed" 0.0;
+         target: "down.image";
+         target: "down.image.arrow";
+         after: "dec_start_signal_emit";
+      }
+      program { name: "dec2";
+         signal: "mouse,up,1";
+         source: "down.btn";
+         action:  STATE_SET "default" 0.0;
+         target: "down.image";
+         target: "down.image.arrow";
+         after: "dec_stop_signal_emit";
+      }
+      program { name: "inc";
+         signal: "mouse,down,1*";
+         source: "up.btn";
+         action:  STATE_SET "pressed" 0.0;
+         target: "up.image";
+         target: "up.image.arrow";
+         after: "inc_start_signal_emit";
+      }
+      program { name: "inc2";
+         signal: "mouse,up,1";
+         source: "up.btn";
+         action:  STATE_SET "default" 0.0;
+         target: "up.image";
+         target: "up.image.arrow";
+         after: "inc_stop_signal_emit";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "disabler";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "disabler";
+      }
+      program { name: "active";
+         signal: "elm,state,active";
+         source: "elm";
+         action: STATE_SET "active" 0.0;
+         target: "elm.text";
+         target: "elm.swallow.entry";
+      }
+      program { name: "inactive";
+         signal: "elm,state,inactive";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+         target: "elm.swallow.entry";
+      }
+      program { name: "toggle_text";
+         signal: "mouse,up,1";
+         source: "button.events";
+         action: SIGNAL_EMIT "elm,action,entry,toggle" "";
+      }
+   }
+}
+
+group { name: "elm/spinner/base/datetime_popup/ampm";
+   inherit: "elm/spinner/base/default";
+
+   parts {
+      part { name: "block.events";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+         }
+      }
+   }
+}
+
+group { name: "elm/layout/datetime_popup/date_layout";
+
+   parts {
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: DATETIME_POPUP_CONTENT_SIZE_INC;
+            max: DATETIME_POPUP_CONTENT_SIZE_INC;
+         }
+      }
+      part { name: "top.padding";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: 0 0;
+            max: -1 0;
+            rel1.to: "bg";
+            rel2 {
+               relative: 1.0 0.0;
+               to: "bg";
+            }
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bottom.padding";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: 0 0;
+            max: -1 0;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "bg";
+            }
+            rel2.to: "bg";
+            align: 0.5 1.0;
+         }
+      }
+      part { name: "left.padding";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: DATETIME_POPUP_CONTENT_LEFT_PADDING_WIDTH_INC 0;
+            max: DATETIME_POPUP_CONTENT_LEFT_PADDING_WIDTH_INC -1;
+            rel1 {
+               relative: 0.0 1.0;
+               to_x: "bg";
+               to_y: "top.padding";
+            }
+            rel2 {
+               relative: 0.0 0.0;
+               to_x: "bg";
+               to_y: "bottom.padding";
+            }
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "right.padding";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: DATETIME_POPUP_CONTENT_RIGHT_PADDING_WIDTH_INC 0;
+            max: DATETIME_POPUP_CONTENT_RIGHT_PADDING_WIDTH_INC -1;
+            rel2.to: "bg";
+            rel1 {
+               relative: 1.0 1.0;
+               to_x: "bg";
+               to_y: "top.padding";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               to_x: "bg";
+               to_y: "bottom.padding";
+            }
+            align: 1.0 0.5;
+         }
+      }
+      part { name: "field0";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "left.padding";
+            }
+            rel2.to: "left.padding";
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "center.padding1";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 0;
+            max: DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC -1;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "field0";
+            }
+            rel2.to: "field0";
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "field1";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "center.padding1";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               to: "center.padding2";
+            }
+         }
+      }
+      part { name: "center.padding2";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            min: DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 0;
+            max: DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC -1;
+            rel1.to: "field2";
+            rel2 {
+               relative: 0.0 1.0;
+               to: "field2";
+            }
+            align: 1.0 0.5;
+         }
+      }
+      part { name: "field2";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 0;
+            rel1.to: "right.padding";
+            rel2 {
+               relative: 0.0 1.0;
+               to: "right.padding";
+            }
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "event_area";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+}
+
+group { name: "elm/layout/datetime_popup/time_layout";
+   inherit: "elm/layout/datetime_popup/date_layout";
+
+   parts {
+      part { name: "hour.minute.color";
+         type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "center.padding1";
+            rel2.to: "center.padding1";
+            color: DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC;
+            text {
+               font: "Tizen:style=Regular";
+               size: DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC;
+               min: 0 0;
+               text_class: "tizen";
+               text: ":";
+            }
+         }
+      }
+   }
+}
index 639dd12..bae7276 100644 (file)
 #define ENTRY_BLOCK_HANDLE_SOURCE10 "elm/entry/selection/block_handle_edge_left"
 #define ENTRY_BLOCK_HANDLE_SOURCE11 "elm/entry/selection/block_handle_edge_right"
 
-#define ENTRY_FOCUS_DATA \
-   data.item: "focus_highlight" "on";
-
 #define ENTRY_EDITFIELD_FOCUS_DATA \
-   data.item: "focus_highlight" "off";
-
-#define ENTRY_FOCUS_IMAGE \
-   images { \
-      image: "00_focus.png" COMP; \
-   }
+   data.item: "focus_highlight" "on";
 
 #define ENTRY_EDITFIELD_FOCUS_IMAGE \
    images { \
       image: "00_eidt_field_bg.png" COMP; \
    }
 
-#define ENTRY_TEXTBLOCK_DEFAULT_REL \
+#define ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL \
    rel1 { \
       to_x: "focus_left_padding"; \
       relative: 1.0 0.0; \
    } \
    rel2 { \
-      to_x: "editfield_space"; \
+      to_x: "clear_padding"; \
       relative: 0.0 1.0; \
    }
 
-#define ENTRY_SWALLOW_SCRIPT_PUBLIC \
+#define ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC \
    script { \
       public scroll_enabled; \
    }
 
-#define ENTRY_SWALLOW_PARTS \
-   part { name: "editfield_space"; \
+#define ENTRY_EDITFIELD_SWALLOW_PARTS \
+   part { name: "clear_padding"; \
       type: SPACER; \
       scale: 1; \
       description { state: "default" 0.0; \
          align: 1.0 0.5; \
          min: 0 0; \
          max: 0 0; \
+         fixed: 1 0; \
          rel1 { \
             to_x: "focus_right_padding"; \
             relative: 0.0 0.0; \
             relative: 0.0 1.0; \
          } \
       } \
-      description { state: "rename_visible" 0.0; \
-         inherit: "default" 0.0; \
-         min: 9 0; \
-         max: 9 0; \
-         rel1 { \
-            to_x: "elm.swallow.rename"; \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "elm.swallow.rename"; \
-            relative: 0.0 1.0; \
-         } \
-      } \
-      description { state: "clear_visible" 0.0; \
-         inherit: "default" 0.0; \
-         min: 9 0; \
-         max: 9 0; \
-         rel1 { \
-            to_x: "elm.swallow.clear"; \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "elm.swallow.clear"; \
-            relative: 0.0 1.0; \
-         } \
-      } \
-   } \
-   part { name: "elm.swallow.clear"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 1; \
-         rel1 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 1.0; \
-         } \
-         visible: 0; \
-      } \
       description { state: "visible" 0.0; \
          inherit: "default" 0.0; \
-         visible: 1; \
+         min: 70 0; \
+         max: 70 0; \
       } \
    } \
-   part { name: "elm.swallow.rename"; \
+   part { name: "elm.swallow.clear"; \
       type: SWALLOW; \
       scale: 1; \
       description { state: "default" 0.0; \
       } \
    }
 
-#define ENTRY_FOCUS_PARTS \
-   part { name: "focus_bg"; \
-      type: RECT; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         visible: 0; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   } \
-   part { name: "focus_left_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: 10 0; \
-         max: 10 0; \
-         fixed: 1 0; \
-         align: 0.0 0.5; \
-         rel1 { \
-            to_x: "focus_bg"; \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "focus_bg"; \
-            relative: 0.0 1.0; \
-         } \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "focus_right_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: 10 0; \
-         max: 10 0; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1 { \
-            to_x: "focus_bg"; \
-            relative: 1.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "focus_bg"; \
-            relative: 1.0 1.0; \
-         } \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "focus_image"; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         visible: 0; \
-         image { \
-            normal: "00_focus.png"; \
-            border: 6 6 6 6; \
-            border_scale: 1; \
-         } \
-         rel1 { \
-            to_x: "focus_bg"; \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "focus_bg"; \
-            relative: 1.0 1.0; \
-         } \
-      } \
-      description { state: "focused" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   }
-
 #define ENTRY_EDITFIELD_FOCUS_PARTS \
    part { name: "focus_bg"; \
       type: IMAGE; \
       } \
    }
 
-#define ENTRY_SWALLOW_PROGRAMS \
+#define ENTRY_EDITFIELD_SWALLOW_PROGRAMS \
    program { name: "scroll_enabled"; \
       signal: "elm,state,scroll,enabled"; \
       source: "*"; \
          v = get_int(scroll_enabled); \
          if (!v) { \
             set_state(PART:"elm.swallow.clear", "visible", 0.0); \
-            set_state(PART:"editfield_space", "clear_visible", 0.0); \
+            set_state(PART:"clear_padding", "visible", 0.0); \
          } \
       } \
    } \
          v = get_int(scroll_enabled); \
          if (!v) { \
             set_state(PART:"elm.swallow.clear", "default", 0.0); \
-            set_state(PART:"editfield_space", "default", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "rename_show"; \
-      signal: "elm,state,rename,visible"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.rename", "visible", 0.0); \
-            set_state(PART:"editfield_space", "rename_visible", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "rename_hide"; \
-      signal: "elm,state,rename,hidden"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.rename", "default", 0.0); \
-            set_state(PART:"editfield_space", "default", 0.0); \
-         } \
-      } \
-   }
-
-#define ENTRY_FOCUS_PROGRAMS \
-   program { name: "action_focus"; \
-      signal: "elm,action,focus_highlight,show"; \
-      source: "elm"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_image", "focused", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "action_unfocus"; \
-      signal: "elm,action,focus_highlight,hide"; \
-      source: "elm"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_image", "default", 0.0); \
+            set_state(PART:"clear_padding", "default", 0.0); \
          } \
       } \
    }
       } \
    }
 
-sounds {
-   sample {
-      name: "touch_sound" AS_IS;
-      source: "S_Touch_30ms.wav";
-   }
-}
-
 group { name: "elm/entry/base/default";
    alias: "elm/entry/base-mixedwrap/default";
    data.item: "default_font_size" "24";
@@ -490,10 +305,7 @@ group { name: "elm/entry/base/default";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -538,7 +350,6 @@ group { name: "elm/entry/base/default";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -548,9 +359,7 @@ group { name: "elm/entry/base/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -587,8 +396,6 @@ group { name: "elm/entry/base/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -644,10 +451,7 @@ group { name: "elm/entry/base-charwrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -692,7 +496,6 @@ group { name: "elm/entry/base-charwrap/default";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -702,9 +505,7 @@ group { name: "elm/entry/base-charwrap/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
         program { name: "focus";
         signal: "load";
@@ -741,8 +542,6 @@ group { name: "elm/entry/base-charwrap/default";
         source: "elm.text";
         action: PLAY_SAMPLE "touch_sound" 1.0;
      }
-     ENTRY_SWALLOW_PROGRAMS
-     ENTRY_FOCUS_PROGRAMS
   }
 }
 
@@ -753,10 +552,7 @@ group { name: "elm/entry/base-nowrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -799,7 +595,6 @@ group { name: "elm/entry/base-nowrap/default";
                min: 1 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -809,9 +604,7 @@ group { name: "elm/entry/base-nowrap/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -848,8 +641,6 @@ group { name: "elm/entry/base-nowrap/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -866,7 +657,7 @@ group { name: "elm/entry/base/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -882,7 +673,7 @@ group { name: "elm/entry/base/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -898,7 +689,7 @@ group { name: "elm/entry/base/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -959,7 +750,7 @@ group { name: "elm/entry/base/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -969,9 +760,9 @@ group { name: "elm/entry/base/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1008,7 +799,7 @@ group { name: "elm/entry/base/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1025,7 +816,7 @@ group { name: "elm/entry/base-charwrap/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_textblock_char_wrap_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1041,7 +832,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1057,7 +848,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1118,7 +909,7 @@ group { name: "elm/entry/base-charwrap/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1128,9 +919,9 @@ group { name: "elm/entry/base-charwrap/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1167,7 +958,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1274,7 +1065,7 @@ group { name: "elm/entry/base-single/editfield";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1283,9 +1074,9 @@ group { name: "elm/entry/base-single/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1322,7 +1113,7 @@ group { name: "elm/entry/base-single/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1334,8 +1125,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    styles {
       style { name: "editfield_searchbar_single_textblock_style";
          base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
@@ -1381,7 +1172,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
       }
    }
    parts {
-      ENTRY_FOCUS_PARTS
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1424,7 +1215,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1433,9 +1224,9 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1472,8 +1263,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -1525,13 +1316,10 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    data {
       item: context_menu_orientation "horizontal";
    }
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1576,7 +1364,6 @@ group { name: "elm/entry/base-single/default";
                max: 0 0;
                align: 0.0 0.5;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1585,9 +1372,7 @@ group { name: "elm/entry/base-single/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1624,8 +1409,6 @@ group { name: "elm/entry/base-single/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -2026,10 +1809,7 @@ group { name: "elm/entry/base-noedit/default";
       data {
          item: context_menu_orientation "horizontal";
       }
-      ENTRY_FOCUS_DATA
-      ENTRY_FOCUS_IMAGE
       parts {
-         ENTRY_FOCUS_PARTS
          part { name: "elm.guide";
             type: TEXTBLOCK;
             mouse_events: 0;
@@ -2073,7 +1853,6 @@ group { name: "elm/entry/base-noedit/default";
                  min: 1 1;
                   max: 0 1;
               }
-               ENTRY_TEXTBLOCK_DEFAULT_REL
            }
            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2082,9 +1861,7 @@ group { name: "elm/entry/base-noedit/default";
               }
            }
         }
-         ENTRY_SWALLOW_PARTS
       }
-      ENTRY_SWALLOW_SCRIPT_PUBLIC
       programs {
         program { name: "focus";
             signal: "load";
@@ -2121,8 +1898,6 @@ group { name: "elm/entry/base-noedit/default";
             source: "elm.text";
             action: PLAY_SAMPLE "touch_sound" 1.0;
          }
-         ENTRY_SWALLOW_PROGRAMS
-         ENTRY_FOCUS_PROGRAMS
       }
    }
 
@@ -2178,10 +1953,7 @@ group { name: "elm/entry/base-password/popup";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -2225,7 +1997,6 @@ group { name: "elm/entry/base-password/popup";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -2234,9 +2005,7 @@ group { name: "elm/entry/base-password/popup";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -2273,8 +2042,6 @@ group { name: "elm/entry/base-password/popup";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4759,10 +4526,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4805,7 +4569,6 @@ group { name: "elm/entry/base-single/multibuttonentry";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4814,9 +4577,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4853,8 +4614,6 @@ group { name: "elm/entry/base-single/multibuttonentry";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 group { name: "elm/entry/base/font_color_black";
@@ -4917,10 +4676,7 @@ group { name: "elm/entry/base/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4964,7 +4720,6 @@ group { name: "elm/entry/base/font_color_black";
                style: "font_color_black_textblock_style";
                min: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4974,9 +4729,7 @@ group { name: "elm/entry/base/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5013,8 +4766,6 @@ group { name: "elm/entry/base/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5178,10 +4929,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -5225,7 +4973,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
                style: "font_color_black_textblock_char_wrap_style";
                min: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5235,9 +4982,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5274,8 +5019,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5339,10 +5082,7 @@ group { name: "elm/entry/base-single/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -5385,7 +5125,6 @@ group { name: "elm/entry/base-single/font_color_black";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5394,9 +5133,7 @@ group { name: "elm/entry/base-single/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5433,8 +5170,6 @@ group { name: "elm/entry/base-single/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5605,7 +5340,6 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
             text {
                style: "tizen_text_class_single_textblock_style";
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5624,10 +5358,7 @@ group { name: "elm/entry/base-password/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
    parts {
-      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -5670,7 +5401,6 @@ group { name: "elm/entry/base-password/font_color_black";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5679,9 +5409,7 @@ group { name: "elm/entry/base-password/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5718,17 +5446,12 @@ group { name: "elm/entry/base-password/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
 group { name: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_focus.png" COMP;
+         item: "focus_highlight" "off";
       }
       script {
          public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
@@ -5758,145 +5481,68 @@ group { name: "elm/scroller/entry/default";
          part { name: "focus_bg";
             type: RECT;
             scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
             mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
                visible: 0;
-               image {
-                  normal: "00_focus.png";
-                  border: 6 6 6 6;
-                  border_scale: 1;
-               }
-               rel1 {
-                  to: "focus_bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
             }
          }
-         part { name: "focus_left_padding";
-            type: SPACER;
+         part { name: "bg";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 0;
-               max: 10 0;
-               align: 0.0 0.5;
-               fixed: 1 0;
-               rel1 {
-                  to: "focus_bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 0.0 1.0;
-               }
+               visible: 0;
             }
          }
-         part { name: "focus_right_padding";
-            type: SPACER;
+         part { name: "clipper";
+            type: RECT;
             scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               min: 10 0;
-               max: 10 0;
-               align: 1.0 0.5;
-               fixed: 1 0;
-               rel1 {
-                  to: "focus_bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 1.0 1.0;
-               }
+               rel1.to: "bg";
+               rel2.to: "bg";
             }
          }
-         part { name: "bg";
+         part { name: "contentclipper";
             type: RECT;
             scale: 1;
+            mouse_events: 0;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               visible: 0;
                rel1 {
-                  to_x: "focus_left_padding";
+                  to_x: "icon_padding";
+                  to_y: "bg";
                   relative: 1.0 0.0;
                }
                rel2 {
-                  to_x: "focus_right_padding";
+                  to_x: "clear_padding";
+                  to_y: "bg";
                   relative: 0.0 1.0;
                }
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-         }
-         part { name: "editfield_space";
+         part { name: "icon_padding";
             type: SPACER;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 1.0 1.0;
+               align: 0.0 0.5;
                min: 0 0;
                max: 0 0;
-               rel1.to: "elm.swallow.end";
-               rel1.relative: 0.0 0.0;
-               rel2.to: "elm.swallow.end";
-               rel2.relative: 1.0 1.0;
-            }
-            description { state: "rename_visible" 0.0;
-               inherit: "default" 0.0;
-               min: 9 0;
-               max: 9 0;
+               fixed: 1 1;
                rel1 {
-                  to_x: "elm.swallow.rename";
+                  to: "bg";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to_x: "elm.swallow.rename";
+                  to: "bg";
                   relative: 0.0 1.0;
                }
             }
-            description { state: "clear_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 9 0;
-               max: 9 0;
-               rel1 {
-                  to_x: "elm.swallow.clear";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.clear";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "contentclipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1.to: "icon_right_padding";
-               rel1.relative: 1.0 0.0;
-               rel2.to: "editfield_space";
-               rel2.relative: 0.0 1.0;
+               min: 70 0;
+               max: 70 0;
             }
          }
          part { name: "elm.swallow.icon";
@@ -5921,36 +5567,13 @@ group { name: "elm/scroller/entry/default";
                visible: 1;
             }
          }
-         part { name: "icon_right_padding";
+         part { name: "clear_padding";
             type: SPACER;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.0 0.0;
+               align: 1.0 0.5;
                min: 0 0;
                max: 0 0;
-               rel1 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 8 0;
-               max: 8 0;
-            }
-         }
-         part { name: "elm.swallow.clear";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
                fixed: 1 1;
                rel1 {
                   to_x: "elm.swallow.end";
@@ -5962,14 +5585,14 @@ group { name: "elm/scroller/entry/default";
                   to_y: "bg";
                   relative: 0.0 1.0;
                }
-               visible: 0;
             }
-            description { state: "clear_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               min: 70 0;
+               max: 70 0;
             }
          }
-         part { name: "elm.swallow.rename";
+         part { name: "elm.swallow.clear";
             type: SWALLOW;
             scale: 1;
             clip_to: "clipper";
@@ -5988,7 +5611,7 @@ group { name: "elm/scroller/entry/default";
                }
                visible: 0;
             }
-            description { state: "rename_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
@@ -6021,12 +5644,14 @@ group { name: "elm/scroller/entry/default";
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
-                       to_x: "icon_right_padding";
-                       relative: 1.0 0.0;
+                  to_x: "icon_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
                }
                rel2 {
-                to_x: "editfield_space";
-                relative: 0.0 1.0;
+                  to_x: "clear_padding";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
                }
             }
          }
@@ -6065,12 +5690,12 @@ group { name: "elm/scroller/entry/default";
                rel1 {
                   relative: 0.0 0.0;
                   to_y:     "elm.swallow.content";
-                  to_x:     "editfield_space";
+                  to_x:     "clear_padding";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_y:     "sb_hbar";
-                  to_x:     "editfield_space";
+                  to_x:     "clear_padding";
                }
             }
          }
@@ -6187,42 +5812,28 @@ group { name: "elm/scroller/entry/default";
             source: "elm";
             action: STATE_SET "visible" 0.0;
             target: "elm.swallow.icon";
-            target: "icon_right_padding";
+            target: "icon_padding";
          }
          program { name: "icon_hide";
             signal: "elm,action,hide,icon";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.icon";
-            target: "icon_right_padding";
+            target: "icon_padding";
          }
          program { name: "clear_show";
             signal: "elm,state,clear,visible";
             source: "*";
-            action: STATE_SET "clear_visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.swallow.clear";
-            target: "editfield_space";
+            target: "clear_padding";
          }
          program { name: "clear_hide";
             signal: "elm,state,clear,hidden";
             source: "*";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.clear";
-            target: "editfield_space";
-         }
-         program { name: "rename_show";
-            signal: "elm,state,rename,visible";
-            source: "*";
-            action: STATE_SET "rename_visible" 0.0;
-            target: "elm.swallow.rename";
-            target: "editfield_space";
-         }
-         program { name: "rename_hide";
-            signal: "elm,state,rename,hidden";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.rename";
-            target: "editfield_space";
+            target: "clear_padding";
          }
          program { name: "end_show";
             signal: "elm,action,show,end";
@@ -6373,24 +5984,12 @@ group { name: "elm/scroller/entry/default";
                set_int(sbvis_timer, v);
             }
          }
-         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/scroller/entry/editfield";
       inherit: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "off";
+         item: "focus_highlight" "on";
       }
       images {
          image: "00_edit_field_focus.png" COMP;
@@ -6413,30 +6012,6 @@ group { name: "elm/scroller/entry/editfield";
                rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               image {
-                  normal: "00_edit_field_focus.png";
-                  border: 8 8 8 8;
-                  border_scale: 1;
-               }
-               rel1 {
-                  to: "focus_bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
          part { name: "focus_left_padding";
             type: SPACER;
             scale: 1;
@@ -6473,6 +6048,31 @@ group { name: "elm/scroller/entry/editfield";
                }
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_edit_field_focus.png";
+                  border: 8 8 8 8;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "bg";
             type: RECT;
             scale: 1;
@@ -6507,7 +6107,7 @@ group { name: "elm/scroller/entry/editfield";
 group { name: "elm/scroller/entry/editfield/searchbar/default";
       inherit: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "off";
+         item: "focus_highlight" "on";
       }
       images {
          image: "00_search_edit_field_bg_focus.png" COMP;
@@ -6530,30 +6130,6 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               image {
-                  normal: "00_search_edit_field_bg_focus.png";
-                  border: 12 13 12 13;
-                  border_scale: 1;
-               }
-               rel1 {
-                  to: "focus_bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
          part { name: "focus_left_padding";
             type: SPACER;
             scale: 1;
@@ -6590,6 +6166,30 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_search_edit_field_bg_focus.png";
+                  border: 12 13 12 13;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "bg";
             type: RECT;
             scale: 1;
@@ -6621,6 +6221,64 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          }
       }
 }
-
+group { name: "elm/entry/base-single/datetime_popup";
+   inherit: "elm/entry/base-single/default";
+   alias: "elm/entry/base-single/datetime_popup/year";
+   alias: "elm/entry/base-single/datetime_popup/month";
+   alias: "elm/entry/base-single/datetime_popup/date";
+   alias: "elm/entry/base-single/datetime_popup/hour";
+   alias: "elm/entry/base-single/datetime_popup/minute";
+   data.item: "default_font_size" "64";
+   styles {
+      style { name: "entry_datetime_popup_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_DATETIME_POPUP_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+   }
+   parts {
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: BLOCK_HANDLE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
+         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
+         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
+         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
+         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
+         description { state: "default" 0.0;
+            text {
+               style: "entry_datetime_popup_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
 
 
index 91caf67..0fc504a 100644 (file)
 
 \r
 \r
-   sounds {\r
-      sample {\r
-         name: "touch_sound" RAW;\r
-         source: "button-pressed.wav";\r
-      }\r
-   }\r
-\r
    styles {\r
       style { name: "gengrid_textblock_style";\r
          base: "font=Tizen:style=Bold font_size="GENGRID_FONT_STYLE_24_INC" color="GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC" align=center wrap=mixed ellipsis=1.0 text_class=tizen";\r
index b696af8..9dbc125 100644 (file)
          )
          // BG of swallowed VIEW(it) is visible 0
          GENLIST_PROGRAM_SOUND("bg")
-         GENLIST_PROGRAM_SOUND("bg_reorder")
+         GENLIST_PROGRAM_REORDER_SOUND("bg_reorder")
          GENLIST_PROGRAM_REORDER(
            target: "bg_clip";
            target: "bg_reorder_clip";
index 52cac17..c2bb7ba 100755 (executable)
  */
 
 /* genlist multisense sample/tone listing */
-   sounds {
-      sample {
-         name: "button-pressed" RAW;
-         source: "button-pressed.wav";
-      }
-   }
 
 //****************************************************************************//
 // *******************************  Default size macro **********************//
 #define GENLIST_PROLOG_NORMAL \
       GENLIST_PROLOG \
       data.item: "treesize" GENLIST_TREESIZE_DEFAULT; \
-      data.item: "flips" "elm.flip.icon elm.flip.content elm.flip.eraser"; \
+      data.item: "flips" "elm.flip.icon elm.flip.content"; \
       images { \
          image : "00_list_group_bg.png" COMP; \
          image : "00_list_group_bg_press.png" COMP; \
 
 #define GENLIST_PROLOG_DIALOGUE \
       GENLIST_PROLOG \
-      data.item: "flips" "elm.flip.icon elm.flip.content elm.flip.eraser"; \
+      data.item: "flips" "elm.flip.icon elm.flip.content"; \
       images { \
          image : "00_list_group_bg.png" COMP; \
          image : "00_list_group_bg_press.png" COMP; \
       } \
       description { state: "editmode" 0.0; \
          inherit: "default" 0.0; \
-         min: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_ICON_MEDIUM_SIZE) 0; \
-         max: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_ICON_MEDIUM_SIZE) 0; \
+         min: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_BTN_02_SIZE) 0; \
+         max: (GENLIST_PADDING_SIZE_DEFAULT*2+GENLIST_BTN_02_SIZE) 0; \
       } \
    ) \
    GENLIST_PART_IMAGE("bg_dialogue", \
          fixed: 1 0; \
          align: 1.0 0.5; \
          rel1.relative: 1 0; \
-         min: GENLIST_PADDING_SIZE_RIGHT 0; \
-         max: GENLIST_PADDING_SIZE_RIGHT -1; \
+         min: GENLIST_PADDING_SIZE_DEFAULT 0; \
+         max: GENLIST_PADDING_SIZE_DEFAULT -1; \
       } \
    ) \
    GENLIST_PART_ICON("elm.icon.edit", \
          inherit: "default" 0.0; \
          visible: 1; \
          fixed: 1 1; \
-         min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE; \
-         max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE; \
+         min: GENLIST_BTN_02_SIZE GENLIST_BTN_02_SIZE; \
+         max: GENLIST_BTN_02_SIZE GENLIST_BTN_02_SIZE; \
       } \
    )
 
             } \
             description { state: "editmode" 0.0; \
                inherit: "default" 0.0; \
-               min: (GENLIST_PADDING_SIZE_DEFAULT+GENLIST_ICON_MEDIUM_SIZE) 0; \
-               max: (GENLIST_PADDING_SIZE_DEFAULT+GENLIST_ICON_MEDIUM_SIZE) -1; \
+               min: (GENLIST_PADDING_SIZE_DEFAULT+GENLIST_BTN_02_SIZE) 0; \
+               max: (GENLIST_PADDING_SIZE_DEFAULT+GENLIST_BTN_02_SIZE) -1; \
             } \
          ) \
          GENLIST_PART_EDITBTN
                color: GENLIST_LIST_BG_COLOR;\
             }\
          ) \
-         GENLIST_PART_SPACER("elm.flip.padding.left",  \
-            description { state: "default" 0.0; \
-               min: 26 0; \
-               max: 26 -1; \
-               fixed: 1 0; \
-               align: 0 0.5; \
-               rel2.relative: 0 1; \
-            } \
-         ) \
          GENLIST_PART_SPACER("elm.flip.padding.right", \
             description { state: "default" 0.0; \
                min: 26 0; \
             } \
          ) \
          GENLIST_PART_ICON("elm.flip.content", \
-            GENLIST_DESCRIPTION("elm.flip.padding.left", "elm.flip.padding.eraser.left",  \
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.flip.padding.icon.left",  \
                "elm.padding.top", "elm.padding.bottom", \
                visible: 0; \
                aspect: 1 1; \
+               min: 0 96; \
             ) \
             description { state: "flipped" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
             } \
          ) \
-         GENLIST_PART_PADDING_R("elm.flip.padding.eraser.left", "elm.flip.eraser") \
-         GENLIST_PART_ICON("elm.flip.eraser", \
-            GENLIST_DESCRIPTION_RTB("elm.flip.padding.icon.left",  \
-               "elm.padding.top", "elm.padding.bottom", \
-               fixed: 1 0; \
-               visible: 0; \
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; \
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE; \
-            ) \
-            description { state: "show" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         ) \
          GENLIST_PART_PADDING_R("elm.flip.padding.icon.left", "elm.flip.icon") \
          GENLIST_PART_ICON( "elm.flip.icon", \
             GENLIST_DESCRIPTION_RTB("elm.flip.padding.right", \
                visible: 0; \
                aspect: 1 1; \
                align: 1 0.5; \
-               max: 154 74; \
+               max: 158 74; \
             ) \
             description { state: "flipped" 0.0; \
                inherit: "default" 0.0; \
       }
 
 #define GENLIST_PROGRAM_SOUND( SRC ) \
+      program { \
+         name: "sound_disable"SRC; \
+         signal: "elm,state,slide,active"; \
+         source: "elm"; \
+         action: STATE_SET "disabled" 0.0; \
+         target: "base"; \
+      } \
+      program { \
+         name: "sound_enable"SRC; \
+         signal: "elm,state,slide,passive"; \
+         source: "elm"; \
+         action: STATE_SET "default" 0.0; \
+         target: "base"; \
+      } \
+      program { name: "play_sound"SRC; \
+         signal: "mouse,clicked,1"; \
+         source: SRC; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"base", st, 30, vl); \
+            if (strcmp(st, "disabled")) \
+               run_program(PROGRAM:"play_button_press"SRC); \
+         } \
+      } \
+      program { name: "play_button_press"SRC; \
+         action: PLAY_SAMPLE "touch_sound" 1.0; \
+      }
+
+#define GENLIST_PROGRAM_REORDER_SOUND( SRC ) \
       program { name: "play_sound"SRC; \
          signal: "mouse,clicked,1"; \
          source: SRC; \
          } \
       } \
       program { name: "play_button_press"SRC; \
-         action: PLAY_SAMPLE "button-pressed" 1.0; \
+         action: PLAY_SAMPLE "reorder_sound" 1.0; \
       }
 
 #define GENLIST_PROGRAM_SELECT( TARGET ) \
             source:  "elm"; \
             action:  STATE_SET "default" 0.0; \
             target: "elm.flip.bg"; \
-         } \
-         program { \
-            signal: "elm,state,eraser,show"; \
-            action: STATE_SET "show" 0.0; \
-            target: "elm.flip.eraser"; \
-         } \
-         program { \
-            signal: "elm,state,eraser,hide"; \
-            action: STATE_SET "default" 0.0; \
-            target: "elm.flip.eraser"; \
          }
 
 #define GENLIST_PROGRAM_FLIP_TARGET( TARGET ) \
          target: "bg_reorder"; \
       ) \
       GENLIST_PROGRAM_SOUND("bg") \
-      GENLIST_PROGRAM_SOUND("bg_reorder") \
+      GENLIST_PROGRAM_REORDER_SOUND("bg_reorder") \
       GENLIST_PROGRAM_DECORATE_REORDER("normal", TARGET \
          target: "bg_clip"; \
          target: "bg_reorder_clip"; \
 
 #define GENLIST_PROGRAM_PLAY_BUTTON_PRESS \
          program { name: "play_button_press"; \
-            action: PLAY_SAMPLE "button-pressed" 1.0; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
          }
 #endif
index d687e9a..79285df 100644 (file)
             name: "slide_right";
             signal: "elm,state,slide,active";
             source: "elm";
+            action: PLAY_SAMPLE "sweep_sound" 1.0;
+            after: "animate_slide_right";
+         }
+         program {
+            name: "animate_slide_right";
             action: STATE_SET "slide" 0.0;
             target: "elm.swallow.origin";
             target: "overlay";
             name: "slide_left";
             signal: "elm,state,slide,passive";
             source: "elm";
+            action: PLAY_SAMPLE "sweep_sound" 1.0;
+            after: "animate_slide_left";
+         }
+         program {
+            name: "animate_slide_left";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.origin";
             target: "overlay";
index a1c3e82..d1bca11 100644 (file)
                }
                color: 255 255 255 255;
             }
+            description { state: "up" 0.0;
+                 rel1.relative: 1.0 0.0;
+                 rel2.relative: 1.0 0.0;
+                 align: 1.0 1.0;
+                 fixed: 1 1;
+            }
+            description { state: "down" 0.0;
+                 rel1.relative: 1.0 1.0;
+                 rel2.relative: 1.0 1.0;
+                 align: 1.0 0.0;
+                 fixed: 1 1;
+            }
          }
          part { name: "button_image";
             scale: 1;
                   offset: -1 -1;
                }
             }
+            description { state: "inactive" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
          }
          part {
             name: "access";
             transition: DECELERATE 0.3;
             target: "clip2";
          }
+         program { name: "event.inactive";
+            signal: "elm,priority,up";
+            source: "elm";
+            action: STATE_SET "inactive" 0.0;
+            target: "elm.swallow.event.0";
+         }
+         program { name: "index.up";
+            signal: "elm,priority,up";
+            source: "elm";
+            action: STATE_SET "up" 0.0;
+            target: "elm.swallow.index.0";
+            after: "index.go.down";
+         }
+         program { name: "index.go.down";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 0.3;
+            target: "elm.swallow.index.0";
+            after: "event.active";
+         }
+         program { name: "event.inactive2";
+            signal: "elm,priority,down";
+            source: "elm";
+            action: STATE_SET "inactive" 0.0;
+            target: "elm.swallow.event.0";
+         }
+         program { name: "index.down";
+            signal: "elm,priority,down";
+            source: "elm";
+            action: STATE_SET "down" 0.0;
+            target: "elm.swallow.index.0";
+            after: "index.go.up";
+         }
+         program { name: "index.go.up";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 0.3;
+            target: "elm.swallow.index.0";
+            after: "event.active";
+         }
+         program { name: "event.active";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.event.0";
+         }
          program {
             name: "access.active";
             signal: "elm,access,state,active";
index 76c1069..a31fdf6 100644 (file)
@@ -1171,13 +1171,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT
          }
       }
 
-   sounds {
-      sample {
-         name: "touch_sound" AS_IS;
-         source: "S_Touch_30ms.wav";
-      }
-   }
-
    group { name: "elm/label/base/datetime/year/default";
       alias: "elm/label/base/datetime/month/default";
       alias: "elm/label/base/datetime";
index 83861d9..729cda4 100644 (file)
@@ -1144,13 +1144,6 @@ group { name: "elm/layout/editfield/title";
    }
 }
 
-sounds {
-   sample {
-      name: "touch_sound" AS_IS;
-      source: "S_Touch_30ms.wav";
-   }
-}
-
 group { name: "elm/layout/searchbar/default";
    images {
       image: "00_search_edit_field_bg.png" COMP;
@@ -1190,13 +1183,14 @@ group { name: "elm/layout/searchbar/default";
          }
       }
       part { name: "inputfield_rect";
-         type: SPACER;
+         type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             min: SEARCHBAR_WIDTH_INC SEARCHBAR_HEIGHT_INC;
             align: 0.0 0.5;
             rel1 { relative: 1.0 1.0; to: "top_left_padding"; }
             rel2 { relative: 0.0 0.0; to: "bottom_right_padding"; }
+            color: 0 0 0 0;
          }
       }
       part {
@@ -1222,7 +1216,7 @@ group { name: "elm/layout/searchbar/default";
      program {
          name: "bg_clicked";
          signal: "mouse,clicked,1";
-         source: "search_textfield";
+         source: "inputfield_rect";
          action: SIGNAL_EMIT "elm,bg,clicked" "elm";
       }
       program {
@@ -1235,10 +1229,6 @@ group { name: "elm/layout/searchbar/default";
 }
 
 group { name: "elm/layout/searchbar/cancel_button";
-   images {
-      image: "00_search_edit_field_bg.png" COMP;
-      image: "00_search_edit_field_bg_focus.png" COMP;
-   }
    parts {
      part { name: "top_padding_rect";
          type: SPACER;
@@ -1302,7 +1292,7 @@ group { name: "elm/layout/searchbar/cancel_button";
          }
       }
       part { name: "inputfield_rect";
-         type: SPACER;
+         type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
@@ -1317,6 +1307,7 @@ group { name: "elm/layout/searchbar/cancel_button";
                to_x: "right_padding_rect";
                to_y: "base_bg";
             }
+            color: 0 0 0 0;
          }
       }
       part { name: "right_btn_padding_rect";
@@ -1386,7 +1377,7 @@ group { name: "elm/layout/searchbar/cancel_button";
      program {
          name: "bg_clicked";
          signal: "mouse,clicked,1";
-         source: "search_textfield";
+         source: "inputfield_rect";
          action: SIGNAL_EMIT "elm,bg,clicked" "elm";
       }
       program { name: "cancel_in";
index 6be197b..a7decfd 100644 (file)
  * limitations under the License.
  */
 
-   sounds {
-      sample {
-         name: "touch_sound" AS_IS;
-         source: "S_Touch_30ms.wav";
-      }
-   }
-
 group {
    name: "elm/multibuttonentry/base/default";
 
diff --git a/themes/widgets/multisense_haptic.edc b/themes/widgets/multisense_haptic.edc
deleted file mode 100644 (file)
index a7d1d70..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * efl-theme-tizen
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-/**
-  *This file contains the list of BEAT theme haptics.
-  *The various variables used to describe a haptic are-
-  
-  *name:The name of the haptic to be used as reference later in the theme.
-  *magnitude:The Magnitude of an effect corresponds to its strength, or the amplitude of the vibration.
-  *duration :The Duration parameter specifies how long the effect lasts from start to finish including the envelope that is the means of shaping the strength of effect in time.
-  *attack_level :The Attack Level specifies the initial strength of the effect.
-  *attack_time: specifies the amount of time, in milliseconds, for the effect to ramp from the Attack Level to the Magnitude.
-  *fade_level:  It specifies the final strength of effect to be reduced to from magnitude at the end of effect's fade time            
-  *fade_time: corresponds to the amount of time before the end of the effect, for the vibration to ramp between the Magnitude and the Fade Level.
-  *type: The Haptic types i.e MAGSWEEP or PERIODIC
-  *pattern:The Full pattern of Haptic - in hexadecimal values
-
-  *NOTE-Present implementation uses only name and pattern parameters to play haptic
-
-*/
-
-haptics
-   {
-      haptic
-        {
-           name: "TOUCH_HAPTIC" ;
-           type: MAGSWEEP ;
-           pattern: "01,00,01,00,0A,00,14,00,00,00,20,01,00,00,7F,00,00,E1,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-        }
-      haptic
-        {
-           name: "ALARM_HAPTIC" ;
-           type: MAGSWEEP ;
-           pattern:"01,00,03,00,38,00,42,00,00,00,19,00,21,00,F1,E0,01,E2,00,00,F1,E0,02,E2,01,1D,F1,E0,01,E2,03,BA,F1,E0,02,E2,04,E0,FF,20,17,00,00,7F,D1,2F,81,30,00,00,F4,01,00,00,00,20,1F,00,00,40,01,96,41,00,00,00,12,00,24,00,54,00,69,00,6D,00,65,00,6C,00,69,00,6E,00,65,00,00,00,50,00,65,00,72,00,69,00,6F,00,64,00,69,00,63,00,00,00,50,00,65,00,72,00,69,00,6F,00,64,00,69,00,63,00,20,00,23,00,31,00,00,00" ;
-        }
-      haptic 
-        {
-           name: "WARNING_HAPTIC" ;
-           type: MAGSWEEP ;
-          pattern: "01,00,02,00,1A,00,28,00,00,00,0D,00,F1,E0,01,E2,00,00,F1,E0,01,E2,00,72,FF,20,01,00,00,7F,00,00,41,00,00,00,12,00,54,00,69,00,6D,00,65,00,6C,00,69,00,6E,00,65,00,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-        }
-      haptic
-        {
-           name:"POPUP_HAPTIC" ;
-           type: MAGSWEEP ;
-           pattern: "01,00,01,00,0A,00,14,00,00,00,20,01,00,00,7F,00,00,41,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-        }
-      haptic
-        {
-           name:"PRESS_HAPTIC" ;
-           type: MAGSWEEP ;
-           pattern: "01,00,01,00,0A,00,14,00,00,00,20,01,00,00,7F,00,00,E1,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-        }
-      haptic
-       {
-          name:"RELEASE_HAPTIC" ;
-          type: MAGSWEEP ;
-          pattern: "01,00,01,00,0A,00,14,00,00,00,20,01,00,00,7F,00,00,41,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-       } 
-
-     haptic
-       {
-          name:"TAP_HAPTIC" ;
-          type: MAGSWEEP ;
-         pattern: "01,00,02,00,1A,00,28,00,00,00,0D,00,F1,E0,01,E2,00,00,F1,E0,01,E2,00,33,FF,20,01,00,00,7F,00,00,E1,00,00,00,12,00,54,00,69,00,6D,00,65,00,6C,00,69,00,6E,00,65,00,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-       }  
-     haptic
-       {
-          name: "DOUBLE_TAP_HAPTIC" ;
-          type: MAGSWEEP ;
-          pattern: "01,00,01,00,12,00,14,00,00,00,30,85,00,06,00,00,7F,00,20,0A,00,00,0D,00,00,01,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-       }
-     haptic
-       {
-          name: "LONG_TAP_HAPTIC" ;
-          type: MAGSWEEP ;
-          pattern: "01,00,02,00,1A,00,28,00,00,00,0D,00,F1,E0,01,E2,00,00,F1,E0,01,E2,00,BB,FF,20,01,00,00,7F,00,00,E1,00,00,00,12,00,54,00,69,00,6D,00,65,00,6C,00,69,00,6E,00,65,00,00,00,4D,00,61,00,67,00,53,00,77,00,65,00,65,00,70,00,00,00" ;
-
-       }
-    }
diff --git a/themes/widgets/multisense_sound.edc b/themes/widgets/multisense_sound.edc
deleted file mode 100644 (file)
index 5d0106d..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * efl-theme-tizen
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-/**
-
-  *Usage:     
-   *sounds {
-             sound: BUTTON_PRESSED_SOUND START_POINT  ENDPOINT
-                ..
-             }
-   *The " sounds" block contains a list of one or more " sound" items.
-    
-   *Present implementation supports only .wav format
-*/
-
-#define BUTTON_PRESSED_SOUND "button-pressed.wav"
-#define BUTTON_TOGGLE_OFF_SOUND "button-toggle-off.wav"
-#define BUTTON_TOGGLE_ON_SOUND "button-toggle-on.wav"
-#define DIALOG_CANCEL_SOUND "dialog-cancel.wav"
-#define DIALOG_ERROR_SOUND "dialog-error.wav"
-#define DIALOG_INFORMATION_SOUND "dialog-information.wav"
-#define DIALOG_OK_SOUND "dialog-ok.wav"
-#define DIALOG_QUESTION_SOUND "dialog-question.wav"
-#define DIALOG_WARNING_SOUND "dialog-warning.wav"
-#define DRAG_ACCEPT_SOUND "drag-accept.wav"
-#define DRAG_FAIL_SOUND "drag-fail.wav"
-#define DRAG_START_SOUND "drag-start.wav"
-#define LINK_PRESSED_SOUND "link-pressed.wav"
-#define MENU_CLICK_SOUND "menu-click.wav"
-#define MENU_POPUP_SOUND "menu-popup.wav"
-#define TOOLTIP_POPUP_SOUND "tooltip-popup.wav"
-#define WINDOW_NEW_SOUND "window-new.wav"
-#define WATERDROP_SOUND "Waterdrop.wav"
-
-sounds {
-          sound: BUTTON_PRESSED_SOUND 0 100 ;
-          sound: BUTTON_TOGGLE_OFF_SOUND 0 100 ;
-          sound: BUTTON_TOGGLE_ON_SOUND 0 100 ;
-          sound: DIALOG_CANCEL_SOUND 0 100 ;
-          sound: DIALOG_ERROR_SOUND 0 100 ;
-          sound: DIALOG_INFORMATION_SOUND 0 100 ;                 
-          sound: DIALOG_OK_SOUND 0 100 ;
-          sound: DIALOG_QUESTION_SOUND 0 100 ;
-          sound: DIALOG_WARNING_SOUND 0 100 ;
-          sound: DRAG_ACCEPT_SOUND 0 100 ;
-          sound: DRAG_FAIL_SOUND 0 100 ;
-          sound: DRAG_START_SOUND 0 100 ;
-          sound: LINK_PRESSED_SOUND 0 100 ;
-          sound: MENU_CLICK_SOUND 0 100 ;
-          sound: MENU_POPUP_SOUND 0 100 ;
-          sound: TOOLTIP_POPUP_SOUND 0 100 ;
-          sound: WINDOW_NEW_SOUND 0 100 ;
-          sound: WATERDROP_SOUND 0 100 ;
-       }
-
-
diff --git a/themes/widgets/multisense_ui.edc b/themes/widgets/multisense_ui.edc
deleted file mode 100644 (file)
index 1610513..0000000
+++ /dev/null
@@ -1,1176 +0,0 @@
-/*
- * efl-theme-tizen
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "multisense_sound.edc" 
-#include "multisense_haptic.edc"
-
-/*
-               Sound and Haptic
-*/
-///////////////////////////////////////////////////////////////////////////////////////
-       group { name: "elm/button/base/sound_dark";
-               images {
-                       image: "00_button_01_normal.png" COMP;
-                       image: "00_button_01_press.png" COMP;
-                       image: "00_button_01_focus.png" COMP;
-               }
-               script {
-                       public button_state = 0; //0:enabled, 1: disabled
-               }
-               parts {
-                       part { name: "button_image";
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 16 50;
-                                       image {
-                                               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_01_press.png";
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit:  "default" 0.0;
-                               }
-                               description { state: "focused" 0.0;
-                                       inherit: "default" 0.0;
-                                       image.normal: "00_button_01_focus.png";
-                               }
-                       }
-                       part {
-                               name: "padding_left";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       min: 5 5;
-                                       fixed: 1 0;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "padding_right";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 1.0 0.0;
-                                       rel1.relative: 1.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       min: 5 5;
-                                       fixed: 1 0;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "padding_top";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       min: 5 5;
-                                       fixed: 0 1;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "padding_bottom";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 1.0 1.0;
-                                       rel1.relative: 0.0 1.0;
-                                       rel2.relative: 1.0 1.0;
-                                       min: 5 5;
-                                       fixed: 0 1;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "icon_rect";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       visible: 1;
-                                       min: 0 40;
-                                       fixed: 1 0;
-                                       rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-                                       rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_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 { relative: 1.0 1.0; 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 { relative: 1.0 1.0; to: "icon_rect"; }                    
-                                       fixed: 1 0;
-                                       min: 5 0;
-                                       color: 0 0 0 0;
-                               }
-                       }                                       
-                       part { name: "elm.swallow.content";
-                               type: SWALLOW;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       align: 0.0 0.5;
-                                       rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-                                       rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-                                       fixed: 1 0;
-                               }
-                               description { state: "visible" 0.0;
-                                       fixed: 1 0;
-                                       visible: 1;
-                                       align: 0.0 0.5;
-                                       rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-                                       rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-                                       aspect: 1.0 1.0;
-                                       aspect_preference: VERTICAL;
-                               }
-                               description { state: "icononly" 0.0;;
-                                       visible: 1;
-                                       min: 40 40;
-                                       rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-                                       rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
-                                       align: 0.5 0.5;
-                                       aspect: 1.0 1.0;
-                                       aspect_preference: VERTICAL;
-                               }
-                       }
-                       part { name: "elm.text";
-                               type:          TEXT;
-                               effect:        SHADOW;
-                               mouse_events:  0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
-                                       rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-                                       align: 0.5 0.5;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 0;
-                                       text {
-                                               font: "Tizen:style=Medium";
-                                               size: 24;
-                                               min:  0 0;
-                                               align: 0.5 0.5;
-                                               max: 1 0;
-                                               text_class: "tizen";
-                                       }
-                               }
-                               description { state: "visible" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 90 40;
-                               }
-                               description { state: "clicked" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 0 0;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 102;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 128;
-                                       color3: 0 0 0 0;
-                               }
-                               description { state: "disabled_visible" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 128;
-                                       color3: 0 0 0 0;
-                                       visible: 1;
-                               }
-                               description { state: "focused" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 0 0;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 102;
-                               }
-                       }
-                       part { name: "over2";
-                               type: RECT;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               ignore_flags: ON_HOLD;
-                               description { state: "default" 0.0;
-                                       color: 0 0 0 0;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit:  "default" 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part { name: "over3";
-                               type: RECT;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               description { state: "default" 0.0;
-                                       color: 0 0 0 0;
-                               }
-                               description { state: "clicked" 0.0;
-                                       inherit:  "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       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:touch_sound ;
-                               after: "button_click_anim";
-                       }
-                       program { name: touch_sound;
-                               action: TOUCH_SOUND BUTTON_TOGGLE_OFF_SOUND 1 ;                            
-                       }                       
-                       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) !=1)
-                                               set_state(PART:"button_image", "default", 0.0);
-                               }
-                               after: button_unpress;
-                       }
-                       program { name: "button_click2";
-                               signal: "mouse,down,1";
-                               source: "over3";
-                               action: STATE_SET "clicked" 0.0;
-                               target: "over3";
-                       }
-                       program { name: "button_unclick2";
-                               signal: "mouse,clicked,1";
-                               source: "over3";
-                               action: STATE_SET "default" 0.0;
-                               target: "over3";
-                       }
-                       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);
-                                       }
-                                       set_state(PART:"elm.text", "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";
-                       }
-                       program { name: "disable";
-                               signal: "elm,state,disabled";
-                               source: "elm";
-                               action: STATE_SET "disabled" 0.0;
-                               target: "button_image";
-                               target: "over2";
-                               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, 1);
-                               }
-                       }
-                       program { name: "enable";
-                               signal: "elm,state,enabled";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "button_image";
-                               target: "over2";
-                               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, 0);
-                               }
-                       }
-                       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/haptic";
-               images {
-                       image: "00_message_button_add_recipient.png" COMP;
-               }
-               script {
-                       public button_state = 0; //0:enabled, 1: disabled
-               }
-               parts {
-                       part { name: "button_image";
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       rel1 { to_x: "padding.left"; to_y: "elm.text";}
-                                       rel2 { to_x: "padding.right"; to_y: "elm.text";}
-                                       min: 44 41;
-                                       image {
-                                               normal: "00_message_button_add_recipient.png";
-                                               border: 21 21 19 19;
-                                               border_scale: 1;
-                                       }
-                               }
-                               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: "padding.left";
-                               type: RECT;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       min: 10 1;
-                                       fixed: 1 0;
-                                       color: 0 0 0 0;
-                                       rel1.relative: 0 0;
-                                       rel2 { relative: 0.0 1.0; to_x: "elm.text";}
-                                       align: 1 0;
-                               }
-                       }
-                       part { name: "padding.right";
-                               type: RECT;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       min: 10 1;
-                                       fixed: 1 0;
-                                       color: 0 0 0 0;
-                                       rel1 { relative: 1.0 0.0; to_x: "elm.text";}
-                                       rel2.relative: 1.0 1.0;
-                                       align: 0 0;
-                               }
-                       }
-                       part {  name: "elm.text";
-                               type: TEXT;
-                               effect: SHADOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       fixed: 1 1;
-                                       align: 0.5 0.5;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 255;
-                                       text {
-                                               font: "Tizen:style=Medium";
-                                               size: 28;
-                                               min:  1 1;
-                                               align: 0.5 0.5;
-                                               text_class: "tizen";
-                                       }
-                               }
-                               description { state: "visible" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 1 1;
-                               }
-                               description { state: "clicked" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 1 1;
-                                       color: 53 45 39 255;
-                                       color2: 0 0 0 102;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 128;
-                                       color3: 0 0 0 0;
-                               }
-                               description { state: "disabled_visible" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 128;
-                                       color3: 0 0 0 0;
-                                       visible: 1;
-                                       min: 1 1;
-                               }
-                               description { state: "focused" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 1 1;
-                                       color: 255 255 255 255;
-                               }
-                       }
-                       part { name: "over1";
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       rel2.relative: 1.0 0.5;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit:  "default" 0.0;
-                               }
-                       }
-                       part { name: "over2";
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               ignore_flags: ON_HOLD;
-                               description { state: "default" 0.0;
-                               rel1.to: "button_image";
-                               rel2.to: "button_image";
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit:  "default" 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part { name: "over3";
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               description { state: "default" 0.0;
-                               rel1.to: "button_image";
-                               rel2.to: "button_image";
-                                       color: 255 255 255 0;
-                               }
-                               description { state: "clicked" 0.0;
-                                       inherit:  "default" 0.0;
-                                       visible: 1;
-                                       color: 255 255 255 0;
-                               }
-                       }
-                       part { name: "disabler";
-                               type: RECT;
-                               description { state: "default" 0.0;
-                                       rel1.to: "button_image";
-                                       rel2.to: "button_image";
-                                       color: 0 0 0 0;
-                                       visible: 0;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-               }
-               programs {
-                       program { name: "button_click";
-                               signal: "mouse,down,1";
-                               source: "over2";
-                               action: SIGNAL_EMIT "elm,action,press" "";
-                               after: touch_haptic;
-                               after: "button_click_anim";
-                       }
-                       program { name: touch_haptic;
-                               action: TOUCH_HAPTIC LONG_TAP_HAPTIC 3 ;                                   
-                       }                       
-                       program { name: "button_click_anim";
-                               action: STATE_SET "clicked" 0.0;
-                               target: "button_image";
-                               target: "elm.text";
-                       }
-                       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) !=1)
-                                               set_state(PART:"button_image", "default", 0.0);
-                               }
-                               after: button_unpress;
-                       }
-                       program { name: "button_click2";
-                               signal: "mouse,down,1";
-                               source: "over3";
-                               action: STATE_SET "clicked" 0.0;
-                               target: "over3";
-                       }
-                       program { name: "button_unclick2";
-                               signal: "mouse,clicked,1";
-                               source: "over3";
-                               action: STATE_SET "default" 0.0;
-                               target: "over3";
-                       }
-                       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";
-                               action: STATE_SET "visible" 0.0;
-                               target: "elm.text";
-                       }
-                       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: "over1";
-                               target: "over2";
-                               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, 1);
-                               }
-                       }
-                       program { name: "enable";
-                               signal: "elm,state,enabled";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "button_image";
-                               target: "over1";
-                               target: "over2";
-                               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, 0);
-                               }
-                       }
-                       program { name: "focused";
-                               signal: "elm,action,focus";
-                               source: "elm";
-                               action: STATE_SET "focused" 0.0;
-                               target: "button_image";
-                               target: "elm.text";
-                       }
-                       program { name: "unfocused";
-                               signal: "elm,action,unfocus";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "button_image";
-                               action: STATE_SET "visible" 0.0;
-                               target: "elm.text";
-                       }
-               }
-       }
-///////////////////////////////////////////////////////////////////////////////////////
-       group { name: "elm/button/base/sound_haptic_multiline";
-               images {
-                       image: "00_button_01_normal.png" COMP;
-                       image: "00_button_01_press.png" COMP;
-                       image: "00_button_01_focus.png" COMP;
-               }
-               script {
-                       public button_state = 0; //0:enabled, 1: disabled
-               }
-               styles{
-                       style { name: "btn_sound_haptic_style";
-                               base: "font=Tizen:style=Medium font_size=18 align=center color=#ffffff wrap=mixed text_class=tizen";
-                               tag:  "br" "\n";
-                               tag:  "ps" "ps";
-                               tag:  "hilight" "+ font=Tizen:style=Bold";
-                               tag:  "b" "+ font=Tizen:style=Bold";
-                               tag:  "tab" "\t";
-                       }
-               }
-               parts {
-                       part { name: "button_image";
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 16 50;
-                                       image {
-                                               normal: "00_button_02_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_02_press.png";
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit:  "default" 0.0;
-                               }
-                               description { state: "focused" 0.0;
-                                       inherit: "default" 0.0;
-                                       image.normal: "00_button_02_focus.png";
-                               }
-                       }
-                       part {
-                               name: "padding_left";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       min: 5 5;
-                                       fixed: 1 0;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "padding_right";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 1.0 0.0;
-                                       rel1.relative: 1.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       min: 5 5;
-                                       fixed: 1 0;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "padding_top";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       min: 5 5;
-                                       fixed: 0 1;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "padding_bottom";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 1.0 1.0;
-                                       rel1.relative: 0.0 1.0;
-                                       rel2.relative: 1.0 1.0;
-                                       min: 5 5;
-                                       fixed: 0 1;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "icon_rect";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       visible: 1;
-                                       min: 0 40;
-                                       fixed: 1 0;
-                                       rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-                                       rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_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 { relative: 1.0 1.0; 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 { relative: 1.0 1.0; to: "icon_rect"; }                    
-                                       fixed: 1 0;
-                                       min: 5 0;
-                                       color: 0 0 0 0;
-                               }
-                       }                                       
-                       part { name: "elm.swallow.content";
-                               type: SWALLOW;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       align: 0.0 0.5;
-                                       rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-                                       rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-                                       fixed: 1 0;
-                               }
-                               description { state: "visible" 0.0;
-                                       fixed: 1 0;
-                                       visible: 1;
-                                       align: 0.0 0.5;
-                                       rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-                                       rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-                                       aspect: 1.0 1.0;
-                                       aspect_preference: VERTICAL;
-                               }
-                               description { state: "icononly" 0.0;;
-                                       visible: 1;
-                                       min: 40 40;
-                                       rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-                                       rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
-                                       align: 0.5 0.5;
-                                       aspect: 1.0 1.0;
-                                       aspect_preference: VERTICAL;
-                               }
-                       }
-                       part { name: "elm.text";
-                               type:          TEXTBLOCK;
-                               effect:        SHADOW;
-                               mouse_events:  0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
-                                       rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-                                       align: 0.5 0.5;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 0;
-                                       text {
-                                               style: "btn_sound_haptic_style";
-                                               min:  0 0;
-                                               max: 0 1;
-                                       }
-                               }
-                               description { state: "visible" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 90 40;
-                               }
-                               description { state: "clicked" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 0 0;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 102;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 128;
-                                       color3: 0 0 0 0;
-                               }
-                               description { state: "disabled_visible" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 0 0 0 128;
-                                       color3: 0 0 0 0;
-                                       visible: 1;
-                               }
-                               description { state: "focused" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                                       min: 0 0;
-                                       color: 255 255 255 255;
-                                       color2: 0 0 0 102;
-                               }
-                       }
-                       part { name: "over2";
-                               type: RECT;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               ignore_flags: ON_HOLD;
-                               description { state: "default" 0.0;
-                                       color: 0 0 0 0;
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit:  "default" 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part { name: "over3";
-                               type: RECT;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               description { state: "default" 0.0;
-                                       color: 0 0 0 0;
-                               }
-                               description { state: "clicked" 0.0;
-                                       inherit:  "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       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:touch_sound ;
-                               after:touch_haptic ;
-                               after: "button_click_anim";
-                       }
-                       program { name: touch_sound;
-                               action: TOUCH_SOUND BUTTON_PRESSED_SOUND 1;                                
-                       }
-                       program { name: touch_haptic;
-                               action: TOUCH_HAPTIC WARNING_HAPTIC 3;                             
-                       }
-                       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) !=1)
-                                               set_state(PART:"button_image", "default", 0.0);
-                               }
-                               after: button_unpress;
-                       }
-                       program { name: "button_click2";
-                               signal: "mouse,down,1";
-                               source: "over3";
-                               action: STATE_SET "clicked" 0.0;
-                               target: "over3";
-                       }
-                       program { name: "button_unclick2";
-                               signal: "mouse,clicked,1";
-                               source: "over3";
-                               action: STATE_SET "default" 0.0;
-                               target: "over3";
-                       }
-                       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);
-                                       }
-                                       set_state(PART:"elm.text", "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";
-                       }
-                       program { name: "disable";
-                               signal: "elm,state,disabled";
-                               source: "elm";
-                               action: STATE_SET "disabled" 0.0;
-                               target: "button_image";
-                               target: "over2";
-                               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, 1);
-                               }
-                       }
-                       program { name: "enable";
-                               signal: "elm,state,enabled";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "button_image";
-                               target: "over2";
-                               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, 0);
-                               }
-                       }
-                       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";
-                       }
-               }
-       }
index a6ee997..9c46293 100644 (file)
                min: 0 0;
                fixed: 1 1;
                rel1 { relative: 1.0 1.0; to_x: "elm.text.title"; to_y: "badge_top_padding"; }
-               rel2 { relative: 1.0 0.5; to_x: "elm.text.title"; to_y: "title_bg"; }
-               align: 0.0 0.5;
+               rel2 { relative: 1.0 1.0; to_x: "elm.text.title"; to_y: "badge_top_padding"; }
+               align: 0.0 0.0;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
             description {
                state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_BADGE_TEXT_RIGHT_PADDING_INC;
+               min: NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC;
             }
          }
          part { name: "badge_bg";
                visible: 0;
                min: NAVIFRAME_BADGE_TEXT_MIN_W_INC 0;
                max: NAVIFRAME_BADGE_TEXT_MAX_W_INC -1;
-               fixed: 1 0;
+               fixed: 1 1;
                rel1 { relative: 1.0 0.0; to: "left.padding.text"; }
                rel2 { relative: 1.0 1.0; to_y: "left.padding.text"; to_x: "badge_padding"; }
                align: 0.0 0.5;
                text {
                   font: "Tizen:style=Bold";
                   size: NAVIFRAME_BADGE_TEXT_H_INC;
-                  min: 1 1;
+                  min: 0 0;
                   max: 1 0;
                   text_class: "tizen";
                }
index bc03a09..3890905 100644 (file)
             description
             {
                state: "default" 0.0;
+               align: 0.0 0.5;
                rel1.to: "whole_left";
                rel2.to: "whole_left";
             }
             description
             {
                state: "default" 0.0;
+               align: 1.0 0.5;
                rel1.to: "whole_right";
                rel2.to: "whole_right";
             }
             description
             {
                state: "default" 0.0;
+               align: 0.5 0.0;
                rel1.to: "whole_left";
                rel2.to: "whole_left";
             }
             description
             {
                state: "default" 0.0;
+               align: 0.5 1.0;
                rel1.to: "whole_right";
                rel2.to: "whole_right";
             }
index 39c3603..49807bd 100644 (file)
 #define POPUP_ITEM_STATE_ENABLED  0
 #define POPUP_ITEM_STATE_DISABLED 1
 
-sounds {
-   sample { name: "touch_sound" RAW;
-      source: "button-pressed.wav";
-   }
-}
-
 /*popup widget specific notify style style*/
 group { name: "elm/notify/center/popup";
    alias: "elm/notify/center/verticalbuttonstyle";
@@ -280,32 +274,6 @@ group { name: "elm/notify/block_events/popup";
          target: "popup_indicator";
          transition: LINEAR 0.2;
       }
-      /*
-      program { name: "landscape_mode";
-         source: "elm";
-         signal: "elm,state,orient,90";
-         action: STATE_SET "landscape" 0.0;
-         target: "block_events";
-      }
-      program { name: "landscape_mode2";
-         source: "elm";
-         signal: "elm,state,orient,270";
-         action: STATE_SET "landscape" 0.0;
-         target: "block_events";
-      }
-      program { name: "portrait_mode";
-         source: "elm";
-         signal: "elm,state,orient,0";
-         action: STATE_SET "default" 0.0;
-         target: "block_events";
-      }
-      program { name: "portrait_mode2";
-         source: "elm";
-         signal: "elm,state,orient,180";
-         action: STATE_SET "default" 0.0;
-         target: "block_events";
-      }
-      */
    }
 }
 
@@ -499,7 +467,6 @@ group { name: "elm/popup/base/default";
                border_scale: 1;
             }
             fill.smooth: 0;
-            align: 0.5 0.5;
          }
          description { state: "landscape" 0.0;
             inherit: "default" 0.0;
@@ -521,13 +488,12 @@ group { name: "elm/popup/base/default";
                border_scale: 1;
             }
             rel1 {
-               relative: 0.0 1.0;
-               to_x: "base";
-               to_y: "shadow_left_top_padding";
+               relative: 1.0 1.0;
+               to: "shadow_left_top_padding";
             }
             rel2 {
-               relative: 1.0 1.0;
-               to_x: "base";
+               relative: 0.0 1.0;
+               to_x: "shadow_right_bottom_padding";
                to_y: "shadow_left_top_padding";
             }
             fill.smooth: 0;
@@ -684,6 +650,7 @@ group { name: "elm/popup/base/default";
               size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
               fit: 1 0;
               min: 0 1;
+              align: 0.0 0.5;
             }
             rel1 {
                relative: 1.0 0.0;
@@ -807,6 +774,34 @@ group { name: "elm/popup/base/default";
             color: 0 0 0 0;
          }
       }
+      part { name: "left_part";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: POPUP_DESC_LEFT_PADDING 0;
+            fixed: 1 0;
+            align: 0.0 0.0;
+            rel1.to: "base";
+            rel2 {
+               to: "base";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+      part { name: "right_part";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: POPUP_DESC_RIGHT_PADDING 0;
+            fixed: 1 0;
+            align: 1.0 1.0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "base";
+            }
+            rel2.to: "base";
+         }
+      }
       part { name: "elm.bg.action_area";
          scale : 1;
          description { state: "default" 0.0;
@@ -820,10 +815,13 @@ group { name: "elm/popup/base/default";
                border_scale: 1;
             }
             rel1 {
+               relative: 1.0 1.0;
+               to: "left_part";
+            }
+            rel2 {
                relative: 0.0 1.0;
-               to: "base";
+               to: "right_part";
             }
-            rel2.to: "base";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -990,13 +988,13 @@ group { name: "elm/popup/base/verticalbuttonstyle";
             fixed: 0 1;
             min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC;
             rel1 {
-               relative: 0.0 0.0;
-               to_x: "base";
+               relative: 1.0 0.0;
+               to_x: "left_part";
                to_y: "shadow_right_bottom_padding";
             }
             rel2 {
-               relative: 1.0 0.0;
-               to_x: "base";
+               relative: 0.0 0.0;
+               to_x: "right_part";
                to_y: "shadow_right_bottom_padding";
             }
          }
@@ -2265,6 +2263,17 @@ group { name: "elm/popup/base/content_expand";
             fixed: 1 1;
          }
       }
+      part {
+         name:"shadow_right_bottom_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING;
+            max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING;
+            align: 1 1;
+            fixed: 1 1;
+         }
+      }
       part { name: "elm.bg.title";
          scale : 1;
          description { state: "default" 0.0;
@@ -2278,14 +2287,14 @@ group { name: "elm/popup/base/content_expand";
                border_scale: 1;
             }
             rel1 {
-               relative: 0.0 1.0;
-               to_x: "base";
-               to_y: "shadow_left_top_padding";
+               relative: 1.0 0.0;
+               to_x: "shadow_left_top_padding";
+               to_y: "base";
             }
             rel2 {
-               relative: 1.0 1.0;
-               to_x: "base";
-               to_y: "shadow_left_top_padding";
+               relative: 0.0 0.0;
+               to_x: "shadow_right_bottom_padding";
+               to_y: "base";
             }
          }
          description { state: "visible" 0.0;
@@ -2348,16 +2357,18 @@ group { name: "elm/popup/base/content_expand";
               size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
               fit: 1 0;
               min: 0 1;
+              align: 0.0 0.5;
             }
             visible: 0;
             rel1 {
-               relative: 1.0 1.0;
                to: "left_pad";
+               relative: 1.0 1.0;
             }
             rel2 {
-               relative: 0.0 1.0;
                to: "right_pad";
+               relative: 0.0 1.0;
             }
+            align: 0.0 0.5;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -2412,10 +2423,15 @@ group { name: "elm/popup/base/content_expand";
                border_scale: 1;
             }
             rel1 {
+               relative: 1.0 1.0;
+               to_x: "shadow_left_top_padding";
+               to_y: "base";
+            }
+            rel2 {
                relative: 0.0 1.0;
-               to_x: "base";
+               to_x: "shadow_right_bottom_padding";
+               to_y: "base";
             }
-            rel2.to_x: "base";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
index 8a03033..80b73c0 100644 (file)
       }
    }
 
-   group { name: "elm/progressbar/horizontal/process_medium";
+   group { name: "elm/progressbar/horizontal/list_process_medium";
+      alias: "elm/progressbar/horizontal/process_medium";
       PROCESS_IMAGES("White", "54x54")
       parts {
          part { name: "access";
       }
    }
 
-   group { name: "elm/progressbar/horizontal/process_medium_black";
+   group { name: "elm/progressbar/horizontal/list_process_medium_black";
+      alias: "elm/progressbar/horizontal/process_medium_black";
       PROCESS_IMAGES("Black", "54x54")
       parts {
          part { name: "access";
index d9e1b79..38d1e03 100644 (file)
 
    styles {
       style { name: "radio_label_textblock_style";
-         base: "font=Tizen:style=Medium font_size="RADIO_STYLE_DEFAULT_FONT_SIZE_INC" color=#ffffff wrap=char text_class=tizen";
+         base: "font=Tizen:style=Regular font_size="RADIO_STYLE_DEFAULT_FONT_SIZE_INC" color="RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC" wrap=char text_class=tizen";
+         tag: "br" "\n";
+         tag: "ps" "ps";
+         tag: "hilight" "+ font=Tizen:style=Bold";
+         tag: "b" "+ font=Tizen:style=Bold";
+         tag: "whitecolor" "+ color=#ffffff";
+         tag: "tab" "\t";
+      }
+      style { name: "radio_label_textblock_style_disable";
+         base: "font=Tizen:style=Regular font_size="RADIO_STYLE_DEFAULT_FONT_SIZE_INC" color="RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC" wrap=char text_class=tizen";
          tag: "br" "\n";
          tag: "ps" "ps";
          tag: "hilight" "+ font=Tizen:style=Bold";
@@ -73,7 +82,6 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_button_radio_press_bg.png"; \
             } \
          } \
          part { name: "radio"; \
                color: 255 255 255 255; \
             } \
          } \
+         part { name: "pressed_bg"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "bg"; \
+               rel2.to: "bg"; \
+               image.normal: "00_button_radio_press_bg.png"; \
+               visible: 0; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "elm.swallow.content"; \
             type: SWALLOW; \
             clip_to: "disclip"; \
                   style: "radio_label_textblock_style"; \
                   min: 0 0; \
                } \
-               color: RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC; \
             } \
             description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
             description { state: "disabled_visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
-               text.min: 1 1; \
-               color: RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC; \
+               text { \
+                  style: "radio_label_textblock_style_disable"; \
+                  min: 0 0; \
+               } \
             } \
          } \
          part { name: "over1"; \
                   set_state(PART:"radio", "visible", 0.0); \
                else \
                   set_state(PART:"radio", "default", 0.0); \
-               set_state(PART:"bg", "default", 0.0); \
+               set_state(PART:"pressed_bg", "default", 0.0); \
             } \
          } \
          program { name: "pressed"; \
                   set_state(PART:"radio", "pressed", 0.0); \
                else \
                   set_state(PART:"radio", "default", 0.0); \
-               set_state(PART:"bg", "pressed", 0.0); \
+               set_state(PART:"pressed_bg", "pressed", 0.0); \
             } \
          } \
          program { name: "mouse,out"; \
index a5e5a09..84db30b 100644 (file)
@@ -60,6 +60,9 @@ styles{
 }
 
 group { name: "elm/toolbar/base/default";
+   data {
+      item: "focus_highlight" "on";
+   }
    images {
        image: "00_toolbar_bg.png" COMP;
    }
@@ -128,6 +131,7 @@ group { name: "elm/toolbar/base/default";
 group { name: "elm/toolbar/item/default";
    images {
       image: "00_toolbar_press.png" COMP;
+      image: "00_tab_focus.png" COMP;
    }
 
    data.item: "transition_animation_on" "1";
@@ -350,6 +354,22 @@ group { name: "elm/toolbar/item/default";
             color: 0 0 0 0;
          }
       }
+      part { name: "highlight";
+         type: IMAGE;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            image {
+                normal: "00_tab_focus.png";
+                border: 8 8 8 8;
+                border_scale: 1;
+            }
+         }
+         description { state: "highlighted" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
    }
    programs {
       program { name: "pressed";
@@ -372,6 +392,10 @@ group { name: "elm/toolbar/item/default";
          signal:  "mouse,clicked,1";
          source:  "event";
          action:  SIGNAL_EMIT "elm,action,click" "elm";
+         after: "play_sound";
+      }
+      program { name: "play_sound";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       program { name: "mouse,in";
          signal:  "mouse,in";
@@ -486,8 +510,13 @@ group { name: "elm/toolbar/item/default";
             set_state(PART:"padding_right_bottom", "3_items", 0.0);
          }
       }
-      program { name: "divider_visible";
+      program { name: "divider_visible_1";
          signal: "elm,order,first,item";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "divider";
+      }
+      program { name: "divider_visible_2";
          signal: "elm,order,default,item";
          source: "elm";
          action: STATE_SET "default" 0.0;
@@ -499,6 +528,18 @@ group { name: "elm/toolbar/item/default";
          action: STATE_SET "hidden" 0.0;
          target: "divider";
       }
+      program { name: "highlight_on";
+         signal: "elm,highlight,on";
+         source: "elm";
+         action: STATE_SET "highlighted" 0.0;
+         target: "highlight";
+      }
+      program { name: "highlight_off";
+         signal: "elm,highlight,off";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "highlight";
+      }
    }
 }
 
@@ -564,6 +605,9 @@ group { name: "elm/toolbar/object/default";
 }
 
 group { name: "elm/toolbar/base/tabbar";
+   data {
+      item: "focus_highlight" "on";
+   }
    images {
       image: "00_effect_tab_bounce_left.png" COMP;
       image: "00_effect_tab_bounce_right.png" COMP;
@@ -1911,8 +1955,13 @@ group { name: "elm/toolbar/item/tabbar";
          target: "elm.text.badge";
          target: "elm.image.badge";
       }
-      program { name: "divider_visible";
+      program { name: "divider_visible_1";
          signal: "elm,order,first,item";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "divider";
+      }
+      program { name: "divider_visible_2";
          signal: "elm,order,default,item";
          source: "elm";
          action: STATE_SET "default" 0.0;