diff options
| author | Jaehwan Kim <jae.hwan.kim@samsung.com> | 2015-08-25 18:06:08 +0900 |
|---|---|---|
| committer | Jaehwan Kim <jae.hwan.kim@samsung.com> | 2015-08-25 18:06:19 +0900 |
| commit | 605ba044f3bd48d3747bb22d0f92032d4038cd7e (patch) | |
| tree | 22ab8243381fefc545f1ccd12de8f4fa7a09bb2f | |
| parent | d276d42d94504a7873b6f91b88dee0c40558d098 (diff) | |
| download | efl-theme-tizen-mobile-605ba044f3bd48d3747bb22d0f92032d4038cd7e.tar.gz efl-theme-tizen-mobile-605ba044f3bd48d3747bb22d0f92032d4038cd7e.tar.bz2 efl-theme-tizen-mobile-605ba044f3bd48d3747bb22d0f92032d4038cd7e.zip | |
Revert "remove vector feature temporary for SQE verification."submit/tizen/20150825.083820accepted/tizen/mobile/20150826.015936
This reverts commit d276d42d94504a7873b6f91b88dee0c40558d098.
Change-Id: Icb2e96f14b02b42dcee3f9612afabb9cf2122735
436 files changed, 3839 insertions, 4544 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc index 26b127e9..44041de3 100644 --- a/mobile/HD-inc.edc +++ b/mobile/HD-inc.edc @@ -428,23 +428,27 @@ #define EDITFIELD_LINE_RECT_MIN_INC 0 3 #define EDITFIELD_ENTRY_SWALLOW_ALIGN 0.5 0.5 -#define BUTTON_OPTION_MIN_MAX_INC 46 46 -#define BUTTON_OPTION_IMAGE_MIN_MAX_INC 46 46 - -//Slider -#define SLIDER_BASE_HEIGHT_INC 6 -#define SLIDER_INDICATOR_SIZE_INC 42 -#define SLIDER_SWALLOWBAR_HEIGHT_INC 42 -#define SLIDER_LEFT_RIGHT_PADDING_SIZE_INC 21 0 +#define BUTTON_OPTION_MIN_MAX_INC 70 70 +#define BUTTON_OPTION_IMAGE_MIN_MAX_INC 70 70 + +//****************************************************************************// +// Slider +//****************************************************************************// +#define SLIDER_BASE_HEIGHT_INC 8 +#define SLIDER_INDICATOR_SIZE_INC 20 +#define SLIDER_SWALLOWBAR_HEIGHT_INC 42 +#define SLIDER_LEFT_RIGHT_PADDING_SIZE_INC 32 0 #define SLIDER_ICON_PADDING_SIZE_INC 5 0 -#define SLIDER_CENTER_POINT_SIZE_INC 10 24 +#define SLIDER_CENTER_POINT_SIZE_INC 6 26 +#define SLIDER_INDICATOR_NORMAL_SIZE_INC 20 20 +#define SLIDER_INDICATOR_BUBBLE_SIZE_INC 20 20 +#define SLIDER_INDICATOR_BUBBLE_PRESSED_SIZE_INC 80 140 +#define SLIDER_WARNING_LEVEL 0.636 //Slider vertical -#define SLIDER_VERTICAL_BASE_HEIGHT_INC 6 -#define SLIDER_SWALLOWBAR_WIDTH_INC 42 -#define SLIDER_VERTICAL_CENTER_POINT_SIZE_INC 24 10 -#define SLIDER_VERTICAL_ICON_PADDING_SIZE_INC 42 5 -#define SLIDER_TOP_BOTTOM_PADDING_SIZE_INC 42 21 +#define SLIDER_VERTICAL_BASE_HEIGHT_INC 6 +#define SLIDER_SWALLOWBAR_WIDTH_INC 42 +#define SLIDER_VERTICAL_CENTER_POINT_SIZE_INC 26 6 #define SLIDER_POPUP_WIDTH_INC 80 #define SLIDER_POPUP_HEIGHT_INC 92 @@ -453,30 +457,39 @@ #define SLIDER_INDICATOR_TEXT_SIZE_HEIGHT 48 #define SLIDER_INDICATOR_TEXT_SIZE_WIDTH 20 -//Progressbar -#define PROGRESSBAR_BG_DEFAULT_HEIGHT_INC 42 -#define PROGRESSBAR_BG_ONE_TEXT_HEIGHT_INC 48 -#define PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC 76 -#define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 6 -#define PROGRESSBAR_PADDING_HEIGHT_INC 7 -#define PROCESS_LARGE_IMAGE_HEIGHT_INC 66 -#define PROCESS_LARGE_IMAGE_WIDTH_INC 66 -#define PROCESS_MEDIUM_IMAGE_HEIGHT_INC 36 -#define PROCESS_MEDIUM_IMAGE_WIDTH_INC 36 -#define PROCESS_SMALL_IMAGE_HEIGHT_INC 28 -#define PROCESS_SMALL_IMAGE_WIDTH_INC 28 - -//Check and Radio -#define CHECK_GEN_SIZE 60 60 -#define CHECK_SIZE 26 26 -#define CHECK_ICON_SIZE 30 30 -#define CHECK_BG_SIZE 40 40 -#define CHECK_BG_STROKE_SIZE 40 40 -#define RADIO_SIZE 30 30 -#define RADIO_BG_SIZE 40 40 -#define RADIO_BG_STROKE_SIZE 40 40 -#define CHECK_TEXT_FONT_SIZE_INC 22 -#define CHECK_PAD_BEFORE_TEXT_INC 15 0 +#define SLIDER_VERTICAL_INDICATOR_SIZE_INC 20 +#define SLIDER_LEFT_VERTICAL_INDICATOR_SIZE_INC 20 +#define SLIDER_TOP_PADDING_SIZE_INC 42 44 +#define SLIDER_BOTTOM_PADDING_SIZE_INC 42 44 + +//****************************************************************************// +// Progressbar +//****************************************************************************// +#define PROGRESSBAR_DEFAULT_HEIGHT_INC 8 +#define PROGRESSBAR_PENDING_HEIGHT_INC 8 +#define PROGRESSBAR_PADDING_HEIGHT_INC 8 +#define PROGRESSBAR_LARGE_SIZE_INC 102 102 +#define PROGRESSBAR_MEDIUM_SIZE_INC 56 54 +#define PROGRESSBAR_SMALL_SIZE_INC 44 44 + + +//****************************************************************************// +// Check +//****************************************************************************// +#define CHECK_DEFAULT_SIZE 50 50 +#define CHECK_ONOFF_SIZE 80 80 +#define CHECK_ONOFF_ICON_SIZE 36 36 +#define CHECK_FAVORITE_SIZE 80 80 +#define CHECK_PAD_BEFORE_TEXT_INC 32 0 + + +//****************************************************************************// +// Radio +//****************************************************************************// +#define RADIO_SIZE 50 50 + + +//****************************************************************************// // No Content //****************************************************************************// #define NO_CONTENT_BG_HEIGHT_INC 1280 @@ -491,31 +504,28 @@ // Button //****************************************************************************// -#define BUTTON_BOTTOM_MIN_HEIGHT 74 -#define BUTTON_MIN_WIDTH 62 -#define BUTTON_MIN_HEIGHT 58 -#define BUTTON_MAX_WIDTH 450 -#define BUTTON_ICON_DEFAULT_WIDTH 30 -#define BUTTON_ICON_DEFAULT_HEIGHT 30 -#define BUTTON_PADDING_ICON_RIGHT 12 -#define BUTTON_BOTTOM_PADDING_LEFT_RIGHT 12 -#define BUTTON_PADDING_LEFT_RIGHT 12 -#define BUTTON_ICON_HEIGHT 46 -#define BUTTON_ICON_WIDTH 46 -#define BUTTON_CIRCLE_SIZE 74 74 -#define BUTTON_CIRCLE_ICON_SIZE 46 46 -#define BUTTON_CIRCLE_LABEL_SIZE 120 173 -#define BUTTON_CIRCLE_TOP_PADDING_HEIGHT 15 -#define BUTTON_CIRCLE_LEFT_RIGHT_PADDING_WIDTH 8 -#define BUTTON_CIRCLE_MIDDDLE_PADDING_HEIGHT 10 -#define BUTTON_CIRCLE_BOTTOM_PADDING_HEIGHT 10 -#define BUTTON_CIRCLE_TEXT_HEIGHT 64 -#define BUTTON_TEXT_SIZE 30 -#define BUTTON_BOTTOM_TEXT_SIZE 33 -#define BUTTON_DATE_TEXT_SIZE 30 -#define BUTTON_AMPM_TEXT_SIZE 54 -#define BUTTON_TEXT_CIRCLE_SIZE 24 -#define BUTTON_POPUP_TEXT_SIZE 33 +#define BUTTON_MIN_WIDTH_INC 50 +#define BUTTON_MIN_HEIGHT_INC 78 +#define BUTTON_BOTTOM_MIN_WIDTH_INC 118 +#define BUTTON_BOTTOM_MIN_HEIGHT_INC 104 +#define BUTTON_PADDING_ICON_RIGHT_INC 14 +#define BUTTON_PADDING_LEFT_RIGHT_INC 32 +#define BUTTON_PADDING_LEFT_ICON_TEXT_INC 56 +#define BUTTON_PADDING_TOP_HEIGHT_INC 10 +#define BUTTON_PADDING_BOTTOM_HEIGHT_INC 14 +#define BUTTON_BOTTOM_PADDING_TOP_HEIGHT_INC 22 +#define BUTTON_BOTTOM_PADDING_BOTTOM_HEIGHT_INC 28 +#define BUTTON_ICON_HEIGHT_INC 80 +#define BUTTON_ICON_WIDTH_INC 80 +#define BUTTON_ICON_DEFAULT_HEIGHT_INC 60 +#define BUTTON_ICON_DEFAULT_WIDTH_INC 60 + +#define BUTTON_CIRCLE_SIZE_INC 98 98 +#define BUTTON_CIRCLE_BASE_SIZE_INC 126 98 +#define BUTTON_CIRCLE_EXTENDED_SIZE_INC 126 199 +#define BUTTON_CIRCLE_ICON_SIZE_INC 60 60 +#define BUTTON_CIRCLE_PADDING_ICON_BOTTOM_INC 13 +#define BUTTON_CIRCLE_PADDING_TEXT_LEFT_RIGHT_INC 8 //****************************************************************************// // Multibuttonentry diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_00.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_00.png Binary files differdeleted file mode 100755 index 36ed2071..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_00.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_01.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_01.png Binary files differdeleted file mode 100755 index 5c34a617..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_01.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_02.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_02.png Binary files differdeleted file mode 100755 index 29e23ae8..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_02.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_03.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_03.png Binary files differdeleted file mode 100755 index 2acc106e..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_03.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_04.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_04.png Binary files differdeleted file mode 100755 index 090b989b..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_04.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_05.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_05.png Binary files differdeleted file mode 100755 index 09ac57ea..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_05.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_06.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_06.png Binary files differdeleted file mode 100755 index 1ffdd7b3..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_06.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_07.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_07.png Binary files differdeleted file mode 100755 index db98da16..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_07.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_08.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_08.png Binary files differdeleted file mode 100755 index d45130cc..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_08.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_09.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_09.png Binary files differdeleted file mode 100755 index d247227c..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_09.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_10.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_10.png Binary files differdeleted file mode 100755 index b578a9c1..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_10.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_11.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_11.png Binary files differdeleted file mode 100755 index e3b9d5bc..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_11.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_12.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_12.png Binary files differdeleted file mode 100755 index 80e80dce..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_12.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_13.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_13.png Binary files differdeleted file mode 100755 index 1bce0c96..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_13.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_14.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_14.png Binary files differdeleted file mode 100755 index 8a3eb7bf..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_14.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_15.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_15.png Binary files differdeleted file mode 100755 index 509be7f6..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_15.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_16.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_16.png Binary files differdeleted file mode 100755 index 3a31be0a..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_16.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_17.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_17.png Binary files differdeleted file mode 100755 index b94cb415..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_17.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_18.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_18.png Binary files differdeleted file mode 100755 index 45b70855..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_18.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_19.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_19.png Binary files differdeleted file mode 100755 index f5c94f21..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_19.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_20.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_20.png Binary files differdeleted file mode 100755 index b993d430..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_20.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_21.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_21.png Binary files differdeleted file mode 100755 index 88612b24..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_21.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_22.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_22.png Binary files differdeleted file mode 100755 index fcb4946f..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_22.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_23.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_23.png Binary files differdeleted file mode 100755 index 78fa32a4..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_23.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_24.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_24.png Binary files differdeleted file mode 100755 index 3abfe675..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_24.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_25.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_25.png Binary files differdeleted file mode 100755 index a2489716..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_25.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_26.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_26.png Binary files differdeleted file mode 100755 index 46b244f8..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_26.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_27.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_27.png Binary files differdeleted file mode 100755 index 215a3897..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_27.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_28.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_28.png Binary files differdeleted file mode 100755 index c598d274..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_28.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_29.png b/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_29.png Binary files differdeleted file mode 100755 index 02266dcc..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_29.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png Binary files differdeleted file mode 100755 index 104bcf32..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png Binary files differdeleted file mode 100755 index 7853e63e..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png Binary files differdeleted file mode 100755 index ab046742..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png Binary files differdeleted file mode 100755 index 0b547aa9..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png Binary files differdeleted file mode 100755 index 61b14879..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png Binary files differdeleted file mode 100755 index 73f89f11..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png Binary files differdeleted file mode 100755 index 8c0284b8..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png Binary files differdeleted file mode 100755 index 7bcbdece..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png Binary files differdeleted file mode 100755 index 5756d57a..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png Binary files differdeleted file mode 100755 index 7988b1b0..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png Binary files differdeleted file mode 100755 index 1459685e..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png Binary files differdeleted file mode 100755 index 66fc1248..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png Binary files differdeleted file mode 100755 index 3cb81e73..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png Binary files differdeleted file mode 100755 index 9b7fd49c..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png Binary files differdeleted file mode 100755 index e55e53de..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png Binary files differdeleted file mode 100755 index a7a3b7c1..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png Binary files differdeleted file mode 100755 index f6de10fb..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png Binary files differdeleted file mode 100755 index 0bff8649..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png Binary files differdeleted file mode 100755 index 9e16c827..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png Binary files differdeleted file mode 100755 index 9d19c882..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png Binary files differdeleted file mode 100755 index 759e192d..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png Binary files differdeleted file mode 100755 index 522bdc55..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png Binary files differdeleted file mode 100755 index 5d44f9ee..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png Binary files differdeleted file mode 100755 index cedc8c8c..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png Binary files differdeleted file mode 100755 index fdcf8552..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png Binary files differdeleted file mode 100755 index cba3e51d..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png Binary files differdeleted file mode 100755 index e7054417..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png Binary files differdeleted file mode 100755 index fb50a260..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png Binary files differdeleted file mode 100755 index 29772219..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png b/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png Binary files differdeleted file mode 100755 index 24a00cb5..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_00.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_00.png Binary files differdeleted file mode 100755 index 7ea575ef..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_00.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_01.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_01.png Binary files differdeleted file mode 100755 index a5b63d30..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_01.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_02.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_02.png Binary files differdeleted file mode 100755 index 3712f78b..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_02.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_03.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_03.png Binary files differdeleted file mode 100755 index 5f69bda8..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_03.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_04.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_04.png Binary files differdeleted file mode 100755 index d60e8cd0..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_04.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_05.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_05.png Binary files differdeleted file mode 100755 index 86815cbc..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_05.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_06.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_06.png Binary files differdeleted file mode 100755 index 853527c3..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_06.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_07.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_07.png Binary files differdeleted file mode 100755 index 2805cc0b..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_07.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_08.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_08.png Binary files differdeleted file mode 100755 index 37415fa3..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_08.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_09.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_09.png Binary files differdeleted file mode 100755 index fde593ef..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_09.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_10.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_10.png Binary files differdeleted file mode 100755 index 6d1d7fa5..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_10.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_11.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_11.png Binary files differdeleted file mode 100755 index e74574a4..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_11.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_12.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_12.png Binary files differdeleted file mode 100755 index e194d765..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_12.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_13.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_13.png Binary files differdeleted file mode 100755 index 72c0ffcb..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_13.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_14.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_14.png Binary files differdeleted file mode 100755 index 9363e342..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_14.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_15.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_15.png Binary files differdeleted file mode 100755 index 838c5856..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_15.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_16.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_16.png Binary files differdeleted file mode 100755 index 5263fa7e..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_16.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_17.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_17.png Binary files differdeleted file mode 100755 index 254a0857..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_17.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_18.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_18.png Binary files differdeleted file mode 100755 index 950bedad..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_18.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_19.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_19.png Binary files differdeleted file mode 100755 index 53e11903..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_19.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_20.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_20.png Binary files differdeleted file mode 100755 index ed7c8712..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_20.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_21.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_21.png Binary files differdeleted file mode 100755 index 6f236072..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_21.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_22.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_22.png Binary files differdeleted file mode 100755 index 359674c9..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_22.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_23.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_23.png Binary files differdeleted file mode 100755 index 1f026e8f..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_23.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_24.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_24.png Binary files differdeleted file mode 100755 index 955ec833..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_24.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_25.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_25.png Binary files differdeleted file mode 100755 index 6e6db92a..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_25.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_26.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_26.png Binary files differdeleted file mode 100755 index 663d4820..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_26.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_27.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_27.png Binary files differdeleted file mode 100755 index b1c4cd4e..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_27.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_28.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_28.png Binary files differdeleted file mode 100755 index c4c47e9c..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_28.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_29.png b/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_29.png Binary files differdeleted file mode 100755 index d39d807b..00000000 --- a/mobile/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_29.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_button_icon_clear.png b/mobile/MIDDLE/images/Content_views/core_button_icon_clear.png Binary files differdeleted file mode 100755 index ae9c80d5..00000000 --- a/mobile/MIDDLE/images/Content_views/core_button_icon_clear.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_dropdown_label_bg.#.png b/mobile/MIDDLE/images/Content_views/core_dropdown_label_bg.#.png Binary files differdeleted file mode 100755 index 17e88fca..00000000 --- a/mobile/MIDDLE/images/Content_views/core_dropdown_label_bg.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_dropdown_label_bg_stroke.#.png b/mobile/MIDDLE/images/Content_views/core_dropdown_label_bg_stroke.#.png Binary files differdeleted file mode 100755 index 36f4c34a..00000000 --- a/mobile/MIDDLE/images/Content_views/core_dropdown_label_bg_stroke.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_dropdown_label_icon_arrow.png b/mobile/MIDDLE/images/Content_views/core_dropdown_label_icon_arrow.png Binary files differdeleted file mode 100755 index 8baacdc8..00000000 --- a/mobile/MIDDLE/images/Content_views/core_dropdown_label_icon_arrow.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_focus.#.png b/mobile/MIDDLE/images/Content_views/core_focus.#.png Binary files differdeleted file mode 100755 index bf366868..00000000 --- a/mobile/MIDDLE/images/Content_views/core_focus.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_folder_icon_folder.png b/mobile/MIDDLE/images/Content_views/core_folder_icon_folder.png Binary files differdeleted file mode 100755 index e230b0e0..00000000 --- a/mobile/MIDDLE/images/Content_views/core_folder_icon_folder.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_folder_icon_minus.png b/mobile/MIDDLE/images/Content_views/core_folder_icon_minus.png Binary files differdeleted file mode 100755 index 0cb1cc6b..00000000 --- a/mobile/MIDDLE/images/Content_views/core_folder_icon_minus.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_folder_icon_plus.png b/mobile/MIDDLE/images/Content_views/core_folder_icon_plus.png Binary files differdeleted file mode 100755 index 144f3edd..00000000 --- a/mobile/MIDDLE/images/Content_views/core_folder_icon_plus.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_group_list_bg_ef.#.png b/mobile/MIDDLE/images/Content_views/core_group_list_bg_ef.#.png Binary files differdeleted file mode 100644 index d7424efd..00000000 --- a/mobile/MIDDLE/images/Content_views/core_group_list_bg_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_pattern_empty_bg.png b/mobile/MIDDLE/images/Content_views/core_pattern_empty_bg.png Binary files differdeleted file mode 100644 index 1a871343..00000000 --- a/mobile/MIDDLE/images/Content_views/core_pattern_empty_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_pattern_empty_bg_h.png b/mobile/MIDDLE/images/Content_views/core_pattern_empty_bg_h.png Binary files differdeleted file mode 100644 index eeab3028..00000000 --- a/mobile/MIDDLE/images/Content_views/core_pattern_empty_bg_h.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Content_views/core_title_icon_option.png b/mobile/MIDDLE/images/Content_views/core_title_icon_option.png Binary files differdeleted file mode 100755 index 1d18a02c..00000000 --- a/mobile/MIDDLE/images/Content_views/core_title_icon_option.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_activity_Indicator_large.png b/mobile/MIDDLE/images/Controls/core_activity_Indicator_large.png Binary files differdeleted file mode 100755 index bff05abc..00000000 --- a/mobile/MIDDLE/images/Controls/core_activity_Indicator_large.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_activity_Indicator_medium.png b/mobile/MIDDLE/images/Controls/core_activity_Indicator_medium.png Binary files differdeleted file mode 100755 index edaf0fe0..00000000 --- a/mobile/MIDDLE/images/Controls/core_activity_Indicator_medium.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_activity_Indicator_small.png b/mobile/MIDDLE/images/Controls/core_activity_Indicator_small.png Binary files differdeleted file mode 100755 index a70c4054..00000000 --- a/mobile/MIDDLE/images/Controls/core_activity_Indicator_small.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_button_add.png b/mobile/MIDDLE/images/Controls/core_button_add.png Binary files differdeleted file mode 100755 index ff9e0b18..00000000 --- a/mobile/MIDDLE/images/Controls/core_button_add.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_button_bg.#.png b/mobile/MIDDLE/images/Controls/core_button_bg.#.png Binary files differdeleted file mode 100755 index fb8e2d48..00000000 --- a/mobile/MIDDLE/images/Controls/core_button_bg.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_button_delete.png b/mobile/MIDDLE/images/Controls/core_button_delete.png Binary files differdeleted file mode 100755 index 854e6003..00000000 --- a/mobile/MIDDLE/images/Controls/core_button_delete.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_button_reorder.png b/mobile/MIDDLE/images/Controls/core_button_reorder.png Binary files differdeleted file mode 100755 index 80946b16..00000000 --- a/mobile/MIDDLE/images/Controls/core_button_reorder.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_check_bg.png b/mobile/MIDDLE/images/Controls/core_check_bg.png Binary files differdeleted file mode 100755 index d2d3792d..00000000 --- a/mobile/MIDDLE/images/Controls/core_check_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_check_bg_stroke.png b/mobile/MIDDLE/images/Controls/core_check_bg_stroke.png Binary files differdeleted file mode 100755 index 4dee1e7f..00000000 --- a/mobile/MIDDLE/images/Controls/core_check_bg_stroke.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_check_icon.png b/mobile/MIDDLE/images/Controls/core_check_icon.png Binary files differdeleted file mode 100755 index 037e7597..00000000 --- a/mobile/MIDDLE/images/Controls/core_check_icon.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_color_picker_color_shadow.png b/mobile/MIDDLE/images/Controls/core_color_picker_color_shadow.png Binary files differdeleted file mode 100755 index a9cc9d5a..00000000 --- a/mobile/MIDDLE/images/Controls/core_color_picker_color_shadow.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_color_picker_palette.png b/mobile/MIDDLE/images/Controls/core_color_picker_palette.png Binary files differdeleted file mode 100755 index 94ff4cce..00000000 --- a/mobile/MIDDLE/images/Controls/core_color_picker_palette.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_color_picker_palette_focused.png b/mobile/MIDDLE/images/Controls/core_color_picker_palette_focused.png Binary files differdeleted file mode 100755 index 6c616ca1..00000000 --- a/mobile/MIDDLE/images/Controls/core_color_picker_palette_focused.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_color_picker_palette_selected.png b/mobile/MIDDLE/images/Controls/core_color_picker_palette_selected.png Binary files differdeleted file mode 100755 index e70de271..00000000 --- a/mobile/MIDDLE/images/Controls/core_color_picker_palette_selected.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_color_picker_palette_selected_bg.png b/mobile/MIDDLE/images/Controls/core_color_picker_palette_selected_bg.png Binary files differdeleted file mode 100755 index a76b5242..00000000 --- a/mobile/MIDDLE/images/Controls/core_color_picker_palette_selected_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_brightness.png b/mobile/MIDDLE/images/Controls/core_icon_brightness.png Binary files differdeleted file mode 100755 index 03ee94b7..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_brightness.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_container.png b/mobile/MIDDLE/images/Controls/core_icon_container.png Binary files differdeleted file mode 100755 index 3a356d28..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_container.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_expand_close.png b/mobile/MIDDLE/images/Controls/core_icon_expand_close.png Binary files differdeleted file mode 100755 index 5144bfd3..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_expand_close.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_expand_open.png b/mobile/MIDDLE/images/Controls/core_icon_expand_open.png Binary files differdeleted file mode 100755 index fad7ece9..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_expand_open.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_favorite.png b/mobile/MIDDLE/images/Controls/core_icon_favorite.png Binary files differdeleted file mode 100755 index 9c766023..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_favorite.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_down.png b/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_down.png Binary files differdeleted file mode 100755 index a9180e64..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_down.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_left.png b/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_left.png Binary files differdeleted file mode 100644 index 86dd9f5f..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_left.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_right.png b/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_right.png Binary files differdeleted file mode 100644 index ca413c9c..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_right.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_up.png b/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_up.png Binary files differdeleted file mode 100755 index 8ad131e2..00000000 --- a/mobile/MIDDLE/images/Controls/core_icon_picker_arrow_up.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_h.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_bar_h.#.png Binary files differdeleted file mode 100755 index 46dd4aa3..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_h.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_h_ef.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_bar_h_ef.#.png Binary files differdeleted file mode 100755 index d27ce3f6..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_h_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_v.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_bar_v.#.png Binary files differdeleted file mode 100755 index f49f7f5c..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_v.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_v_ef.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_bar_v_ef.#.png Binary files differdeleted file mode 100755 index 3f9555cb..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_bar_v_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_h_01.png b/mobile/MIDDLE/images/Controls/core_index_scroll_handler_h_01.png Binary files differdeleted file mode 100755 index 55a59cef..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_h_01.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_h_02.png b/mobile/MIDDLE/images/Controls/core_index_scroll_handler_h_02.png Binary files differdeleted file mode 100755 index 550c14ca..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_h_02.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_v_01.png b/mobile/MIDDLE/images/Controls/core_index_scroll_handler_v_01.png Binary files differdeleted file mode 100755 index 00f6f724..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_v_01.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_v_02.png b/mobile/MIDDLE/images/Controls/core_index_scroll_handler_v_02.png Binary files differdeleted file mode 100755 index 7da518dc..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_handler_v_02.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg.#.png Binary files differdeleted file mode 100755 index 2c38e2a9..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg_ef.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg_ef.#.png Binary files differdeleted file mode 100755 index 0e35ec87..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg_stroke.#.png b/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg_stroke.#.png Binary files differdeleted file mode 100755 index 5b91618e..00000000 --- a/mobile/MIDDLE/images/Controls/core_index_scroll_popup_bg_stroke.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_list_button_bg.#.png b/mobile/MIDDLE/images/Controls/core_list_button_bg.#.png Binary files differdeleted file mode 100755 index 6e326fc8..00000000 --- a/mobile/MIDDLE/images/Controls/core_list_button_bg.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_progress_bar.#.png b/mobile/MIDDLE/images/Controls/core_progress_bar.#.png Binary files differdeleted file mode 100755 index f6ae9466..00000000 --- a/mobile/MIDDLE/images/Controls/core_progress_bar.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_progress_bar_v.#.png b/mobile/MIDDLE/images/Controls/core_progress_bar_v.#.png Binary files differdeleted file mode 100755 index 9b86e6d3..00000000 --- a/mobile/MIDDLE/images/Controls/core_progress_bar_v.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_progress_pending_bg_01.png b/mobile/MIDDLE/images/Controls/core_progress_pending_bg_01.png Binary files differdeleted file mode 100755 index 8354a328..00000000 --- a/mobile/MIDDLE/images/Controls/core_progress_pending_bg_01.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_progress_pending_bg_02.png b/mobile/MIDDLE/images/Controls/core_progress_pending_bg_02.png Binary files differdeleted file mode 100755 index 1dc90ca2..00000000 --- a/mobile/MIDDLE/images/Controls/core_progress_pending_bg_02.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_radio_bg.png b/mobile/MIDDLE/images/Controls/core_radio_bg.png Binary files differdeleted file mode 100755 index 15289180..00000000 --- a/mobile/MIDDLE/images/Controls/core_radio_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_radio_bg_stroke.png b/mobile/MIDDLE/images/Controls/core_radio_bg_stroke.png Binary files differdeleted file mode 100755 index f7200f94..00000000 --- a/mobile/MIDDLE/images/Controls/core_radio_bg_stroke.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_radio_icon.png b/mobile/MIDDLE/images/Controls/core_radio_icon.png Binary files differdeleted file mode 100755 index 215391b0..00000000 --- a/mobile/MIDDLE/images/Controls/core_radio_icon.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_scroll_bar_h.#.png b/mobile/MIDDLE/images/Controls/core_scroll_bar_h.#.png Binary files differdeleted file mode 100755 index ae7efb66..00000000 --- a/mobile/MIDDLE/images/Controls/core_scroll_bar_h.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_scroll_bar_h_ef.#.png b/mobile/MIDDLE/images/Controls/core_scroll_bar_h_ef.#.png Binary files differdeleted file mode 100755 index c6614b1c..00000000 --- a/mobile/MIDDLE/images/Controls/core_scroll_bar_h_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_scroll_bar_h_tab.#.png b/mobile/MIDDLE/images/Controls/core_scroll_bar_h_tab.#.png Binary files differdeleted file mode 100644 index 7d259173..00000000 --- a/mobile/MIDDLE/images/Controls/core_scroll_bar_h_tab.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_scroll_bar_v.#.png b/mobile/MIDDLE/images/Controls/core_scroll_bar_v.#.png Binary files differdeleted file mode 100755 index b93567f2..00000000 --- a/mobile/MIDDLE/images/Controls/core_scroll_bar_v.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_scroll_bar_v_ef.#.png b/mobile/MIDDLE/images/Controls/core_scroll_bar_v_ef.#.png Binary files differdeleted file mode 100755 index 64378ffc..00000000 --- a/mobile/MIDDLE/images/Controls/core_scroll_bar_v_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_center_point_bg.png b/mobile/MIDDLE/images/Controls/core_slider_center_point_bg.png Binary files differdeleted file mode 100755 index b6571459..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_center_point_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_center_point_bg_v.png b/mobile/MIDDLE/images/Controls/core_slider_center_point_bg_v.png Binary files differdeleted file mode 100755 index 0183dc8d..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_center_point_bg_v.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_handle_normal.png b/mobile/MIDDLE/images/Controls/core_slider_handle_normal.png Binary files differdeleted file mode 100755 index 6623b515..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_handle_normal.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_handle_press.png b/mobile/MIDDLE/images/Controls/core_slider_handle_press.png Binary files differdeleted file mode 100755 index e131d60e..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_handle_press.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_popup_bg.png b/mobile/MIDDLE/images/Controls/core_slider_popup_bg.png Binary files differdeleted file mode 100755 index 6649c238..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_popup_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_popup_bg_ef.png b/mobile/MIDDLE/images/Controls/core_slider_popup_bg_ef.png Binary files differdeleted file mode 100755 index ba289a11..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_popup_bg_ef.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_slider_popup_bg_stroke.png b/mobile/MIDDLE/images/Controls/core_slider_popup_bg_stroke.png Binary files differdeleted file mode 100755 index 70fd6605..00000000 --- a/mobile/MIDDLE/images/Controls/core_slider_popup_bg_stroke.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_toggle_bg.png b/mobile/MIDDLE/images/Controls/core_toggle_bg.png Binary files differdeleted file mode 100755 index 563d1267..00000000 --- a/mobile/MIDDLE/images/Controls/core_toggle_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_toggle_icon_off.png b/mobile/MIDDLE/images/Controls/core_toggle_icon_off.png Binary files differdeleted file mode 100755 index 37fe4e6b..00000000 --- a/mobile/MIDDLE/images/Controls/core_toggle_icon_off.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Controls/core_toggle_icon_on.png b/mobile/MIDDLE/images/Controls/core_toggle_icon_on.png Binary files differdeleted file mode 100755 index 6f56f9ac..00000000 --- a/mobile/MIDDLE/images/Controls/core_toggle_icon_on.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_Magnifier.#.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_Magnifier.#.png Binary files differdeleted file mode 100644 index 1706aa97..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_Magnifier.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_Magnifier_mask.#.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_Magnifier_mask.#.png Binary files differdeleted file mode 100644 index 450175f4..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_Magnifier_mask.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_center_circle.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_center_circle.png Binary files differdeleted file mode 100755 index cd9d8df9..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_center_circle.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_center_line.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_center_line.png Binary files differdeleted file mode 100755 index 314ece66..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_center_line.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_bottom.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_bottom.png Binary files differdeleted file mode 100644 index 048c247f..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_bottom.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_top.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_top.png Binary files differdeleted file mode 100644 index 0cd7cad2..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_top.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_line_bottom.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_line_bottom.png Binary files differdeleted file mode 100644 index bc1b3442..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_line_bottom.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_line_top.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_line_top.png Binary files differdeleted file mode 100644 index 3153d0bd..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_handler_line_top.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg.#.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg.#.png Binary files differdeleted file mode 100644 index 17feee1b..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_ef.#.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_ef.#.png Binary files differdeleted file mode 100644 index a44eea3b..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_line.#.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_line.#.png Binary files differdeleted file mode 100644 index 226b7441..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_line.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_clipboard.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_clipboard.png Binary files differdeleted file mode 100755 index e3554fc2..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_clipboard.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_copy.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_copy.png Binary files differdeleted file mode 100755 index d3ab99cf..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_copy.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_cut.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_cut.png Binary files differdeleted file mode 100755 index 0fc85eaa..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_cut.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_paste.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_paste.png Binary files differdeleted file mode 100755 index 5b20dbc2..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_paste.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select.png Binary files differdeleted file mode 100755 index b483da8e..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select_all.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select_all.png Binary files differdeleted file mode 100755 index 05e87960..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select_all.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom.png Binary files differdeleted file mode 100644 index 197dca25..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png Binary files differdeleted file mode 100644 index 654a596b..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png Binary files differdeleted file mode 100644 index 261c0a30..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up.png Binary files differdeleted file mode 100644 index f25155f6..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up_line.png b/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up_line.png Binary files differdeleted file mode 100644 index 2a54dcb8..00000000 --- a/mobile/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up_line.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-angry-shout.png b/mobile/MIDDLE/images/Emoticon/emo-angry-shout.png Binary files differdeleted file mode 100644 index 9995fe8a..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-angry-shout.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-angry.png b/mobile/MIDDLE/images/Emoticon/emo-angry.png Binary files differdeleted file mode 100644 index 8ad74e19..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-angry.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-guilty.png b/mobile/MIDDLE/images/Emoticon/emo-guilty.png Binary files differdeleted file mode 100644 index d2894414..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-guilty.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-haha.png b/mobile/MIDDLE/images/Emoticon/emo-haha.png Binary files differdeleted file mode 100644 index a4c61b7c..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-haha.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-half-smile.png b/mobile/MIDDLE/images/Emoticon/emo-half-smile.png Binary files differdeleted file mode 100644 index d1d07cc3..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-half-smile.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-happy.png b/mobile/MIDDLE/images/Emoticon/emo-happy.png Binary files differdeleted file mode 100644 index 8cdfd564..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-happy.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-kiss.png b/mobile/MIDDLE/images/Emoticon/emo-kiss.png Binary files differdeleted file mode 100644 index 0f148a87..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-kiss.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-little-bit-sorry.png b/mobile/MIDDLE/images/Emoticon/emo-little-bit-sorry.png Binary files differdeleted file mode 100644 index e053f281..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-little-bit-sorry.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-love.png b/mobile/MIDDLE/images/Emoticon/emo-love.png Binary files differdeleted file mode 100644 index 78892a09..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-love.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-minimal-smile.png b/mobile/MIDDLE/images/Emoticon/emo-minimal-smile.png Binary files differdeleted file mode 100644 index aff28da5..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-minimal-smile.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-omg.png b/mobile/MIDDLE/images/Emoticon/emo-omg.png Binary files differdeleted file mode 100644 index 94faeefc..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-omg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-smile.png b/mobile/MIDDLE/images/Emoticon/emo-smile.png Binary files differdeleted file mode 100644 index 7a011d37..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-smile.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-sorry.png b/mobile/MIDDLE/images/Emoticon/emo-sorry.png Binary files differdeleted file mode 100644 index bbfbe4e8..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-sorry.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-surprised.png b/mobile/MIDDLE/images/Emoticon/emo-surprised.png Binary files differdeleted file mode 100644 index 87a9d987..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-surprised.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-tongue-dangling.png b/mobile/MIDDLE/images/Emoticon/emo-tongue-dangling.png Binary files differdeleted file mode 100644 index 3a7f0ac4..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-tongue-dangling.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-very-sorry.png b/mobile/MIDDLE/images/Emoticon/emo-very-sorry.png Binary files differdeleted file mode 100644 index a9daeb73..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-very-sorry.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-wink.png b/mobile/MIDDLE/images/Emoticon/emo-wink.png Binary files differdeleted file mode 100644 index 2f22878a..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-wink.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Emoticon/emo-worried.png b/mobile/MIDDLE/images/Emoticon/emo-worried.png Binary files differdeleted file mode 100644 index 9bb78c86..00000000 --- a/mobile/MIDDLE/images/Emoticon/emo-worried.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_icon_badge_container.#.png b/mobile/MIDDLE/images/Navigation_elements/core_icon_badge_container.#.png Binary files differdeleted file mode 100755 index e7102347..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_icon_badge_container.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_icon_badge_container_outer.#.png b/mobile/MIDDLE/images/Navigation_elements/core_icon_badge_container_outer.#.png Binary files differdeleted file mode 100755 index 5fd01437..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_icon_badge_container_outer.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_icon_drawer.png b/mobile/MIDDLE/images/Navigation_elements/core_icon_drawer.png Binary files differdeleted file mode 100755 index f58e6770..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_icon_drawer.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_navigation_bar_bg.png b/mobile/MIDDLE/images/Navigation_elements/core_navigation_bar_bg.png Binary files differdeleted file mode 100755 index 28503a57..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_navigation_bar_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_navigation_bar_icon_arrow.png b/mobile/MIDDLE/images/Navigation_elements/core_navigation_bar_icon_arrow.png Binary files differdeleted file mode 100755 index 39301643..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_navigation_bar_icon_arrow.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_off.png b/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_off.png Binary files differdeleted file mode 100755 index 7b8fabd7..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_off.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_off_ef.png b/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_off_ef.png Binary files differdeleted file mode 100755 index e3d999fa..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_off_ef.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_on.png b/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_on.png Binary files differdeleted file mode 100755 index eb256e1e..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_page_indicator_on.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_title_button_bg.png b/mobile/MIDDLE/images/Navigation_elements/core_title_button_bg.png Binary files differdeleted file mode 100755 index 1e22522d..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_title_button_bg.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_title_button_focus.png b/mobile/MIDDLE/images/Navigation_elements/core_title_button_focus.png Binary files differdeleted file mode 100755 index cdbcea07..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_title_button_focus.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_title_icon_cancel.png b/mobile/MIDDLE/images/Navigation_elements/core_title_icon_cancel.png Binary files differdeleted file mode 100755 index 98fe29a1..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_title_icon_cancel.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Navigation_elements/core_title_icon_done.png b/mobile/MIDDLE/images/Navigation_elements/core_title_icon_done.png Binary files differdeleted file mode 100755 index ecc3061b..00000000 --- a/mobile/MIDDLE/images/Navigation_elements/core_title_icon_done.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Popups/core_popup_noti_bg.#.png b/mobile/MIDDLE/images/Popups/core_popup_noti_bg.#.png Binary files differdeleted file mode 100755 index 74e6dda9..00000000 --- a/mobile/MIDDLE/images/Popups/core_popup_noti_bg.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Popups/core_popup_noti_bg_ef.#.png b/mobile/MIDDLE/images/Popups/core_popup_noti_bg_ef.#.png Binary files differdeleted file mode 100755 index 0df0511e..00000000 --- a/mobile/MIDDLE/images/Popups/core_popup_noti_bg_ef.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Popups/core_popup_noti_bg_stroke.#.png b/mobile/MIDDLE/images/Popups/core_popup_noti_bg_stroke.#.png Binary files differdeleted file mode 100755 index 78efbcf4..00000000 --- a/mobile/MIDDLE/images/Popups/core_popup_noti_bg_stroke.#.png +++ /dev/null diff --git a/mobile/MIDDLE/images/Popups/core_popup_top.#.png b/mobile/MIDDLE/images/Popups/core_popup_top.#.png Binary files differdeleted file mode 100755 index 003ec207..00000000 --- a/mobile/MIDDLE/images/Popups/core_popup_top.#.png +++ /dev/null diff --git a/mobile/Makefile.am b/mobile/Makefile.am index d343097a..6e99ac4c 100644 --- a/mobile/Makefile.am +++ b/mobile/Makefile.am @@ -19,31 +19,6 @@ all: -id ./HD/images/Emoticon\ -id ./HD/images/Old\ -sd ./HD/sounds -fd ../objects \ - -id ./SMALL/images/ \ - -id ./SMALL/images/Activity_indicator/ \ - -id ./SMALL/images/Activity_indicator/large \ - -id ./SMALL/images/Activity_indicator/medium \ - -id ./SMALL/images/Activity_indicator/small \ - -id ./SMALL/images/Content_views \ - -id ./SMALL/images/Controls \ - -id ./SMALL/images/Copy_Paste \ - -id ./SMALL/images/Emoticon \ - -id ./SMALL/images/Navigation_elements \ - -id ./SMALL/images/Popups \ - -id ./SMALL/images/Indicator \ - -sd ./SMALL/sounds -fd ../objects \ - -id ./MIDDLE/images/ \ - -id ./MIDDLE/images/Activity_indicator/ \ - -id ./MIDDLE/images/Activity_indicator/large \ - -id ./MIDDLE/images/Activity_indicator/medium \ - -id ./MIDDLE/images/Activity_indicator/small \ - -id ./MIDDLE/images/Content_views \ - -id ./MIDDLE/images/Controls \ - -id ./MIDDLE/images/Copy_Paste \ - -id ./MIDDLE/images/Emoticon \ - -id ./MIDDLE/images/Navigation_elements \ - -id ./MIDDLE/images/Popups \ - -sd ./MIDDLE/sounds -fd ../objects \ $(SRC).edc $(SRC).edj; edje_cc $(EDJE_FLAGS_$(V)) \ -id default/images/tizen-hd -sd default/sounds -fd ../objects \ @@ -55,17 +30,6 @@ all: -id ./HD/images/Copy_Paste\ -id ./HD/images/Emoticon\ -id ./HD/images/Old\ - -id ./SMALL/images/\ - -id ./SMALL/images/Activity_indicator/\ - -id ./SMALL/images/Activity_indicator/large\ - -id ./SMALL/images/Activity_indicator/medium\ - -id ./SMALL/images/Activity_indicator/small\ - -id ./SMALL/images/Content_views\ - -id ./SMALL/images/Controls\ - -id ./SMALL/images/Copy_Paste\ - -id ./SMALL/images/Emoticon\ - -id ./SMALL/images/Navigation_elements\ - -id ./SMALL/images/Popups\ $(DEFAULT_SRC).edc $(DEFAULT_SRC).edj; diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_00.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_00.png Binary files differdeleted file mode 100644 index 05cb5479..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_00.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_01.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_01.png Binary files differdeleted file mode 100644 index 53cff683..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_01.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_02.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_02.png Binary files differdeleted file mode 100644 index 525f882c..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_02.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_03.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_03.png Binary files differdeleted file mode 100644 index 580012e3..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_03.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_04.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_04.png Binary files differdeleted file mode 100644 index b40035f8..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_04.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_05.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_05.png Binary files differdeleted file mode 100644 index 0cbddc67..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_05.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_06.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_06.png Binary files differdeleted file mode 100644 index 2db5b519..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_06.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_07.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_07.png Binary files differdeleted file mode 100644 index bd4bab17..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_07.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_08.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_08.png Binary files differdeleted file mode 100644 index 67cace68..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_08.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_09.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_09.png Binary files differdeleted file mode 100644 index 3d041c02..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_09.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_10.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_10.png Binary files differdeleted file mode 100644 index 4628958b..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_10.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_11.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_11.png Binary files differdeleted file mode 100644 index de400e3a..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_11.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_12.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_12.png Binary files differdeleted file mode 100644 index 2097cb57..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_12.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_13.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_13.png Binary files differdeleted file mode 100644 index ded89099..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_13.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_14.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_14.png Binary files differdeleted file mode 100644 index 61d9be0f..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_14.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_15.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_15.png Binary files differdeleted file mode 100644 index ef6bebbc..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_15.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_16.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_16.png Binary files differdeleted file mode 100644 index ec370e6e..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_16.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_17.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_17.png Binary files differdeleted file mode 100644 index 1e298482..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_17.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_18.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_18.png Binary files differdeleted file mode 100644 index c8fcd13b..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_18.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_19.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_19.png Binary files differdeleted file mode 100644 index 892bebe1..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_19.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_20.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_20.png Binary files differdeleted file mode 100644 index a46231f8..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_20.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_21.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_21.png Binary files differdeleted file mode 100644 index 67424cd9..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_21.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_22.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_22.png Binary files differdeleted file mode 100644 index 1551b12f..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_22.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_23.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_23.png Binary files differdeleted file mode 100644 index 1ae3057c..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_23.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_24.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_24.png Binary files differdeleted file mode 100644 index 7a2049bb..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_24.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_25.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_25.png Binary files differdeleted file mode 100644 index 8f650015..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_25.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_26.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_26.png Binary files differdeleted file mode 100644 index 105f5e09..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_26.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_27.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_27.png Binary files differdeleted file mode 100644 index 10f45b29..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_27.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_28.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_28.png Binary files differdeleted file mode 100644 index 70777106..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_28.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_29.png b/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_29.png Binary files differdeleted file mode 100644 index a882859d..00000000 --- a/mobile/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_29.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png Binary files differdeleted file mode 100644 index 37b7a90d..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png Binary files differdeleted file mode 100644 index c14c54b0..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png Binary files differdeleted file mode 100644 index 693f8f29..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png Binary files differdeleted file mode 100644 index 0270a404..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png Binary files differdeleted file mode 100644 index 6fc55873..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png Binary files differdeleted file mode 100644 index ee5d96b1..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png Binary files differdeleted file mode 100644 index 46e39641..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png Binary files differdeleted file mode 100644 index 93ebf9ed..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png Binary files differdeleted file mode 100644 index 8e4c6881..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png Binary files differdeleted file mode 100644 index 007218f5..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png Binary files differdeleted file mode 100644 index 75cb0f86..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png Binary files differdeleted file mode 100644 index 5df320a1..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png Binary files differdeleted file mode 100644 index c28de6ba..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png Binary files differdeleted file mode 100644 index 2fd2e51d..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png Binary files differdeleted file mode 100644 index 9e07a5d0..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png Binary files differdeleted file mode 100644 index 5fccce57..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png Binary files differdeleted file mode 100644 index 5bdbcddf..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png Binary files differdeleted file mode 100644 index 88becef3..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png Binary files differdeleted file mode 100644 index ef23ee03..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png Binary files differdeleted file mode 100644 index e8a6dba9..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png Binary files differdeleted file mode 100644 index 79e50b15..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png Binary files differdeleted file mode 100644 index 2f9f472b..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png Binary files differdeleted file mode 100644 index 9f77e60e..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png Binary files differdeleted file mode 100644 index bea093d3..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png Binary files differdeleted file mode 100644 index dcad32d7..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png Binary files differdeleted file mode 100644 index 46cdca2d..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png Binary files differdeleted file mode 100644 index 62071df0..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png Binary files differdeleted file mode 100644 index 55b2cabd..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png Binary files differdeleted file mode 100644 index 85868f57..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png b/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png Binary files differdeleted file mode 100644 index 6e358a15..00000000 --- a/mobile/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_00.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_00.png Binary files differdeleted file mode 100644 index d62fae76..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_00.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_01.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_01.png Binary files differdeleted file mode 100644 index 63cb531d..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_01.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_02.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_02.png Binary files differdeleted file mode 100644 index de3e25b6..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_02.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_03.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_03.png Binary files differdeleted file mode 100644 index ee57d118..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_03.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_04.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_04.png Binary files differdeleted file mode 100644 index 66564622..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_04.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_05.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_05.png Binary files differdeleted file mode 100644 index 7be533ce..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_05.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_06.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_06.png Binary files differdeleted file mode 100644 index ee5c6826..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_06.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_07.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_07.png Binary files differdeleted file mode 100644 index 3294b3a2..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_07.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_08.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_08.png Binary files differdeleted file mode 100644 index fa8a2c13..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_08.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_09.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_09.png Binary files differdeleted file mode 100644 index 430be0a8..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_09.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_10.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_10.png Binary files differdeleted file mode 100644 index 25e11219..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_10.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_11.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_11.png Binary files differdeleted file mode 100644 index 0da56d08..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_11.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_12.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_12.png Binary files differdeleted file mode 100644 index 3c7c428f..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_12.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_13.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_13.png Binary files differdeleted file mode 100644 index 62d07671..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_13.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_14.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_14.png Binary files differdeleted file mode 100644 index ba7da289..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_14.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_15.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_15.png Binary files differdeleted file mode 100644 index 02da45a0..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_15.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_16.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_16.png Binary files differdeleted file mode 100644 index cf9ff136..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_16.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_17.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_17.png Binary files differdeleted file mode 100644 index 86db1e18..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_17.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_18.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_18.png Binary files differdeleted file mode 100644 index 7d33fb2e..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_18.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_19.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_19.png Binary files differdeleted file mode 100644 index fa016c05..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_19.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_20.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_20.png Binary files differdeleted file mode 100644 index a62ad25c..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_20.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_21.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_21.png Binary files differdeleted file mode 100644 index 78fa3aa0..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_21.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_22.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_22.png Binary files differdeleted file mode 100644 index 2bb086bd..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_22.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_23.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_23.png Binary files differdeleted file mode 100644 index 37aa26f5..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_23.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_24.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_24.png Binary files differdeleted file mode 100644 index d3f6f4d2..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_24.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_25.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_25.png Binary files differdeleted file mode 100644 index 85a2b817..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_25.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_26.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_26.png Binary files differdeleted file mode 100644 index ac459c9e..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_26.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_27.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_27.png Binary files differdeleted file mode 100644 index 4271b3c9..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_27.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_28.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_28.png Binary files differdeleted file mode 100644 index d0359778..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_28.png +++ /dev/null diff --git a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_29.png b/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_29.png Binary files differdeleted file mode 100644 index db892f87..00000000 --- a/mobile/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_29.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_button_icon_clear.png b/mobile/SMALL/images/Content_views/core_button_icon_clear.png Binary files differdeleted file mode 100644 index 89702e88..00000000 --- a/mobile/SMALL/images/Content_views/core_button_icon_clear.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_dropdown_label_bg.#.png b/mobile/SMALL/images/Content_views/core_dropdown_label_bg.#.png Binary files differdeleted file mode 100644 index 8d669ee4..00000000 --- a/mobile/SMALL/images/Content_views/core_dropdown_label_bg.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_dropdown_label_bg_stroke.#.png b/mobile/SMALL/images/Content_views/core_dropdown_label_bg_stroke.#.png Binary files differdeleted file mode 100644 index 557c707d..00000000 --- a/mobile/SMALL/images/Content_views/core_dropdown_label_bg_stroke.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_dropdown_label_icon_arrow.png b/mobile/SMALL/images/Content_views/core_dropdown_label_icon_arrow.png Binary files differdeleted file mode 100644 index fb111b05..00000000 --- a/mobile/SMALL/images/Content_views/core_dropdown_label_icon_arrow.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_focus.#.png b/mobile/SMALL/images/Content_views/core_focus.#.png Binary files differdeleted file mode 100644 index 16a3b7df..00000000 --- a/mobile/SMALL/images/Content_views/core_focus.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_folder_icon_folder.png b/mobile/SMALL/images/Content_views/core_folder_icon_folder.png Binary files differdeleted file mode 100644 index dc379fa3..00000000 --- a/mobile/SMALL/images/Content_views/core_folder_icon_folder.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_folder_icon_minus.png b/mobile/SMALL/images/Content_views/core_folder_icon_minus.png Binary files differdeleted file mode 100644 index a94a9f15..00000000 --- a/mobile/SMALL/images/Content_views/core_folder_icon_minus.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_folder_icon_plus.png b/mobile/SMALL/images/Content_views/core_folder_icon_plus.png Binary files differdeleted file mode 100644 index 9dc8402c..00000000 --- a/mobile/SMALL/images/Content_views/core_folder_icon_plus.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_group_list_bg_ef.#.png b/mobile/SMALL/images/Content_views/core_group_list_bg_ef.#.png Binary files differdeleted file mode 100644 index d7424efd..00000000 --- a/mobile/SMALL/images/Content_views/core_group_list_bg_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_pattern_empty_bg.png b/mobile/SMALL/images/Content_views/core_pattern_empty_bg.png Binary files differdeleted file mode 100755 index fff3c00e..00000000 --- a/mobile/SMALL/images/Content_views/core_pattern_empty_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_pattern_empty_bg_h.png b/mobile/SMALL/images/Content_views/core_pattern_empty_bg_h.png Binary files differdeleted file mode 100644 index c67291d8..00000000 --- a/mobile/SMALL/images/Content_views/core_pattern_empty_bg_h.png +++ /dev/null diff --git a/mobile/SMALL/images/Content_views/core_title_icon_option.png b/mobile/SMALL/images/Content_views/core_title_icon_option.png Binary files differdeleted file mode 100755 index 762a7d4a..00000000 --- a/mobile/SMALL/images/Content_views/core_title_icon_option.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_button_add.png b/mobile/SMALL/images/Controls/core_button_add.png Binary files differdeleted file mode 100644 index b0911482..00000000 --- a/mobile/SMALL/images/Controls/core_button_add.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_button_bg.#.png b/mobile/SMALL/images/Controls/core_button_bg.#.png Binary files differdeleted file mode 100644 index eba1fe58..00000000 --- a/mobile/SMALL/images/Controls/core_button_bg.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_button_delete.png b/mobile/SMALL/images/Controls/core_button_delete.png Binary files differdeleted file mode 100644 index b93030b3..00000000 --- a/mobile/SMALL/images/Controls/core_button_delete.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_button_reorder.png b/mobile/SMALL/images/Controls/core_button_reorder.png Binary files differdeleted file mode 100755 index 21a06ec9..00000000 --- a/mobile/SMALL/images/Controls/core_button_reorder.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_check_bg.png b/mobile/SMALL/images/Controls/core_check_bg.png Binary files differdeleted file mode 100644 index 8a295283..00000000 --- a/mobile/SMALL/images/Controls/core_check_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_check_bg_stroke.png b/mobile/SMALL/images/Controls/core_check_bg_stroke.png Binary files differdeleted file mode 100644 index 54f7e134..00000000 --- a/mobile/SMALL/images/Controls/core_check_bg_stroke.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_check_icon.png b/mobile/SMALL/images/Controls/core_check_icon.png Binary files differdeleted file mode 100644 index 1ad477a1..00000000 --- a/mobile/SMALL/images/Controls/core_check_icon.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_color_picker_color_shadow.png b/mobile/SMALL/images/Controls/core_color_picker_color_shadow.png Binary files differdeleted file mode 100644 index 1dcb359c..00000000 --- a/mobile/SMALL/images/Controls/core_color_picker_color_shadow.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_color_picker_palette.png b/mobile/SMALL/images/Controls/core_color_picker_palette.png Binary files differdeleted file mode 100644 index be0bc79b..00000000 --- a/mobile/SMALL/images/Controls/core_color_picker_palette.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_color_picker_palette_focused.png b/mobile/SMALL/images/Controls/core_color_picker_palette_focused.png Binary files differdeleted file mode 100644 index cd27c935..00000000 --- a/mobile/SMALL/images/Controls/core_color_picker_palette_focused.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_color_picker_palette_selected.png b/mobile/SMALL/images/Controls/core_color_picker_palette_selected.png Binary files differdeleted file mode 100644 index 5245cf23..00000000 --- a/mobile/SMALL/images/Controls/core_color_picker_palette_selected.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_color_picker_palette_selected_bg.png b/mobile/SMALL/images/Controls/core_color_picker_palette_selected_bg.png Binary files differdeleted file mode 100644 index d6b76d5b..00000000 --- a/mobile/SMALL/images/Controls/core_color_picker_palette_selected_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_brightness.png b/mobile/SMALL/images/Controls/core_icon_brightness.png Binary files differdeleted file mode 100644 index 0ab208c7..00000000 --- a/mobile/SMALL/images/Controls/core_icon_brightness.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_container.png b/mobile/SMALL/images/Controls/core_icon_container.png Binary files differdeleted file mode 100644 index 570a91e6..00000000 --- a/mobile/SMALL/images/Controls/core_icon_container.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_expand_close.png b/mobile/SMALL/images/Controls/core_icon_expand_close.png Binary files differdeleted file mode 100644 index f386dd8e..00000000 --- a/mobile/SMALL/images/Controls/core_icon_expand_close.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_expand_open.png b/mobile/SMALL/images/Controls/core_icon_expand_open.png Binary files differdeleted file mode 100644 index 2e608cfd..00000000 --- a/mobile/SMALL/images/Controls/core_icon_expand_open.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_favorite.png b/mobile/SMALL/images/Controls/core_icon_favorite.png Binary files differdeleted file mode 100644 index 292bad2b..00000000 --- a/mobile/SMALL/images/Controls/core_icon_favorite.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_picker_arrow_down.png b/mobile/SMALL/images/Controls/core_icon_picker_arrow_down.png Binary files differdeleted file mode 100644 index e16bb8bf..00000000 --- a/mobile/SMALL/images/Controls/core_icon_picker_arrow_down.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_picker_arrow_left.png b/mobile/SMALL/images/Controls/core_icon_picker_arrow_left.png Binary files differdeleted file mode 100755 index 78f6081d..00000000 --- a/mobile/SMALL/images/Controls/core_icon_picker_arrow_left.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_picker_arrow_right.png b/mobile/SMALL/images/Controls/core_icon_picker_arrow_right.png Binary files differdeleted file mode 100755 index 84a88329..00000000 --- a/mobile/SMALL/images/Controls/core_icon_picker_arrow_right.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_icon_picker_arrow_up.png b/mobile/SMALL/images/Controls/core_icon_picker_arrow_up.png Binary files differdeleted file mode 100644 index 465c91d4..00000000 --- a/mobile/SMALL/images/Controls/core_icon_picker_arrow_up.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_bar_h.#.png b/mobile/SMALL/images/Controls/core_index_scroll_bar_h.#.png Binary files differdeleted file mode 100755 index f607cc93..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_bar_h.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_bar_h_ef.#.png b/mobile/SMALL/images/Controls/core_index_scroll_bar_h_ef.#.png Binary files differdeleted file mode 100755 index b1555dcd..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_bar_h_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_bar_v.#.png b/mobile/SMALL/images/Controls/core_index_scroll_bar_v.#.png Binary files differdeleted file mode 100755 index ebf2b358..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_bar_v.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_bar_v_ef.#.png b/mobile/SMALL/images/Controls/core_index_scroll_bar_v_ef.#.png Binary files differdeleted file mode 100755 index 51cb22ba..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_bar_v_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_handler_h_01.png b/mobile/SMALL/images/Controls/core_index_scroll_handler_h_01.png Binary files differdeleted file mode 100644 index 2e85775c..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_handler_h_01.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_handler_h_02.png b/mobile/SMALL/images/Controls/core_index_scroll_handler_h_02.png Binary files differdeleted file mode 100644 index 23db633d..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_handler_h_02.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_handler_v_01.png b/mobile/SMALL/images/Controls/core_index_scroll_handler_v_01.png Binary files differdeleted file mode 100644 index 165ae07b..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_handler_v_01.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_handler_v_02.png b/mobile/SMALL/images/Controls/core_index_scroll_handler_v_02.png Binary files differdeleted file mode 100644 index b844d4bd..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_handler_v_02.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_popup_bg.#.png b/mobile/SMALL/images/Controls/core_index_scroll_popup_bg.#.png Binary files differdeleted file mode 100644 index b264f4a8..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_popup_bg.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_popup_bg_ef.#.png b/mobile/SMALL/images/Controls/core_index_scroll_popup_bg_ef.#.png Binary files differdeleted file mode 100644 index 7cbda50a..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_popup_bg_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_index_scroll_popup_bg_stroke.#.png b/mobile/SMALL/images/Controls/core_index_scroll_popup_bg_stroke.#.png Binary files differdeleted file mode 100755 index 6caf5e79..00000000 --- a/mobile/SMALL/images/Controls/core_index_scroll_popup_bg_stroke.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_list_button_bg.#.png b/mobile/SMALL/images/Controls/core_list_button_bg.#.png Binary files differdeleted file mode 100644 index ea6c926b..00000000 --- a/mobile/SMALL/images/Controls/core_list_button_bg.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_progress_bar.#.png b/mobile/SMALL/images/Controls/core_progress_bar.#.png Binary files differdeleted file mode 100644 index 233f0dae..00000000 --- a/mobile/SMALL/images/Controls/core_progress_bar.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_progress_bar_v.#.png b/mobile/SMALL/images/Controls/core_progress_bar_v.#.png Binary files differdeleted file mode 100755 index e03c8ce9..00000000 --- a/mobile/SMALL/images/Controls/core_progress_bar_v.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_progress_pending_bg_01.png b/mobile/SMALL/images/Controls/core_progress_pending_bg_01.png Binary files differdeleted file mode 100755 index 1342d403..00000000 --- a/mobile/SMALL/images/Controls/core_progress_pending_bg_01.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_progress_pending_bg_02.png b/mobile/SMALL/images/Controls/core_progress_pending_bg_02.png Binary files differdeleted file mode 100755 index f9936928..00000000 --- a/mobile/SMALL/images/Controls/core_progress_pending_bg_02.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_radio_bg.png b/mobile/SMALL/images/Controls/core_radio_bg.png Binary files differdeleted file mode 100644 index 98623eec..00000000 --- a/mobile/SMALL/images/Controls/core_radio_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_radio_bg_stroke.png b/mobile/SMALL/images/Controls/core_radio_bg_stroke.png Binary files differdeleted file mode 100644 index d6db6ae6..00000000 --- a/mobile/SMALL/images/Controls/core_radio_bg_stroke.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_radio_icon.png b/mobile/SMALL/images/Controls/core_radio_icon.png Binary files differdeleted file mode 100644 index ee0f0d37..00000000 --- a/mobile/SMALL/images/Controls/core_radio_icon.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_scroll_bar_h.#.png b/mobile/SMALL/images/Controls/core_scroll_bar_h.#.png Binary files differdeleted file mode 100644 index 6f7000ea..00000000 --- a/mobile/SMALL/images/Controls/core_scroll_bar_h.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_scroll_bar_h_ef.#.png b/mobile/SMALL/images/Controls/core_scroll_bar_h_ef.#.png Binary files differdeleted file mode 100644 index b2682722..00000000 --- a/mobile/SMALL/images/Controls/core_scroll_bar_h_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_scroll_bar_h_tab.#.png b/mobile/SMALL/images/Controls/core_scroll_bar_h_tab.#.png Binary files differdeleted file mode 100644 index 7d259173..00000000 --- a/mobile/SMALL/images/Controls/core_scroll_bar_h_tab.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_scroll_bar_v.#.png b/mobile/SMALL/images/Controls/core_scroll_bar_v.#.png Binary files differdeleted file mode 100644 index 3ce40934..00000000 --- a/mobile/SMALL/images/Controls/core_scroll_bar_v.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_scroll_bar_v_ef.#.png b/mobile/SMALL/images/Controls/core_scroll_bar_v_ef.#.png Binary files differdeleted file mode 100644 index 54e4bd30..00000000 --- a/mobile/SMALL/images/Controls/core_scroll_bar_v_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_center_point_bg.png b/mobile/SMALL/images/Controls/core_slider_center_point_bg.png Binary files differdeleted file mode 100644 index 6405989e..00000000 --- a/mobile/SMALL/images/Controls/core_slider_center_point_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_center_point_bg_v.png b/mobile/SMALL/images/Controls/core_slider_center_point_bg_v.png Binary files differdeleted file mode 100755 index fcfa8ddc..00000000 --- a/mobile/SMALL/images/Controls/core_slider_center_point_bg_v.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_handle_normal.png b/mobile/SMALL/images/Controls/core_slider_handle_normal.png Binary files differdeleted file mode 100644 index ec63c337..00000000 --- a/mobile/SMALL/images/Controls/core_slider_handle_normal.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_handle_press.png b/mobile/SMALL/images/Controls/core_slider_handle_press.png Binary files differdeleted file mode 100644 index 2c34d83e..00000000 --- a/mobile/SMALL/images/Controls/core_slider_handle_press.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_popup_bg.png b/mobile/SMALL/images/Controls/core_slider_popup_bg.png Binary files differdeleted file mode 100644 index 444a23ee..00000000 --- a/mobile/SMALL/images/Controls/core_slider_popup_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_popup_bg_ef.png b/mobile/SMALL/images/Controls/core_slider_popup_bg_ef.png Binary files differdeleted file mode 100644 index 4505abcc..00000000 --- a/mobile/SMALL/images/Controls/core_slider_popup_bg_ef.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_slider_popup_bg_stroke.png b/mobile/SMALL/images/Controls/core_slider_popup_bg_stroke.png Binary files differdeleted file mode 100644 index e6b27fe8..00000000 --- a/mobile/SMALL/images/Controls/core_slider_popup_bg_stroke.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_toggle_bg.png b/mobile/SMALL/images/Controls/core_toggle_bg.png Binary files differdeleted file mode 100644 index 5716656c..00000000 --- a/mobile/SMALL/images/Controls/core_toggle_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_toggle_icon_off.png b/mobile/SMALL/images/Controls/core_toggle_icon_off.png Binary files differdeleted file mode 100644 index 68011e0f..00000000 --- a/mobile/SMALL/images/Controls/core_toggle_icon_off.png +++ /dev/null diff --git a/mobile/SMALL/images/Controls/core_toggle_icon_on.png b/mobile/SMALL/images/Controls/core_toggle_icon_on.png Binary files differdeleted file mode 100644 index 0e11effa..00000000 --- a/mobile/SMALL/images/Controls/core_toggle_icon_on.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_Magnifier.#.png b/mobile/SMALL/images/Copy_Paste/copy&paste_Magnifier.#.png Binary files differdeleted file mode 100644 index 1706aa97..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_Magnifier.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_Magnifier_mask.#.png b/mobile/SMALL/images/Copy_Paste/copy&paste_Magnifier_mask.#.png Binary files differdeleted file mode 100644 index 450175f4..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_Magnifier_mask.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_center_circle.png b/mobile/SMALL/images/Copy_Paste/copy&paste_handler_center_circle.png Binary files differdeleted file mode 100644 index e794a3e1..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_center_circle.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_center_line.png b/mobile/SMALL/images/Copy_Paste/copy&paste_handler_center_line.png Binary files differdeleted file mode 100644 index 569e3f22..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_center_line.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_circle_bottom.png b/mobile/SMALL/images/Copy_Paste/copy&paste_handler_circle_bottom.png Binary files differdeleted file mode 100644 index 048c247f..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_circle_bottom.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_circle_top.png b/mobile/SMALL/images/Copy_Paste/copy&paste_handler_circle_top.png Binary files differdeleted file mode 100644 index 0cd7cad2..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_circle_top.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_line_bottom.png b/mobile/SMALL/images/Copy_Paste/copy&paste_handler_line_bottom.png Binary files differdeleted file mode 100644 index bc1b3442..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_line_bottom.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_line_top.png b/mobile/SMALL/images/Copy_Paste/copy&paste_handler_line_top.png Binary files differdeleted file mode 100644 index 3153d0bd..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_handler_line_top.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg.#.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg.#.png Binary files differdeleted file mode 100644 index 55447cd4..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg_ef.#.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg_ef.#.png Binary files differdeleted file mode 100644 index b89651c9..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg_line.#.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg_line.#.png Binary files differdeleted file mode 100644 index 0b5c2b1b..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_bg_line.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_clipboard.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_clipboard.png Binary files differdeleted file mode 100644 index f0b6c4e3..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_clipboard.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_copy.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_copy.png Binary files differdeleted file mode 100644 index 4583c8d7..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_copy.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_cut.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_cut.png Binary files differdeleted file mode 100644 index 6dd00443..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_cut.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_paste.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_paste.png Binary files differdeleted file mode 100644 index 48e7f502..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_paste.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_select.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_select.png Binary files differdeleted file mode 100755 index c61bb355..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_select.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_select_all.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_select_all.png Binary files differdeleted file mode 100755 index e4b23466..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_icon_select_all.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom.png Binary files differdeleted file mode 100644 index 197dca25..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png Binary files differdeleted file mode 100644 index 654a596b..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png Binary files differdeleted file mode 100644 index 261c0a30..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_up.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_up.png Binary files differdeleted file mode 100644 index f25155f6..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_up.png +++ /dev/null diff --git a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_up_line.png b/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_up_line.png Binary files differdeleted file mode 100644 index 2a54dcb8..00000000 --- a/mobile/SMALL/images/Copy_Paste/copy&paste_popup_tail_up_line.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-angry-shout.png b/mobile/SMALL/images/Emoticon/emo-angry-shout.png Binary files differdeleted file mode 100644 index 9995fe8a..00000000 --- a/mobile/SMALL/images/Emoticon/emo-angry-shout.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-angry.png b/mobile/SMALL/images/Emoticon/emo-angry.png Binary files differdeleted file mode 100644 index 8ad74e19..00000000 --- a/mobile/SMALL/images/Emoticon/emo-angry.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-guilty.png b/mobile/SMALL/images/Emoticon/emo-guilty.png Binary files differdeleted file mode 100644 index d2894414..00000000 --- a/mobile/SMALL/images/Emoticon/emo-guilty.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-haha.png b/mobile/SMALL/images/Emoticon/emo-haha.png Binary files differdeleted file mode 100644 index a4c61b7c..00000000 --- a/mobile/SMALL/images/Emoticon/emo-haha.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-half-smile.png b/mobile/SMALL/images/Emoticon/emo-half-smile.png Binary files differdeleted file mode 100644 index d1d07cc3..00000000 --- a/mobile/SMALL/images/Emoticon/emo-half-smile.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-happy.png b/mobile/SMALL/images/Emoticon/emo-happy.png Binary files differdeleted file mode 100644 index 8cdfd564..00000000 --- a/mobile/SMALL/images/Emoticon/emo-happy.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-kiss.png b/mobile/SMALL/images/Emoticon/emo-kiss.png Binary files differdeleted file mode 100644 index 0f148a87..00000000 --- a/mobile/SMALL/images/Emoticon/emo-kiss.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-little-bit-sorry.png b/mobile/SMALL/images/Emoticon/emo-little-bit-sorry.png Binary files differdeleted file mode 100644 index e053f281..00000000 --- a/mobile/SMALL/images/Emoticon/emo-little-bit-sorry.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-love.png b/mobile/SMALL/images/Emoticon/emo-love.png Binary files differdeleted file mode 100644 index 78892a09..00000000 --- a/mobile/SMALL/images/Emoticon/emo-love.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-minimal-smile.png b/mobile/SMALL/images/Emoticon/emo-minimal-smile.png Binary files differdeleted file mode 100644 index aff28da5..00000000 --- a/mobile/SMALL/images/Emoticon/emo-minimal-smile.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-omg.png b/mobile/SMALL/images/Emoticon/emo-omg.png Binary files differdeleted file mode 100644 index 94faeefc..00000000 --- a/mobile/SMALL/images/Emoticon/emo-omg.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-smile.png b/mobile/SMALL/images/Emoticon/emo-smile.png Binary files differdeleted file mode 100644 index 7a011d37..00000000 --- a/mobile/SMALL/images/Emoticon/emo-smile.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-sorry.png b/mobile/SMALL/images/Emoticon/emo-sorry.png Binary files differdeleted file mode 100644 index bbfbe4e8..00000000 --- a/mobile/SMALL/images/Emoticon/emo-sorry.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-surprised.png b/mobile/SMALL/images/Emoticon/emo-surprised.png Binary files differdeleted file mode 100644 index 87a9d987..00000000 --- a/mobile/SMALL/images/Emoticon/emo-surprised.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-tongue-dangling.png b/mobile/SMALL/images/Emoticon/emo-tongue-dangling.png Binary files differdeleted file mode 100644 index 3a7f0ac4..00000000 --- a/mobile/SMALL/images/Emoticon/emo-tongue-dangling.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-very-sorry.png b/mobile/SMALL/images/Emoticon/emo-very-sorry.png Binary files differdeleted file mode 100644 index a9daeb73..00000000 --- a/mobile/SMALL/images/Emoticon/emo-very-sorry.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-wink.png b/mobile/SMALL/images/Emoticon/emo-wink.png Binary files differdeleted file mode 100644 index 2f22878a..00000000 --- a/mobile/SMALL/images/Emoticon/emo-wink.png +++ /dev/null diff --git a/mobile/SMALL/images/Emoticon/emo-worried.png b/mobile/SMALL/images/Emoticon/emo-worried.png Binary files differdeleted file mode 100644 index 9bb78c86..00000000 --- a/mobile/SMALL/images/Emoticon/emo-worried.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_icon_badge_container.#.png b/mobile/SMALL/images/Navigation_elements/core_icon_badge_container.#.png Binary files differdeleted file mode 100644 index 4f533f48..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_icon_badge_container.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_icon_badge_container_outer.#.png b/mobile/SMALL/images/Navigation_elements/core_icon_badge_container_outer.#.png Binary files differdeleted file mode 100644 index 748fa8e9..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_icon_badge_container_outer.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_icon_drawer.png b/mobile/SMALL/images/Navigation_elements/core_icon_drawer.png Binary files differdeleted file mode 100644 index a10ff936..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_icon_drawer.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_navigation_bar_bg.png b/mobile/SMALL/images/Navigation_elements/core_navigation_bar_bg.png Binary files differdeleted file mode 100644 index d609b33e..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_navigation_bar_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_navigation_bar_icon_arrow.png b/mobile/SMALL/images/Navigation_elements/core_navigation_bar_icon_arrow.png Binary files differdeleted file mode 100644 index 4ca4418f..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_navigation_bar_icon_arrow.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_page_indicator_off.png b/mobile/SMALL/images/Navigation_elements/core_page_indicator_off.png Binary files differdeleted file mode 100644 index 3ab25a79..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_page_indicator_off.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_page_indicator_off_ef.png b/mobile/SMALL/images/Navigation_elements/core_page_indicator_off_ef.png Binary files differdeleted file mode 100644 index 21709ed2..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_page_indicator_off_ef.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_page_indicator_on.png b/mobile/SMALL/images/Navigation_elements/core_page_indicator_on.png Binary files differdeleted file mode 100644 index 815ddc58..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_page_indicator_on.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_title_button_bg.png b/mobile/SMALL/images/Navigation_elements/core_title_button_bg.png Binary files differdeleted file mode 100755 index 6cfbcb83..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_title_button_bg.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_title_button_focus.png b/mobile/SMALL/images/Navigation_elements/core_title_button_focus.png Binary files differdeleted file mode 100644 index f02c34c9..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_title_button_focus.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_title_icon_cancel.png b/mobile/SMALL/images/Navigation_elements/core_title_icon_cancel.png Binary files differdeleted file mode 100644 index fe94c3ea..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_title_icon_cancel.png +++ /dev/null diff --git a/mobile/SMALL/images/Navigation_elements/core_title_icon_done.png b/mobile/SMALL/images/Navigation_elements/core_title_icon_done.png Binary files differdeleted file mode 100755 index 988dae84..00000000 --- a/mobile/SMALL/images/Navigation_elements/core_title_icon_done.png +++ /dev/null diff --git a/mobile/SMALL/images/Popups/core_popup_noti_bg.#.png b/mobile/SMALL/images/Popups/core_popup_noti_bg.#.png Binary files differdeleted file mode 100644 index 6362748f..00000000 --- a/mobile/SMALL/images/Popups/core_popup_noti_bg.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Popups/core_popup_noti_bg_ef.#.png b/mobile/SMALL/images/Popups/core_popup_noti_bg_ef.#.png Binary files differdeleted file mode 100755 index 85636f8f..00000000 --- a/mobile/SMALL/images/Popups/core_popup_noti_bg_ef.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Popups/core_popup_noti_bg_stroke.#.png b/mobile/SMALL/images/Popups/core_popup_noti_bg_stroke.#.png Binary files differdeleted file mode 100755 index 0afeb12f..00000000 --- a/mobile/SMALL/images/Popups/core_popup_noti_bg_stroke.#.png +++ /dev/null diff --git a/mobile/SMALL/images/Popups/core_popup_top.#.png b/mobile/SMALL/images/Popups/core_popup_top.#.png Binary files differdeleted file mode 100644 index 83827823..00000000 --- a/mobile/SMALL/images/Popups/core_popup_top.#.png +++ /dev/null diff --git a/mobile/widgets/button.edc b/mobile/widgets/button.edc index 2a557160..929cf15c 100644 --- a/mobile/widgets/button.edc +++ b/mobile/widgets/button.edc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved * * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) * @@ -24,175 +24,183 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -group { name: "elm/button/base/default"; + group { name: "elm/button/base/default"; + data.item: "vector_ux" "default"; script { public mouse_down = 0; public multi_down = 0; - public text_visible = 0; public disabled = 0; - } - images { - set { - name: "core_list_button_bg.#"; - image { - image: "SMALL/images/Controls/core_list_button_bg.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_list_button_bg.#.png" COMP; - } - } + public text = 0; + public content = 0; } parts { part { name: "base"; scale: 1; type: SPACER; description { state: "default" 0.0; - min: BUTTON_MIN_WIDTH BUTTON_MIN_HEIGHT; + min: BUTTON_MIN_WIDTH_INC BUTTON_MIN_HEIGHT_INC; } } - part { name: "bg"; + //Base Shape Part + part { name: "tizen_vg_shape"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper"; scale: 1; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "core_list_button_bg.#"; - color: 38 107 191 255; /*(Changeable UI) color_class: "W012";*/ + min: 0 BUTTON_MIN_HEIGHT_INC; + rel1.relative: 0 0.5; + rel2.relative: 1 0.5; + fixed: 0 1; + } + } + part { name: "tizen_vg_shape_clipper"; + type: RECT; + description { state: "default" 0.0; + color: 82 198 216 255; + } + description { state: "disabled" 0.0; + color: 138 195 204 255; + } + } + //Effect Shape Part + part { name: "tizen_vg_shape2"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper2"; + scale: 1; + description { state: "default" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + rel1.relative: 0.15 0.15; + rel2.relative: 0.85 0.85; + } + description { state: "ready" 0.0; + inherit: "default" 0.0; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 30 85 153 255; /*(Changeable UI) color_class: "W012P";*/ + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; } - description { state: "disabled" 0.0; + } + part { name: "tizen_vg_shape_clipper2"; + type: RECT; + description { state: "default" 0.0; + visible: 0; + color: 48 139 153 0; + } + description { state: "ready" 0.0; inherit: "default" 0.0; - color: 76 128 191 255; /*(Changeable UI) color_class: "W012D";*/ + visible: 1; + } + description { state: "pressed" 0.0; + color: 48 139 153 255; } } part { name: "padding_left_top"; type: SPACER; scale: 1; description { state: "default" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; align: 0.0 0.0; rel2.relative: 0.0 0.0; - min: BUTTON_PADDING_LEFT_RIGHT 0; + min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_TOP_HEIGHT_INC; fixed: 1 1; } + description { state: "icon_only" 0.0; + inherit: "default" 0.0; + min: 0 0; + } + description { state: "icon_text" 0.0; + inherit: "default" 0.0; + min: BUTTON_PADDING_LEFT_ICON_TEXT_INC BUTTON_PADDING_TOP_HEIGHT_INC; + } } part { name: "padding_right_bottom"; type: SPACER; scale: 1; description { state: "default" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; align: 1.0 1.0; rel1.relative: 1.0 1.0; - min: BUTTON_PADDING_LEFT_RIGHT 0; + min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_BOTTOM_HEIGHT_INC; fixed: 1 1; } + description { state: "icon_only" 0.0; + inherit: "default" 0.0; + min: 0 0; + } } part { name: "icon_rect"; type: SPACER; scale: 1; description { state: "default" 0.0; - align: 0.0 0.5; + align: 0.0 0.0; rel1 { relative: 1.0 1.0; to: "padding_left_top"; } rel2 { - relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; + relative: 1.0 1.0; + to: "padding_left_top"; } - min: 0 0; + min: 0 BUTTON_ICON_DEFAULT_HEIGHT_INC; fixed: 1 1; } description { state: "visible" 0.0; inherit: "default" 0.0; - min: (BUTTON_PADDING_LEFT_RIGHT + BUTTON_PADDING_ICON_RIGHT + BUTTON_ICON_DEFAULT_WIDTH) BUTTON_ICON_DEFAULT_HEIGHT; - max: (BUTTON_PADDING_LEFT_RIGHT + BUTTON_PADDING_ICON_RIGHT + BUTTON_ICON_DEFAULT_WIDTH) BUTTON_ICON_DEFAULT_HEIGHT; + min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; fixed: 1 1; } - } - part { name: "icon_text_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 1.0 0.5; - min: BUTTON_PADDING_ICON_RIGHT BUTTON_ICON_DEFAULT_HEIGHT; - rel1 { - relative: 0.0 1.0; - to_x: "elm.text"; - to_y: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to_x: "elm.text"; - to_y: "padding_right_bottom"; - } + description { state: "icon_only" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; + max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; + align: 0.5 0.5; fixed: 1 1; } } part { name: "elm.swallow.content"; type: SWALLOW; scale: 1; - clip_to: "elm.icon.clipper"; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to: "icon_rect"; + rel2.to: "icon_rect"; + } + } + part { name: "icon_text_padding"; + type: SPACER; + scale: 1; description { state: "default" 0.0; - visible: 0; align: 0.0 0.5; + min: 0 0; rel1 { - relative: 1.0 1.0; - to: "padding_left_top"; - } - rel2 { relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; - } - fixed: 1 0; - } - description { state: "visible" 0.0; - fixed: 1 1; - min: BUTTON_ICON_DEFAULT_WIDTH BUTTON_ICON_DEFAULT_HEIGHT; - align: 1.0 0.5; - rel1 { - relative: 0.0 1.0; - to_x: "icon_text_padding"; - to_y: "padding_left_top"; + to: "icon_rect"; } rel2 { - relative: 0.0 0.0; - to_x: "icon_text_padding"; - to_y: "padding_right_bottom"; + relative: 1.0 1.0; + to: "icon_rect"; } + fixed: 1 1; } - description { state: "icononly" 0.0; - visible: 1; - min: BUTTON_ICON_DEFAULT_WIDTH BUTTON_ICON_DEFAULT_HEIGHT; - max: BUTTON_ICON_DEFAULT_WIDTH BUTTON_ICON_DEFAULT_HEIGHT; - } - } - part { name: "elm.icon.clipper"; - type: RECT; - description { state: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "W012i";*/ - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "W012iP";*/ - } - description { state: "disabled" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; - color: 244 244 244 127; /*(Changeable UI) color_class: "W012iD";*/ + min: BUTTON_PADDING_ICON_RIGHT_INC 0; } } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; scale: 1; + clip_to: "clipper"; description { state: "default" 0.0; - visible: 1; rel1 { - relative: 1.0 1.0; - to_x: "icon_rect"; - to_y: "padding_left_top"; + relative: 1.0 0.0; + to: "icon_text_padding"; } rel2 { relative: 0.0 0.0; @@ -200,57 +208,74 @@ group { name: "elm/button/base/default"; } text { style: "button_main"; - min: 1 0; - max: 1 0; - ellipsis: -1; + min: 1 1; } } - description { state: "invisible" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - text.style: "button_main_press"; + } + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; } description { state: "disabled" 0.0; inherit: "default" 0.0; - text.style: "button_main_dim"; + color: 255 255 255 127; } } part { name: "event"; - scale: 1; type: RECT; + ignore_flags: ON_HOLD; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + color: 0 0 0 0; } } } programs { - program { name: "pressed"; - signal: "mouse,down,1*"; - source: "event"; + program { name: "clicked_effect"; + action: STATE_SET "ready" 0.0; + target: "tizen_vg_shape2"; + target: "tizen_vg_shape_clipper2"; + after: "clicked_effect2"; + } + program { name: "clicked_effect2"; script { - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) - { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press1"); - } + run_program(PROGRAM:"clicked_effect3"); + run_program(PROGRAM:"clicked_effect4"); } } - program { name: "button_press1"; + program { name: "clicked_effect3"; + action: STATE_SET "pressed" 0.0; + target: "tizen_vg_shape2"; + transition: DECELERATE 0.3; + } + program { name: "clicked_effect4"; + action: STATE_SET "pressed" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.225; + after: "clicked_effect5"; + } + program { name: "clicked_effect5"; + action: STATE_SET "ready" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: LINEAR 0.45; + after: "clicked_effect6"; + } + program { name: "clicked_effect6"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape2"; + target: "tizen_vg_shape_clipper2"; + } + program { name: "pressed"; + signal: "mouse,down,1*"; + source: "event"; script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - set_state(PART:"bg", "pressed", 0.0); - set_state(PART:"elm.icon.clipper", "pressed", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "pressed", 0.0); - emit("elm,action,press", ""); + if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) { + set_int(mouse_down, 1); + if (get_int(disabled) == 0) { + emit("elm,action,press", ""); + run_program(PROGRAM:"clicked_effect"); + } } } } @@ -259,22 +284,10 @@ group { name: "elm/button/base/default"; source: "event"; script { if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress1"); - } - } - } - program { name: "button_unpress1"; - script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"elm.icon.clipper", "default", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "default", 0.0); - emit("elm,action,unpress", ""); + set_int(mouse_down, 0); + if (get_int(disabled) == 0) { + emit("elm,action,unpress", ""); + } } } } @@ -282,78 +295,74 @@ group { name: "elm/button/base/default"; signal: "mouse,clicked,1"; source: "event"; script { - new st[31]; - new Float:vl; if (get_int(multi_down) == 0) { - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { + if (get_int(disabled) == 0) { + run_program(PROGRAM:"touch_sound"); emit("elm,action,click", ""); } } } } - program { name: "text_show"; - signal: "elm,state,text,visible"; + program { name: "touch_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; source: "elm"; script { - new st[31]; - new Float:vl; - set_int(text_visible, 1); - get_state(PART:"elm.swallow.content", st, 30, vl); - if (!strcmp(st, "icononly")) - { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"icon_rect", "visible", 0.0); - } - if(get_int(disabled) == 0) - set_state(PART:"elm.text", "default", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); + set_int(content, 1); + set_state(PART:"icon_text_padding", "visible", 0.0); + if (get_int(text) == 1) { + set_state(PART:"icon_rect", "visible", 0.0); + set_state(PART:"padding_left_top", "icon_text", 0.0); + } else { + set_state(PART:"icon_rect", "icon_only", 0.0); + set_state(PART:"padding_left_top", "icon_only", 0.0); + set_state(PART:"padding_right_bottom", "icon_only", 0.0); + } } } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; + program { name: "icon_hide"; + signal: "elm,state,icon,hidden"; source: "elm"; script { - new st[31]; - new Float:vl; - set_int(text_visible, 0); - get_state(PART:"elm.swallow.content", st, 30, vl); - if (!strcmp(st, "visible")) - { - set_state(PART:"elm.swallow.content", "icononly", 0.0); - set_state(PART:"icon_rect", "default", 0.0); - } - set_state(PART:"elm.text", "invisible", 0.0); + set_int(content, 0); + set_state(PART:"icon_text_padding", "default", 0.0); + set_state(PART:"icon_rect", "default", 0.0); + set_state(PART:"padding_left_top", "default", 0.0); + set_state(PART:"padding_right_bottom", "default", 0.0); } } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; + program { name: "text_show"; + signal: "elm,state,text,visible"; source: "elm"; script { - set_state(PART:"icon_rect", "visible", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.swallow.content", "visible", 0.0); - else - set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_int(text, 1); + if (get_int(content) == 1) { + set_state(PART:"icon_rect", "visible", 0.0); + set_state(PART:"padding_left_top", "icon_text", 0.0); + } } } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; + program { name: "text_hide"; + signal: "elm,state,text,hidden"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - target: "icon_rect"; + script { + set_int(text, 0); + if (get_int(content) == 1) { + set_state(PART:"icon_rect", "icon_only", 0.0); + set_state(PART:"padding_left_top", "icon_only", 0.0); + set_state(PART:"padding_right_bottom", "icon_only", 0.0); + } + } } program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; script { set_int(disabled, 1); - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"elm.icon.clipper", "disabled", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); } } program { name: "enable"; @@ -361,10 +370,8 @@ group { name: "elm/button/base/default"; source: "elm"; script { set_int(disabled, 0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"elm.icon.clipper", "default", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); } } program { name: "multi_down"; @@ -383,576 +390,222 @@ group { name: "elm/button/base/default"; } } } - - /* This transparent button style is used by applications which use webview. */ - group{ name: "elm/button/base/transparent"; - script { + group { name: "elm/button/base/circle"; + data.item: "vector_ux" "circle"; + script { public mouse_down = 0; public multi_down = 0; - } - parts { - part { name: "bg"; - type: SPACER; + public disabled = 0; + } + parts { + part { name: "base"; scale: 1; + type: SPACER; description { state: "default" 0.0; + min: BUTTON_CIRCLE_BASE_SIZE_INC; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + description { state: "extended" 0.0; + min: BUTTON_CIRCLE_EXTENDED_SIZE_INC; } } - part { name: "elm.swallow.content"; + //Base Shape Part + part { name: "tizen_vg_shape"; type: SWALLOW; + clip_to: "tizen_vg_shape_clipper"; scale: 1; description { state: "default" 0.0; + min: BUTTON_CIRCLE_SIZE_INC; + rel1.relative: 0.5 0; + rel2.relative: 0.5 0; + align: 0.5 0; + fixed: 1 1; } } - part { name: "event"; + part { name: "tizen_vg_shape_clipper"; type: RECT; - scale: 1; - /* Do not remove the following line. - * elm.swallow.content part should receive mouse events. */ - repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; - } - } - } - programs { - program { name: "pressed"; - signal: "mouse,down,1*"; - source: "event"; - script { - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) - { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press1"); - } - } - } - program { name: "button_press1"; - script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - emit("elm,action,press", ""); - } - } - } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress1"); - } + color: 82 198 216 255; } - } - program { name: "button_unpress1"; - script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - emit("elm,action,unpress", ""); - } - } - } - program { name: "clicked"; - signal: "mouse,clicked,1"; - source: "event"; - script { - new st[31]; - new Float:vl; - if (get_int(multi_down) == 0) { - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - emit("elm,action,click", ""); - } - } - } - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "bg"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - } - program { name: "multi_down"; - signal: "elm,action,multi,down"; - source: "elm"; - script { - set_int(multi_down, 1); - } - } - program { name: "multi_up"; - signal: "elm,action,multi,up"; - source: "elm"; - script { - set_int(multi_down, 0); - } - } - } - } - - group{ name: "elm/button/base/datetime"; - inherit: "elm/button/base/default"; - parts { - part { name: "left.padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC 0; - max: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC -1; - fixed: 1 0; - align: 0.0 0.5; - } - } - part { name: "right.padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC 0; - max: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC -1; - fixed: 1 0; - align: 1.0 0.5; + description { state: "disabled" 0.0; + color: 138 195 204 255; } } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; + //Effect Shape Part + part { name: "tizen_vg_shape2"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper2"; scale: 1; description { state: "default" 0.0; - fixed: 0 0; - rel1 { - relative: 1.0 0.0; - to: "left.padding"; - } - rel2 { - relative: 0.0 1.0; - to: "right.padding"; - } - text { - style: "button_date"; - min: 1 0; - max: 1 0; - ellipsis: -1; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + rel1.relative: 0.15 0.15; + rel2.relative: 0.85 0.85; } - description { state: "invisible" 0.0; + description { state: "ready" 0.0; inherit: "default" 0.0; - visible: 0; } description { state: "pressed" 0.0; inherit: "default" 0.0; - text { - style: "button_date_press"; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - text { - style: "button_date_dim"; - } - } - } - } - } - -/////////////////////////////////////////////////////////////////////////////////////// -#define BUTTON_ICON_STYLES(style_name, image_normal, style_normal , style_press , style_dim ,min_width, min_height) \ - group { name: "elm/button/base/"style_name; \ - images { \ - image: image_normal COMP; \ - } \ - script { \ - public mouse_down = 0; \ - public multi_down = 0; \ - } \ - parts { \ - part { name: "button_image"; \ - type: SPACER; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: min_width min_height; \ - max: min_width min_height; \ - } \ - } \ - part { name: "button_center_part"; \ - mouse_events: 0; \ - scale: 1; \ - description { state: "default" 0.0; \ - rel1.to: "button_image"; \ - rel2.to: "button_image"; \ - image.normal: image_normal; \ - color_class: style_normal; \ - } \ - description { state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - color_class: style_press; \ - } \ - description { state: "disabled" 0.0; \ - inherit: "default" 0.0; \ - color_class: style_dim; \ - } \ - } \ - part { name: "over1"; \ - 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: "over2"; \ - 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_press"; \ - signal: "mouse,down,1*"; \ - source: "over1"; \ - script { \ - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) \ - { \ - set_int(mouse_down, 1); \ - run_program(PROGRAM:"button_press2"); \ - } \ - } \ - } \ - program { name: "button_press2"; \ - action: SIGNAL_EMIT "elm,action,press" ""; \ - after: "button_press_anim"; \ - } \ - program { name: "button_press_anim"; \ - action: STATE_SET "pressed" 0.0; \ - target: "button_center_part"; \ - } \ - program { name: "key_press"; \ - signal: "elm,action,pressed"; \ - source: "elm"; \ - action: STATE_SET "pressed" 0.0; \ - target: "button_center_part"; \ - } \ - program { name: "key_unpress"; \ - signal: "elm,action,unpressed"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ - target: "button_center_part"; \ - } \ - program { name: "button_unpress"; \ - signal: "mouse,up,1*"; \ - source: "over2"; \ - script { \ - if (get_int(mouse_down) == 1) \ - { \ - set_int(mouse_down, 0); \ - run_program(PROGRAM:"button_unpress2"); \ - run_program(PROGRAM:"button_unpress_anim"); \ - } \ - } \ - } \ - program { name: "button_unpress2"; \ - action: SIGNAL_EMIT "elm,action,unpress" ""; \ - } \ - program { name: "button_unpress_anim"; \ - action: STATE_SET "default" 0.0; \ - target: "button_center_part"; \ - } \ - program { name: "button_click"; \ - signal: "mouse,clicked,1"; \ - source: "over2"; \ - script { \ - if (get_int(multi_down) == 0) { \ - run_program(PROGRAM:"button_click2"); \ - } \ - } \ - } \ - program { name: "button_click2"; \ - action: SIGNAL_EMIT "elm,action,click" ""; \ - } \ - program { name: "disable"; \ - signal: "elm,state,disabled"; \ - source: "elm"; \ - action: STATE_SET "disabled" 0.0; \ - target: "disabler"; \ - target: "button_center_part"; \ - } \ - program { name: "enable"; \ - signal: "elm,state,enabled"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ - target: "disabler"; \ - target: "button_center_part"; \ - } \ - program { \ - name: "multi_down"; \ - signal: "elm,action,multi,down"; \ - source: "elm"; \ - script { \ - set_int(multi_down, 1); \ - } \ - } \ - program { \ - name: "multi_up"; \ - signal: "elm,action,multi,up"; \ - source: "elm"; \ - script { \ - set_int(multi_down, 0); \ - } \ - } \ - } \ - } - -/////////////////////////////////////////////////////////////////////////////////////// - BUTTON_ICON_STYLES("icon_reorder", "core_button_reorder.png", "F060L1" ,"F060L1P" , "F060L1D" , BUTTON_ICON_WIDTH , BUTTON_ICON_HEIGHT) -/////////////////////////////////////////////////////////////////////////////////////// - BUTTON_ICON_STYLES("icon_expand_add", "core_button_add.png", "F060L2" , "F060L2P", "F060L2D", BUTTON_ICON_WIDTH , BUTTON_ICON_HEIGHT) -/////////////////////////////////////////////////////////////////////////////////////// - BUTTON_ICON_STYLES("icon_expand_delete", "core_button_delete.png", "F060L3" , "F060L3P" ,"F060L3D", BUTTON_ICON_WIDTH , BUTTON_ICON_HEIGHT) - -group { name: "elm/button/base/bottom"; - script { - public mouse_down = 0; - public multi_down = 0; - public text_visible = 0; - public disabled = 0; - } - images { - set { - name: "core_button_bg.#"; - image { - image: "SMALL/images/Controls/core_button_bg.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_button_bg.#.png" COMP; - } - } - } - parts { - part { name: "base"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_MIN_WIDTH BUTTON_BOTTOM_MIN_HEIGHT; - max: BUTTON_MAX_WIDTH BUTTON_BOTTOM_MIN_HEIGHT; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; } } - part { name: "bg"; - scale: 1; + part { name: "tizen_vg_shape_clipper2"; + type: RECT; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "core_button_bg.#"; - color: 38 107 191 255; /*(Changeable UI) color_class: "W011";*/ + visible: 0; + color: 48 139 153 0; } - description { state: "pressed" 0.0; + description { state: "ready" 0.0; inherit: "default" 0.0; - color: 30 85 153 255; /*(Changeable UI) color_class: "W011P";*/ + visible: 1; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 76 128 191 255; /*(Changeable UI) color_class: "W011D";*/ + description { state: "pressed" 0.0; + color: 48 139 153 255; } } - part { name: "padding_left_top"; - type: SPACER; + part { name: "elm.swallow.content"; + type: SWALLOW; scale: 1; + clip_to: "clipper"; description { state: "default" 0.0; - align: 0.0 0.0; - rel2.relative: 0.0 0.0; - min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0; + min: BUTTON_CIRCLE_ICON_SIZE_INC; fixed: 1 1; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; } } - part { name: "padding_right_bottom"; + part { name: "icon_text_padding"; type: SPACER; scale: 1; description { state: "default" 0.0; - align: 1.0 1.0; - rel1.relative: 1.0 1.0; - min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0; + rel1.to_y: "tizen_vg_shape"; + rel2.to_y: "tizen_vg_shape"; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + align: 0.5 0.0; + min: 0 0; fixed: 1 1; } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: 0 BUTTON_CIRCLE_PADDING_ICON_BOTTOM_INC; + } } - part { name: "icon_rect"; + part { name: "text_left_padding"; type: SPACER; scale: 1; description { state: "default" 0.0; - align: 0.0 0.5; + min: BUTTON_CIRCLE_PADDING_TEXT_LEFT_RIGHT_INC 0; rel1 { - relative: 1.0 1.0; - to: "padding_left_top"; - } - rel2 { - relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; + relative: 0.0 1.0; + to: "icon_text_padding"; } - min: 0 0; - fixed: 1 1; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: (BUTTON_ICON_HEIGHT + BUTTON_BOTTOM_PADDING_LEFT_RIGHT) BUTTON_ICON_WIDTH; - max: (BUTTON_ICON_HEIGHT + BUTTON_BOTTOM_PADDING_LEFT_RIGHT) BUTTON_ICON_WIDTH; - fixed: 1 1; + rel2.relative: 0.0 1.0; + align: 0.0 0.5; + fixed: 1 0; } } - part { name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "elm.swallow.content.clip"; + part { name: "text_right_padding"; + type: SPACER; scale: 1; description { state: "default" 0.0; - visible: 0; - align: 0.0 0.5; + min: BUTTON_CIRCLE_PADDING_TEXT_LEFT_RIGHT_INC 0; rel1 { relative: 1.0 1.0; - to: "padding_left_top"; - } - rel2 { - relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; + to: "icon_text_padding"; } - fixed: 1 0; - } - description { state: "visible" 0.0; - visible: 1; - fixed: 1 1; - min: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH; - max: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH; align: 1.0 0.5; - rel1 { - relative: 0.0 1.0; - to_x: "elm.text"; - to_y: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to_x: "elm.text"; - to_y: "padding_right_bottom"; - } - } - description { state: "icononly" 0.0; - visible: 1; - min: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH; - max: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH; + fixed: 1 0; } } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; scale: 1; + clip_to: "clipper"; description { state: "default" 0.0; - fixed: 1 1; rel1 { - relative: 1.0 1.0; - to_x: "icon_rect"; - to_y: "padding_left_top"; + relative: 1.0 0.0; + to: "text_left_padding"; } rel2 { - relative: 0.0 0.0; - to: "padding_right_bottom"; + relative: 0.0 1.0; + to: "text_right_padding"; } text { - style: "button_bottom"; - max: 1 0; + style: "button_circle"; + align: 0.5 0; + min: 0 0; } - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - text.style: "button_bottom_press"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - text.style: "button_bottom_dim"; - } - description { state: "invisible" 0.0; - inherit: "default" 0.0; - visible: 0; + align: 0.5 0; } } - part { name: "elm.swallow.content.clip"; + part { name: "clipper"; type: RECT; - scale: 1; description { state: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3";*/ - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3P";*/ } description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 244 244 244 127; /*(Changeable UI) color_class: "F032L3D";*/ + color: 255 255 255 127; } } part { name: "event"; - scale: 1; type: RECT; + ignore_flags: ON_HOLD; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; + rel1.to: "tizen_vg_shape"; + rel2.to: "elm.text"; + color: 0 0 0 0; } } } programs { - program { name: "pressed"; - signal: "mouse,down,1*"; - source: "event"; + program { name: "clicked_effect"; + action: STATE_SET "ready" 0.0; + target: "tizen_vg_shape2"; + target: "tizen_vg_shape_clipper2"; + after: "clicked_effect2"; + } + program { name: "clicked_effect2"; script { - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) - { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press1"); - } + run_program(PROGRAM:"clicked_effect3"); + run_program(PROGRAM:"clicked_effect4"); } } - program { name: "button_press1"; + program { name: "clicked_effect3"; + action: STATE_SET "pressed" 0.0; + target: "tizen_vg_shape2"; + transition: DECELERATE 0.3; + } + program { name: "clicked_effect4"; + action: STATE_SET "pressed" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.225; + after: "clicked_effect5"; + } + program { name: "clicked_effect5"; + action: STATE_SET "ready" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: LINEAR 0.45; + after: "clicked_effect6"; + } + program { name: "clicked_effect6"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape2"; + target: "tizen_vg_shape_clipper2"; + } + program { name: "pressed"; + signal: "mouse,down,1*"; + source: "event"; script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - set_state(PART:"bg", "pressed", 0.0); - set_state(PART:"elm.swallow.content.clip", "pressed", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "pressed", 0.0); - emit("elm,action,press", ""); + if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) { + set_int(mouse_down, 1); + if (get_int(disabled) == 0) { + emit("elm,action,press", ""); + run_program(PROGRAM:"clicked_effect"); + } } } } @@ -961,22 +614,10 @@ group { name: "elm/button/base/bottom"; source: "event"; script { if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress1"); - } - } - } - program { name: "button_unpress1"; - script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"elm.swallow.content.clip", "default", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "default", 0.0); - emit("elm,action,unpress", ""); + set_int(mouse_down, 0); + if (get_int(disabled) == 0) { + emit("elm,action,unpress", ""); + } } } } @@ -984,78 +625,40 @@ group { name: "elm/button/base/bottom"; signal: "mouse,clicked,1"; source: "event"; script { - new st[31]; - new Float:vl; if (get_int(multi_down) == 0) { - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { + if (get_int(disabled) == 0) { + run_program(PROGRAM:"touch_sound"); emit("elm,action,click", ""); } } } } + program { name: "touch_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "text_show"; signal: "elm,state,text,visible"; source: "elm"; script { - new st[31]; - new Float:vl; - set_int(text_visible, 1); - get_state(PART:"elm.swallow.content", st, 30, vl); - if (!strcmp(st, "icononly")) - { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"icon_rect", "visible", 0.0); - } - if(get_int(disabled) == 0) - set_state(PART:"elm.text", "default", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"base", "extended", 0.0); + set_state(PART:"icon_text_padding", "visible", 0.0); } } program { name: "text_hide"; signal: "elm,state,text,hidden"; source: "elm"; script { - new st[31]; - new Float:vl; - set_int(text_visible, 0); - get_state(PART:"elm.swallow.content", st, 30, vl); - if (!strcmp(st, "visible")) - { - set_state(PART:"elm.swallow.content", "icononly", 0.0); - set_state(PART:"icon_rect", "default", 0.0); - } - set_state(PART:"elm.text", "invisible", 0.0); - } - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - script { - set_state(PART:"icon_rect", "visible", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.swallow.content", "visible", 0.0); - else - set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"icon_text_padding", "default", 0.0); } } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - target: "icon_rect"; - } program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; script { set_int(disabled, 1); - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"elm.swallow.content.clip", "disabled", 0.0); - if ( get_int(text_visible) == 1) - set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); } } program { name: "enable"; @@ -1063,10 +666,8 @@ group { name: "elm/button/base/bottom"; source: "elm"; script { set_int(disabled, 0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"elm.swallow.content.clip", "default", 0.0); - if (get_int(text_visible) == 1) - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); } } program { name: "multi_down"; @@ -1086,398 +687,153 @@ group { name: "elm/button/base/bottom"; } } -group { name: "elm/button/base/popup"; - script { - public mouse_down = 0; - public multi_down = 0; - } - images { - set { - name: "core_button_bg.#"; - image { - image: "SMALL/images/Controls/core_button_bg.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_button_bg.#.png" COMP; - } - } - - } + group { name: "elm/button/base/floatingbutton"; + inherit: "elm/button/base/default"; + data.item: "vector_ux" "floatingbutton"; parts { part { name: "base"; scale: 1; - description { state: "default" 0.0; - min: BUTTON_MIN_WIDTH BUTTON_BOTTOM_MIN_HEIGHT; - max: BUTTON_MAX_WIDTH BUTTON_BOTTOM_MIN_HEIGHT; - image.normal: "core_button_bg.#"; - color: 255 255 255 255; /*(Changeable UI) color_class: "W011E1";*/ - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - visible: 0 ; - } - } - part { name: "bg"; - scale: 1; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "core_button_bg.#"; - color: 38 107 191 255; /*(Changeable UI) color_class: "W011";*/ - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 30 85 153 255; /*(Changeable UI) color_class: "W011P";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 76 128 191 255; /*(Changeable UI) color_class: "W011D";*/ - } - } - part { name: "padding_left_top"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 0.0 0.0; - rel2.relative: 0.0 0.0; - min: BUTTON_PADDING_LEFT_RIGHT 0; - fixed: 1 1; - } - } - part { name: "padding_right_bottom"; type: SPACER; - scale: 1; description { state: "default" 0.0; - align: 1.0 1.0; - rel1.relative: 1.0 1.0; - min: BUTTON_PADDING_LEFT_RIGHT 0; - fixed: 1 1; + min: BUTTON_FLOATINGBUTTON_SIZE_INC; } } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; + part { name: "tizen_vg_shape_clipper"; + type: RECT; description { state: "default" 0.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to: "padding_right_bottom"; - } - text { - style: "button_popup"; - } - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - text.style: "button_popup_press"; + visible: 0; } description { state: "disabled" 0.0; - inherit: "default" 0.0; - text.style: "button_popup_dim"; - } - description { state: "invisible" 0.0; - inherit: "default" 0.0; visible: 0; } } - part { name: "event"; - scale: 1; + part { name: "tizen_vg_shape_clipper2"; type: RECT; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; - } - } - } - programs { - program { name: "pressed"; - signal: "mouse,down,1*"; - source: "event"; - script { - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) - { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press1"); - } - } - } - program { name: "button_press1"; - script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - set_state(PART:"base", "pressed", 0.0); - set_state(PART:"bg", "pressed", 0.0); - set_state(PART:"elm.text", "pressed", 0.0); - emit("elm,action,press", ""); - } - } - } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress1"); - } - } - } - program { name: "button_unpress1"; - script { - new st[31]; - new Float:vl; - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - set_state(PART:"base", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - emit("elm,action,unpress", ""); - } + visible: 0; + color: 57 78 160 0; } - } - program { name: "touch_snd"; - signal: "mouse,clicked,1"; - source: "event"; - script { - new st[31]; - new Float:vl; - if (get_int(multi_down) == 0) { - get_state(PART:"bg", st, 30, vl); - if (strcmp(st, "disabled")) { - emit("elm,action,click", ""); - } - } + description { state: "ready" 0.0; + inherit: "default" 0.0; + visible: 1; } - } - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "invisible" 0.0; - target: "elm.text"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "bg"; - target: "elm.text"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "elm.text"; - } - program { name: "multi_down"; - signal: "elm,action,multi,down"; - source: "elm"; - script { - set_int(multi_down, 1); + description { state: "pressed" 0.0; + color: 57 78 160 255; } } - program { name: "multi_up"; - signal: "elm,action,multi,up"; + } + programs { + program { + signal: "elm,floatingbutton,state,default"; source: "elm"; script { - set_int(multi_down, 0); + set_int(mouse_down, 0); } } } } -group { name: "elm/button/base/circle"; - script { - public mouse_down = 0; - public multi_down = 0; - } - images { - set { - name: "core_icon_container"; - image { - image: "SMALL/images/Controls/core_icon_container.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_icon_container.png" COMP; - } - } - } + group { name: "elm/button/base/bottom"; + inherit: "elm/button/base/default"; + alias: "elm/button/base/popup"; + data.item: "vector_ux" "bottom"; parts { - part { name: "background"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_CIRCLE_LABEL_SIZE; - } - } - part { name: "top_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 BUTTON_CIRCLE_TOP_PADDING_HEIGHT; - fixed: 0 1; - align: 0.5 0.0; - rel1.to : "background"; - rel2.relative: 1.0 0.0; - } - } - part { name: "left_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_CIRCLE_LEFT_RIGHT_PADDING_WIDTH 0; - fixed: 1 0; - align: 0.0 0.0; - rel1.to: "background"; - rel2 { - to: "background"; - relative: 0.0 1.0; - } - } - } - part{ name: "right_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_CIRCLE_LEFT_RIGHT_PADDING_WIDTH 0; - fixed: 1 0; - align: 1.0 0.0; - rel1 { - to: "background"; - relative: 1.0 0.0; - } - rel2.to: "background"; - } - } part { name: "base"; scale: 1; type: SPACER; description { state: "default" 0.0; - min: BUTTON_CIRCLE_SIZE; - max: BUTTON_CIRCLE_SIZE; - rel1 { - relative: 0.0 1.0; - to_y: "top_padding"; - } - align: 0.5 0.0; + min: BUTTON_BOTTOM_MIN_WIDTH_INC BUTTON_BOTTOM_MIN_HEIGHT_INC; } } - part { name: "bg"; + part { name: "tizen_vg_shape"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper"; scale: 1; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "core_icon_container"; - color: 38 107 191 255; /*(Changeable UI) color_class: "W015L6";*/ - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 30 85 153 255; /*(Changeable UI) color_class: "W015L6P";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 76 128 191 255; /*(Changeable UI) color_class: "W015L6D";*/ + min: 0 BUTTON_BOTTOM_MIN_HEIGHT_INC; } } - part { name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "elm.icon.clipper"; - scale: 1; + //Base Shape Part + part { name: "tizen_vg_shape_clipper"; + type: RECT; description { state: "default" 0.0; - min: BUTTON_CIRCLE_ICON_SIZE; - max: BUTTON_CIRCLE_ICON_SIZE; - rel1.to: "bg"; - rel2.to: "bg"; + color: 76 103 211 255; } - description { state: "invisible" 0.0; - inherit: "default" 0.0; - visible: 0; + description { state: "disabled" 0.0; + color: 134 155 239 255; } } - part { name: "elm.icon.clipper"; + part { name: "tizen_vg_shape_clipper2"; type: RECT; description { state: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3";*/ + visible: 0; + color: 57 78 160 0; } - description { state: "pressed" 0.0; + description { state: "ready" 0.0; inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3P";*/ + visible: 1; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 244 244 244 127; /*(Changeable UI) color_class: "F032L3D";*/ + description { state: "pressed" 0.0; + color: 57 78 160 255; } } - part { name: "mid_padding"; + part { name: "padding_left_top"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 BUTTON_CIRCLE_MIDDDLE_PADDING_HEIGHT; - max: -1 BUTTON_CIRCLE_MIDDDLE_PADDING_HEIGHT; - fixed: 0 1; - rel1 { - to_y : "base"; - relative: 0.0 1.0; - } - align: 0.5 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + align: 0.0 0.0; + rel1.relative: 0.0 0.0; + min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_BOTTOM_PADDING_TOP_HEIGHT_INC; + fixed: 1 1; } } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; + part { name: "padding_right_bottom"; + type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 BUTTON_CIRCLE_TEXT_HEIGHT; - max: -1 BUTTON_CIRCLE_TEXT_HEIGHT; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + align: 1.0 1.0; + rel1.relative: 1.0 1.0; + min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_BOTTOM_PADDING_BOTTOM_HEIGHT_INC; fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to_x: "left_padding"; - to_y: "mid_padding"; - } - rel2 { - relative: 0.0 0.0; - to_x: "right_padding"; - to_y: "bottom_padding"; - } - text { - min: 0 1; - align: 0.5 0.0; - style: "button_circle"; - } } } - part { name: "bottom_padding"; + } + } + + /* This transparent button style is used by applications which use webview. */ + group{ name: "elm/button/base/transparent"; + script { + public mouse_down = 0; + public multi_down = 0; + } + parts { + part { name: "bg"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 BUTTON_CIRCLE_BOTTOM_PADDING_HEIGHT; - rel2.to : "background"; - rel1.relative: 0.0 1.0; - fixed: 0 1; - align: 0.0 1.0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; } } - part { name: "event"; + part { name: "elm.swallow.content"; + type: SWALLOW; scale: 1; + description { state: "default" 0.0; + } + } + part { name: "event"; type: RECT; + scale: 1; + /* Do not remove the following line. + * elm.swallow.content part should receive mouse events. */ + repeat_events: 1; + ignore_flags: ON_HOLD; description { state: "default" 0.0; - rel1.to:"background"; - rel2.to:"background"; color: 0 0 0 0; } } @@ -1500,8 +856,6 @@ group { name: "elm/button/base/circle"; new Float:vl; get_state(PART:"bg", st, 30, vl); if (strcmp(st, "disabled")) { - set_state(PART:"bg", "pressed", 0.0); - set_state(PART:"elm.icon.clipper", "pressed", 0.0); emit("elm,action,press", ""); } } @@ -1522,13 +876,11 @@ group { name: "elm/button/base/circle"; new Float:vl; get_state(PART:"bg", st, 30, vl); if (strcmp(st, "disabled")) { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"elm.icon.clipper", "default", 0.0); emit("elm,action,unpress", ""); } } } - program { name: "touch_snd"; + program { name: "clicked"; signal: "mouse,clicked,1"; source: "event"; script { @@ -1542,31 +894,17 @@ group { name: "elm/button/base/circle"; } } } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "invisible" 0.0; - target: "elm.swallow.content"; - } program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.0; target: "bg"; - target: "elm.icon.clipper"; } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.0; target: "bg"; - target: "elm.icon.clipper"; } program { name: "multi_down"; signal: "elm,action,multi,down"; @@ -1585,6 +923,184 @@ group { name: "elm/button/base/circle"; } } +/////////////////////////////////////////////////////////////////////////////////////// +#define BUTTON_ICON_STYLES(style_name, image_normal, style_normal , style_press , style_dim ,min_width, min_height) \ + group { name: "elm/button/base/"style_name; \ + images { \ + image: image_normal COMP; \ + } \ + script { \ + public mouse_down = 0; \ + public multi_down = 0; \ + } \ + parts { \ + part { name: "button_image"; \ + type: SPACER; \ + scale: 1; \ + description { state: "default" 0.0; \ + min: min_width min_height; \ + max: min_width min_height; \ + } \ + } \ + part { name: "button_center_part"; \ + mouse_events: 0; \ + scale: 1; \ + description { state: "default" 0.0; \ + rel1.to: "button_image"; \ + rel2.to: "button_image"; \ + image.normal: image_normal; \ + color_class: style_normal; \ + } \ + description { state: "pressed" 0.0; \ + inherit: "default" 0.0; \ + color_class: style_press; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + color_class: style_dim; \ + } \ + } \ + part { name: "over1"; \ + 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: "over2"; \ + 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_press"; \ + signal: "mouse,down,1*"; \ + source: "over1"; \ + script { \ + if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) \ + { \ + set_int(mouse_down, 1); \ + run_program(PROGRAM:"button_press2"); \ + } \ + } \ + } \ + program { name: "button_press2"; \ + action: SIGNAL_EMIT "elm,action,press" ""; \ + after: "button_press_anim"; \ + } \ + program { name: "button_press_anim"; \ + action: STATE_SET "pressed" 0.0; \ + target: "button_center_part"; \ + } \ + program { name: "key_press"; \ + signal: "elm,action,pressed"; \ + source: "elm"; \ + action: STATE_SET "pressed" 0.0; \ + target: "button_center_part"; \ + } \ + program { name: "key_unpress"; \ + signal: "elm,action,unpressed"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "button_center_part"; \ + } \ + program { name: "button_unpress"; \ + signal: "mouse,up,1*"; \ + source: "over2"; \ + script { \ + if (get_int(mouse_down) == 1) \ + { \ + set_int(mouse_down, 0); \ + run_program(PROGRAM:"button_unpress2"); \ + run_program(PROGRAM:"button_unpress_anim"); \ + } \ + } \ + } \ + program { name: "button_unpress2"; \ + action: SIGNAL_EMIT "elm,action,unpress" ""; \ + } \ + program { name: "button_unpress_anim"; \ + action: STATE_SET "default" 0.0; \ + target: "button_center_part"; \ + } \ + program { name: "button_click"; \ + signal: "mouse,clicked,1"; \ + source: "over2"; \ + script { \ + if (get_int(multi_down) == 0) { \ + run_program(PROGRAM:"touch_sound"); \ + run_program(PROGRAM:"button_click2"); \ + } \ + } \ + } \ + program { name: "touch_sound"; \ + action: RUN_PLUGIN "touch_sound"; \ + } \ + program { name: "button_click2"; \ + action: SIGNAL_EMIT "elm,action,click" ""; \ + } \ + program { name: "disable"; \ + signal: "elm,state,disabled"; \ + source: "elm"; \ + action: STATE_SET "disabled" 0.0; \ + target: "disabler"; \ + target: "button_center_part"; \ + } \ + program { name: "enable"; \ + signal: "elm,state,enabled"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "disabler"; \ + target: "button_center_part"; \ + } \ + program { \ + name: "multi_down"; \ + signal: "elm,action,multi,down"; \ + source: "elm"; \ + script { \ + set_int(multi_down, 1); \ + } \ + } \ + program { \ + name: "multi_up"; \ + signal: "elm,action,multi,up"; \ + source: "elm"; \ + script { \ + set_int(multi_down, 0); \ + } \ + } \ + } \ + } + +/////////////////////////////////////////////////////////////////////////////////////// + BUTTON_ICON_STYLES("icon_reorder", "core_button_reorder.png", "F060L1" ,"F060L1P" , "F060L1D" , BUTTON_ICON_WIDTH_INC, BUTTON_ICON_HEIGHT_INC) +/////////////////////////////////////////////////////////////////////////////////////// + BUTTON_ICON_STYLES("icon_expand_add", "core_button_add.png", "F060L2" , "F060L2P", "F060L2D", BUTTON_ICON_WIDTH_INC, BUTTON_ICON_HEIGHT_INC) +/////////////////////////////////////////////////////////////////////////////////////// + BUTTON_ICON_STYLES("icon_expand_delete", "core_button_delete.png", "F060L3" , "F060L3P" ,"F060L3D", BUTTON_ICON_WIDTH_INC, BUTTON_ICON_HEIGHT_INC) + + group { name: "elm/button/base/contacts"; data { item: "focus_highlight" "on"; @@ -1593,10 +1109,10 @@ group { name: "elm/button/base/contacts"; set { name: "core_list_button_bg.#"; image { - image: "SMALL/images/Controls/core_list_button_bg.#.png" COMP; + image: SMALL"images/User_Input_Elements/core_list_button_bg.#.png" COMP; } image { - image: "MIDDLE/images/Controls/core_list_button_bg.#.png" COMP; + image: MEDIUM"images/User_Input_Elements/core_list_button_bg.#.png" COMP; } } } @@ -1618,8 +1134,8 @@ group { name: "elm/button/base/contacts"; to_x: "padding.right"; to_y: "elm.text"; } - min: 0 BUTTON_MIN_HEIGHT; - max: -1 BUTTON_MIN_HEIGHT; + min: 0 BUTTON_MIN_HEIGHT_INC; + max: -1 BUTTON_MIN_HEIGHT_INC; } } part { name: "button_image"; @@ -1628,22 +1144,22 @@ group { name: "elm/button/base/contacts"; rel1.to: "button_image_base"; rel2.to: "button_image_base"; image.normal: "core_list_button_bg.#"; - color: 38 107 191 255; /*(Changeable UI) color_class: "W012";*/ + color: 38 107 191 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 30 85 153 255; /*(Changeable UI) color_class: "W012P";*/ + color: 30 85 153 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 76 128 191 255; /*(Changeable UI) color_class: "W012D";*/ + color: 76 128 191 255; } } part { name: "padding.left"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: BUTTON_PADDING_LEFT_RIGHT 0; + min: BUTTON_PADDING_LEFT_RIGHT_INC 0; fixed: 1 0; rel2 { relative: 0.0 1.0; @@ -1656,7 +1172,7 @@ group { name: "elm/button/base/contacts"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: BUTTON_PADDING_LEFT_RIGHT 0; + min: BUTTON_PADDING_LEFT_RIGHT_INC 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -1675,7 +1191,6 @@ group { name: "elm/button/base/contacts"; text { style: "button_contacts"; min: 1 1; - ellipsis: -1; } } description { state: "visible" 0.0; @@ -1814,10 +1329,14 @@ group { name: "elm/button/base/contacts"; source: "over3"; script { if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "button_click2"; action: SIGNAL_EMIT "elm,action,click" ""; } @@ -1896,35 +1415,31 @@ group { name: "elm/button/base/contacts"; } } - group { name: "elm/button/base/naviframe/back_btn/default"; - alias: "elm/button/base/naviframe/end_btn/default"; - images { - set { - name: "core_icon_back"; - image { - image: SMALL"images/Navigation_elements/core_icon_back.png" COMP; - } - image { - image: MEDIUM"images/Navigation_elements/core_icon_back.png" COMP; - } - } - } + group { name: "elm/button/base/naviframe/title"; script { public mouse_down = 0; public multi_down = 0; public check_disabled = 0; } parts { + part { name: "base"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_BUTTON_SIZE_INC; + max: BUTTON_NAVIFRAME_TITLE_BUTTON_SIZE_INC; + fixed: 1 1; + } + } part { name: "button_bg"; type: RECT; scale: 1; mouse_events: 0; clip_to: "button_bg_clipper"; description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; - max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; + min: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; + max: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; fixed: 1 1; - color: 61 185 204 255; } } part { name: "button_bg_clipper"; @@ -1937,27 +1452,30 @@ group { name: "elm/button/base/contacts"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 193 193 193 255; + color: 104 141 186 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 43 93 155 255; } } part { name: "button_icon"; - type: IMAGE; + type: RECT; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; - max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; + min: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; + max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; fixed: 1 1; - color: 255 255 255 255; - image.normal: "core_icon_back"; + color: 52 158 91 255; } } part { name: "over2"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - rel1.to: "button_bg"; - rel2.to: "button_bg"; + rel1.to: "base"; + rel2.to: "base"; color: 0 0 0 0; } } @@ -1965,16 +1483,16 @@ group { name: "elm/button/base/contacts"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "button_bg"; - rel2.to: "button_bg"; + rel1.to: "base"; + rel2.to: "base"; color: 0 0 0 0; } } part { name: "disabler"; type: RECT; description { state: "default" 0.0; - rel1.to: "button_bg"; - rel2.to: "button_bg"; + rel1.to: "base"; + rel2.to: "base"; color: 0 0 0 0; visible: 0; } @@ -2065,26 +1583,31 @@ group { name: "elm/button/base/contacts"; } } - group { name: "elm/button/base/naviframe/title"; - alias: "elm/button/base/naviframe/prev_btn/default"; - alias: "elm/button/base/naviframe/more/default"; - script { - public mouse_down = 0; - public multi_down = 0; - public check_disabled = 0; - } - parts { - part { name: "base"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_TITLE_BUTTON_SIZE_INC; - max: BUTTON_NAVIFRAME_TITLE_BUTTON_SIZE_INC; - fixed: 1 1; + group { name: "elm/button/base/naviframe/title_done"; + inherit: "elm/button/base/naviframe/title"; + images { + set { + name: "core_title_button_bg"; + image { + image: SMALL"images/Old/core_title_button_bg.png" COMP; + } + image { + image: MEDIUM"images/Old/core_title_button_bg.png" COMP; } } + set { + name: "core_title_icon_done"; + image { + image: SMALL"images/Old/core_title_icon_done.png" COMP; + } + image { + image: MEDIUM"images/Old/core_title_icon_done.png" COMP; + } + } + } + parts { part { name: "button_bg"; - type: RECT; + type: IMAGE; scale: 1; mouse_events: 0; clip_to: "button_bg_clipper"; @@ -2092,65 +1615,36 @@ group { name: "elm/button/base/contacts"; min: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; max: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; fixed: 1 1; - } - } - part { name: "button_bg_clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_bg"; - rel2.to: "button_bg"; - color: 255 255 255 255; /*(Changeable UI) color_class: "B0541";*/ + image.normal: "core_title_button_bg"; + color: 255 255 255 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 104 141 186 255; /*(Changeable UI) color_class: "B0541P";*/ + color: 104 141 186 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 43 93 155 255; /*(Changeable UI) color_class: "B0541D";*/ + color: 43 93 155 255; } } part { name: "button_icon"; - type: RECT; + type: IMAGE; scale: 1; mouse_events: 0; description { state: "default" 0.0; min: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; fixed: 1 1; - color: 52 158 91 255; /*(Changeable UI) color_class: "B0561L1";*/ - } - } - part { name: "over2"; - type: RECT; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; - } - } - part { name: "over3"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; + image.normal: "core_title_icon_done"; + color: 52 158 91 255; } - } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; - visible: 0; + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 2 61 132 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - visible: 1; + color: 2 61 132 255; } } } @@ -2159,10 +1653,12 @@ group { name: "elm/button/base/contacts"; signal: "mouse,down,1*"; source: "over2"; script { - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) + if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) { set_int(mouse_down, 1); set_state(PART:"button_bg_clipper", "pressed", 0.0); + set_state(PART:"button_bg", "pressed", 0.0); + set_state(PART:"button_icon", "pressed", 0.0); emit("elm,action,press", ""); } } @@ -2171,10 +1667,12 @@ group { name: "elm/button/base/contacts"; signal: "mouse,up,1*"; source: "over3"; script { - if (get_int(mouse_down) == 1) + if ((get_int(check_disabled) == 0) && (get_int(mouse_down) == 1)) { set_int(mouse_down, 0); set_state(PART:"button_bg_clipper", "default", 0.0); + set_state(PART:"button_bg", "default", 0.0); + set_state(PART:"button_icon", "default", 0.0); emit("elm,action,unpress", ""); } } @@ -2183,34 +1681,58 @@ group { name: "elm/button/base/contacts"; signal: "mouse,clicked,1"; source: "over2"; script { - if (get_int(multi_down) == 0) { + if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0)) { + run_program(PROGRAM:"play_sound"); emit("elm,action,click", ""); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "key_press"; signal: "elm,action,pressed"; source: "elm"; - action: STATE_SET "pressed" 0.0; - target: "button_bg_clipper"; + script { + if (get_int(check_disabled) == 0) + { + set_state(PART:"button_bg", "pressed", 0.0); + set_state(PART:"button_icon", "pressed", 0.0); + set_state(PART:"button_bg_clipper", "pressed", 0.0); + } + } } program { name: "key_unpress"; signal: "elm,action,unpressed"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_bg_clipper"; + script { + if (get_int(check_disabled) == 0) + { + set_state(PART:"button_bg", "default", 0.0); + set_state(PART:"button_icon", "default", 0.0); + set_state(PART:"button_bg_clipper", "default", 0.0); + } + } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_bg_clipper"; + script { + set_int(check_disabled, 0); + set_state(PART:"button_bg", "default", 0.0); + set_state(PART:"button_icon", "default", 0.0); + set_state(PART:"button_bg_clipper", "default", 0.0); + } } program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button_bg_clipper"; + script { + set_int(check_disabled, 1); + set_state(PART:"button_bg", "disabled", 0.0); + set_state(PART:"button_icon", "disabled", 0.0); + set_state(PART:"button_bg_clipper", "disabled", 0.0); + } } program { name: "multi_down"; @@ -2231,25 +1753,25 @@ group { name: "elm/button/base/contacts"; } } - group { name: "elm/button/base/naviframe/title_done"; + group { name: "elm/button/base/naviframe/title_cancel"; inherit: "elm/button/base/naviframe/title"; images { set { name: "core_title_button_bg"; image { - image: "SMALL/images/Navigation_elements/core_title_button_bg.png" COMP; + image: SMALL"images/Old/core_title_button_bg.png" COMP; } image { - image: "MIDDLE/images/Navigation_elements/core_title_button_bg.png" COMP; + image: MEDIUM"images/Old/core_title_button_bg.png" COMP; } } set { - name: "core_title_icon_done"; + name: "core_title_icon_cancel"; image { - image: "SMALL/images/Navigation_elements/core_title_icon_done.png" COMP; + image: SMALL"images/Old/core_title_icon_cancel.png" COMP; } image { - image: "MIDDLE/images/Navigation_elements/core_title_icon_done.png" COMP; + image: MEDIUM"images/Old/core_title_icon_cancel.png" COMP; } } } @@ -2264,15 +1786,15 @@ group { name: "elm/button/base/contacts"; max: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; fixed: 1 1; image.normal: "core_title_button_bg"; - color: 255 255 255 255; /*(Changeable UI) color_class: "B0541";*/ + color: 255 255 255 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 104 141 186 255; /*(Changeable UI) color_class: "B0541P";*/ + color: 104 141 186 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 43 93 155 255; /*(Changeable UI) color_class: "B0541D";*/ + color: 43 93 155 255; } } part { name: "button_icon"; @@ -2283,16 +1805,16 @@ group { name: "elm/button/base/contacts"; min: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; fixed: 1 1; - image.normal: "core_title_icon_done"; - color: 52 158 91 255; /*(Changeable UI) color_class: "B0561L1";*/ + image.normal: "core_title_icon_cancel"; + color: 224 33 33 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "B0561L1P";*/ + color: 2 61 132 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "B0561L1D";*/ + color: 2 61 132 255; } } } @@ -2330,10 +1852,14 @@ group { name: "elm/button/base/contacts"; source: "over2"; script { if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0)) { + run_program(PROGRAM:"play_sound"); emit("elm,action,click", ""); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "key_press"; signal: "elm,action,pressed"; source: "elm"; @@ -2397,68 +1923,119 @@ group { name: "elm/button/base/contacts"; } } - group { name: "elm/button/base/naviframe/title_cancel"; - inherit: "elm/button/base/naviframe/title"; - images { - set { - name: "core_title_button_bg"; - image { - image: "SMALL/images/Navigation_elements/core_title_button_bg.png" COMP; - } - image { - image: "MIDDLE/images/Navigation_elements/core_title_button_bg.png" COMP; - } - } - set { - name: "core_title_icon_cancel"; - image { - image: "SMALL/images/Navigation_elements/core_title_icon_cancel.png" COMP; - } - image { - image: "MIDDLE/images/Navigation_elements/core_title_icon_cancel.png" COMP; - } - } + group { name: "elm/button/base/naviframe/title_left"; + script { + public mouse_down = 0; + public multi_down = 0; + public check_disabled = 0; } parts { part { name: "button_bg"; - type: IMAGE; + type: RECT; scale: 1; mouse_events: 0; clip_to: "button_bg_clipper"; description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; - max: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC; + min: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_SIZE_INC; + max: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_SIZE_INC; fixed: 1 1; - image.normal: "core_title_button_bg"; - color: 255 255 255 255; /*(Changeable UI) color_class: "B0541";*/ + color: 61 185 204 255; + } + } + part { name: "button_bg_clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 255 255 255 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 104 141 186 255; /*(Changeable UI) color_class: "B0541P";*/ + color: 193 193 193 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 43 93 155 255; /*(Changeable UI) color_class: "B0541D";*/ + color: 61 185 204 77; } } - part { name: "button_icon"; - type: IMAGE; + part { name: "left_padding"; + type: SPACER; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; - max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC; + min: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_LEFT_PADDING_WIDTH_INC 0; + max: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_LEFT_PADDING_WIDTH_INC -1; + align: 0.0 0.0; fixed: 1 1; - image.normal: "core_title_icon_cancel"; - color: 224 33 33 255; /*(Changeable UI) color_class: "B0562L1";*/ + rel1 { to: "button_bg"; relative: 0.0 0.0; } + rel2 { to: "button_bg"; relative: 0.0 1.0; } + } + } + part { name: "right_padding"; + type: SPACER; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_RIGHT_PADDING_WIDTH_INC 0; + max: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_RIGHT_PADDING_WIDTH_INC -1; + align: 1.0 0.0; + fixed: 1 1; + rel1 { to: "button_bg"; relative: 1.0 0.0; } + rel2 { to: "button_bg"; relative: 1.0 1.0; } + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 0.0 0.5; + rel1 { to: "left_padding"; relative: 1.0 0.0; } + rel2 { to: "right_padding"; relative: 0.0 1.0; } + text { + style: "button_title_left"; + min: 0 1; + } } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "B0562L1P";*/ + text.style: "button_title_left_press"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + text.style: "button_title_left_dim"; + } + } + part { name: "over2"; + type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 0 0 0 0; + } + } + part { name: "over3"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 0 0 0 0; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 0 0 0 0; + visible: 0; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "B0562L1D";*/ + visible: 1; } } } @@ -2467,12 +2044,10 @@ group { name: "elm/button/base/contacts"; signal: "mouse,down,1*"; source: "over2"; script { - if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) + if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) { set_int(mouse_down, 1); set_state(PART:"button_bg_clipper", "pressed", 0.0); - set_state(PART:"button_bg", "pressed", 0.0); - set_state(PART:"button_icon", "pressed", 0.0); emit("elm,action,press", ""); } } @@ -2481,12 +2056,10 @@ group { name: "elm/button/base/contacts"; signal: "mouse,up,1*"; source: "over3"; script { - if ((get_int(check_disabled) == 0) && (get_int(mouse_down) == 1)) + if (get_int(mouse_down) == 1) { set_int(mouse_down, 0); set_state(PART:"button_bg_clipper", "default", 0.0); - set_state(PART:"button_bg", "default", 0.0); - set_state(PART:"button_icon", "default", 0.0); emit("elm,action,unpress", ""); } } @@ -2495,54 +2068,265 @@ group { name: "elm/button/base/contacts"; signal: "mouse,clicked,1"; source: "over2"; script { - if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0)) { + if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); emit("elm,action,click", ""); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "key_press"; signal: "elm,action,pressed"; source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "button_bg_clipper"; + } + program { name: "key_unpress"; + signal: "elm,action,unpressed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "button_bg_clipper"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "button_bg_clipper"; + target: "elm.text"; + target: "disabler"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "button_bg_clipper"; + target: "elm.text"; + target: "disabler"; + } + program { + name: "multi_down"; + signal: "elm,action,multi,down"; + source: "elm"; script { - if (get_int(check_disabled) == 0) + set_int(multi_down, 1); + } + } + program { + name: "multi_up"; + signal: "elm,action,multi,up"; + source: "elm"; + script { + set_int(multi_down, 0); + } + } + } + } + + group { name: "elm/button/base/naviframe/title_right"; + inherit: "elm/button/base/naviframe/title_left"; + parts { + part { name: "left_padding"; + type: SPACER; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_LEFT_PADDING_WIDTH_INC 0; + max: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_LEFT_PADDING_WIDTH_INC -1; + align: 0.0 0.0; + fixed: 1 1; + rel1 { to: "button_bg"; relative: 0.0 0.0; } + rel2 { to: "button_bg"; relative: 0.0 1.0; } + } + } + part { name: "right_padding"; + type: SPACER; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_RIGHT_PADDING_WIDTH_INC 0; + max: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_RIGHT_PADDING_WIDTH_INC -1; + align: 1.0 0.0; + fixed: 1 1; + rel1 { to: "button_bg"; relative: 1.0 0.0; } + rel2 { to: "button_bg"; relative: 1.0 1.0; } + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 1.0 0.5; + rel1 { to: "left_padding"; relative: 1.0 0.0; } + rel2 { to: "right_padding"; relative: 0.0 1.0; } + text { + style: "button_title_right"; + min: 0 1; + } + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + text.style: "button_title_right_press"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + text.style: "button_title_right_dim"; + } + } + } + } + + group { name: "elm/button/base/naviframe/back_btn/default"; + alias: "elm/button/base/naviframe/end_btn/default"; + images { + set { + name: "core_icon_back"; + image { + image: SMALL"images/Navigation_elements/core_icon_back.png" COMP; + } + image { + image: MEDIUM"images/Navigation_elements/core_icon_back.png" COMP; + } + } + } + script { + public mouse_down = 0; + public multi_down = 0; + public check_disabled = 0; + } + parts { + part { name: "button_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "button_bg_clipper"; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; + max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; + fixed: 1 1; + color: 61 185 204 255; + } + } + part { name: "button_bg_clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 255 255 255 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 193 193 193 255; + } + } + part { name: "button_icon"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; + max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC; + fixed: 1 1; + color: 255 255 255 255; + image.normal: "core_icon_back"; + } + } + part { name: "over2"; + type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 0 0 0 0; + } + } + part { name: "over3"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 0 0 0 0; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { name: "button_press"; + signal: "mouse,down,1*"; + source: "over2"; + script { + if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) { - set_state(PART:"button_bg", "pressed", 0.0); - set_state(PART:"button_icon", "pressed", 0.0); + set_int(mouse_down, 1); set_state(PART:"button_bg_clipper", "pressed", 0.0); + emit("elm,action,press", ""); } } } - program { name: "key_unpress"; - signal: "elm,action,unpressed"; - source: "elm"; + program { name: "button_unpress"; + signal: "mouse,up,1*"; + source: "over3"; script { - if (get_int(check_disabled) == 0) + if (get_int(mouse_down) == 1) { - set_state(PART:"button_bg", "default", 0.0); - set_state(PART:"button_icon", "default", 0.0); + set_int(mouse_down, 0); set_state(PART:"button_bg_clipper", "default", 0.0); + emit("elm,action,unpress", ""); } } } + program { name: "button_click"; + signal: "mouse,clicked,1"; + source: "over2"; + script { + if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); + emit("elm,action,click", ""); + } + } + } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { name: "key_press"; + signal: "elm,action,pressed"; + source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "button_bg_clipper"; + } + program { name: "key_unpress"; + signal: "elm,action,unpressed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "button_bg_clipper"; + } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; - script { - set_int(check_disabled, 0); - set_state(PART:"button_bg", "default", 0.0); - set_state(PART:"button_icon", "default", 0.0); - set_state(PART:"button_bg_clipper", "default", 0.0); - } + action: STATE_SET "default" 0.0; + target: "button_bg_clipper"; } program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; - script { - set_int(check_disabled, 1); - set_state(PART:"button_bg", "disabled", 0.0); - set_state(PART:"button_icon", "disabled", 0.0); - set_state(PART:"button_bg_clipper", "disabled", 0.0); - } + action: STATE_SET "disabled" 0.0; + target: "button_bg_clipper"; } program { name: "multi_down"; @@ -2563,15 +2347,16 @@ group { name: "elm/button/base/contacts"; } } + group { name: "elm/button/base/naviframe/drawers"; images { set { name: "core_icon_drawer"; image { - image: "SMALL/images/Navigation_elements/core_icon_drawer.png" COMP; + image: SMALL"images/Old/core_icon_drawer.png" COMP; } image { - image: "MIDDLE/images/Navigation_elements/core_icon_drawer.png" COMP; + image: MEDIUM"images/Old/core_icon_drawer.png" COMP; } } } @@ -2601,7 +2386,7 @@ group { name: "elm/button/base/contacts"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 2 48 104 255; /*(Changeable UI) color_class: "F043P";*/ + color: 2 48 104 255; visible: 1; } } @@ -2695,10 +2480,14 @@ group { name: "elm/button/base/contacts"; source: "over2"; script { if (get_int(multi_down) == 0) { + run_program(PROGRAM:"touch_sound"); emit("elm,action,click", ""); } } } + program { name: "touch_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "key_press"; signal: "elm,action,pressed"; source: "elm"; @@ -2749,6 +2538,17 @@ group { name: "elm/button/base/contacts"; data { \ item: "focus_highlight" "on"; \ } \ + images { \ + set { \ + name: "core_focus.#"; \ + image { \ + image: SMALL"images/Presentation_views/core_focus.#.png" COMP; \ + } \ + image { \ + image: MEDIUM"images/Presentation_views/core_focus.#.png" COMP; \ + } \ + } \ + } \ script { \ public mouse_down = 0; \ public multi_down = 0; \ @@ -2762,16 +2562,17 @@ group { name: "elm/button/base/contacts"; } \ part { name: "focus_image"; \ scale: 1; \ - type: RECT; \ + type: IMAGE; \ mouse_events: 0; \ repeat_events: 1; \ description { state: "default" 0.0; \ + image.normal: "core_focus.#"; \ visible: 0; \ - color_class: "transparent"; \ } \ description { state: "focused" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ + color: 61 185 204 255; \ } \ } \ part { name: "over2"; \ @@ -2861,10 +2662,10 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") set { name: "core_button_icon_clear"; image { - image: "SMALL/images/Content_views/core_button_icon_clear.png" COMP; + image: SMALL"images/Presentation_views/core_button_icon_clear.png" COMP; } image { - image: "MIDDLE/images/Content_views/core_button_icon_clear.png" COMP; + image: MEDIUM"images/Presentation_views/core_button_icon_clear.png" COMP; } } } @@ -2911,13 +2712,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") part { name: "clear_button.clipper"; type: RECT; description { state: "default" 0.0; - color: 7 7 7 255; /*(Changeable UI) color_class: "F053";*/ + color: 61 184 204 255; } description { state: "pressed" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "F053P";*/ + color: 34 104 114 255; } description { state: "disabled" 0.0; - color: 7 7 7 76; /*(Changeable UI) color_class: "F053D";*/ + color: 0 0 0 76; } } part { name: "over2"; @@ -2998,10 +2799,14 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") source: "over2"; script { if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "button_click2"; action: SIGNAL_EMIT "elm,action,click" ""; } @@ -3045,10 +2850,10 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") set { name: "core_title_icon_option"; image { - image: "SMALL/images/Content_views/core_title_icon_option.png" COMP; + image: SMALL"images/Old/core_title_icon_option.png" COMP; } image { - image: "MIDDLE/images/Content_views/core_title_icon_option.png" COMP; + image: MEDIUM"images/Old/core_title_icon_option.png" COMP; } } } @@ -3095,13 +2900,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") part { name: "option_button.clipper"; type: RECT; description { state: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "B0563L1";*/ + color: 2 61 132 255; } description { state: "pressed" 0.0; - color: 1 43 94 255; /*(Changeable UI) color_class: "B0563L1P";*/ + color: 1 43 94 255; } description { state: "disabled" 0.0; - color: 7 7 7 76; /*(Changeable UI) color_class: "B0563L1D";*/ + color: 7 7 7 76; } } part { name: "over2"; @@ -3182,10 +2987,14 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") source: "over2"; script { if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "button_click2"; action: SIGNAL_EMIT "elm,action,click" ""; } @@ -3223,209 +3032,60 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") } } } -/* + group { name: "elm/button/base/datetime/ampm"; - script { - public mouse_down = 0; - public multi_down = 0; - } + inherit: "elm/button/base/default"; parts { - part { name: "bg"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: DATETIME_AMPM_BUTTON_SIZE_INC; - max: DATETIME_AMPM_BUTTON_SIZE_INC; - } - } - part { name: "top_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC; - max: -1 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC; - fixed: 0 1; - align: 0.5 0.0; - rel1.to: "bg"; - rel2 { - to: "bg"; - relative: 1.0 0.0; - } - } - } - part { name: "pressed_area"; - type: RECT; - scale: 1; - mouse_events: 0; + part { name: "base"; description { state: "default" 0.0; - min: DATETIME_AMPM_BUTTON_PRESSED_AREA_SIZE_INC; - max: DATETIME_AMPM_BUTTON_PRESSED_AREA_SIZE_INC; - color_class: "transparent"; - align: 0.5 0.0; - fixed: 1 1; - rel1 { - to: "top_padding"; - relative: 0.0 1.0; - } - rel2 { - to: "top_padding"; - relative: 1.0 1.0; - } - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 2 61 132 127; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + min: DATETIME_AMPM_BUTTON_WIDTH_SIZE_INC DATETIME_AMPM_BUTTON_HEIGHT_SIZE_INC; } } - part { name: "elm.text"; - type: TEXTBLOCK; - scale: 1; + part { name: "tizen_vg_shape"; description { state: "default" 0.0; - visible: 1; - rel1.to: "pressed_area"; - rel2.to: "pressed_area"; - fixed: 1 1; - text { - style: "button_ampm"; - min: 1 0; - max: 1 0; - ellipsis: -1; - } - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - text { - style: "button_ampm_press"; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - text { - style: "button_ampm_dim"; - } + min: 0 DATETIME_AMPM_BUTTON_HEIGHT_SIZE_INC; } } - part { name: "bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC; - max: -1 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC; - fixed: 0 1; - align: 0.5 1.0; - rel1 { - to: "pressed_area"; - relative: 0.0 1.0; - } - rel2.to: "bg"; - } + part { name: "tizen_vg_shape_clipper"; + description { state: "unselected" 0.0; + color: 204 204 204 255; + } } - part { name: "over2"; - type: RECT; - ignore_flags: ON_HOLD; + part { name: "padding_left_top"; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "bg"; - rel2.to: "bg"; + min: DATETIME_AMPM_BUTTON_TOP_LEFT_PADDING_INC; } } - part { name: "over3"; - type: RECT; - repeat_events: 1; + part { name: "padding_right_bottom"; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "bg"; - rel2.to: "bg"; + min: DATETIME_AMPM_BUTTON_BOTTOM_RIGHT_PADDING_INC; } } - part { name: "disabler"; - type: RECT; + part { name: "elm.text"; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - color: 0 0 0 0; - visible: 0; + text.style: "button_ampm"; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "unselected" 0.0; + text.style: "button_ampm_dim"; } } } - programs { - program { name: "button_press"; - signal: "mouse,down,1*"; - source: "over2"; - script { - if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) - { - set_int(mouse_down, 1); - set_state(PART:"pressed_area", "pressed", 0.0); - set_state(PART:"elm.text", "pressed", 0.0); - emit("elm,action,press", ""); - } - } - } - program { name: "button_unpress"; - signal: "mouse,up,1*"; - source: "over3"; - script { - if (get_int(mouse_down) == 1) - { - set_int(mouse_down, 0); - set_state(PART:"pressed_area", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); - emit("elm,action,unpress", ""); - } - } - } - program { name: "button_click"; - signal: "mouse,clicked,1"; - source: "over2"; - script { - if (get_int(multi_down) == 0) { - emit("elm,action,click", ""); - } - } - } - program { - name: "multi_down"; - signal: "elm,action,multi,down"; - source: "elm"; - script { - set_int(multi_down, 1); - } - } - program { - name: "multi_up"; - signal: "elm,action,multi,up"; - source: "elm"; - script { - set_int(multi_down, 0); - } - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "pressed_area"; - target: "elm.text"; - target: "disabler"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "pressed_area"; - target: "elm.text"; - target: "disabler"; - } + program { name: "unselected"; + signal: "elm,action,button,unselected"; + source: "elm"; + action: STATE_SET "unselected" 0.0; + target: "tizen_vg_shape_clipper"; + target: "elm.text"; + } + program { name: "selected"; + signal: "elm,action,button,selected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape_clipper"; + target: "elm.text"; } } -*/ + /******************* SPINNER BUTTONS STYLES **********************/ group { name: "elm/button/base/spinner/increase/default"; @@ -3450,7 +3110,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 2 61 132 127; /*(Changeable UI) color_class: "B042";*/ + color: 2 61 132 127; visible: 1; } description { state: "disabled" 0.0; @@ -3464,16 +3124,16 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") rel2.to: "arrow.image.bg"; min: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC; max: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC; - color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/ + color: 111 125 142 255; image.normal: "core_icon_picker_arrow_right.png"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/ + color: 244 244 244 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/ + color: 111 125 142 127; } } part { name: "focus_image"; @@ -3552,10 +3212,19 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") source: "over"; script { if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { name: "longpress_sound"; + signal: "elm,action,longpress"; + source: "elm"; + action: RUN_PLUGIN "touch_haptic"; + } program { name: "action_unpressed"; signal: "elm,action,unpressed"; source: "elm"; @@ -3644,16 +3313,16 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") rel2.to: "arrow.image.bg"; min: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC; max: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC; - color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/ + color: 111 125 142 255; image.normal: "core_icon_picker_arrow_left.png"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/ + color: 244 244 244 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/ + color: 111 125 142 127; } } } @@ -3667,23 +3336,20 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") type: SPACER; scale: 1; description { state: "default" 0.0; - min: SPINNER_LEFT_RIGHT_BG_IMAGE_SIZE_INC; + min: SPINNER_VERTICAL_TEXT_BUTTON_BG_SIZE_INC; } } part { name: "elm.text"; type: TEXT; scale: 1; description { state: "default" 0.0; - visible: 1; - color: 7 7 7 255; /*(Changeable UI) color_class: "T1233";*/ - min: 0 SPINNER_TEXT_HEIGHT_INC; - max: -1 SPINNER_TEXT_HEIGHT_INC; + fixed: 1 1; + color: 7 7 7 255; rel1.to: "bg"; rel2.to: "bg"; text { - min: 0 0; - max: 1 0; - font: "Tizen:style=Light"; size: "60"; /*(Changeable UI) text_class: "T1233";*/ + font: "Tizen:style=Light"; + size: 106; text_class: "tizen"; } } @@ -3726,9 +3392,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") signal: "mouse,clicked,1"; source: "over"; script { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "button_click2"; action: SIGNAL_EMIT "elm,action,click" ""; } @@ -3765,6 +3435,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") // Vertical ///////////// ///////////////////////// group { name: "elm/button/base/spinner/increase/vertical"; + alias: "elm/button/base/spinner/increase/vertical_time_picker"; alias: "elm/button/base/spinner/increase/vertical_date_picker"; alias: "elm/button/base/spinner/increase/datetime"; data.item: "focus_highlight" "on"; @@ -3787,7 +3458,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 2 61 132 127; /*(Changeable UI) color_class: "B042";*/ + color: 61 184 204 76; visible: 1; } description { state: "disabled" 0.0; @@ -3801,16 +3472,16 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") rel2.to: "arrow.image.bg"; min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; - color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/ + color: 204 204 204 255; image.normal: "core_icon_picker_arrow_up.png"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/ + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/ + color: 204 204 204 127; } } part { name: "focus_image"; @@ -3889,10 +3560,19 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") source: "over"; script { if (get_int(multi_down) == 0) { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { name: "longpress_sound"; + signal: "elm,action,longpress"; + source: "elm"; + action: RUN_PLUGIN "touch_haptic"; + } program { name: "action_unpressed"; signal: "elm,action,unpressed"; source: "elm"; @@ -3969,6 +3649,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") group { name: "elm/button/base/spinner/decrease/vertical"; inherit: "elm/button/base/spinner/increase/vertical"; + alias: "elm/button/base/spinner/decrease/vertical_time_picker"; alias: "elm/button/base/spinner/decrease/vertical_date_picker"; alias: "elm/button/base/spinner/decrease/datetime"; images { @@ -3982,45 +3663,45 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") rel2.to: "arrow.image.bg"; min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; - color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/ + color: 204 204 204 255; image.normal: "core_icon_picker_arrow_down.png"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/ + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/ + color: 204 204 204 127; } } } } group { name: "elm/button/base/spinner/vertical"; + alias: "elm/button/base/spinner/vertical_time_picker"; + alias: "elm/button/base/spinner/datetime"; data.item: "focus_highlight" "on"; parts { part { name: "bg"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC; + min: SPINNER_VERTICAL_TEXT_BUTTON_BG_SIZE_INC; } } part { name: "elm.text"; type: TEXT; scale: 1; description { state: "default" 0.0; - visible: 1; - color: 7 7 7 255; /*(Changeable UI) color_class: "T1233";*/ - min: 0 SPINNER_TEXT_HEIGHT_INC; - max: -1 SPINNER_TEXT_HEIGHT_INC; + fixed: 1 1; + color: 0 0 0 255; rel1.to: "bg"; rel2.to: "bg"; text { - min: 0 0; - max: 1 0; - font: "Tizen:style=Light"; size: "60"; /*(Changeable UI) text_class: "T1233";*/ + // FIXME: It should be changed to SNum-3L font. + font: "Tizen:style=Light"; + size: 106; text_class: "tizen"; } } @@ -4063,9 +3744,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") signal: "mouse,clicked,1"; source: "over"; script { + run_program(PROGRAM:"play_sound"); run_program(PROGRAM:"button_click2"); } } + program { name: "play_sound"; + action: RUN_PLUGIN "touch_sound"; + } program { name: "button_click2"; action: SIGNAL_EMIT "elm,action,click" ""; } @@ -4100,21 +3785,27 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus") group { name: "elm/button/base/spinner/vertical_date_picker"; inherit: "elm/button/base/spinner/vertical"; - alias: "elm/button/base/spinner/datetime"; parts { + part { name: "bg"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; + } + } part { name: "elm.text"; type: TEXT; scale: 1; description { state: "default" 0.0; - visible: 1; - color: 7 7 7 255; /*(Changeable UI) color_class: "T1233";*/ - min: 0 SPINNER_TEXT_HEIGHT_INC; - max: -1 SPINNER_TEXT_HEIGHT_INC; + fixed: 1 1; + color: 0 0 0 255; + rel1.to: "bg"; + rel2.to: "bg"; text { - min: 0 0; - max: 1 0; - font: "Tizen:style=Light"; size: "60"; /*(Changeable UI) text_class: "T1233";*/ - text_class: "tizen"; + font: "TizenSans:style=Light"; + size: 60; + size_range: 60 90; + fit: 1 0; } } description { state: "active" 0.0; @@ -4125,3 +3816,325 @@ group { name: "elm/button/base/spinner/vertical_date_picker"; } } /***********************SPINNER BUTTONS STYLES******************************/ + +group { name: "elm/button/base/hoversel_vertical_entry/default"; + alias: "elm/button/base/hoversel_vertical_entry/entry"; + alias: "elm/button/base/hoversel_horizontal_entry/default"; + alias: "elm/button/base/hoversel_horizontal_entry/entry"; + script { + public disabled = 0; + } + parts { + part { name: "button_image"; + type: RECT; + mouse_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 0 HOVERSEL_ITEM_MIN_HEIGHT_INC; + color: 0 0 0 0; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 61 185 204 77; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + } + part { name: "text_left_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: HOVERSEL_ITEM_TEXT_LR_PADDING_INC 0; + fixed: 1 1; + align: 0.0 0.5; + rel1 { to: "button_image"; relative: 0.0 0.0; } + rel2 { to: "button_image"; relative: 0.0 1.0; } + } + } + part { name: "text_right_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: HOVERSEL_ITEM_TEXT_LR_PADDING_INC 0; + fixed: 1 1; + align: 1.0 0.5; + rel1 { to: "button_image"; relative: 1.0 0.0; } + rel2 { to: "button_image"; relative: 1.0 1.0; } + } + } + part { name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.5; + rel1 { to_x: "text_left_padding"; to_y: "button_image"; relative: 1.0 0.0; } + rel2 { to_x: "text_right_padding"; to_y: "button_image"; relative: 0.0 1.0; } + text { + font: "Tizen:style=Regular"; + size: "26"; + align: 0.0 0.5; + min: 1 1; + } + color: 0 0 0 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 0 0 0 115; + } + } + 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; + } + } + } + programs { + program { name: "button_click"; + signal: "mouse,down,1"; + source: "over2"; + script { + if (get_int(disabled) == 0) { + emit("elm,action,press", ""); + run_program(PROGRAM:"button_click_anim"); + } + } + } + program { name: "button_click_anim"; + action: STATE_SET "pressed" 0.0; + target: "button_image"; + } + program { name: "button_unclick_anim"; + signal: "mouse,up,1"; + source: "over2"; + script { + if (get_int(disabled) == 0) { + set_state(PART:"button_image", "default", 0.0); + run_program(PROGRAM:"button_unclick"); + } + } + } + program { name: "button_unclick"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_int(disabled, 1); + set_state(PART:"button_image", "disabled", 0.0); + set_state(PART:"over2", "disabled", 0.0); + set_state(PART:"elm.text", "disabled", 0.0); + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_int(disabled, 0); + set_state(PART:"button_image", "default", 0.0); + set_state(PART:"over2", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); + } + } + } +} + +group { name: "elm/button/base/hoversel_vertical/default"; + alias: "elm/button/base/hoversel_vertical/entry"; + alias: "elm/button/base/hoversel_horizontal/default"; + alias: "elm/button/base/hoversel_horizontal/entry"; + images { + set { + name: "core_dropdown_label_icon_arrow"; + image { + image: SMALL"images/User_Input_Elements/core_dropdown_label_icon_arrow.png" COMP; + } + image { + image: MEDIUM"images/User_Input_Elements/core_dropdown_label_icon_arrow.png" COMP; + } + } + } + script { + public disabled = 0; + } + parts { + part { name: "base"; + scale: 1; + type: SPACER; + description { state: "default" 0.0; + min: BUTTON_HOVERSEL_MIN_SIZE_INC; + } + } + part { name: "button_image"; + type: RECT; + mouse_events: 1; + scale: 1; + description { state: "default" 0.0; + color: 255 255 255 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 61 185 204 77; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + } + part { name: "text_left_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_HOVERSEL_TEXT_LEFT_PADDING_INC 0; + fixed: 1 0; + align: 0.0 0.5; + rel1 { to: "button_image"; relative: 0.0 0.0; } + rel2 { to: "button_image"; relative: 0.0 1.0; } + } + } + part { name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1 { to: "text_left_padding"; relative: 1.0 0.0; } + rel2 { to: "text_right_padding"; relative: 0.0 1.0; } + color: 61 185 204 255; + text { + font: "Tizen:style=Regular"; + size: "40"; + min: 1 0; + ellipsis: -1; + align: -1.0 0.5; + } + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 61 185 204 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 61 185 204 163; + } + } + part { name: "underline"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: 0 BUTTON_HOVERSEL_UNDERLINE_HEIGHT_INC; + fixed: 0 1; + align: 0.5 1.0; + rel1 { to: "button_image"; relative: 0.0 1.0; } + rel2 { to: "button_image"; relative: 1.0 1.0; } + color: 61 185 204 255; + } + } + part { name: "underline_padding"; + type: SPACER; + scale: 1; + description { state: "default"; + fixed: 0 1; + align: 0.5 1.0; + min: 0 BUTTON_HOVERSEL_UNDERLINE_PADDING_INC; + rel1 { to: "underline"; relative: 0.0 0.0; } + rel2 { to: "underline"; relative: 1.0 0.0; } + } + } + part { name: "arrow"; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_HOVERSEL_ARROW_ICON_SIZE_INC; + fixed: 1 1; + align: 1.0 1.0; + rel1 { to_x: "button_image"; to_y: "underline_padding"; relative: 1.0 0.0; } + rel1 { to_x: "button_image"; to_y: "underline_padding"; relative: 1.0 0.0; } + image.normal: "core_dropdown_label_icon_arrow"; + color: 61 185 204 255; + } + } + part { name: "text_right_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: BUTTON_HOVERSEL_TEXT_RIGHT_PADDING_INC 0; + fixed: 1 0; + align: 1.0 0.5; + rel1 { to_x: "arrow"; to_y: "button_image"; relative: 0.0 0.0; } + rel2 { to_x: "arrow"; to_y: "button_image"; relative: 0.0 1.0; } + } + } + 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; + } + } + } + programs { + program { name: "button_click"; + signal: "mouse,down,1"; + source: "over2"; + script { + if (get_int(disabled) == 0) { + emit("elm,action,press", ""); + run_program(PROGRAM:"button_click_anim"); + } + } + } + program { name: "button_click_anim"; + action: STATE_SET "pressed" 0.0; + target: "button_image"; + } + program { name: "button_unclick_anim"; + signal: "mouse,up,1"; + source: "over2"; + script { + if (get_int(disabled) == 0) { + set_state(PART:"button_image", "default", 0.0); + run_program(PROGRAM:"button_unclick"); + } + } + } + program { name: "button_unclick"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_int(disabled, 1); + set_state(PART:"button_image", "disabled", 0.0); + set_state(PART:"over2", "disabled", 0.0); + set_state(PART:"elm.text", "disabled", 0.0); + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_int(disabled, 0); + set_state(PART:"button_image", "default", 0.0); + set_state(PART:"over2", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); + } + } + } +} diff --git a/mobile/widgets/check.edc b/mobile/widgets/check.edc index ad9da5ee..fbdc8c29 100644 --- a/mobile/widgets/check.edc +++ b/mobile/widgets/check.edc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved * * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) * @@ -24,181 +24,161 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ group { name: "elm/check/base/default"; - images { - set { - name: "core_check_bg"; - image { - image: "SMALL/images/Controls/core_check_bg.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_check_bg.png" COMP; - } - } - set { - name: "core_check_bg_stroke"; - image { - image: "SMALL/images/Controls/core_check_bg_stroke.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_check_bg_stroke.png" COMP; - } - } - set { - name: "core_check_icon"; - image { - image: "SMALL/images/Controls/core_check_icon.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_check_icon.png" COMP; - } - } - } + alias: "elm/check/base/popup"; + data.item: "vector_ux" "default"; script { public check_state; - public check_disabled; - public check_visible; + public disabled; + public text; + public animate = 0; } parts { - part { name: "bg"; + part { name: "base"; + type: SPACER; scale: 1; description { state: "default" 0.0; - min: CHECK_BG_SIZE; - align: 0.0 0.5; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_check_bg"; - color: 0 0 0 102; /*(Changeable UI) color_class: "W013L1E1";*/ + min: CHECK_DEFAULT_SIZE; } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W013L1";*/ + } + //Outline + Rectangle Fill + part { name: "tizen_vg_shape"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper"; + scale: 1; + description { state: "default" 0.0; + min: CHECK_DEFAULT_SIZE; + rel1.relative: 0 0.5; + rel2.relative: 0 0.5; + align: 0 0.5; + fixed: 1 1; + } + } + part { name: "tizen_vg_shape_clipper"; + type: RECT; + description { state: "default" 0.0; + color: 61 184 204 255; } description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 51; /*(Changeable UI) color_class: "W013L1D";*/ + color: 61 184 204 77; } } - part { name: "bg_stroke"; + //Check Line + part { name: "tizen_vg_shape2"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: CHECK_BG_STROKE_SIZE; - align: 0.0 0.5; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_check_bg_stroke"; - color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2E1";*/ + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2";*/ + } + part { name: "padding_before_text"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.5; + min: 0 0; + rel1 { + to: "tizen_vg_shape"; + relative: 1.0 0.0; + } + rel2 { + to: "tizen_vg_shape"; + relative: 1.0 1.0; + } } - description { state: "disabled" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; - color: 191 191 191 76; /*(Changeable UI) color_class: "W013L2D";*/ + min: CHECK_PAD_BEFORE_TEXT_INC; + fixed: 1 1; } } - part { name: "check"; + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: CHECK_ICON_SIZE; - rel1.to: "bg"; - rel1.relative: 0.125 0.125; - rel2.to: "bg"; - rel2.relative: 0.875 0.875; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_check_icon"; - color_class:"W013L1i"; - visible:0; + visible: 0; + fixed: 0 1; + rel1 { + relative: 1.0 0.5; + to_x : "padding_before_text"; + } + rel2 { + relative: 1.0 0.5; + } + align: 0.0 0.5; + text { + style: "check_default"; + min: 0 0; + } } - description { state: "on" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; + text.min: 1 1; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class:"W013L1iD"; + visible: 1; + text { + style: "check_default_dim"; + min: 0 1; + } + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + visible: 1; + text { + style: "check_default_press"; + min: 0 1; + } } } part { name: "event"; - scale: 1; type: RECT; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; color: 0 0 0 0; } } } programs { - program { name: "show"; - signal: "show"; - script { - set_int(check_visible, 1); - } - } - program { name: "hide"; - signal: "hide"; - script { - set_int(check_visible, 0); - } - } program { name: "click"; signal: "mouse,clicked,1"; source: "event"; script { - if (get_int(check_disabled) == 1) return; - emit("elm,action,check,toggle", ""); + if (get_int(disabled) == 0) { + emit("elm,action,check,toggle", ""); + run_program(PROGRAM:"touch_sound"); + } } } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; + program { name: "touch_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { name: "check_on_activate"; + signal: "elm,activate,check,on"; + source: "elm"; script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) { - set_state(PART:"check", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"check", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } + set_int(animate, 1); } } - program { name: "unpressed2"; - signal: "elm,state,mouse,up"; + program { name: "check_off_activate"; + signal: "elm,activate,check,off"; source: "elm"; script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) { - set_state(PART:"check", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"check", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } + set_int(animate, 1); } } - program { name: "check_on"; signal: "elm,state,check,on"; source: "elm"; script { - if (get_int(check_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); + if (get_int(animate) == 0) { + emit("elm,check,state,toggle", "tizen_vg"); + } else { + emit("elm,check,action,toggle", "tizen_vg"); } - else { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - set_state(PART:"check", "on", 0.0); + set_int(animate, 0); set_int(check_state, 1); } } @@ -206,235 +186,76 @@ group { name: "elm/check/base/default"; signal: "elm,state,check,off"; source: "elm"; script { - if (get_int(check_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); + if (get_int(animate) == 0) { + emit("elm,check,state,toggle", "tizen_vg"); + } else { + emit("elm,check,action,toggle", "tizen_vg"); } - set_state(PART:"check", "default", 0.0); + set_int(animate, 0); set_int(check_state, 0); } } - program { name: "disable"; + program { name: "disabled"; signal: "elm,state,disabled"; source: "elm"; script { - set_int(check_disabled, 1); - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - set_state(PART:"check", "disabled", 0.0); + set_int(disabled, 1); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + if (get_int(text) == 1) { + set_state(PART:"elm.text", "disabled", 0.0); + } } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; script { - set_int(check_disabled, 0); - if (get_int(check_state) == 1) { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - set_state(PART:"check", "on", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - set_state(PART:"check", "default", 0.0); - } - } - } - } -} - -group { name: "elm/check/base/list"; - images { - image: "core_check_bg.png" COMP; - image: "core_check_bg_stroke.png" COMP; - image: "core_check_icon.png" COMP; - } - script { - public check_state; - public check_disabled; - public check_visible; - } - parts { - part { name: "bg"; - scale: 1; - description { state: "default" 0.0; - min: CHECK_BG_SIZE; - align: 0.0 0.5; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_check_bg.png"; - color: 0 0 0 102; /*(Changeable UI) color_class: "W013L1E1";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W013L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 51; /*(Changeable UI) color_class: "W013L1D";*/ - } - } - part { name: "bg_stroke"; - scale: 1; - description { state: "default" 0.0; - min: CHECK_BG_STROKE_SIZE; - align: 0.0 0.5; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_check_bg_stroke.png"; - color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2E1";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 191 191 191 76; /*(Changeable UI) color_class: "W013L2D";*/ - } - } - part { name: "check"; - scale: 1; - description { state: "default" 0.0; - min: CHECK_ICON_SIZE; - rel1.to: "bg"; - rel1.relative: 0.125 0.125; - rel2.to: "bg"; - rel2.relative: 0.875 0.875; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_check_icon.png"; - color_class:"W013L1i"; - visible:0; - } - description { state: "on" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class:"W013L1iD"; - } - } - part { name: "event"; - scale: 1; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - color: 0 0 0 0; - } - } - } - programs { - program { name: "show"; - signal: "show"; - script { - set_int(check_visible, 1); - } - } - program { name: "hide"; - signal: "hide"; - script { - set_int(check_visible, 0); - } - } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) { - set_state(PART:"check", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"check", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); + set_int(disabled, 0); + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + if (get_int(text) == 1) { + set_state(PART:"elm.text", "visible", 0.0); } } } - program { name: "unpressed2"; - signal: "elm,state,mouse,up"; + program { name: "text_show"; + signal: "elm,state,text,visible"; source: "elm"; script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) { - set_state(PART:"check", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"check", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); + set_int(text, 1); + set_state(PART:"padding_before_text", "visible", 0.0); + if (get_int(disabled) == 1) { + set_state(PART:"elm.text", "disabled", 0.0); + }else { + set_state(PART:"elm.text", "visible", 0.0); } } } - - program { name: "check_on"; - signal: "elm,state,check,on"; + program { name: "text_hide"; + signal: "elm,state,text,hidden"; source: "elm"; script { - if (get_int(check_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - set_state(PART:"check", "on", 0.0); - set_int(check_state, 1); + set_int(text, 0); + set_state(PART:"padding_before_text", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); } } - program { name: "check_off"; - signal: "elm,state,check,off"; - source: "elm"; + program { name: "pressed"; + signal: "mouse,down,1"; + source: "event"; script { - if (get_int(check_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); + if (get_int(disabled) == 1) return; + if (get_int(text) == 1) { + set_state(PART:"elm.text", "pressed", 0.0); } - set_state(PART:"check", "default", 0.0); - set_int(check_state, 0); - } - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - script { - set_int(check_disabled, 1); - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - set_state(PART:"check", "disabled", 0.0); } } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; + program { name: "unpressed"; + signal: "mouse,up,1"; + source: "event"; script { - set_int(check_disabled, 0); - if (get_int(check_state) == 1) { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - set_state(PART:"check", "on", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - set_state(PART:"check", "default", 0.0); + if (get_int(disabled) == 1) return; + if (get_int(text) == 1) { + set_state(PART:"elm.text", "visible", 0.0); } } } @@ -442,403 +263,291 @@ group { name: "elm/check/base/list"; } group { name: "elm/check/base/favorite"; - images { - set { - name: "core_icon_favorite"; - image { - image: "SMALL/images/Controls/core_icon_favorite.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_icon_favorite.png" COMP; + inherit: "elm/check/base/default"; + data.item: "vector_ux" "favorite"; + parts { + part { name: "base"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: CHECK_FAVORITE_SIZE; } } - } - script { - public check_state; - public check_disabled; - public check_visible; - } - parts { - part { name: "bg"; + //Outline Star + part { name: "tizen_vg_shape"; + type: SWALLOW; scale: 1; + clip_to: "tizen_vg_shape_clipper"; description { state: "default" 0.0; - min: CHECK_BG_SIZE ; - max: CHECK_BG_SIZE ; - image.normal: "core_icon_favorite"; - color: 7 7 7 76; /*(Changeable UI) color_class: "W016L1iE1";*/ + min: CHECK_FAVORITE_SIZE; + rel1.relative: 0 0.5; + rel2.relative: 0 0.5; + align: 0 0.5; + fixed: 1 1; } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 255 178 0 255; /*(Changeable UI) color_class: "W016L1i";*/ + } + part { name: "tizen_vg_shape_clipper"; + type: RECT; + description { state: "default" 0.0; + color: 255 178 0 255; } description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 7 7 7 38; /*(Changeable UI) color_class: "W016L1iD";*/ + color: 0 0 0 38; } } - part { name: "event"; + //Inner Star Body + part { name: "tizen_vg_shape2"; + clip_to: "tizen_vg_shape_clipper2"; scale: 1; - type: RECT; + type: SWALLOW; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - color: 0 0 0 0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; } } - } - programs { - program { name: "show"; - signal: "show"; - script { - set_int(check_visible, 1); - } - } - program { name: "hide"; - signal: "hide"; - script { - set_int(check_visible, 0); + part { name: "tizen_vg_shape_clipper2"; + type: RECT; + description { state: "default" 0.0; + color: 255 178 0 0; } - } - program { name: "click"; - signal: "mouse,clicked,1"; - source: "event"; - script { - if (get_int(check_disabled) == 1) return; - emit("elm,action,check,toggle", ""); + description { state: "on" 0.0; + color: 255 178 0 255; } - } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) - set_state(PART:"bg", "on", 0.0); - else - set_state(PART:"bg", "default", 0.0); + description { state: "disabled" 0.0; + color: 0 0 0 38; } } - program { name: "unpressed2"; - signal: "elm,state,mouse,up"; - source: "elm"; - script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) - set_state(PART:"bg", "on", 0.0); - else - set_state(PART:"bg", "default", 0.0); - } + } + programs { + program { name: "toggle_on_effect"; + action: STATE_SET "on" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.5; } program { name: "check_on"; signal: "elm,state,check,on"; source: "elm"; script { - set_state(PART:"bg", "on", 0.0); + if (get_int(animate) == 0) { + emit("elm,check,state,toggle", "tizen_vg"); + if (!get_int(disabled)) { + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); + } + } else { + emit("elm,check,action,toggle", "tizen_vg"); + if (!get_int(disabled)) { + run_program(PROGRAM:"toggle_on_effect"); + } + } + set_int(animate, 0); set_int(check_state, 1); } } + program { name: "toggle_off_effect"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.3; + } program { name: "check_off"; signal: "elm,state,check,off"; source: "elm"; script { - if (get_int(check_disabled) == 1) - set_state(PART:"bg", "disabled", 0.0); - else - set_state(PART:"bg", "default", 0.0); + if (get_int(animate) == 0) { + emit("elm,check,state,toggle", "tizen_vg"); + if (!get_int(disabled)) { + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + } + } else { + emit("elm,check,action,toggle", "tizen_vg"); + if (!get_int(disabled)) { + run_program(PROGRAM:"toggle_off_effect"); + } + } + set_int(animate, 0); set_int(check_state, 0); } } - program { name: "disable"; + program { name: "disabled"; signal: "elm,state,disabled"; source: "elm"; script { - set_int(check_disabled, 1); - if (get_int(check_state) == 1) - set_state(PART:"bg", "on", 0.0); - else - set_state(PART:"bg", "disabled", 0.0); + set_int(disabled, 1); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0); + if (get_int(text) == 1) { + set_state(PART:"elm.text", "disabled", 0.0); + } } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; script { - set_int(check_disabled, 0); - if (get_int(check_state) == 1) - set_state(PART:"bg", "on", 0.0); - else - set_state(PART:"bg", "default", 0.0); + set_int(disabled, 0); + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + if (get_int(check_state) == 0) { + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + } else { + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); + } + if (get_int(text) == 1) { + set_state(PART:"elm.text", "visible", 0.0); + } } } } } group { name: "elm/check/base/on&off"; - images { - set { - name: "core_toggle_bg"; - image { - image: "SMALL/images/Controls/core_toggle_bg.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_toggle_bg.png" COMP; - } - } - set { - name: "core_toggle_icon_off"; - image { - image: "SMALL/images/Controls/core_toggle_icon_off.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_toggle_icon_off.png" COMP; - } - } - set { - name: "core_toggle_icon_on"; - image { - image: "SMALL/images/Controls/core_toggle_icon_on.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_toggle_icon_on.png" COMP; - } - } - } - script { - public check_state; - public check_disabled; - public check_visible; - } + inherit: "elm/check/base/default"; + data.item: "vector_ux" "on&off"; parts { - part { name: "bg"; + part { name: "base"; type: SPACER; - mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: CHECK_GEN_SIZE; - max: CHECK_GEN_SIZE; + min: CHECK_ONOFF_SIZE; } } - part { name: "bg_image"; - mouse_events: 0; + //Circle BG + part { name: "tizen_vg_shape"; + type: SWALLOW; scale: 1; + clip_to: "tizen_vg_shape_clipper"; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "core_toggle_bg"; - color: 7 7 7 76; /*(Changeable UI) color_class: "W015L1E1";*/ + min: CHECK_ONOFF_SIZE; + rel1.relative: 0 0.5; + rel2.relative: 0 0.5; + align: 0 0.5; + fixed: 1 1; + } + } + part { name: "tizen_vg_shape_clipper"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 102; } description { state: "on" 0.0; - inherit: "default" 0.0; - color: 52 158 91 255; /*(Changeable UI) color_class: "W015L1";*/ + color: 0 0 0 102; } description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 7 7 7 38; /*(Changeable UI) color_class: "W015L1D";*/ + color: 0 0 0 40; } } - part { name: "button"; - mouse_events: 0; - scale: 1; + //Overlapped Circle + part { name: "tizen_vg_shape2"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper2"; description { state: "default" 0.0; - min: CHECK_SIZE ; - max: CHECK_SIZE ; - rel1.to: "bg_image"; - rel2.to: "bg_image"; - image.normal: "core_toggle_icon_off"; - color: 244 244 244 255; /*(Changeable UI) color_class: "W015L1i";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - image.normal: "core_toggle_icon_on"; - color: 244 244 244 255; /*(Changeable UI) color_class: "W015L1i";*/ + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; } } - part { name: "event"; - scale: 1; + part { name: "tizen_vg_shape_clipper2"; type: RECT; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - color: 0 0 0 0; + color: 89 175 58 0; } - } - } - programs { - program { name: "show"; - signal: "show"; - script { - set_int(check_visible, 1); - } - } - program { name: "hide"; - signal: "hide"; - script { - set_int(check_visible, 0); + description { state: "on" 0.0; + color: 89 175 58 255; } - } - program { name: "click"; - signal: "mouse,clicked,1"; - source: "event"; - script { - if (get_int(check_disabled) == 1) return; - emit("elm,action,check,toggle", ""); + description { state: "disabled" 0.0; + visible: 0; } } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) { - set_state(PART:"bg_image", "on", 0.0); - set_state(PART:"button", "on", 0.0); - } - else { - set_state(PART:"bg_image", "default", 0.0); - set_state(PART:"button", "default", 0.0); - } + //Line <-> Circle + part { name: "tizen_vg_shape3"; + type: SWALLOW; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + min: CHECK_ONOFF_ICON_SIZE; + fixed: 1 1; + align: 0.5 0.5; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; } } - program { name: "unpressed2"; - signal: "elm,state,mouse,up"; - source: "elm"; - script { - if (get_int(check_disabled) == 1) return; - if (get_int(check_state) == 1) { - set_state(PART:"bg_image", "on", 0.0); - set_state(PART:"button", "on", 0.0) - } - else { - set_state(PART:"bg_image", "default", 0.0); - set_state(PART:"button", "default", 0.0); - } - } + } + programs { + program { name: "toggle_on_effect"; + action: STATE_SET "on" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.45; } program { name: "check_on"; signal: "elm,state,check,on"; source: "elm"; script { - if (get_int(check_disabled) == 1) - set_state(PART:"bg_image", "disabled", 0.0); - else - set_state(PART:"bg_image", "on", 0.0); - set_state(PART:"button", "on", 0.0) + if (get_int(animate) == 0) { + emit("elm,check,state,toggle", "tizen_vg"); + if (!get_int(disabled)) { + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); + } + } else { + emit("elm,check,action,toggle", "tizen_vg"); + if (!get_int(disabled)) { + run_program(PROGRAM:"toggle_on_effect"); + } + } + set_int(animate, 0); set_int(check_state, 1); } } + program { name: "toggle_off_effect"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.45; + } program { name: "check_off"; signal: "elm,state,check,off"; source: "elm"; script { - if (get_int(check_disabled) == 1) - set_state(PART:"bg_image", "disabled", 0.0); - else - set_state(PART:"bg_image", "default", 0.0); - set_state(PART:"button", "default", 0.0); + if (get_int(animate) == 0) { + emit("elm,check,state,toggle", "tizen_vg"); + if (!get_int(disabled)) { + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + } + } else { + emit("elm,check,action,toggle", "tizen_vg"); + if (!get_int(disabled)) { + run_program(PROGRAM:"toggle_off_effect"); + } + } + set_int(animate, 0); set_int(check_state, 0); } } - program { name: "disable"; + program { name: "disabled"; signal: "elm,state,disabled"; source: "elm"; script { - set_int(check_disabled, 1); - set_state(PART:"bg_image", "disabled", 0.0); + set_int(disabled, 1); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0); + if (get_int(text) == 1) { + set_state(PART:"elm.text", "disabled", 0.0); + } } } program { name: "enable"; signal: "elm,state,enabled"; source: "elm"; script { - set_int(check_disabled, 0); - if (get_int(check_state) == 1) - set_state(PART:"bg_image", "on", 0.0); - else - set_state(PART:"bg_image", "default", 0.0); - } - } - } -} - -group { name: "elm/check/base/popup"; - inherit: "elm/check/base/default"; - parts { - part { name: "padding_before_text"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 0.0 0.5; - min: 0 0; - rel1 { - to_x: "bg"; - relative: 1.0 0.0; - } - rel2 { - to_x: "bg"; - relative: 1.0 1.0; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: CHECK_PAD_BEFORE_TEXT_INC; - max: CHECK_PAD_BEFORE_TEXT_INC; - fixed: 1 0; - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 0 1; - rel1 { - relative: 1.0 0.5; - to_x: "padding_before_text"; + set_int(disabled, 0); + if (get_int(check_state) == 0) { + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + } else { + set_state(PART:"tizen_vg_shape_clipper", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); } - rel2 { - relative: 1.0 0.5; - } - align: 0.0 0.5; - text { - style: "check_popup"; - min: 0 0; + if (get_int(text) == 1) { + set_state(PART:"elm.text", "visible", 0.0); } } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; - text.ellipsis: -1; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text { - style: "check_popup_dim"; - min: 1 1; - ellipsis: -1; - } - } - } - } - programs { - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "padding_before_text"; - target: "elm.text"; - } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "padding_before_text"; - target: "elm.text"; } } - } +} diff --git a/mobile/widgets/progressbar.edc b/mobile/widgets/progressbar.edc index d6ff9403..1603d271 100644 --- a/mobile/widgets/progressbar.edc +++ b/mobile/widgets/progressbar.edc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved * * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) * @@ -25,20 +25,8 @@ */ -/////////////////////////////////////////////////////////////////////////////////////// - group { name: "elm/progressbar/horizontal/default"; - images { - set { - name: "core_progress_bar.#"; - image { - image: "SMALL/images/Controls/core_progress_bar.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_progress_bar.#.png" COMP; - } - } - } + data.item: "vector_ux" "default"; parts { part { name: "access"; type: RECT; @@ -47,70 +35,37 @@ color: 0 0 0 0; } } - part { name: "elm.background.progressbar"; - type: SPACER; - scale: 1; + part { name: "elm.swallow.bar"; + type: SWALLOW; description { state: "default" 0.0; - } - description { state: "show" 0.0; - min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC; + visible: 0; } } - part { name: "elm.text"; - type: TEXT; - mouse_events: 0; + part { name: "base"; + type: SPACER; scale: 1; description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } - text { - min: 0 0; - align: 1.0 0.0; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ - text_class: "tizen"; - } - align: 1.0 0.0; - color_class: "T057L2"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; + min: 0 PROGRESSBAR_DEFAULT_HEIGHT_INC; } } - part { name: "elm.left.top.text"; + part { name: "elm.text.top.right"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + rel1.to: "top_padding"; + rel2.to: "top_padding"; text { - min: 1 1; + min: 0 0; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } - align: 0.0 0.0; - color_class: "T057L2"; + align: 1.0 1.0; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -118,225 +73,131 @@ visible: 1; } } - part { name: "swallowbar.top.pad"; + part { name: "top_padding"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 0; - max: 0 0; - rel1 { - to: "elm.text"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.text"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - max: -1 PROGRESSBAR_PADDING_HEIGHT_INC; + fixed: 0 1; + rel1.to_y: "background"; + rel2.to_y: "background"; + rel1.relative: 0 0; + rel2.relative: 1 0; + align: 0.5 1; } } - part { name: "elm.swallow.bar"; - type: SWALLOW; + part { name: "background"; + type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - rel1.to: "elm.background.progressbar"; - rel2.to: "elm.background.progressbar"; + min: 0 PROGRESSBAR_DEFAULT_HEIGHT_INC; fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - rel1 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 0.0 1.0; - } - rel2 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - visible: 1; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; + align: 0.5 0.5; + color: 145 145 145 179; } } - part { name: "background"; + part { name: "tizen_vg_shape1"; + type: SWALLOW; mouse_events: 0; scale: 1; + clip_to: "background"; description { state: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - image.normal: "core_progress_bar.#"; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ + rel1.to: "background"; + rel2.to: "background"; } } - part { name: "swallowbar.bottom.pad"; + part { name: "drag.background"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; rel1 { - to: "elm.swallow.bar"; - relative: 0.0 1.0; + to_x: "background"; + to_y: "background"; + relative: 0.0 0.0; } rel2 { - to: "elm.swallow.bar"; + to_x: "background"; + to_y: "background"; relative: 1.0 1.0; } - align: 0.5 0.0; - fixed: 1 1; } } - part { name: "elm.text.status"; - type: TEXT; - mouse_events: 0; + part { name: "tizen_vg_shape2"; + type: SWALLOW; scale: 1; + clip_to: "tizen_vg_shape2_clipper"; description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } - text { - min: 1 1; - align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ - text_class: "tizen"; - ellipsis: -1; - } - align: 1.0 0.0; - color_class: "T057L2"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; + rel1.to: "elm.progress.progressbar"; + rel2.to: "elm.progress.progressbar"; } } - part { name: "elm.bottom.text"; - type: TEXT; - mouse_events: 0; - scale: 1; + part { name: "tizen_vg_shape2_clipper"; + type: RECT; description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } - text { - min: 1 1; - align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/ - text_class: "tizen"; - ellipsis: -1; - } - align: 0.0 0.0; - color_class: "T057L1"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; + color:61 184 204 77; } } - part { name: "drag.background"; - type: SPACER; + part { name: "tizen_vg_shape3"; + type: SWALLOW; scale: 1; + clip_to: "elm.progress.progressbar"; description { state: "default" 0.0; - rel1 { - to_x: "background"; - to_y: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to_x: "background"; - to_y: "elm.swallow.bar"; - relative: 1.0 1.0; - } + rel1.to: "elm.progress.progressbar"; + rel2.to: "elm.progress.progressbar"; } } part { name: "elm.progress.progressbar"; - mouse_events: 0; - scale: 1; + type: RECT; description { state: "default" 0.0; min: 0 0; fixed: 1 1; rel1 { - to: "elm.swallow.bar"; + to: "background"; relative: 0.0 0.0; } rel2 { - to_y: "elm.swallow.bar"; + to_y: "background"; to_x: "elm.cur.progressbar"; offset: -1 -1; } - image.normal: "core_progress_bar.#"; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ + color:61 184 204 255; } description { state: "invert" 0.0; inherit: "default" 0.0; rel1 { - to_y: "elm.swallow.bar"; + to_y: "background"; to_x: "elm.cur.progressbar"; } rel2 { - to_y: "elm.swallow.bar"; - to_x: "background"; + to: "background"; relative: 1.0 1.0; } } description { state: "state_begin" 0.0; inherit: "default" 0.0; rel1 { - to: "elm.swallow.bar"; + to: "background"; relative: 0.0 0.0; } rel2 { - to: "elm.swallow.bar"; + to: "background"; relative: 0.1 1.0; } } description { state: "state_end" 0.0; inherit: "default" 0.0; rel1 { - to: "elm.swallow.bar"; + to: "background"; relative: 0.9 0.0; } rel2 { - to: "elm.swallow.bar"; + to: "background"; relative: 1.0 1.0; } } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "W062L2D"; - } } part { name: "elm.cur.progressbar"; mouse_events: 0; @@ -354,190 +215,37 @@ rel2.to: "drag.background"; } } - } - programs { - program { name: "units_show"; - signal: "elm,units,show"; - source: "elm"; - action: STATE_SET "show" 0.0; - target: "elm.text.status"; - target: "elm.swallow.bar"; - target: "elm.bottom.text"; - target: "elm.left.top.text"; - target: "elm.text"; - target: "swallowbar.top.pad"; - target: "elm.background.progressbar"; - } - program { name: "units_hide"; - signal: "elm,units,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.status"; - target: "elm.swallow.bar"; - target: "elm.bottom.text"; - target: "elm.left.top.text"; - target: "elm.text"; - target: "swallowbar.top.pad"; - target: "elm.background.progressbar"; - } - program { name: "slide_to_end"; - action: STATE_SET "state_end" 0.0; - transition: LINEAR 0.5; - target: "elm.progress.progressbar"; - after: "slide_to_begin"; - } - program { name: "slide_to_begin"; - signal: "elm,state,slide,begin"; - action: STATE_SET "state_begin" 0.0; - target: "elm.progress.progressbar"; - transition: LINEAR 0.5; - after: "slide_to_end"; - } - program { name: "start_pulse"; - signal: "elm,state,pulse,start"; - source: "elm"; - } - program { name: "stop_pulse"; - signal: "elm,state,pulse,stop"; - source: "elm"; - action: ACTION_STOP; - target: "slide_to_begin"; - target: "slide_to_end"; - target: "start_pulse"; - } - program { name: "state_pulse"; - signal: "elm,state,pulse"; - source: "elm"; - action: STATE_SET "state_begin" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "state_fraction"; - signal: "elm,state,fraction"; - source: "elm"; - action: ACTION_STOP; - target: "slide_to_begin"; - target: "slide_to_end"; - target: "start_pulse"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "set_invert_on"; - signal: "elm,state,inverted,on"; - source: "elm"; - action: STATE_SET "invert" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "set_invert_off"; - signal: "elm,state,inverted,off"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "progressbar_disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "elm.progress.progressbar"; - target: "background"; - } - program { name: "progressbar_enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - target: "background"; - } - } - } - group { name: "elm/progressbar/horizontal/custom"; - alias: "elm/progressbar/horizontal/list_progress"; - images { - set { - name: "core_progress_bar.#"; - image { - image: "SMALL/images/Controls/core_progress_bar.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_progress_bar.#.png" COMP; - } - } - } - parts { - part { name: "access"; - type: RECT; - description { state: "default" 0.0; - fixed: 1 1; - color: 0 0 0 0; - } - } - part { name: "elm.background.progressbar"; + part { name: "bottom_padding"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 PROGRESSBAR_BG_DEFAULT_HEIGHT_INC; - } - description { state: "one_text" 0.0; - min: 0 PROGRESSBAR_BG_ONE_TEXT_HEIGHT_INC; - } - description { state: "two_text" 0.0; - min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC; + min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; + fixed: 0 1; + rel1.to_y: "background"; + rel2.to_y: "background"; + rel1.relative: 0 1; + rel2.relative: 1 1; + align: 0.5 0; } } - part { name: "elm.top.right.text"; + part { name: "elm.text.bottom.left"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } + rel1.to_y: "bottom_padding"; + rel2.to_y: "bottom_padding"; + rel1.relative: 0.0 1.0; + rel2.relative: 0.0 1.0; text { min: 0 0; - align: 1.0 0.0; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ - text_class: "tizen"; - } - align: 1.0 0.0; - color_class: "T057L2"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; - } - } - part { name: "elm.top.left.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - text { - min: 1 1; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } align: 0.0 0.0; - color_class: "T057L2"; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -545,323 +253,103 @@ visible: 1; } } - part { name: "swallowbar.top.pad"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 0; - max: 0 0; - rel1 { - to: "elm.top.right.text"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.top.right.text"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - max: -1 PROGRESSBAR_PADDING_HEIGHT_INC; - } - } - part { name: "elm.swallow.bar"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - rel1.to: "elm.background.progressbar"; - rel2.to: "elm.background.progressbar"; - fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - rel1 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 0.0 1.0; - } - rel2 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - visible: 1; - } - } - part { name: "background"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - image.normal: "core_progress_bar.#"; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ - } - } - part { name: "swallowbar.bottom.pad"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 1 1; - } - } - part { name: "elm.bottom.right.text"; + part { name: "elm.text.status"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } + rel1.to_y: "bottom_padding"; + rel2.to_y: "bottom_padding"; + rel1.relative: 1.0 1.0; + rel2.relative: 1.0 1.0; text { - min: 1 1; + min: 0 0; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } align: 1.0 0.0; - color_class: "T057L2"; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; + text.min: 1 1; visible: 1; } } - part { name: "elm.bottom.left.text"; + part { name: "elm.text.bottom.right"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } + rel1.to_y: "bottom_padding"; + rel2.to_y: "bottom_padding"; + rel1.relative: 1.0 1.0; + rel2.relative: 1.0 1.0; text { - min: 1 1; + min: 0 0; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } - align: 0.0 0.0; - color_class: "T057L1"; + align: 1.0 0.0; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; + text.min: 1 1; visible: 1; } } - part { name: "drag.background"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - rel1 { - to_x: "background"; - to_y: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to_x: "background"; - to_y: "elm.swallow.bar"; - relative: 1.0 1.0; - } - } - } - part { name: "elm.progress.progressbar"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 0; - fixed: 1 1; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to_y: "elm.swallow.bar"; - to_x: "elm.cur.progressbar"; - offset: -1 -1; - } - image.normal: "core_progress_bar.#"; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ - } - description { state: "invert" 0.0; - inherit: "default" 0.0; - rel1 { - to_y: "elm.swallow.bar"; - to_x: "elm.cur.progressbar"; - } - rel2 { - to_y: "elm.swallow.bar"; - to_x: "background"; - relative: 1.0 1.0; - } - } - description { state: "state_begin" 0.0; - inherit: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 0.1 1.0; - } - } - description { state: "state_end" 0.0; - inherit: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.9 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "W062L2D"; - } - } - part { name: "elm.cur.progressbar"; - mouse_events: 0; - scale: 1; - dragable { - confine: "drag.background"; - x: 1 1 1; - y: 0 0 0; - } - description { state: "default" 0.0; - min: 0 28; - fixed: 1 1; - visible: 0; - rel1.to: "drag.background"; - rel2.to: "drag.background"; - } - } - } - script { - public top_text = 0; - public bottom_text = 0; } programs { - program { name: "bottom_text_show"; - signal: "elm,bottom,text,show"; + program { name: "text_top_right_show"; + signal: "elm,state,top.right,visible"; source: "elm"; - script { - if (!get_int(top_text)) - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - else - set_state(PART:"elm.background.progressbar", "two_text", 0.0); - set_int(bottom_text, 1); - run_program(PROGRAM:"prog1"); - } - } - program { name: "prog1"; action: STATE_SET "show" 0.0; - target: "elm.bottom.right.text"; - target: "elm.swallow.bar"; - target: "elm.bottom.left.text"; + target: "elm.text.top.right"; } - program { name: "bottom_text_hide"; - signal: "elm,bottom,text,hide"; + program { name: "text_top_right_text_hide"; + signal: "elm,state,top.right,hidden"; source: "elm"; - script { - if (!get_int(top_text)) - set_state(PART:"elm.background.progressbar", "default", 0.0); - else - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - set_int(bottom_text, 0); - run_program(PROGRAM:"prog1"); - } - after: "prog3"; + action: STATE_SET "default" 0.0; + target: "elm.text.top.right"; } - program { name: "prog3"; + program { name: "text_bottom_left_show"; + signal: "elm,state,bottom.left,visible"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "elm.text.bottom.left"; + } + program { name: "text_bottom_left_text_hide"; + signal: "elm,state,bottom.left,hidden"; + source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.bottom.right.text"; - target: "elm.bottom.left.text"; - target: "elm.swallow.bar"; + target: "elm.text.bottom.left"; } - program { name: "top_text_show"; - signal: "elm,top,text,show"; + program { name: "text_bottom_right_show"; + signal: "elm,state,bottom.right,visible"; source: "elm"; script { - if (!get_int(bottom_text)) - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - else - set_state(PART:"elm.background.progressbar", "two_text", 0.0); - set_int(top_text, 1); - run_program(PROGRAM:"prog2"); + set_state(PART:"elm.text.status", "default", 0.0); + set_state(PART:"elm.text.bottom.right", "show", 0.0); } } - program { name: "prog2"; - action: STATE_SET "show" 0.0; - target: "elm.top.right.text"; - target: "elm.top.left.text"; - target: "elm.swallow.bar"; - target: "swallowbar.top.pad"; - } - program { name: "top_text_hide"; - signal: "elm,top,text,hide"; + program { name: "text_status_show"; + signal: "elm,state,status,visible"; source: "elm"; script { - if (!get_int(bottom_text)) - set_state(PART:"elm.background.progressbar", "default", 0.0); - else - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - set_int(top_text, 0); - run_program(PROGRAM:"prog1"); + set_state(PART:"elm.text.bottom.right", "default", 0.0); + set_state(PART:"elm.text.status", "show", 0.0); } - after: "prog4"; } - program { name: "prog4"; + program { name: "text_status_text_hide"; + signal: "elm,state,status,hidden"; + source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.top.right.text"; - target: "elm.top.left.text"; - target: "elm.swallow.bar"; - target: "swallowbar.top.pad"; + target: "elm.text.status"; } program { name: "slide_to_end"; action: STATE_SET "state_end" 0.0; @@ -916,50 +404,39 @@ action: STATE_SET "default" 0.0; target: "elm.progress.progressbar"; } - program { name: "progressbar_disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "elm.progress.progressbar"; - target: "background"; - } - program { name: "progressbar_enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - target: "background"; - } } } -group { name: "elm/progressbar/horizontal/pending"; + group { name: "elm/progressbar/horizontal/pending"; + script { + public state_end = 0; + } images { set { name: "core_progress_bar.#"; image { - image: "SMALL/images/Controls/core_progress_bar.#.png" COMP; + image: SMALL"images/User_Input_Elements/core_progress_bar.#.png" COMP; } image { - image: "MIDDLE/images/Controls/core_progress_bar.#.png" COMP; + image: MEDIUM"images/User_Input_Elements/core_progress_bar.#.png" COMP; } } set { name: "core_progress_pending_bg_01"; image { - image: "SMALL/images/Controls/core_progress_pending_bg_01.png" COMP; + image: SMALL"images/User_Input_Elements/core_progress_pending_bg_01.png" COMP; } image { - image: "MIDDLE/images/Controls/core_progress_pending_bg_01.png" COMP; + image: MEDIUM"images/User_Input_Elements/core_progress_pending_bg_01.png" COMP; } } set { name: "core_progress_pending_bg_02"; image { - image: "SMALL/images/Controls/core_progress_pending_bg_02.png" COMP; + image: SMALL"images/User_Input_Elements/core_progress_pending_bg_02.png" COMP; } image { - image: "MIDDLE/images/Controls/core_progress_pending_bg_02.png" COMP; + image: MEDIUM"images/User_Input_Elements/core_progress_pending_bg_02.png" COMP; } } } @@ -971,70 +448,37 @@ group { name: "elm/progressbar/horizontal/pending"; color: 0 0 0 0; } } - part { name: "elm.background.progressbar"; - type: SPACER; - scale: 1; + part { name: "elm.swallow.bar"; + type: SWALLOW; description { state: "default" 0.0; - } - description { state: "show" 0.0; - min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC; + visible: 0; } } - part { name: "elm.text"; - type: TEXT; - mouse_events: 0; + part { name: "base"; + type: SPACER; scale: 1; description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } - text { - min: 0 0; - align: 1.0 0.0; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ - text_class: "tizen"; - } - align: 1.0 0.0; - color_class: "T057L2"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; + min: 0 PROGRESSBAR_PENDING_HEIGHT_INC; } } - part { name: "elm.left.top.text"; + part { name: "elm.text.top.right"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + rel1.to: "top_padding"; + rel2.to: "top_padding"; text { - min: 1 1; + min: 0 0; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } - align: 0.0 1.0; - color_class: "T057L2"; + align: 1.0 1.0; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -1042,171 +486,38 @@ group { name: "elm/progressbar/horizontal/pending"; visible: 1; } } - part { name: "swallowbar.top.pad"; + part { name: "top_padding"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 0; - max: 0 0; - rel1 { - to: "elm.text"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.text"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - max: -1 PROGRESSBAR_PADDING_HEIGHT_INC; - } - } - part { name: "elm.swallow.bar"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - rel1.to: "elm.background.progressbar"; - rel2.to: "elm.background.progressbar"; fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - rel1 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 0.0 1.0; - } - rel2 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - visible: 1; - } - } - part { name: "swallowbar.bottom.pad"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 1 1; - } - } - part { name: "elm.text.status"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } - text { - min: 1 1; - align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ - text_class: "tizen"; - ellipsis: -1; - } - align: 1.0 0.0; - color_class: "T057L2"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "elm.bottom.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } - text { - min: 1 1; - align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/ - text_class: "tizen"; - ellipsis: -1; - } - align: 0.0 0.0; - color_class: "T057L1"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; + rel1.to_y: "background"; + rel2.to_y: "background"; + rel1.relative: 0 0; + rel2.relative: 1 0; + align: 0.5 1; } } part { name: "background"; - mouse_events: 0; scale: 1; - description { - state: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - image.normal: "core_progress_bar.#"; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ + description { state: "default" 0.0; + min: 0 PROGRESSBAR_PENDING_HEIGHT_INC; + fixed: 0 1; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; + align: 0.5 0.5; + image.normal: "core_progress_bar.#"; + color: 178 178 178 255; } } part { name: "elm.progress.progressbar"; - mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 0 0; - fixed: 1 1; - rel1 { - to: "background"; - relative: 0.0 0.0; - } - rel2 { - to: "background"; - relative: 1.0 1.0; - offset: -1 -1; - } + rel1.to: "background"; + rel2.to: "background"; image.normal: "core_progress_pending_bg_01"; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ + color: 61 184 204 255; } description { state: "state_begin" 0.0; inherit: "default" 0.0; @@ -1214,212 +525,39 @@ group { name: "elm/progressbar/horizontal/pending"; description { state: "state_end" 0.0; inherit: "default" 0.0; image.normal: "core_progress_pending_bg_02"; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ - } - description { state: "state_begin_disabled" 0.0; - inherit: "default" 0.0; - color_class: "W062L5D"; - } - description { state: "state_end_disabled" 0.0; - inherit: "default" 0.0; - color_class: "W062L5D"; } } - } - script { - public state_end = 0; - } - programs { - program { name: "units_show"; - signal: "elm,units,show"; - source: "elm"; - action: STATE_SET "show" 0.0; - target: "elm.text.status"; - target: "elm.swallow.bar"; - target: "elm.bottom.text"; - target: "elm.text"; - target: "elm.left.top.text"; - target: "swallowbar.top.pad"; - target: "elm.background.progressbar"; - } - program { name: "units_hide"; - signal: "elm,bottom,text,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.status"; - target: "elm.swallow.bar"; - target: "elm.bottom.text"; - target: "elm.text"; - target: "elm.left.top.text"; - target: "swallowbar.top.pad"; - target: "elm.background.progressbar"; - } - program { name: "slide_to_end"; - in: 0.3 0.0; - script { - set_state(PART:"elm.progress.progressbar", "state_end", 0.0); - set_int(state_end, 1); - } - after: "slide_to_begin"; - } - program { name: "slide_to_begin"; - signal: "elm,state,slide,begin"; - in: 0.3 0.0; - script { - set_state(PART:"elm.progress.progressbar", "state_begin", 0.0); - set_int(state_end, 0); - } - after: "slide_to_end"; - } - program { name: "start_pulse"; - signal: "elm,state,pulse,start"; - source: "elm"; - after: "slide_to_end"; - } - program { name: "stop_pulse"; - signal: "elm,state,pulse,stop"; - source: "elm"; - action: ACTION_STOP; - target: "slide_to_begin"; - target: "slide_to_end"; - target: "start_pulse"; - after: "init_pulse"; - } - program { name: "init_pulse"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "progressbar_disable"; - signal: "elm,state,disabled"; - source: "elm"; - script { - set_state(PART:"background", "disabled", 0.0); - if (!get_int(state_end)) - set_state(PART:"elm.progress.progressbar", "state_begin_disabled", 0.0); - else - set_state(PART:"elm.progress.progressbar", "state_end_disabled", 0.0); - } - } - program { name: "progressbar_enable"; - signal: "elm,state,enabled"; - source: "elm"; - script { - set_state(PART:"background", "default", 0.0); - if (!get_int(state_end)) - set_state(PART:"elm.progress.progressbar", "state_begin", 0.0); - else - set_state(PART:"elm.progress.progressbar", "state_end", 0.0); - } - } - } - } - - group { name: "elm/progressbar/horizontal/pending_custom"; - images { - set { - name: "core_progress_bar.#"; - image { - image: "SMALL/images/Controls/core_progress_bar.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_progress_bar.#.png" COMP; - } - } - set { - name: "core_progress_pending_bg_01"; - image { - image: "SMALL/images/Controls/core_progress_pending_bg_01.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_progress_pending_bg_01.png" COMP; - } - } - set { - name: "core_progress_pending_bg_02"; - image { - image: "SMALL/images/Controls/core_progress_pending_bg_02.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_progress_pending_bg_02.png" COMP; - } - } - } - parts { - part { name: "access"; - type: RECT; - description { state: "default" 0.0; - fixed: 1 1; - color: 0 0 0 0; - } - } - part { name: "elm.background.progressbar"; + part { name: "bottom_padding"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 0 PROGRESSBAR_BG_DEFAULT_HEIGHT_INC; - } - description { state: "one_text" 0.0; - min: 0 PROGRESSBAR_BG_ONE_TEXT_HEIGHT_INC; - } - description { state: "two_text" 0.0; - min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC; + min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; + fixed: 0 1; + rel1.to_y: "background"; + rel2.to_y: "background"; + rel1.relative: 0 1; + rel2.relative: 1 1; + align: 0.5 0; } } - part { name: "elm.top.right.text"; + part { name: "elm.text.bottom.left"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 1.0 0.0; - } + rel1.to_y: "bottom_padding"; + rel2.to_y: "bottom_padding"; + rel1.relative: 0.0 1.0; + rel2.relative: 0.0 1.0; text { min: 0 0; - align: 1.0 0.0; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ - text_class: "tizen"; - } - align: 1.0 0.0; - color_class: "T057L2"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - text.min: 1 1; - text.ellipsis: -1; - visible: 1; - } - } - part { name: "elm.top.left.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - text { - min: 1 1; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } align: 0.0 0.0; - color_class: "T057L2"; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -1427,271 +565,103 @@ group { name: "elm/progressbar/horizontal/pending"; visible: 1; } } - part { name: "swallowbar.top.pad"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 0; - max: 0 0; - rel1 { - to: "elm.top.right.text"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.top.right.text"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - max: -1 PROGRESSBAR_PADDING_HEIGHT_INC; - } - } - part { name: "elm.swallow.bar"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC; - rel1.to: "elm.background.progressbar"; - rel2.to: "elm.background.progressbar"; - fixed: 0 1; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - rel1 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 0.0 1.0; - } - rel2 { - to_x: "elm.background.progressbar"; - to_y: "swallowbar.top.pad"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - visible: 1; - } - } - part { name: "swallowbar.bottom.pad"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 PROGRESSBAR_PADDING_HEIGHT_INC; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 1.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - align: 0.5 0.0; - fixed: 1 1; - } - } - part { name: "elm.bottom.right.text"; + part { name: "elm.text.status"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 1.0 1.0; - } + rel1.to_y: "bottom_padding"; + rel2.to_y: "bottom_padding"; + rel1.relative: 1.0 1.0; + rel2.relative: 1.0 1.0; text { - min: 1 1; + min: 0 0; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } align: 1.0 0.0; - color_class: "T057L2"; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; + text.min: 1 1; visible: 1; } } - part { name: "elm.bottom.left.text"; + part { name: "elm.text.bottom.right"; type: TEXT; - mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - visible: 0; - rel1 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } - rel2 { - to: "swallowbar.bottom.pad"; - relative: 0.0 1.0; - } + rel1.to_y: "bottom_padding"; + rel2.to_y: "bottom_padding"; + rel1.relative: 1.0 1.0; + rel2.relative: 1.0 1.0; text { - min: 1 1; + min: 0 0; align: 0.5 0.5; - font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/ + font: "Tizen:style=Regular"; size: "32"; text_class: "tizen"; - ellipsis: -1; } - align: 0.0 0.0; - color_class: "T057L1"; + align: 1.0 0.0; + color: 102 102 102 255; + visible: 0; } description { state: "show" 0.0; inherit: "default" 0.0; + text.min: 1 1; visible: 1; } } - part { name: "background"; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - image.normal: "core_progress_bar.#"; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ - } - } - part { name: "elm.progress.progressbar"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 0; - fixed: 1 1; - rel1 { - to: "background"; - relative: 0.0 0.0; - } - rel2 { - to: "background"; - relative: 1.0 1.0; - offset: -1 -1; - } - image.normal: "core_progress_pending_bg_01"; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ - } - description { state: "state_begin" 0.0; - inherit: "default" 0.0; - } - description { state: "state_end" 0.0; - inherit: "default" 0.0; - image.normal: "core_progress_pending_bg_02"; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ - } - description { state: "state_begin_disabled" 0.0; - inherit: "default" 0.0; - color_class: "W062L5D"; - } - description { state: "state_end_disabled" 0.0; - inherit: "default" 0.0; - color_class: "W062L5D"; - } - } - } - script { - public top_text = 0; - public bottom_text = 0; - public state_end = 0; } programs { - program { name: "bottom_text_show"; - signal: "elm,bottom,text,show"; + program { name: "text_top_right_show"; + signal: "elm,state,top.right,visible"; source: "elm"; - script { - if (!get_int(top_text)) - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - else - set_state(PART:"elm.background.progressbar", "two_text", 0.0); - set_int(bottom_text, 1); - run_program(PROGRAM:"prog1"); - } - } - program { name: "prog1"; action: STATE_SET "show" 0.0; - target: "elm.bottom.right.text"; - target: "elm.swallow.bar"; - target: "elm.bottom.left.text"; + target: "elm.text.top.right"; } - program { name: "bottom_text_hide"; - signal: "elm,bottom,text,hide"; + program { name: "text_top_right_text_hide"; + signal: "elm,state,top.right,hidden"; source: "elm"; - script { - if (!get_int(top_text)) - set_state(PART:"elm.background.progressbar", "default", 0.0); - else - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - set_int(bottom_text, 0); - run_program(PROGRAM:"prog1"); - } - after: "prog3"; + action: STATE_SET "default" 0.0; + target: "elm.text.top.right"; + } + program { name: "text_bottom_left_show"; + signal: "elm,state,bottom.left,visible"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "elm.text.bottom.left"; } - program { name: "prog3"; + program { name: "text_bottom_left_text_hide"; + signal: "elm,state,bottom.left,hidden"; + source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.bottom.right.text"; - target: "elm.bottom.left.text"; - target: "elm.swallow.bar"; + target: "elm.text.bottom.left"; } - program { name: "top_text_show"; - signal: "elm,top,text,show"; + program { name: "text_bottom_right_show"; + signal: "elm,state,bottom.right,visible"; source: "elm"; script { - if (!get_int(bottom_text)) - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - else - set_state(PART:"elm.background.progressbar", "two_text", 0.0); - set_int(top_text, 1); - run_program(PROGRAM:"prog2"); + set_state(PART:"elm.text.status", "default", 0.0); + set_state(PART:"elm.text.bottom.right", "show", 0.0); } } - program { name: "prog2"; - action: STATE_SET "show" 0.0; - target: "elm.top.right.text"; - target: "elm.top.left.text"; - target: "elm.swallow.bar"; - target: "swallowbar.top.pad"; - } - program { name: "top_text_hide"; - signal: "elm,top,text,hide"; + program { name: "text_status_show"; + signal: "elm,state,status,visible"; source: "elm"; script { - if (!get_int(bottom_text)) - set_state(PART:"elm.background.progressbar", "default", 0.0); - else - set_state(PART:"elm.background.progressbar", "one_text", 0.0); - set_int(top_text, 0); - run_program(PROGRAM:"prog1"); + set_state(PART:"elm.text.bottom.right", "default", 0.0); + set_state(PART:"elm.text.status", "show", 0.0); } - after: "prog4"; } - program { name: "prog4"; + program { name: "text_status_text_hide"; + signal: "elm,state,status,hidden"; + source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.top.right.text"; - target: "elm.top.left.text"; - target: "elm.swallow.bar"; - target: "swallowbar.top.pad"; + target: "elm.text.status"; } program { name: "slide_to_end"; in: 0.3 0.0; @@ -1732,18 +702,13 @@ group { name: "elm/progressbar/horizontal/pending"; signal: "elm,state,disabled"; source: "elm"; script { - set_state(PART:"background", "disabled", 0.0); - if (!get_int(state_end)) - set_state(PART:"elm.progress.progressbar", "state_begin_disabled", 0.0); - else - set_state(PART:"elm.progress.progressbar", "state_end_disabled", 0.0); + set_state(PART:"elm.progress.progressbar", "default", 0.0); } } program { name: "progressbar_enable"; signal: "elm,state,enabled"; source: "elm"; script { - set_state(PART:"background", "default", 0.0); if (!get_int(state_end)) set_state(PART:"elm.progress.progressbar", "state_begin", 0.0); else @@ -1753,309 +718,8 @@ group { name: "elm/progressbar/horizontal/pending"; } } -#define PROGRESS_DESC(NUM , SIZE) \ - description { state: "pulse" 0.0; \ - inherit: "default" 0.0; \ - image.normal: "core_activity_Indicator_"SIZE; \ - map { \ - on: 1; \ - smooth: 0; \ - rotation { \ - z: NUM; \ - } \ - } \ - } - -#define PROCESS_DESCS(WIDTH, HEIGHT, SIZE) \ - description { \ - state: "default" 0.0; \ - min: WIDTH HEIGHT; \ - max: WIDTH HEIGHT; \ - aspect: 1.0 1.0; \ - aspect_preference: BOTH; \ - image.normal: "core_activity_Indicator_"SIZE; \ - } \ - PROGRESS_DESC(-360, SIZE) - -#define PROGRESSING_DELAY 0.01 - -#define PROCESS_IMAGES(SIZE) \ - images { \ - set { \ - name: "core_activity_Indicator_"SIZE"_00"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_00.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_00.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_01"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_01.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_01.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_02"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_02.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_02.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_03"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_03.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_03.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_04"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_04.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_04.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_05"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_05.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_05.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_06"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_06.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_06.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_07"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_07.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_07.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_08"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_08.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_08.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_09"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_09.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_09.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_10"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_10.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_10.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_11"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_11.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_11.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_12"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_12.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_12.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_13"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_13.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_13.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_14"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_14.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_14.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_15"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_15.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_15.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_16"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_16.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_16.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_17"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_17.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_17.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_18"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_18.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_18.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_19"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_19.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_19.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_20"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_20.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_20.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_21"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_21.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_21.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_22"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_22.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_22.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_23"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_23.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_23.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_24"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_24.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_24.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_25"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_25.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_25.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_26"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_26.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_26.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_27"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_27.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_27.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_28"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_28.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_28.png" COMP; \ - } \ - } \ - set { \ - name: "core_activity_Indicator_"SIZE"_29"; \ - image { \ - image: "SMALL/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_29.png" COMP; \ - } \ - image { \ - image: "MIDDLE/images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_29.png" COMP; \ - } \ - } \ - } - - group { name: "elm/progressbar/horizontal/process_large"; - PROCESS_IMAGES(large) + data.item: "vector_ux" "process_large"; parts { part { name: "access"; type: RECT; @@ -2064,136 +728,69 @@ group { name: "elm/progressbar/horizontal/pending"; color: 0 0 0 0; } } - part { name: "elm.background.progressbar"; + part { name: "elm.swallow.bar"; + type: SWALLOW; + description { state: "default" 0.0; + visible: 0; + } + } + part { name: "clipper"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; + min: PROGRESSBAR_LARGE_SIZE_INC; + max: PROGRESSBAR_LARGE_SIZE_INC; + color: 61 184 204 102; } } - part { name: "background"; + part { name: "tizen_vg_shape1"; + type: SWALLOW; mouse_events: 0; scale: 1; - clip_to: "elm.background.progressbar"; + clip_to: "clipper"; description { state: "default" 0.0; - min: PROCESS_LARGE_IMAGE_WIDTH_INC PROCESS_LARGE_IMAGE_HEIGHT_INC; - max: PROCESS_LARGE_IMAGE_WIDTH_INC PROCESS_LARGE_IMAGE_HEIGHT_INC; - aspect: 1.0 1.0; - aspect_preference: BOTH; - color: 2 61 132 178; /*(Changeable UI) color_class: "W157E1";*/ - image.normal: "core_activity_Indicator_large_00"; - image.tween: "core_activity_Indicator_large_01"; - image.tween: "core_activity_Indicator_large_02"; - image.tween: "core_activity_Indicator_large_03"; - image.tween: "core_activity_Indicator_large_04"; - image.tween: "core_activity_Indicator_large_05"; - image.tween: "core_activity_Indicator_large_06"; - image.tween: "core_activity_Indicator_large_07"; - image.tween: "core_activity_Indicator_large_08"; - image.tween: "core_activity_Indicator_large_09"; - image.tween: "core_activity_Indicator_large_10"; - image.tween: "core_activity_Indicator_large_11"; - image.tween: "core_activity_Indicator_large_12"; - image.tween: "core_activity_Indicator_large_13"; - image.tween: "core_activity_Indicator_large_14"; - image.tween: "core_activity_Indicator_large_15"; - image.tween: "core_activity_Indicator_large_16"; - image.tween: "core_activity_Indicator_large_17"; - image.tween: "core_activity_Indicator_large_18"; - image.tween: "core_activity_Indicator_large_19"; - image.tween: "core_activity_Indicator_large_20"; - image.tween: "core_activity_Indicator_large_21"; - image.tween: "core_activity_Indicator_large_22"; - image.tween: "core_activity_Indicator_large_23"; - image.tween: "core_activity_Indicator_large_24"; - image.tween: "core_activity_Indicator_large_25"; - image.tween: "core_activity_Indicator_large_26"; - image.tween: "core_activity_Indicator_large_27"; - image.tween: "core_activity_Indicator_large_28"; - image.tween: "core_activity_Indicator_large_29"; + rel1.to: "clipper"; + rel2.to: "clipper"; } } - } - programs { - program { name: "start_pulse"; - signal: "elm,state,pulse,start"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "background"; - transition: LINEAR 1.8; - after: "start_pulse"; - } - program { name: "stop_pulse"; - signal: "elm,state,pulse,stop"; - source: "elm"; - action: ACTION_STOP; - target: "start_pulse"; - after: "init_pulse"; - } - program { name: "init_pulse"; - action: STATE_SET "default" 0.0; - target: "background"; + + part { name: "tizen_vg_shape2"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "tizen_vg_shape2_clipper"; + description { state: "default" 0.0; + rel1.to: "clipper"; + rel2.to: "clipper"; + } } - } - } - group { name: "elm/progressbar/horizontal/process_medium"; - PROCESS_IMAGES(medium) - parts { - part { name: "access"; + part { name: "tizen_vg_shape2_clipper"; type: RECT; + mouse_events: 0; + scale: 1; description { state: "default" 0.0; - fixed: 1 1; - color: 0 0 0 0; + color: 61 184 204 102; } } - part { name: "elm.background.progressbar"; - type: RECT; + + part { name: "tizen_vg_shape3"; + type: SWALLOW; mouse_events: 0; scale: 1; + clip_to: "tizen_vg_shape3_clipper"; description { state: "default" 0.0; + rel1.to: "clipper"; + rel2.to: "clipper"; } } - part { name: "background"; + part { name: "tizen_vg_shape3_clipper"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "elm.background.progressbar"; description { state: "default" 0.0; - min: PROCESS_MEDIUM_IMAGE_WIDTH_INC PROCESS_MEDIUM_IMAGE_HEIGHT_INC; - max: PROCESS_MEDIUM_IMAGE_WIDTH_INC PROCESS_MEDIUM_IMAGE_HEIGHT_INC; - aspect: 1.0 1.0; - aspect_preference: BOTH; - color: 2 61 132 178; /*(Changeable UI) color_class: "W157E1";*/ - image.normal: "core_activity_Indicator_medium_00"; - image.tween: "core_activity_Indicator_medium_01"; - image.tween: "core_activity_Indicator_medium_02"; - image.tween: "core_activity_Indicator_medium_03"; - image.tween: "core_activity_Indicator_medium_04"; - image.tween: "core_activity_Indicator_medium_05"; - image.tween: "core_activity_Indicator_medium_06"; - image.tween: "core_activity_Indicator_medium_07"; - image.tween: "core_activity_Indicator_medium_08"; - image.tween: "core_activity_Indicator_medium_09"; - image.tween: "core_activity_Indicator_medium_10"; - image.tween: "core_activity_Indicator_medium_11"; - image.tween: "core_activity_Indicator_medium_12"; - image.tween: "core_activity_Indicator_medium_13"; - image.tween: "core_activity_Indicator_medium_14"; - image.tween: "core_activity_Indicator_medium_15"; - image.tween: "core_activity_Indicator_medium_16"; - image.tween: "core_activity_Indicator_medium_17"; - image.tween: "core_activity_Indicator_medium_18"; - image.tween: "core_activity_Indicator_medium_19"; - image.tween: "core_activity_Indicator_medium_20"; - image.tween: "core_activity_Indicator_medium_21"; - image.tween: "core_activity_Indicator_medium_22"; - image.tween: "core_activity_Indicator_medium_23"; - image.tween: "core_activity_Indicator_medium_24"; - image.tween: "core_activity_Indicator_medium_25"; - image.tween: "core_activity_Indicator_medium_26"; - image.tween: "core_activity_Indicator_medium_27"; - image.tween: "core_activity_Indicator_medium_28"; - image.tween: "core_activity_Indicator_medium_29"; + color: 61 184 204 255; } } } @@ -2202,9 +799,7 @@ group { name: "elm/progressbar/horizontal/pending"; signal: "elm,state,pulse,start"; source: "elm"; action: STATE_SET "default" 0.0; - target: "background"; - transition: LINEAR 1.8; - after: "start_pulse"; + target: "clipper"; } program { name: "stop_pulse"; signal: "elm,state,pulse,stop"; @@ -2215,90 +810,41 @@ group { name: "elm/progressbar/horizontal/pending"; } program { name: "init_pulse"; action: STATE_SET "default" 0.0; - target: "background"; + target: "clipper"; } } } - group { name: "elm/progressbar/horizontal/process_small"; - PROCESS_IMAGES(small) + group { name: "elm/progressbar/horizontal/process_medium"; + inherit: "elm/progressbar/horizontal/process_large"; + data.item: "vector_ux" "process_medium"; parts { - part { name: "access"; - type: RECT; - description { state: "default" 0.0; - fixed: 1 1; - color: 0 0 0 0; - } - } - part { name: "elm.background.progressbar"; + part { name: "clipper"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; + min: PROGRESSBAR_MEDIUM_SIZE_INC; + max: PROGRESSBAR_MEDIUM_SIZE_INC; + color: 61 184 204 102; } } - part { name: "background"; + } + } + + group { name: "elm/progressbar/horizontal/process_small"; + inherit: "elm/progressbar/horizontal/process_large"; + data.item: "vector_ux" "process_small"; + parts { + part { name: "clipper"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "elm.background.progressbar"; description { state: "default" 0.0; - min: PROCESS_SMALL_IMAGE_WIDTH_INC PROCESS_SMALL_IMAGE_HEIGHT_INC; - max: PROCESS_SMALL_IMAGE_WIDTH_INC PROCESS_SMALL_IMAGE_HEIGHT_INC; - aspect: 1.0 1.0; - aspect_preference: BOTH; - color: 2 61 132 178; /*(Changeable UI) color_class: "W157E1";*/ - image.normal: "core_activity_Indicator_small_00"; - image.tween: "core_activity_Indicator_small_01"; - image.tween: "core_activity_Indicator_small_02"; - image.tween: "core_activity_Indicator_small_03"; - image.tween: "core_activity_Indicator_small_04"; - image.tween: "core_activity_Indicator_small_05"; - image.tween: "core_activity_Indicator_small_06"; - image.tween: "core_activity_Indicator_small_07"; - image.tween: "core_activity_Indicator_small_08"; - image.tween: "core_activity_Indicator_small_09"; - image.tween: "core_activity_Indicator_small_10"; - image.tween: "core_activity_Indicator_small_11"; - image.tween: "core_activity_Indicator_small_12"; - image.tween: "core_activity_Indicator_small_13"; - image.tween: "core_activity_Indicator_small_14"; - image.tween: "core_activity_Indicator_small_15"; - image.tween: "core_activity_Indicator_small_16"; - image.tween: "core_activity_Indicator_small_17"; - image.tween: "core_activity_Indicator_small_18"; - image.tween: "core_activity_Indicator_small_19"; - image.tween: "core_activity_Indicator_small_20"; - image.tween: "core_activity_Indicator_small_21"; - image.tween: "core_activity_Indicator_small_22"; - image.tween: "core_activity_Indicator_small_23"; - image.tween: "core_activity_Indicator_small_24"; - image.tween: "core_activity_Indicator_small_25"; - image.tween: "core_activity_Indicator_small_26"; - image.tween: "core_activity_Indicator_small_27"; - image.tween: "core_activity_Indicator_small_28"; - image.tween: "core_activity_Indicator_small_29"; + min: PROGRESSBAR_SMALL_SIZE_INC; + max: PROGRESSBAR_SMALL_SIZE_INC; + color: 61 184 204 102; } } } - programs { - program { name: "start_pulse"; - signal: "elm,state,pulse,start"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "background"; - transition: LINEAR 1.8; - after: "start_pulse"; - } - program { name: "stop_pulse"; - signal: "elm,state,pulse,stop"; - source: "elm"; - action: ACTION_STOP; - target: "start_pulse"; - after: "init_pulse"; - } - program { name: "init_pulse"; - action: STATE_SET "default" 0.0; - target: "background"; - } - } } diff --git a/mobile/widgets/radio.edc b/mobile/widgets/radio.edc index dd3243e3..87fb0a6b 100644 --- a/mobile/widgets/radio.edc +++ b/mobile/widgets/radio.edc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved * * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) * @@ -23,414 +23,334 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - group { name: "elm/radio/base/default"; - images { - set { - name: "core_radio_bg"; - image { - image: "SMALL/images/Controls/core_radio_bg.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_radio_bg.png" COMP; - } + data.item: "vector_ux" "on"; + script { + public radio_state; + public disabled; + public text; + public animate = 0; + } + parts { + part { name: "base"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: RADIO_SIZE; } - set { - name: "core_radio_bg_stroke"; - image { - image: "SMALL/images/Controls/core_radio_bg_stroke.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_radio_bg_stroke.png" COMP; - } + } + //Outline + part { name: "tizen_vg_shape"; + type: SWALLOW; + scale: 1; + clip_to: "tizen_vg_shape_clipper"; + description { state: "default" 0.0; + min: CHECK_DEFAULT_SIZE; + rel1.relative: 0 0.5; + rel2.relative: 0 0.5; + align: 0 0.5; + fixed: 1 1; } - set { - name: "core_radio_icon"; - image { - image: "SMALL/images/Controls/core_radio_icon.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_radio_icon.png" COMP; - } + } + part { name: "tizen_vg_shape_clipper"; + type: RECT; + description { state: "default" 0.0; + color: 61 184 204 255; + } + description { state: "on" 0.0; + color: 61 184 204 0; + } + description { state: "disabled" 0.0; + color: 61 184 204 77; } } - script { - public radio_state; - public radio_disabled; + //Middle Circle + part { name: "tizen_vg_shape2"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper2"; + description { state: "default" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; + } } - parts { - part { name: "bg"; - scale: 1; - description { state: "default" 0.0; - min: RADIO_BG_SIZE; - image.normal: "core_radio_bg"; - aspect: 1 1; - aspect_preference: BOTH; - color: 0 0 0 102; /*(Changeable UI) color_class: "W014L1E1";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W014L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 51; /*(Changeable UI) color_class: "W014L1D";*/ - } + part { name: "tizen_vg_shape_clipper2"; + type: RECT; + description { state: "default" 0.0; + color: 255 255 255 0; } - part { name: "bg_stroke"; - scale: 1; - description { state: "default" 0.0; - min: RADIO_BG_STROKE_SIZE; - image.normal: "core_radio_bg_stroke"; - aspect: 1 1; - aspect_preference: BOTH; - color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2E1";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 191 191 191 76; /*(Changeable UI) color_class: "W014L2D";*/ - } + description { state: "on" 0.0; + color: 255 255 255 255; } - part { name: "radio"; - scale: 1; - description { state: "default" 0.0; - min: RADIO_SIZE; - rel1.to: "bg"; - rel1.relative: 0.125 0.125; - rel2.to: "bg"; - rel2.relative: 0.875 0.875; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_radio_icon"; - color: 244 244 244 255; /*(Changeable UI) color_class: "W014Li";*/ - visible:0; - } - description { state: "on" 0.0; - inherit: "default" 0.0; - visible:1; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 244 244 244 153; /*(Changeable UI) color_class: "W014LiD";*/ - } + description { state: "disabled" 0.0; + color: 255 255 255 77; } - part { name: "event"; - scale: 1; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - color: 0 0 0 0; - } + } + //Iconic Circle + part { name: "tizen_vg_shape3"; + type: SWALLOW; + clip_to: "tizen_vg_shape_clipper3"; + description { state: "default" 0.0; + rel1.to: "tizen_vg_shape"; + rel2.to: "tizen_vg_shape"; } } - programs { - program { name: "click"; - signal: "mouse,clicked,1"; - source: "event"; - script { - if (get_int(radio_disabled) == 1) return; - emit("elm,action,radio,toggle", ""); - } + part { name: "tizen_vg_shape_clipper3"; + type: RECT; + description { state: "default" 0.0; + color: 61 184 204 0; } - program { name: "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(radio_disabled) == 1) return; - if (get_int(radio_state) == 1) { - set_state(PART:"radio", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"radio", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } - } + description { state: "on" 0.0; + color: 61 184 204 255; } - program { name: "pressed"; - signal: "mouse,down,1"; - source: "event"; - script { - if (get_int(radio_disabled) == 1) return; - if (get_int(radio_state) == 1) { - set_state(PART:"radio", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"radio", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } - } + description { state: "disabled" 0.0; + color: 61 184 204 77; } - program { name: "radio_on"; - signal: "elm,state,radio,on"; - source: "elm"; - script { - if (get_int(radio_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - set_state(PART:"radio", "on", 0.0); - set_int(radio_state, 1); + } + part { name: "padding_before_text"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.5; + min: 0 0; + rel1 { + to: "tizen_vg_shape"; + relative: 1.0 0.0; + } + rel2 { + to: "tizen_vg_shape"; + relative: 1.0 1.0; } } - program { name: "radio_off"; - signal: "elm,state,radio,off"; - source: "elm"; - script { - if (get_int(radio_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } - set_state(PART:"radio", "default", 0.0); - set_int(radio_state, 0); + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: CHECK_PAD_BEFORE_TEXT_INC; + fixed: 1 1; + } + } + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + fixed: 0 1; + rel1 { + relative: 1.0 0.5; + to_x: "padding_before_text"; + } + rel2 { + relative: 1.0 0.5; + } + align: 0.0 0.5; + text { + style: "check_default"; + min: 0 0; } } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - script { - set_int(radio_disabled, 1); - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - set_state(PART:"radio", "disabled", 0.0); + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + text { + style: "check_default_dim"; + min: 0 1; } } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - script { - set_int(radio_disabled, 0); - if (get_int(radio_state) == 1) { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - set_state(PART:"radio", "on", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - set_state(PART:"radio", "default", 0.0); - } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + visible: 1; + text { + style: "check_default_press"; + min: 0 1; } } } + part { name: "event"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } } - -group { name: "elm/radio/base/list"; - images { - set { - name: "core_radio_bg"; - image { - image: "SMALL/images/Controls/core_radio_bg.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_radio_bg.png" COMP; - } + programs { + program { name: "click"; + signal: "mouse,clicked,1"; + source: "event"; + script { + if (get_int(disabled) == 1) return; + emit("elm,action,radio,toggle", ""); + run_program(PROGRAM:"touch_sound"); } - set { - name: "core_radio_bg_stroke"; - image { - image: "SMALL/images/Controls/core_radio_bg_stroke.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_radio_bg_stroke.png" COMP; - } + } + program { name: "touch_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { name: "radio_on_activate"; + signal: "elm,activate,radio,on"; + source: "elm"; + script { + set_int(animate, 1); } - set { - name: "core_radio_icon"; - image { - image: "SMALL/images/Controls/core_radio_icon.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_radio_icon.png" COMP; - } + } + program { name: "radio_off_activate"; + signal: "elm,activate,radio,off"; + source: "elm"; + script { + set_int(animate, 1); } } - script { - public radio_state; - public radio_disabled; + program { name: "toggle_on_effect"; + action: STATE_SET "on" 0.0; + target: "tizen_vg_shape_clipper"; + target: "tizen_vg_shape_clipper3"; + transition: DECELERATE 0.3; } - parts { - part { name: "bg"; - scale: 1; - description { state: "default" 0.0; - min: RADIO_BG_SIZE; - image.normal: "core_radio_bg"; - aspect: 1 1; - aspect_preference: BOTH; - color: 0 0 0 102; /*(Changeable UI) color_class: "W014L1E1";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W014L1";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 51; /*(Changeable UI) color_class: "W014L1D";*/ - } - } - part { name: "bg_stroke"; - scale: 1; - description { state: "default" 0.0; - min: RADIO_BG_STROKE_SIZE; - image.normal: "core_radio_bg_stroke"; - aspect: 1 1; - aspect_preference: BOTH; - color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2E1";*/ - } - description { state: "on" 0.0; - inherit: "default" 0.0; - color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2";*/ - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 191 191 191 76; /*(Changeable UI) color_class: "W014L2D";*/ + program { name: "toggle_off_effect"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape_clipper"; + target: "tizen_vg_shape_clipper3"; + transition: DECELERATE 0.3; + } + program { name: "toggle_on_effect2"; + action: STATE_SET "on" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.15; + } + program { name: "toggle_off_effect2"; + action: STATE_SET "default" 0.0; + target: "tizen_vg_shape_clipper2"; + transition: DECELERATE 0.15; + } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + script { + set_int(text, 1); + set_state(PART:"padding_before_text", "visible", 0.0); + if (get_int(disabled) == 1) { + set_state(PART:"elm.text", "disabled", 0.0); + }else { + set_state(PART:"elm.text", "visible", 0.0); } } - part { name: "radio"; - scale: 1; - description { state: "default" 0.0; - min: RADIO_SIZE; - rel1.to: "bg"; - rel1.relative: 0.125 0.125; - rel2.to: "bg"; - rel2.relative: 0.875 0.875; - aspect: 1 1; - aspect_preference: BOTH; - image.normal: "core_radio_icon"; - color: 244 244 244 255; /*(Changeable UI) color_class: "W014Li";*/ - visible:0; - } - description { state: "on" 0.0; - inherit: "default" 0.0; - visible:1; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 244 244 244 153; /*(Changeable UI) color_class: "W014LiD";*/ - } + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + script { + set_int(text, 0); + set_state(PART:"padding_before_text", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); } - part { name: "event"; - scale: 1; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - color: 0 0 0 0; + } + program { name: "radio_on"; + signal: "elm,state,radio,on"; + source: "elm"; + script { + if (get_int(disabled) == 1) { + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "disabled", 0.0); + }else { + if (get_int(animate) == 0) { + set_state(PART:"tizen_vg_shape_clipper", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "on", 0.0); + } else { + run_program(PROGRAM:"toggle_on_effect"); + run_program(PROGRAM:"toggle_on_effect2"); + } } + set_int(animate, 0); + set_int(radio_state, 1); } } - programs { - program { name: "unpressed"; - signal: "elm,state,mouse,up"; - source: "elm"; - script { - if (get_int(radio_disabled) == 1) return; - if (get_int(radio_state) == 1) { - set_state(PART:"radio", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"radio", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } - } - } - program { name: "pressed"; - signal: "elm,state,mouse,down"; - source: "elm"; - script { - if (get_int(radio_disabled) == 1) return; - if (get_int(radio_state) == 1) { - set_state(PART:"radio", "on", 0.0); - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - else { - set_state(PART:"radio", "default", 0.0); - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); + program { name: "radio_off"; + signal: "elm,state,radio,off"; + source: "elm"; + script { + if (get_int(disabled) == 1) { + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "disabled", 0.0); + }else { + if (get_int(animate) == 0) { + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "default", 0.0); + } else { + run_program(PROGRAM:"toggle_off_effect"); + run_program(PROGRAM:"toggle_off_effect2"); } } + set_int(animate, 0); + set_int(radio_state, 0); } - program { name: "radio_on"; - signal: "elm,state,radio,on"; - source: "elm"; - script { - if (get_int(radio_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - } - set_state(PART:"radio", "on", 0.0); - set_int(radio_state, 1); + } + program { name: "pressed"; + signal: "mouse,down,1"; + source: "event"; + script { + if (get_int(disabled) == 1) return; + if (get_int(text) == 1) { + set_state(PART:"elm.text", "pressed", 0.0); } } - program { name: "radio_off"; - signal: "elm,state,radio,off"; - source: "elm"; - script { - if (get_int(radio_disabled) == 1) { - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - } - set_state(PART:"radio", "default", 0.0); - set_int(radio_state, 0); + } + program { name: "unpressed"; + signal: "mouse,up,1"; + source: "event"; + script { + if (get_int(disabled) == 1) return; + if (get_int(radio_state) == 1) { + set_state(PART:"tizen_vg_shape_clipper", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "on", 0.0); + }else { + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "default", 0.0); + } + if (get_int(text) == 1) { + set_state(PART:"elm.text", "visible", 0.0); } } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - script { - set_int(radio_disabled, 1); - set_state(PART:"bg", "disabled", 0.0); - set_state(PART:"bg_stroke", "disabled", 0.0); - set_state(PART:"radio", "disabled", 0.0); + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_int(disabled, 1); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "disabled", 0.0); + if (get_int(text) == 1) { + set_state(PART:"elm.text", "disabled", 0.0); } } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - script { - set_int(radio_disabled, 0); - if (get_int(radio_state) == 1) { - set_state(PART:"bg", "on", 0.0); - set_state(PART:"bg_stroke", "on", 0.0); - set_state(PART:"radio", "on", 0.0); - } - else { - set_state(PART:"bg", "default", 0.0); - set_state(PART:"bg_stroke", "default", 0.0); - set_state(PART:"radio", "default", 0.0); - } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_int(disabled, 0); + if (get_int(radio_state) == 1) { + set_state(PART:"tizen_vg_shape_clipper", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "on", 0.0); + } else { + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper3", "default", 0.0); + } + if (get_int(text) == 1) { + set_state(PART:"elm.text", "visible", 0.0); } } } } - +} diff --git a/mobile/widgets/slider.edc b/mobile/widgets/slider.edc index df9085f4..2608af26 100644 --- a/mobile/widgets/slider.edc +++ b/mobile/widgets/slider.edc @@ -25,26 +25,6 @@ */ group { name: "elm/slider/horizontal/indicator/default"; - images { - set { - name: "core_slider_handle_normal"; - image { - image: "SMALL/images/Controls/core_slider_handle_normal.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_slider_handle_normal.png" COMP; - } - } - set { - name: "core_slider_handle_press"; - image { - image: "SMALL/images/Controls/core_slider_handle_press.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_slider_handle_press.png" COMP; - } - } - } parts { part { name: "access"; type: RECT; @@ -56,10 +36,11 @@ part { name: "button_events"; type: RECT; mouse_events: 1; + ignore_flags: ON_HOLD; scale: 1; description { state: "default" 0.0; fixed: 1 1; - min: 2*SLIDER_INDICATOR_SIZE_INC 1.5*SLIDER_INDICATOR_SIZE_INC; + min: 1.5*SLIDER_INDICATOR_SIZE_INC 1.5*SLIDER_SWALLOWBAR_HEIGHT_INC; aspect: 1.0 1.0; aspect_preference: VERTICAL; color: 0 0 0 0; @@ -69,40 +50,91 @@ visible: 0; } } + part { name: "elm.swallow.tizen_vg_shape1"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "button0"; + description { state: "default" 0.0; + rel1.to: "button0"; + rel2.to: "button0"; + } + } part { name: "button0"; + type : RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC; - max: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC; - image { - normal: "core_slider_handle_normal"; - } - color: 2 61 132 255; /*(Changeable UI) color_class: "W0641";*/ + min: SLIDER_INDICATOR_NORMAL_SIZE_INC; + max: SLIDER_INDICATOR_NORMAL_SIZE_INC; + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "W0641D"; - visible: 1; + } + } + part { name: "elm.swallow.tizen_vg_shape2"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "button0_press"; + description { state: "default" 0.0; + rel1.to: "button0_press"; + rel2.to: "button0_press"; } } part { name: "button0_press"; + type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC; - max: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC; - image { - normal: "core_slider_handle_press"; - } - color_class: "W0641P"; + min: SLIDER_INDICATOR_BUBBLE_SIZE_INC; + max: SLIDER_INDICATOR_BUBBLE_SIZE_INC; + color: 255 255 255 255; visible: 0; + rel1.to: "button0"; + rel2.to: "button0"; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; + align: 0.5 0.5; } description { state: "pressed" 0.0; inherit: "default" 0.0; + min: SLIDER_INDICATOR_BUBBLE_PRESSED_SIZE_INC; + max: SLIDER_INDICATOR_BUBBLE_PRESSED_SIZE_INC; visible: 1; + align: 0.5 0.72; + } + } + part { name: "elm.indicator"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT; + max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT; + color: 7 7 7 255; + align: 0.5 0.0; + rel1.to: "button0_press"; + rel2.to: "button0_press"; + rel1.offset: 0 12; + text { + min: 0 1; + font: "Tizen:style=Light"; size: "36"; + text_class: "tizen"; + } + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + visible: 1; + text { + min: 0 1; + font: "Tizen:style=Light"; size: "36"; + text_class: "tizen"; + } } } } @@ -110,15 +142,61 @@ program { name: "mouse_down"; signal: "mouse,down,*"; source: "button_events"; - action: STATE_SET "pressed" 0.0; - target: "button0_press"; + script { + run_program(PROGRAM:"pressed_effect1"); + run_program(PROGRAM:"pressed_effect2"); + } } program { name: "mouse_up"; signal: "mouse,up,*"; source: "button_events"; + script { + run_program(PROGRAM:"release_effect1"); + run_program(PROGRAM:"release_effect2"); + } + } + program { name: "indicator_show"; + signal: "elm,state,indicator,show"; + source: "elm"; + script { + run_program(PROGRAM:"pressed_effect1"); + run_program(PROGRAM:"pressed_effect2"); + } + } + program { name: "indicator_hide"; + signal: "elm,state,indicator,hide"; + source: "elm"; + script { + run_program(PROGRAM:"release_effect1"); + run_program(PROGRAM:"release_effect2"); + } + } + program { name: "pressed_effect1"; + action: STATE_SET "pressed" 0.0; + transition: DECELERATE 0.3; + target: "button0_press"; + } + program { name: "pressed_effect2"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.21; + target: "elm.indicator"; + after: "pressed_effect3"; + } + program { name: "pressed_effect3"; + action: STATE_SET "pressed" 0.0; + transition: DECELERATE 0.09; + target: "elm.indicator"; + } + program { name: "release_effect1"; action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; target: "button0_press"; } + program { name: "release_effect2"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.09; + target: "elm.indicator"; + } program { name: "slider_disable"; signal: "elm,state,disabled"; source: "elm"; @@ -135,60 +213,57 @@ } } } + group { name: "elm/slider/horizontal/default"; - images { - set { - name: "core_progress_bar.#"; - image { - image: "SMALL/images/Controls/core_progress_bar.#.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_progress_bar.#.png" COMP; - } - } - set { - name: "core_slider_center_point_bg"; - image { - image: "SMALL/images/Controls/core_slider_center_point_bg.png" COMP; - } - image { - image: "MIDDLE/images/Controls/core_slider_center_point_bg.png" COMP; - } - } - } + data.item: "vector_ux" "default"; script { public invert_on = 0; + public disabled = 0; public popup_show = 1; public show = 0; public set_popup_show() { - set_int(popup_show, 1); + set_int(popup_show, 0); } public set_popup_hide() { set_int(popup_show, 0); } public set_invert_on() { - set_state(PART:"level", "inverted", 0.0); - set_state(PART:"level2", "inverted", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } set_int(invert_on, 1); } public set_invert_off() { - set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } + else { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } set_int(invert_on, 0); } public thumb_down() { - if (get_int(invert_on) == 0) { + if (!get_int(invert_on)) set_state(PART:"level", "pressed", 0.0); + else set_state(PART:"level2", "pressed", 0.0); - } + set_state(PART:"handle_color", "pressed", 0.0); if (get_int(popup_show) == 1) emit("popup,show", "elm"); } public thumb_up() { - if (get_int(invert_on) == 0) { + if (!get_int(invert_on)) set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); - } + else + set_state(PART:"level2", "inverted", 0.0); + set_state(PART:"handle_color", "default", 0.0); if (get_int(popup_show) == 1) emit("popup,hide", "elm"); } @@ -196,13 +271,25 @@ group { name: "elm/slider/horizontal/default"; new Float:dx, Float:dy; get_drag(PART:"elm.dragable.slider", dx, dy); if (dx > 0.5) { - set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } + else { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } set_int(invert_on, 0); } else { - set_state(PART:"level", "inverted", 0.0); - set_state(PART:"level2", "inverted", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } set_int(invert_on, 1); } } @@ -316,6 +403,7 @@ group { name: "elm/slider/horizontal/default"; } } part { name: "base"; + type: "RECT"; mouse_events: 0; scale: 1; description { state: "default" 0.0; @@ -330,24 +418,28 @@ group { name: "elm/slider/horizontal/default"; relative: 0.0 1.0; } fixed: 0 1; - image.normal: "core_progress_bar.#"; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ + color: 145 145 145 179; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ + color: 145 145 145 77; } } part { name: "drag_base"; type: "SPACER"; + scale: 1; description { state: "default" 0.0; min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC; rel1 { to_x: "bar_image_left_padding"; to_y: "bg"; - relative: 0.0 0.0; + relative: 1.0 0.0; + } + rel2 { + to_x: "bar_image_right_padding"; + to_y: "bg"; + relative: 0.0 1.0; } - rel2.to: "bg"; fixed: 1 1; } description { state: "visible" 0.0; @@ -355,15 +447,19 @@ group { name: "elm/slider/horizontal/default"; rel1 { to_x: "bar_icon_right_padding_2"; to_y: "bg"; - relative: 0.0 0.0; + relative: 1.0 0.0; + } + rel2 { + to_x: "bar_image_right_padding"; + to_y: "bg"; + relative: 0.0 1.0; } - rel2.to: "bg"; } } part { name: "level"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; rel1 { to_x: "bar_icon_right_padding_2"; @@ -376,32 +472,43 @@ group { name: "elm/slider/horizontal/default"; fixed: 1 1; min: 0 SLIDER_BASE_HEIGHT_INC; max: -1 SLIDER_BASE_HEIGHT_INC; - image.normal: "core_progress_bar.#"; + color: 61 184 204 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 0; } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 61 184 204 77; + } } part { name: "level2"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; visible: 0; - rel1 { - to_y: "base"; - to_x: "elm.dragable.slider"; - relative: 0.5 0.0; - } + rel1.to: "level"; + rel1.relative: 1 0; rel2.to: "base"; - image.normal: "core_progress_bar.#"; + color: 61 184 204 255; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 1; } + description { state: "pressed" 0.0; + inherit: "inverted" 0.0; + } + description { state: "disabled" 0.0; + inherit: "inverted" 0.0; + color: 61 184 204 77; + } } part { name: "bar_image_right_padding"; @@ -427,10 +534,10 @@ group { name: "elm/slider/horizontal/default"; scale: 1; type: RECT; description { state: "default" 0.0; - color: 232 224 0 255; /*(Changeable UI) color_class: "W0661";*/ + color: 61 184 204 255; } description { state: "disabled" 0.0; - color_class: "W0661D"; + color: 61 184 204 76; } } part { name: "elm.swallow.bar"; @@ -451,16 +558,16 @@ group { name: "elm/slider/horizontal/default"; } } part { name:"center_point"; + type: RECT; scale: 1; description { state: "default" 0.0; min: SLIDER_CENTER_POINT_SIZE_INC; max: SLIDER_CENTER_POINT_SIZE_INC; visible: 0; - image.normal: "core_slider_center_point_bg"; rel1.to: "base"; rel2.to: "base"; fixed: 0 1; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ + color: 61 184 204 255; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -469,7 +576,7 @@ group { name: "elm/slider/horizontal/default"; description { state: "disabled" 0.0; inherit: "default" 0.0; visible: 1; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ + color: 61 184 204 77; } } part { name: "elm.track.slider"; @@ -490,18 +597,70 @@ group { name: "elm/slider/horizontal/default"; } } } + part { name: "elm.swallow.tizen_vg_shape1"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "base"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + } + } + part { name: "elm.swallow.tizen_vg_shape2"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level"; + description { state: "default" 0.0; + rel1.to: "level"; + rel2.to: "level"; + } + } + part { name: "elm.swallow.tizen_vg_shape3"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level2"; + description { state: "default" 0.0; + rel1.to: "level2"; + rel2.to: "level2"; + } + } + part { name: "elm.swallow.tizen_vg_shape4"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "hider"; + description { state: "default" 0.0; + rel1.to: "level"; + rel2.to: "level"; + } + } + part { name: "elm.swallow.tizen_vg_shape5"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "center_point"; + description { state: "default" 0.0; + rel1.to: "center_point"; + rel2.to: "center_point"; + } + } part { name: "elm.dragable.slider"; type: GROUP; source: "elm/slider/horizontal/indicator/default"; mouse_events: 1; + ignore_flags: ON_HOLD; scale: 1; + clip_to : "handle_color"; dragable { x: 1 1 0; y: 0 0 0; confine: "drag_base"; } description { state: "default" 0.0; - min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC; + min: SLIDER_INDICATOR_SIZE_INC SLIDER_SWALLOWBAR_HEIGHT_INC; fixed: 1 1; align: 0.5 0.5; rel1.to: "drag_base"; @@ -511,30 +670,42 @@ group { name: "elm/slider/horizontal/default"; color: 0 0 0 0; } } - part { name: "disabler"; + part { name:"handle_color"; type: RECT; - mouse_events: 1; - repeat_events: 0; scale: 1; description { state: "default" 0.0; - visible: 0; - color: 0 0 0 0; + rel1.offset: 0 -1000; + rel2.offset: -1 1000; + color: 61 184 204 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; } description { state: "disabled" 0.0; inherit: "default" 0.0; - visible: 1; + color: 163 198 204 255; } } - part { name: "clipper"; + part { name: "hider"; type: RECT; + scale: 1; description { state: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ + visible: 0; + color: 0 0 0 0; } - description { state: "pressed" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2P";*/ + } + part { name: "disabler"; + type: RECT; + mouse_events: 1; + repeat_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + color: 0 0 0 0; } description { state: "disabled" 0.0; - color_class: "W062L2D"; + inherit: "default" 0.0; + visible: 1; } } } @@ -614,8 +785,16 @@ group { name: "elm/slider/horizontal/default"; set_state(PART:"center_point", "disabled", 0.0); set_state(PART:"disabler", "disabled", 0.0); set_state(PART:"icon_clipper", "disabled", 0.0); - set_state(PART:"clipper", "disabled", 0.0); set_state(PART:"base", "disabled", 0.0); + set_state(PART:"handle_color", "disabled", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } + set_int(disabled, 1); } } program { name: "slider_enable"; @@ -623,11 +802,19 @@ group { name: "elm/slider/horizontal/default"; source: "elm"; script { if (get_int(show)) - set_state(PART:"center_point", "default", 0.0); + set_state(PART:"center_point", "visible", 0.0); set_state(PART:"disabler", "default", 0.0); set_state(PART:"icon_clipper", "default", 0.0); - set_state(PART:"clipper", "default", 0.0); set_state(PART:"base", "default", 0.0); + set_state(PART:"handle_color", "default", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + set_int(disabled, 0); } } } @@ -635,11 +822,12 @@ group { name: "elm/slider/horizontal/default"; group { name: "elm/slider/horizontal/center_point"; inherit: "elm/slider/horizontal/default"; + data.item: "vector_ux" "center_point"; parts { part { name: "level"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; rel1 { @@ -652,19 +840,24 @@ group { name: "elm/slider/horizontal/center_point"; to_y: "base"; relative: 0.5 1.0; } + color: 61 184 204 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 0; } - description { state: "pressed" 0.0; + description { state: "disabled" 0.0; inherit: "default" 0.0; + color: 61 184 204 77; } } part { name: "level2"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; visible: 0; @@ -678,28 +871,39 @@ group { name: "elm/slider/horizontal/center_point"; to_y: "base"; relative: 0.5 1.0; } - image.normal: "core_progress_bar.#"; + color: 61 184 204 255; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 1; } description { state: "pressed" 0.0; - inherit: "default" 0.0; - visible: 1; + inherit: "inverted" 0.0; + } + description { state: "disabled" 0.0; + inherit: "inverted" 0.0; + color: 61 184 204 77; } } part { name:"center_point"; + type: RECT; scale: 1; description { state: "default" 0.0; min: SLIDER_CENTER_POINT_SIZE_INC; max: SLIDER_CENTER_POINT_SIZE_INC; - image.normal: "core_slider_center_point_bg"; rel1.to: "base"; rel2.to: "base"; fixed: 0 1; visible: 1; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ + color: 61 184 204 255; + } + description { state: "visible" 0.0; + inherit: "default"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 61 184 204 77; } } } @@ -739,76 +943,857 @@ group { name: "elm/slider/horizontal/center_point"; drag_state(); } } + program { name: "slider_disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_state(PART:"center_point", "disabled", 0.0); + set_state(PART:"disabler", "disabled", 0.0); + set_state(PART:"icon_clipper", "disabled", 0.0); + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"handle_color", "disabled", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } + set_int(disabled, 1); + } + } + program { name: "slider_enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_state(PART:"center_point", "visible", 0.0); + set_state(PART:"disabler", "default", 0.0); + set_state(PART:"icon_clipper", "default", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"handle_color", "default", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + set_int(disabled, 0); + } + } } } -group { name: "elm/slider/vertical/default"; - images { - set { - name: "core_progress_bar_v.#"; - image { - image: "SMALL/images/Controls/core_progress_bar_v.#.png" COMP; + +group { name: "elm/slider/horizontal/warning"; + data.item: "vector_ux" "default"; + script { + public invert_on = 0; + public warning = 0; + public disabled = 0; + public popup_show = 1; + public show = 0; + public set_popup_show() { + set_int(popup_show, 0); + } + public set_popup_hide() { + set_int(popup_show, 0); + } + public set_invert_on() { + if (!get_int(disabled)) { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } + if (!get_int(warning)){ + set_state(PART:"level_warning_clip", "inverted", 0.0); + } + else { + set_state(PART:"level_warning_clip", "inverted_warning", 0.0); + } + set_state(PART:"center_point", "inverted", 0.0); + set_state(PART:"level_rest_clip", "inverted", 0.0); + set_int(invert_on, 1); + } + public set_invert_off() { + if (!get_int(disabled)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } + else { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } + if (!get_int(warning)){ + set_state(PART:"level_warning_clip", "default", 0.0); + } + else { + set_state(PART:"level_warning_clip", "warning", 0.0); + } + set_state(PART:"center_point", "default", 0.0); + set_state(PART:"level_rest_clip", "default", 0.0); + set_int(invert_on, 0); + } + public thumb_down() { + if (!get_int(warning)) + set_state(PART:"handle_color", "pressed", 0.0); + else + set_state(PART:"handle_color", "pressed_warning", 0.0); + if (get_int(popup_show) == 1) + emit("popup,show", "elm"); + } + public thumb_up() { + if (!get_int(warning)) + set_state(PART:"handle_color", "default", 0.0); + else + set_state(PART:"handle_color", "warning", 0.0); + if (get_int(popup_show) == 1) + emit("popup,hide", "elm"); } - image { - image: "MIDDLE/images/Controls/core_progress_bar_v.#.png" COMP; + public drag_state_warning() { + new Float:dx, Float:dy; + get_drag(PART:"elm.dragable.slider", dx, dy); + if (!get_int(invert_on)) { + if (dx > SLIDER_WARNING_LEVEL) { + if (!get_int(disabled)) { + set_state(PART:"handle_color", "warning", 0.0); + } + else { + set_state(PART:"handle_color", "disabled_warning", 0.0); + } + set_state(PART:"level_warning_clip", "warning", 0.0); + set_int(warning, 1); + } + else { + if (!get_int(disabled)) { + set_state(PART:"handle_color", "default", 0.0); + } + else { + set_state(PART:"handle_color", "disabled", 0.0); + } + set_state(PART:"level_warning_clip", "default", 0.0); + set_int(warning, 0); + } + } + else { + if (dx < (1.0 - SLIDER_WARNING_LEVEL)) { + if (!get_int(disabled)) { + set_state(PART:"handle_color", "warning", 0.0); + } + else { + set_state(PART:"handle_color", "disabled_warning", 0.0); + } + set_state(PART:"level_warning_clip", "inverted_warning", 0.0); + set_int(warning, 1); + } + else { + if (!get_int(disabled)) { + set_state(PART:"handle_color", "default", 0.0); + } + else { + set_state(PART:"handle_color", "disabled", 0.0); + } + set_state(PART:"level_warning_clip", "inverted", 0.0); + set_int(warning, 0); + } + } } } - set { - name: "core_slider_center_point_bg_v"; - image { - image: "SMALL/images/Controls/core_slider_center_point_bg_v.png" COMP; + parts { + part { name: "access"; + type: RECT; + description { state: "default" 0.0; + fixed: 1 1; + color: 0 0 0 0; + } + } + part { + name: "bg"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC; + } + } + part { + name: "bar_image_left_padding"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC; + max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC; + fixed: 1 0; + rel1.to: "bg"; + rel2 { + relative: 0.0 1.0; + to: "bg"; + } + align: 0.0 0.5; + } + } + part { name: "elm.swallow.icon"; + type: SWALLOW; + clip_to: "icon_clipper"; + scale: 1; + description { state: "default" 0.0; + visible: 0; + align: 0.0 0.5; + max: SLIDER_SWALLOWBAR_HEIGHT_INC SLIDER_SWALLOWBAR_HEIGHT_INC; + rel1 { + relative: 1.0 0.0; + to_x: "bar_image_left_padding"; + to_y: "bg"; + } + rel2 { + relative: 1.0 1.0; + to_x: "bar_image_left_padding"; + to_y: "bg"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { + name: "bar_icon_right_padding_1"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + align: 0.0 0.5; + min: 0 0; + max: 0 0; + rel1 { + relative: 1.0 0.0; + to: "elm.swallow.icon"; + } + rel2 { + relative: 1.0 1.0; + to: "elm.swallow.icon"; + } + fixed: 1 1; + } + description { state: "visible"; + inherit: "default" 0.0; + min: SLIDER_ICON_PADDING_SIZE_INC; + max: SLIDER_ICON_PADDING_SIZE_INC; + } + } + part { + name: "bar_icon_right_padding_2"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + align: 0.0 0.5; + min: 0 0; + max: 0 0; + rel1 { + relative: 1.0 0.0; + to: "bar_icon_right_padding_1"; + } + rel2 { + relative: 1.0 1.0; + to: "bar_icon_right_padding_1"; + } + fixed: 1 1; + } + description { state: "visible"; + inherit: "default" 0.0; + min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC; + max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC; + } + } + part { name: "base"; + type: "RECT"; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 SLIDER_BASE_HEIGHT_INC; + max: -1 SLIDER_BASE_HEIGHT_INC; + rel1 { + to: "bar_icon_right_padding_2"; + relative: 1.0 0.0; + } + rel2 { + to: "bar_image_right_padding"; + relative: 0.0 1.0; + } + fixed: 0 1; + color: 145 145 145 179; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 145 145 145 77; + } + } + part { name: "drag_base"; + type: "SPACER"; + scale: 1; + description { state: "default" 0.0; + min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC; + rel1 { + to_x: "bar_image_left_padding"; + to_y: "bg"; + relative: 1.0 0.0; + } + rel2 { + to_x: "bar_image_right_padding"; + to_y: "bg"; + relative: 0.0 1.0; + } + fixed: 1 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1 { + to_x: "bar_icon_right_padding_2"; + to_y: "bg"; + relative: 1.0 0.0; + } + rel2 { + to_x: "bar_image_right_padding"; + to_y: "bg"; + relative: 0.0 1.0; + } + } + } + part { name: "level"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1 { + to_x: "bar_icon_right_padding_2"; + relative: 1.0 0.0; + } + rel2 { + to_x: "elm.dragable.slider"; + relative: 0.5 1.0; + } + fixed: 1 1; + min: 0 SLIDER_BASE_HEIGHT_INC; + max: -1 SLIDER_BASE_HEIGHT_INC; + color: 255 25 25 255; + } + description { state: "inverted" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 216 162 162 255; + } + } + part { name: "level2"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + rel1.to: "level"; + rel1.relative: 1 0; + rel2.to: "base"; + color: 255 25 25 255; + } + description { state: "inverted" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "disabled" 0.0; + inherit: "inverted" 0.0; + color: 216 162 162 255; + } + } + part { name: "level_rest_clip"; + type: RECT; + description { state: "default" 0.0; + fixed: 1 1; + color: 201 132 132 255; + rel1.to_x: "center_point"; + rel1.to_y: "base"; + rel1.relative: 0.5 0.0; + rel2.to: "base"; + } + description { state: "inverted" 0.0; + inherit: "default" 0.0; + rel1.to: "base"; + rel1.relative: 0.0 0.0; + rel2.to_x: "center_point"; + rel2.to_y: "base"; + rel2.relative: 0.5 1.0; + } + } + part { name: "level_warning_clip"; + type: RECT; + scale: 1; + clip_to: "disabled_clipper"; + description { state: "default" 0.0; + rel1.to: "level"; + rel2.to: "level"; + } + description { state: "warning" 0.0; + inherit: "default"; + rel1.to: "level"; + rel2.to_x: "level_rest_clip"; + rel2.to_y: "level"; + rel2.relative: 0.0 1.0; + } + description { state: "inverted" 0.0; + inherit: "default"; + rel1.to: "level2"; + rel2.to: "level2"; + } + description { state: "inverted_warning" 0.0; + inherit: "inverted" 0.0; + rel1.to_x: "level_rest_clip"; + rel1.to_y: "level2"; + rel1.relative: 1.0 0.0; + rel2.to: "level2"; + } + } + part { name: "disabled_clipper"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "level_warning_clip"; + rel2.to: "level_warning_clip"; + color: 61 184 204 255; + } + description { state: "disabled"; + inherit: "default" 0.0; + color: 163 198 204 255; + } + } + part { + name: "bar_image_right_padding"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC; + max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to: "bg"; + } + rel2 { + relative: 1.0 1.0; + to: "bg"; + } + align: 1.0 0.5; + } + } + part { name: "icon_clipper"; + scale: 1; + type: RECT; + description { state: "default" 0.0; + color: 61 184 204 255; + } + description { state: "disabled" 0.0; + color: 61 184 204 76; + } + } + part { name: "elm.swallow.bar"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC; + max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC; + fixed: 0 1; + rel1 { + to: "bar_icon_right_padding_2"; + relative: 1.0 0.0; + } + rel2 { + to: "bar_image_right_padding"; + relative: 0.0 1.0; + } + } + } + part { name:"center_point"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 0 0; + max: 0 0; + align: SLIDER_WARNING_LEVEL 0.5; + rel1.to: "base"; + rel2.to: "base"; + fixed: 0 1; + color: 0 0 0 0; + } + description { state: "inverted" 0.0; + inherit: "default" 0.0; + align: (1.0 - SLIDER_WARNING_LEVEL) 0.5; + } + } + part { name: "elm.track.slider"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 SLIDER_POPUP_HEIGHT_INC; + max: -1 SLIDER_POPUP_HEIGHT_INC; + align: 0.5 1.0; + fixed: 0 1; + rel1.to: "elm.dragable.slider"; + rel1.offset: 0 8; + rel2 { + relative: 1.0 0.0; + to: "elm.dragable.slider"; + offset: 0 8; + } + } + } + part { name: "elm.swallow.tizen_vg_shape1"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "base"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + } + } + part { name: "elm.swallow.tizen_vg_shape4"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level_rest_clip"; + description { state: "default" 0.0; + rel1.to: "level_rest_clip"; + rel2.to: "level_rest_clip"; + } + } + part { name: "elm.swallow.tizen_vg_shape2"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level"; + description { state: "default" 0.0; + rel1.to: "level"; + rel2.to: "level"; + } + } + part { name: "elm.swallow.tizen_vg_shape3"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level2"; + description { state: "default" 0.0; + rel1.to: "level2"; + rel2.to: "level2"; + } + } + part { name: "elm.swallow.tizen_vg_shape5"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level_warning_clip"; + description { state: "default" 0.0; + rel1.to: "level_warning_clip"; + rel2.to: "level_warning_clip"; + } + } + part { name: "elm.dragable.slider"; + type: GROUP; + source: "elm/slider/horizontal/indicator/default"; + mouse_events: 1; + ignore_flags: ON_HOLD; + scale: 1; + clip_to : "handle_color"; + dragable { + x: 1 1 0; + y: 0 0 0; + confine: "drag_base"; + } + description { state: "default" 0.0; + min: SLIDER_INDICATOR_SIZE_INC SLIDER_SWALLOWBAR_HEIGHT_INC; + fixed: 1 1; + align: 0.5 0.5; + rel1.to: "drag_base"; + rel1.relative: 0.5 0.5; + rel2.to: "drag_base"; + rel2.relative: 0.5 0.5; + color: 0 0 0 0; + } + } + part { name:"handle_color"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.offset: 0 -1000; + rel2.offset: -1 1000; + color: 61 184 204 255; + } + description { state: "warning" 0.0; + inherit: "default" 0.0; + color: 255 25 25 255; + } + description { state: "pressed" 0.0; + inherit: "default"; + } + description { state: "pressed_warning" 0.0; + inherit: "warning"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 163 198 204 255; + } + description { state: "disabled_warning" 0.0; + inherit: "default" 0.0; + color: 216 162 162 255; + } + } + part { name: "disabler"; + type: RECT; + mouse_events: 1; + repeat_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + color: 0 0 0 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { name: "invert_on"; + signal: "elm,state,inverted,on"; + source: "elm"; + script { + set_invert_on(); + } + } + program { name: "invert_off"; + signal: "elm,state,inverted,off"; + source: "elm"; + script { + set_invert_off(); + } + } + program { name: "val_show"; + signal: "mouse,down,*"; + source: "elm.dragable.slider"; + script { + thumb_down(); + } + } + program { name: "val_hide"; + signal: "mouse,up,*"; + source: "elm.dragable.slider"; + script { + thumb_up(); + } + } + program { name: "popup_show"; + signal: "elm,state,val,show"; + source: "elm"; + script { + set_popup_show(); + } + } + program { name: "popup_hide"; + signal: "elm,state,val,hide"; + source: "elm"; + script { + set_popup_hide(); + } + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.icon"; + target: "bar_icon_right_padding_1"; + target: "bar_icon_right_padding_2"; + target: "drag_base"; + } + program { name: "center_point_enable"; + signal: "slider,center,point,show"; + source: "elm"; + script { + set_state(PART:"center_point", "visible", 0.0); + set_int(show, 1); + } + } + program { name: "center_point_disable"; + signal: "slider,center,point,hide"; + source: "elm"; + script { + set_state(PART:"center_point", "default", 0.0); + set_int(show, 0); + } + } + program { name: "slider_disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_state(PART:"disabler", "disabled", 0.0); + set_state(PART:"icon_clipper", "disabled", 0.0); + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"disabled_clipper", "disabled", 0.0); + if (!get_int(warning)) + set_state(PART:"handle_color", "disabled", 0.0); + else + set_state(PART:"handle_color", "disabled_warning", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } + set_int(disabled, 1); + } + } + program { name: "slider_enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_state(PART:"disabler", "default", 0.0); + set_state(PART:"icon_clipper", "default", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"disabled_clipper", "default", 0.0); + if (!get_int(warning)) + set_state(PART:"handle_color", "default", 0.0); + else + set_state(PART:"handle_color", "warning", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + set_int(disabled, 0); + } + } + program { name: "center_point_calc"; + signal: "drag"; + source: "elm.dragable.slider"; + script { + drag_state_warning(); + } + } + program { name: "center_point_calc1"; + signal: "drag,start"; + source: "elm.dragable.slider"; + script { + drag_state_warning(); + } + } + program { name: "center_point_calc2"; + signal: "drag,set"; + source: "elm.dragable.slider"; + script { + drag_state_warning(); + } + } + program { name: "center_point_calc3"; + signal: "mouse,up,*"; + source: "elm.swallow.bar"; + script { + drag_state_warning(); + } } - image { - image: "MIDDLE/images/Controls/core_slider_center_point_bg_v.png" COMP; + program { name: "center_point_calc4"; + signal: "mouse,move"; + source: "elm.swallow.bar"; + script { + drag_state_warning(); + } } } - } + } + +group { name: "elm/slider/vertical/default"; + data.item: "vector_ux" "default"; script { public invert_on = 0; + public disabled = 0; public show = 0; public popup_show = 1; public set_popup_show() { - set_int(popup_show, 1); + set_int(popup_show, 0); } public set_popup_hide() { set_int(popup_show, 0); } public set_invert_on() { - set_state(PART:"level", "inverted", 0.0); - set_state(PART:"level2", "inverted", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + else { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } set_int(invert_on, 1); } public set_invert_off() { - set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } + else { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } set_int(invert_on, 0); } public thumb_down() { - if (get_int(invert_on) == 0) { - set_state(PART:"level", "pressed", 0.0); - set_state(PART:"level2", "pressed", 0.0); - } + if (!get_int(invert_on)) + set_state(PART:"level2", "pressed", 0.0); + else + set_state(PART:"level", "pressed", 0.0); + set_state(PART:"handle_color", "pressed", 0.0); if (get_int(popup_show) == 1) emit("popup,show", "elm"); } public thumb_up() { - if (get_int(invert_on) == 0) { - set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); - } + if (!get_int(invert_on)) + set_state(PART:"level2", "default", 0.0); + else + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"handle_color", "default", 0.0); if (get_int(popup_show) == 1) emit("popup,hide", "elm"); } public drag_state() { new Float:dx, Float:dy; get_drag(PART:"elm.dragable.slider", dx, dy); - if (dy > 0.5) { - set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); + if (dy < 0.5) { + if (!get_int(disabled)) { + set_state(PART:"level", "pressed", 0.0); + set_state(PART:"level2", "default", 0.0); + } + else { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "default", 0.0); + } set_int(invert_on, 0); } else { - set_state(PART:"level", "inverted", 0.0); - set_state(PART:"level2", "inverted", 0.0); + if (!get_int(disabled)) { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "pressed", 0.0); + } + else { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } set_int(invert_on, 1); } } @@ -837,8 +1822,8 @@ group { name: "elm/slider/vertical/default"; scale: 1; description { state: "default" 0.0; - min: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC; - max: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC; + min: SLIDER_TOP_PADDING_SIZE_INC; + max: SLIDER_TOP_PADDING_SIZE_INC; fixed: 1 1; rel1 { relative: 0.0 0.0; @@ -852,6 +1837,7 @@ group { name: "elm/slider/vertical/default"; } } part { name: "base"; + type: "RECT"; mouse_events: 0; scale: 1; description { state: "default" 0.0; @@ -867,25 +1853,25 @@ group { name: "elm/slider/vertical/default"; relative: 1.0 0.0; } fixed: 1 1; - image.normal: "core_progress_bar_v.#"; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ + color: 145 145 145 179; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ + color: 145 145 145 77; } } part { name: "drag_base"; type: "SPACER"; + scale: 1; description { state: "default" 0.0; min: SLIDER_SWALLOWBAR_HEIGHT_INC 0; rel1 { to: "bar_image_top_padding"; - relative: 0.0 0.0; + relative: 0.0 1.0; } rel2 { - to: "bg"; - relative: 1.0 1.0; + to: "bar_image_bottom_padding"; + relative: 1.0 0.0; } fixed: 1 1; } @@ -893,18 +1879,18 @@ group { name: "elm/slider/vertical/default"; inherit: "default" 0.0; rel1 { to: "bar_image_top_padding"; - relative: 0.0 0.0; + relative: 0.0 1.0; } rel2 { - to: "bg"; - relative: 1.0 1.0; + to: "bar_image_bottom_padding"; + relative: 1.0 0.0; } } } part { name: "level"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; visible: 0; rel1 { @@ -920,17 +1906,24 @@ group { name: "elm/slider/vertical/default"; fixed: 1 1; min: SLIDER_BASE_HEIGHT_INC 0; max: SLIDER_BASE_HEIGHT_INC -1; - image.normal: "core_progress_bar_v.#"; + color: 61 184 204 255; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 1; } + description { state: "pressed" 0.0; + inherit: "inverted" 0.0; + } + description { state: "disabled" 0.0; + inherit: "inverted" 0.0; + color: 61 184 204 77; + } } part { name: "level2"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; rel1 { @@ -945,12 +1938,19 @@ group { name: "elm/slider/vertical/default"; fixed: 1 1; min: SLIDER_BASE_HEIGHT_INC 0; max: SLIDER_BASE_HEIGHT_INC -1; - image.normal: "core_progress_bar_v.#"; + color: 61 184 204 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 0; } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 61 184 204 77; + } } part { name: "bar_image_bottom_padding"; @@ -958,8 +1958,8 @@ group { name: "elm/slider/vertical/default"; scale: 1; description { state: "default" 0.0; - min: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC; - max: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC; + min: SLIDER_BOTTOM_PADDING_SIZE_INC; + max: SLIDER_BOTTOM_PADDING_SIZE_INC; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -990,16 +1990,16 @@ group { name: "elm/slider/vertical/default"; } } part { name:"center_point"; + type: RECT; scale: 1; description { state: "default" 0.0; min: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC; max: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC; visible: 0; - image.normal: "core_slider_center_point_bg_v"; rel1.to: "base"; rel2.to: "base"; fixed: 1 0; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ + color: 61 184 204 255; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1008,7 +2008,7 @@ group { name: "elm/slider/vertical/default"; description { state: "disabled" 0.0; inherit: "default" 0.0; visible: 1; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/ + color: 61 184 204 77; } } part { name: "elm.track.slider"; @@ -1029,18 +2029,70 @@ group { name: "elm/slider/vertical/default"; } } } + part { name: "elm.swallow.tizen_vg_shape1"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "base"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + } + } + part { name: "elm.swallow.tizen_vg_shape2"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level"; + description { state: "default" 0.0; + rel1.to: "level"; + rel2.to: "level"; + } + } + part { name: "elm.swallow.tizen_vg_shape3"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "level2"; + description { state: "default" 0.0; + rel1.to: "level2"; + rel2.to: "level2"; + } + } + part { name: "elm.swallow.tizen_vg_shape4"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "hider"; + description { state: "default" 0.0; + rel1.to: "level"; + rel2.to: "level"; + } + } + part { name: "elm.swallow.tizen_vg_shape5"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + clip_to: "center_point"; + description { state: "default" 0.0; + rel1.to: "center_point"; + rel2.to: "center_point"; + } + } part { name: "elm.dragable.slider"; type: GROUP; source: "elm/slider/horizontal/indicator/default"; mouse_events: 1; + ignore_flags: ON_HOLD; scale: 1; + clip_to : "handle_color"; dragable { x: 0 0 0; y: 1 1 0; confine: "drag_base"; } description { state: "default" 0.0; - min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC; + min: SLIDER_LEFT_VERTICAL_INDICATOR_SIZE_INC SLIDER_VERTICAL_INDICATOR_SIZE_INC; fixed: 1 1; align: 0.5 0.5; rel1.to: "drag_base"; @@ -1050,6 +2102,30 @@ group { name: "elm/slider/vertical/default"; color: 0 0 0 0; } } + part { name:"handle_color"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.offset: 0 -1000; + rel2.offset: -1 1000; + color: 61 184 204 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 163 198 204 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + } + } + part { name: "hider"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + visible: 0; + color: 0 0 0 0; + } + } part { name: "disabler"; type: RECT; mouse_events: 1; @@ -1064,18 +2140,6 @@ group { name: "elm/slider/vertical/default"; visible: 1; } } - part { name: "clipper"; - type: RECT; - description { state: "default" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/ - } - description { state: "pressed" 0.0; - color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2P";*/ - } - description { state: "disabled" 0.0; - color_class: "W062L2D"; - } - } } programs { program { name: "invert_on"; @@ -1145,8 +2209,16 @@ group { name: "elm/slider/vertical/default"; if (get_int(show)) set_state(PART:"center_point", "disabled", 0.0); set_state(PART:"disabler", "disabled", 0.0); - set_state(PART:"clipper", "disabled", 0.0); set_state(PART:"base", "disabled", 0.0); + set_state(PART:"handle_color", "disabled", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level2", "disabled", 0.0); + set_state(PART:"level", "default", 0.0); + } else { + set_state(PART:"level2", "inverted", 0.0); + set_state(PART:"level", "disabled", 0.0); + } + set_int(disabled, 1); } } program { name: "slider_enable"; @@ -1154,10 +2226,18 @@ group { name: "elm/slider/vertical/default"; source: "elm"; script { if (get_int(show)) - set_state(PART:"center_point", "default", 0.0); + set_state(PART:"center_point", "visible", 0.0); set_state(PART:"disabler", "default", 0.0); - set_state(PART:"clipper", "default", 0.0); set_state(PART:"base", "default", 0.0); + set_state(PART:"handle_color", "default", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level2", "default", 0.0); + set_state(PART:"level", "default", 0.0); + } else { + set_state(PART:"level2", "inverted", 0.0); + set_state(PART:"level", "inverted", 0.0); + } + set_int(disabled, 0); } } } @@ -1168,28 +2248,28 @@ group { name: "elm/slider/vertical/default"; set { name: "core_slider_popup_bg"; image { - image: "SMALL/images/Controls/core_slider_popup_bg.png" COMP; + image: SMALL"images/Old/core_slider_popup_bg.png" COMP; } image { - image: "MIDDLE/images/Controls/core_slider_popup_bg.png" COMP; + image: MEDIUM"images/Old/core_slider_popup_bg.png" COMP; } } set { name: "core_slider_popup_bg_stroke"; image { - image: "SMALL/images/Controls/core_slider_popup_bg_stroke.png" COMP; + image: SMALL"images/Old/core_slider_popup_bg_stroke.png" COMP; } image { - image: "MIDDLE/images/Controls/core_slider_popup_bg_stroke.png" COMP; + image: MEDIUM"images/Old/core_slider_popup_bg_stroke.png" COMP; } } set { name: "core_slider_popup_bg_ef"; image { - image: "SMALL/images/Controls/core_slider_popup_bg_ef.png" COMP; + image: SMALL"images/Old/core_slider_popup_bg_ef.png" COMP; } image { - image: "MIDDLE/images/Controls/core_slider_popup_bg_ef.png" COMP; + image: MEDIUM"images/Old/core_slider_popup_bg_ef.png" COMP; } } } @@ -1302,7 +2382,6 @@ group { name: "elm/slider/vertical/default"; text { min: 1 1; font: "Bold"; size: "33"; /*(Changeable UI) text_class: "T116";*/ - ellipsis: -1; } } description { state: "visible" 0.0; @@ -1356,11 +2435,12 @@ group { name: "elm/slider/vertical/default"; } group { name: "elm/slider/vertical/center_point"; inherit: "elm/slider/vertical/default"; + data.item: "vector_ux" "center_point"; parts { part { name: "level2"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; rel1 { @@ -1373,19 +2453,24 @@ group { name: "elm/slider/vertical/default"; to_x: "base"; relative: 1.0 0.5; } + color: 61 184 204 255; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 0; } - description { state: "pressed" 0.0; + description { state: "disabled" 0.0; inherit: "default" 0.0; + color: 61 184 204 77; } } part { name: "level"; + type: RECT; mouse_events: 0; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; visible: 0; @@ -1399,28 +2484,39 @@ group { name: "elm/slider/vertical/default"; to_x: "base"; relative: 1.0 0.5; } - image.normal: "core_progress_bar_v.#"; + color: 61 184 204 255; } description { state: "inverted" 0.0; inherit: "default" 0.0; visible: 1; } description { state: "pressed" 0.0; - inherit: "default" 0.0; - visible: 1; + inherit: "inverted" 0.0; + } + description { state: "disabled" 0.0; + inherit: "inverted" 0.0; + color: 61 184 204 77; } } part { name:"center_point"; + type: RECT; scale: 1; description { state: "default" 0.0; min: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC; max: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC; - image.normal: "core_slider_center_point_bg_v"; rel1.to: "base"; rel2.to: "base"; fixed: 1 0; visible: 1; - color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/ + color: 61 184 204 255; + } + description { state: "visible" 0.0; + inherit: "default"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 61 184 204 77; } } } @@ -1460,5 +2556,42 @@ group { name: "elm/slider/vertical/default"; drag_state(); } } + program { name: "slider_disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_state(PART:"center_point", "disabled", 0.0); + set_state(PART:"disabler", "disabled", 0.0); + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"handle_color", "disabled", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level2", "disabled", 0.0); + set_state(PART:"level", "default", 0.0); + } else { + set_state(PART:"level2", "inverted", 0.0); + set_state(PART:"level", "disabled", 0.0); + } + set_int(disabled, 1); + } + } + program { name: "slider_enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_state(PART:"center_point", "visible", 0.0); + set_state(PART:"disabler", "default", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"handle_color", "default", 0.0); + if (!get_int(invert_on)) { + set_state(PART:"level2", "default", 0.0); + set_state(PART:"level", "default", 0.0); + } else { + set_state(PART:"level2", "inverted", 0.0); + set_state(PART:"level", "inverted", 0.0); + } + set_int(disabled, 0); + } + } } } + |
