GUI 3.6 applied in EditDate & EditTime

[platform/framework/native/uifw.git] / src / ui / resource / FUi_ResourceEditTimeConfig.cpp

diff --git a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 6a29b1a..e494566
--- a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp
+++ b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp
@@ -2,14 +2,14 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Apache License, Version 2.0 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://floralicense.org/license/
+//     http://www.apache.org/licenses/LICENSE-2.0/
 //
 // Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
+// distributed under the License is distributed on an ”AS IS” BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
@@ -27,12 +27,17 @@ START_UI_CONFIG(EDITTIME);
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B042);
        ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $W011);
+       ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161);
+       ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011);
+       ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042);
+       ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011);
+       ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161);
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $F031L1);
        ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $F031L1P);
        ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $F031L1D);
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L1);
-       ADD_COLOR_CONFIG(TEXT_PRESSED, $F011L2);
-       ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L1);
+       ADD_COLOR_CONFIG(TEXT_PRESSED, $F011L1P);
+       ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L1D);
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $B052L5);
 
@@ -40,40 +45,49 @@ START_UI_CONFIG(EDITTIME);
        ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL, #00_button_01.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_button_01.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_DISABLED, #00_button_01.#.png);
-       ADD_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED, #00_button_01_focus.png);
+       ADD_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED, #00_button_01_focus.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, #00_button_01_ef.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
+       ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
 
        START_UI_CONFIG_MODE(720x1280);
        {
-               ADD_SHAPE_CONFIG(WIDTH, 720);
+               ADD_SHAPE_CONFIG(WIDTH, 306);
                ADD_SHAPE_CONFIG(HEIGHT, 112);
-               ADD_SHAPE_CONFIG(TIME_WIDTH, 114);
-               ADD_SHAPE_CONFIG(HOUR_MINUTE_WIDTH, 48);
-               ADD_SHAPE_CONFIG(TITLE_TIME_MARGIN, 5);
+               ADD_SHAPE_CONFIG(TIME_WIDTH, 160);
+               ADD_SHAPE_CONFIG(HOUR_MINUTE_WIDTH, 69);
+               ADD_SHAPE_CONFIG(HOUR_MINUTE_MIN_WIDTH, 69);
+               ADD_SHAPE_CONFIG(TITLE_TIME_MARGIN, 6);
                ADD_SHAPE_CONFIG(TIME_BAR_MARGIN, 10);
-               ADD_SHAPE_CONFIG(TIME_HEIGHT, 46);
-               ADD_SHAPE_CONFIG(TIME_AMPM_MARGIN, 24);
-               ADD_SHAPE_CONFIG(AMPM_WIDTH, 106);
-               ADD_SHAPE_CONFIG(AMPM_HEIGHT, 56);
+               ADD_SHAPE_CONFIG(TIME_HEIGHT, 48);
+               ADD_SHAPE_CONFIG(TIME_AMPM_MARGIN, 17);
+               ADD_SHAPE_CONFIG(AMPM_WIDTH, 95);
+               ADD_SHAPE_CONFIG(AMPM_HEIGHT, 60);
                ADD_SHAPE_CONFIG(TITLE_HEIGHT, 36);
-               ADD_SHAPE_CONFIG(TIME_FONT_SIZE, 36);
+               ADD_SHAPE_CONFIG(TIME_FONT_SIZE, 34);
                ADD_SHAPE_CONFIG(TEXT_FONT_SIZE, 32);
-               ADD_SHAPE_CONFIG(AMPM_FONT_SIZE, 36);
+               ADD_SHAPE_CONFIG(AMPM_FONT_SIZE, 34);
                ADD_SHAPE_CONFIG(COLON_WIDTH, 12);
-               ADD_SHAPE_CONFIG(COLON_MARGIN, 3);
-               ADD_SHAPE_CONFIG(TIME_TEXT_LEFT_MARGIN, 20);
-               ADD_DIMENSION_CONFIG(MIN_SIZE, 0, 0);
+               ADD_SHAPE_CONFIG(COLON_MARGIN, 5);
+               ADD_SHAPE_CONFIG(TIME_TEXT_LEFT_MARGIN, 17);
+               ADD_SHAPE_CONFIG(TITLE_TEXT_LEFT_MARGIN, 20);
+               ADD_DIMENSION_CONFIG(MIN_SIZE, 306, 112);
        }
        END_UI_CONFIG_MODE(720x1280);
 
        START_UI_CONFIG_MODE(1280x720);
        {
-               ADD_DIMENSION_CONFIG(MIN_SIZE, 0, 0);
-               ADD_SHAPE_CONFIG(WIDTH, _SCREEN_HEIGHT_);
-               ADD_SHAPE_CONFIG(TIME_WIDTH, 242);
-               ADD_SHAPE_CONFIG(TIME_AMPM_MARGIN, 84);
+               ADD_DIMENSION_CONFIG(MIN_SIZE, 306, 112);
+               ADD_SHAPE_CONFIG(WIDTH, 466);
+               ADD_SHAPE_CONFIG(HOUR_MINUTE_WIDTH, 149);
+               ADD_SHAPE_CONFIG(TIME_WIDTH, 320);
        }
        END_UI_CONFIG_MODE(1280x720);
 }