From: Hermet Park Date: Mon, 28 Nov 2016 10:15:07 +0000 (+0900) Subject: remove all FIXME in the exmaples. X-Git-Tag: submit/tizen_3.0/20161201.104015~3^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F100525%2F2;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git remove all FIXME in the exmaples. and replace the folder name from data to res. Change-Id: I68a32680fba3cca3baa71a9cab02aff4fe09bb9d --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e332a10..fe34690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ SET(EDJDIR "/usr/share/edje/${LIBNAME}") SET(BINNAME ui.viewmgr.demo) SET(BINDIR /usr/apps/${BINNAME}) -SET(IMGDIR ${BINDIR}/data/images) +SET(IMGDIR ${BINDIR}/res/images) SET(ICONDIR ${BINDIR}/shared/res) SET(CMAKE_SKIP_BUILD_RPATH TRUE) @@ -46,19 +46,19 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pc/${LIBNAME}.pc DESTINATION ${LIBDIR} #edj file ADD_CUSTOM_TARGET(${LIBNAME}.edj - COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc - ${CMAKE_SOURCE_DIR}/data/edc/${LIBNAME}.edc ${CMAKE_BINARY_DIR}/data/edc/${LIBNAME}.edj - DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/${LIBNAME}.edc + COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/res/edc + ${CMAKE_SOURCE_DIR}/res/edc/${LIBNAME}.edc ${CMAKE_BINARY_DIR}/res/edc/${LIBNAME}.edj + DEPENDS ${CMAKE_SOURCE_DIR}/res/edc/${LIBNAME}.edc ) ADD_DEPENDENCIES(${LIBNAME} ${LIBNAME}.edj) -INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/${LIBNAME}.edj DESTINATION ${EDJDIR}) +INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/${LIBNAME}.edj DESTINATION ${EDJDIR}) #xml file CONFIGURE_FILE(${BINNAME}.xml.in ${BINNAME}.xml @ONLY) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${BINNAME}.xml DESTINATION /usr/share/packages/) #image file -INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png") +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png") #icon file INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/res/ DESTINATION ${ICONDIR} FILES_MATCHING PATTERN "*.png") diff --git a/data/edc/images/core_icon_badge_container.#.png b/data/edc/images/core_icon_badge_container.#.png deleted file mode 100644 index bba06a6..0000000 Binary files a/data/edc/images/core_icon_badge_container.#.png and /dev/null differ diff --git a/data/edc/images/core_theme_bg_01.png b/data/edc/images/core_theme_bg_01.png deleted file mode 100644 index 477402f..0000000 Binary files a/data/edc/images/core_theme_bg_01.png and /dev/null differ diff --git a/data/edc/ui-viewmgr.edc b/data/edc/ui-viewmgr.edc deleted file mode 100644 index f3bb4fd..0000000 --- a/data/edc/ui-viewmgr.edc +++ /dev/null @@ -1,1452 +0,0 @@ -/* - * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved - * - * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#define TIZEN_VIEW_BG_PORTRAIT_HEIGHT_INC 1280 -#define TIZEN_VIEW_BG_LANDSPACPE_HEIGHT_INC 720 -#define TIZEN_VIEW_TITLE_HEIGHT_INC 110 -#define TIZEN_VIEW_TITLE_TEXT_FONT_SIZE_INC 50 -#define TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC 42 -#define TIZEN_VIEW_VISIBLE_TEXT_FONT_SIZE_INC 28 -#define TIZEN_VIEW_TITLE_TEXT_FONT_RANGE_INC 36 50 -#define TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_RANGE_INC 36 42 -#define TIZEN_VIEW_TITLE_TOP_PADDING_HEIGHT_INC 3 -#define TIZEN_VIEW_SUBTITLE_HEIGHT_INC 38 -#define TIZEN_VIEW_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC 3 -#define TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC 22 -#define TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 22 -#define TIZEN_VIEW_BADGE_HEIGHT_INC 48 -#define TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC (TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC + TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC + TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC) -#define TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC 32 -#define TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC 176 110 -#define TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC 10 -#define TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 90 -#define BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC 80 80 -#define TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC 32 -#define TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC 80 -#define TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC 100 -#define TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC 80 -#define TIZEN_VIEW_TOOLBAR_LIGHT_VIEW_HEIGHT_INC 86 -#define TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC 0 -#define TRANSITION_TIME 0.2 -#define TIZEN_VIEW_TAB1_HEIGHT_INC 110 -#define TIZEN_VIEW_TAB2_HEIGHT_INC 144 - -collections { - base_scale: 2.6; - styles { - style { "tizen_view_title_style"; - base: "font=Tizen:style=Condensed align=center font_size="TIZEN_VIEW_TITLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=none ellipsis=1.0 text_class=tizen"; - tag: "br" "\n"; - tag: "tab" "\t"; - } - style { "tizen_view_subtitle_visible_style"; - base: "font=Tizen:style=Condensed align=center font_size="TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=none ellipsis=1.0 text_class=tizen"; - tag: "br" "\n"; - tag: "tab" "\t"; - } - style { "tizen_view_subtitle_style"; - base: "font=Tizen:style=Condensed align=center font_size="TIZEN_VIEW_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=none ellipsis=1.0 text_class=tizen"; - tag: "br" "\n"; - tag: "tab" "\t"; - } - } - group { "tizen_view/default"; - images { - image: "images/core_theme_bg_01.png" COMP; - image: "images/core_icon_badge_container.#.png" COMP; - } - script { - public landscape_mode = 0; //Landscape status - public prev_btn_visible = 0; //Previous button visible status - public title_left_btn_visible = 0; //Title left button visible status - public title_right_btn_visible = 0; //Title right button visible status - public toolbar_visible = 0; //Tabbar visible status (This value is used for toolbar group) - } - parts { - spacer { "base"; - desc { "default"; - } - } - image { "bg_img"; - scale: 1; - mouse_events: 0; - clip_to: "clipper"; - desc { "default"; - rel1.to: "base"; - rel2.to: "base"; - align: 0.5 0.0; - fixed: 0 1; - min: 0 TIZEN_VIEW_BG_PORTRAIT_HEIGHT_INC; - image.normal: "images/core_theme_bg_01.png"; - } - desc { "landscape"; - inherit: "default"; - min: 0 TIZEN_VIEW_BG_LANDSPACPE_HEIGHT_INC; - } - } - rect { "clipper"; - mouse_events: 0; - desc { "default"; - visible: 1; - } - desc { "hidden"; - visible: 0; - } - } - rect { "title_bg"; - scale: 1; - mouse_events: 0; - desc { "default"; - min: 0 TIZEN_VIEW_TITLE_HEIGHT_INC; - max: -1 TIZEN_VIEW_TITLE_HEIGHT_INC; - align: 0.0 0.0; - fixed: 0 1; - rel1 { - to: "base"; - relative: 0.0 0.0; - } - rel2 { - to: "base"; - relative: 1.0 0.0; - } - color: 61 185 204 255; - } - desc { "hidden"; - inherit: "default"; - min: 0 0; - max: -1 0; - } - } - spacer { "toolbar_top_padding"; - scale: 1; - repeat_events: 1; - desc { "default"; - min: 0 TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC; - max: -1 TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC; - fixed: 0 1; - align: 0.5 0.0; - rel1 { - to: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to: "title_bg"; - relative: 1.0 0.0; - } - } - } - swallow { "toolbar"; - scale: 1; - clip_to: "toolbar_clipper"; - desc { "default"; - min: 0 0; - max: -1 0; - fixed: 0 1; - align: 0.5 0.0; - rel1 { - to: "toolbar_top_padding"; - relative: 0.0 1.0; - } - rel2 { - to: "toolbar_top_padding"; - relative: 1.0 1.0; - } - visible: 0; - } - desc { "visible"; - inherit: "default"; - min: 0 TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC; - max: -1 TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC; - visible: 1; - } - } - rect { "toolbar_top_divider"; - scale: 1; - mouse_events: 0; - clip_to: "toolbar_clipper"; - desc { "default"; - min: 0 0; - max: -1 0; - fixed: 0 1; - align: 0.5 0.0; - rel1 { - to: "toolbar_clipper"; - relative: 0.0 0.0; - } - rel2 { - to: "toolbar_clipper"; - relative: 1.0 0.0; - } - color: 244 244 244 25; - visible: 0; - } - desc { "visible"; - inherit: "default"; - min: 0 TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC; - max: -1 TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC; - visible: 1; - } - } - rect { "toolbar_clipper"; - scale: 1; - mouse_events: 0; - clip_to: "clipper"; - desc { "default"; - min: 0 TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC; - max: -1 TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC; - fixed: 0 1; - align: 0.5 1.0; - rel1 { - to: "toolbar"; - relative: 0.0 1.0; - } - rel2 { - to: "toolbar"; - relative: 1.0 1.0; - } - } - } - rect { "title_clipper"; - mouse_events: 0; - clip_to: "clipper"; - desc { "default"; - rel1.to_y: "title_bg"; - rel2.to_y: "title_bg"; - } - desc { "hidden"; - inherit: "default"; - visible: 0; - } - } - spacer { "title_text_left_padding"; - scale: 1; - desc { "default"; - rel1.to: "title_bg"; - rel2.to: "title_left_btn_bg"; - } - desc { "title_badge_visible"; - rel1.to: "title_bg"; - rel2.to: "title_badge2_padding"; - } - desc { "prev_btn_visible"; - rel1.to: "title_bg"; - rel2 { - to_x: "elm.swallow.prev_btn"; - to_y: "title_bg"; - relative: 1.0 1.0; - } - } - } - spacer { "title_text_right_padding"; - scale: 1; - desc { "default"; - rel1.to: "title_right_btn_bg"; - rel2.to: "title_bg"; - } - desc { "title_badge_visible"; - rel1.to: "badge_icon_left_padding"; - rel2.to: "title_bg"; - } - desc { "prev_btn_visible"; - rel1.to: "prev_btn_title_right_padding"; - rel2.to: "title_bg"; - } - } - textblock { "elm.text.title"; - scale: 1; - mouse_events: 0; - clip_to: "title_text_clipper"; - desc { "default"; - text { - style: "tizen_view_title_style"; - size: TIZEN_VIEW_TITLE_TEXT_FONT_SIZE_INC; - size_range: TIZEN_VIEW_TITLE_TEXT_FONT_RANGE_INC; - fit: 1 0; - } - fixed: 1 1; - rel1 { - to_x: "title_text_left_padding"; - to_y: "title_bg"; - relative: 1.0 0.0; - } - rel2 { - to_x: "title_text_right_padding"; - to_y: "title_bg"; - relative: 0.0 1.0; - } - } - desc { "subtitle_visible"; - text { - style: "tizen_view_subtitle_visible_style"; - size: TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC; - size_range: TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_RANGE_INC; - fit: 1 0; - } - fixed: 1 1; - rel1 { - to_x: "title_text_left_padding"; - to_y: "title_top_padding"; - relative: 1.0 1.0; - } - rel2 { - to_x: "title_text_right_padding"; - to_y: "elm.text.subtitle"; - relative: 0.0 0.0; - } - } - } - rect { "title_text_clipper"; - mouse_events: 0; - clip_to: "title_clipper"; - desc { "default"; - rel1.to: "elm.text.title"; - rel2.to: "elm.text.title"; - } - } - spacer { "title_top_padding"; - scale: 1; - desc { "default"; - min: 0 TIZEN_VIEW_TITLE_TOP_PADDING_HEIGHT_INC; - max: -1 TIZEN_VIEW_TITLE_TOP_PADDING_HEIGHT_INC; - fixed: 0 1; - align: 0.5 0.0; - rel1 { - to: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to: "title_bg"; - relative: 1.0 0.0; - } - } - } - textblock { "elm.text.subtitle"; - scale: 1; - mouse_events: 0; - desc { "default"; - text { - style: "tizen_view_subtitle_style"; - } - min: 0 TIZEN_VIEW_SUBTITLE_HEIGHT_INC; - max: -1 TIZEN_VIEW_SUBTITLE_HEIGHT_INC; - fixed: 1 1; - align: 0.5 1.0; - rel1 { - to_x: "title_text_left_padding"; - to_y: "subtitle_bottom_padding"; - relative: 1.0 0.0; - } - rel2 { - to_x: "title_text_right_padding"; - to_y: "subtitle_bottom_padding"; - relative: 0.0 0.0; - } - } - } - spacer { "subtitle_bottom_padding"; - desc { "default"; - min: 0 TIZEN_VIEW_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC; - max: -1 TIZEN_VIEW_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC; - fixed: 0 1; - align: 0.5 1.0; - rel1 { - to: "title_bg"; - relative: 0.0 1.0; - } - rel2 { - to: "title_bg"; - relative: 1.0 1.0; - } - } - } - rect { "click_event_area"; - ignore_flags: ON_HOLD; - desc { "default"; - rel1.to: "title_bg"; - rel2.to: "title_bg"; - color: 0 0 0 0; - } - } - rect { "access.title"; - repeat_events: 1; - desc { "default"; - rel1.to: "title_bg"; - rel2.to: "title_bg"; - color: 0 0 0 0; - } - } - swallow { "elm.swallow.icon"; - scale: 1; - clip_to: "title_clipper"; - desc { "default"; - max: 0 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to: "title_left_padding"; - } - rel2 { - relative: 1.0 1.0; - to: "title_left_padding"; - } - visible: 0; - } - } - spacer { "badge_icon_left_padding"; - scale: 1; - desc { "default"; - min: 0 0; - max: 0 -1; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - to_x: "badge_text_left_padding"; - to_y: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to_x: "badge_text_left_padding"; - to_y: "title_bg"; - relative: 0.0 1.0; - } - } - desc { "visible"; - inherit: "default"; - min: TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC -1; - } - } - image { "badge_icon"; - scale: 1; - mouse_events: 0; - clip_to: "title_clipper"; - desc { "default"; - min: 0 0; - max: 0 0; - fixed: 1 1; - rel1 { - to_x: "badge_text_left_padding"; - to_y: "title_badge"; - } - rel2 { - to_x: "badge_text_right_padding"; - to_y: "title_badge"; - } - color: 195 219 226 255; - image.normal: "images/core_icon_badge_container.#.png"; - visible: 0; - } - desc { "visible"; - rel1 { - to_x: "badge_text_left_padding"; - to_y: "title_badge"; - } - rel2 { - to_x: "badge_text_right_padding"; - to_y: "title_badge"; - } - color: 195 219 226 255; - image.normal: "images/core_icon_badge_container.#.png"; - visible: 1; - } - } - spacer { "badge_text_left_padding"; - scale: 1; - desc { "default"; - min: 0 0; - max: 0 -1; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - to_x: "title_badge"; - to_y: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to_x: "title_badge"; - to_y: "title_bg"; - relative: 0.0 1.0; - } - } - desc { "visible"; - inherit: "default"; - min: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC -1; - } - } - spacer { "badge_text_right_padding"; - scale: 1; - desc { "default"; - min: 0 0; - max: 0 -1; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - to_x: "title_right_padding"; - to_y: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to_x: "title_right_padding"; - to_y: "title_bg"; - relative: 0.0 1.0; - } - } - desc { "visible"; - inherit: "default"; - min: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC -1; - } - } - text { "title_badge"; - scale: 1; - mouse_events: 0; - clip_to: "title_clipper"; - desc { "default"; - text { - font: "Tizen:style=Regular"; - size: "32"; - text_class: "tizen"; - min: 1 0; - max: 1 0; - align: 1.0 0.5; - ellipsis: -1; - } - color: 7 7 7 255; - min: 0 TIZEN_VIEW_BADGE_HEIGHT_INC; - max: -1 TIZEN_VIEW_BADGE_HEIGHT_INC; - fixed: 1 1; - align: 1.0 0.5; - rel1 { - to_x: "badge_text_right_padding"; - to_y: "elm.text.title"; - relative: 0.0 0.0; - } - rel2 { - to_x: "badge_text_right_padding"; - to_y: "elm.text.title"; - relative: 0.0 1.0; - } - } - } - text { "title_badge2"; - scale: 1; - mouse_events: 0; - clip_to: "title_clipper"; - desc { "default"; - text { - font: "Tizen:style=Regular"; - size: "32"; - text_class: "tizen"; - min: 1 0; - max: 1 0; - align: 0.0 0.5; - ellipsis: -1; - } - color: 7 7 7 255; - min: 0 TIZEN_VIEW_BADGE_HEIGHT_INC; - max: -1 TIZEN_VIEW_BADGE_HEIGHT_INC; - fixed: 1 1; - align: 0.0 0.5; - rel1 { - to_x: "title_left_padding"; - to_y: "elm.text.title"; - relative: 1.0 0.0; - } - rel2 { - to_x: "title_left_padding"; - to_y: "elm.text.title"; - relative: 1.0 1.0; - } - visible: 0; - } - } - spacer { "title_badge2_padding"; - scale: 1; - desc { "default"; - min: 0 0; - max: 0 -1; - fixed: 1 0; - align: 0.0 0.5; - rel1 { - to_x: "title_badge2"; - to_y: "title_bg"; - relative: 1.0 0.0; - } - rel2 { - to_x: "title_badge2"; - to_y: "title_bg"; - relative: 1.0 1.0; - } - } - desc { "visible"; - inherit: "default"; - min: TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC -1; - } - } - spacer { "title_left_padding"; - scale: 1; - desc { "default"; - min: TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC -1; - fixed: 1 0; - align: 0.0 0.0; - rel1 { - to: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to: "title_bg"; - relative: 0.0 1.0; - } - } - desc { "hidden"; - inherit: "default"; - min: 0 0; - max: 0 -1; - } - } - spacer { "title_left_btn_bg"; - scale: 1; - desc { "default"; - min: 0 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 { - to: "title_left_padding"; - relative: 1.0 0.0; - } - rel2 { - to: "title_left_padding"; - relative: 1.0 1.0; - } - } - desc { "visible"; - inherit: "default"; - min: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; - max: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; - } - } - swallow { "title_left_btn"; - scale: 1; - clip_to: "title_clipper"; - desc { "default"; - fixed: 1 1; - rel1.to: "title_left_btn_bg"; - rel2.to: "title_left_btn_bg"; - visible: 0; - } - desc { "visible"; - inherit: "default"; - visible: 1; - } - } - spacer { "title_right_btn_bg"; - scale: 1; - desc { "default"; - min: 0 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - to: "title_right_padding"; - relative: 0.0 0.0; - } - rel2 { - to: "title_right_padding"; - relative: 0.0 1.0; - } - } - desc { "visible"; - inherit: "default"; - min: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; - max: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; - } - } - spacer { "title_right_padding"; - scale: 1; - desc { "default"; - min: TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC -1; - fixed: 1 0; - align: 1.0 0.0; - rel1 { - to: "title_bg"; - relative: 1.0 0.0; - } - rel2 { - to: "title_bg"; - relative: 1.0 1.0; - } - } - desc { "hidden"; - inherit: "default"; - min: 0 0; - max: 0 -1; - } - } - swallow { "title_right_btn"; - scale: 1; - clip_to: "title_clipper"; - desc { "default"; - fixed: 1 1; - rel1.to: "title_right_btn_bg"; - rel2.to: "title_right_btn_bg"; - visible: 0; - } - desc { "visible"; - inherit: "default"; - visible: 1; - } - } - swallow { "elm.swallow.content"; - scale: 1; - repeat_events: 0; - clip_to: "content_clipper"; - desc { "default"; - align: 0.0 0.0; - rel1 { - to_x: "base"; - to_y: "title_bg"; - relative: 0.0 1.0; - } - rel2.to: "base"; - } - desc { "toolbar"; - align: 0.0 0.0; - rel1 { - to_x: "base"; - to_y: "toolbar"; - relative: 0.0 1.0; - } - rel2.to: "base"; - } - } - rect { "content_clipper"; - mouse_events: 0; - clip_to: "clipper"; - desc { "default"; - rel1.to_y: "elm.swallow.content"; - rel2.to_y: "elm.swallow.content"; - } - } - spacer { "prev_btn_left_padding"; - scale: 1; - desc { "default"; - min: TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC -1; - align: 0.0 0.0; - fixed: 1 1; - rel1 { - to: "title_bg"; - relative: 0.0 0.0; - } - rel2 { - to: "title_bg"; - relative: 0.0 1.0; - } - } - } - swallow { "elm.swallow.prev_btn"; - clip_to: "title_clipper"; - scale: 1; - desc { "default"; - min: BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC; - max: BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC; - align: 0.0 0.5; - fixed: 1 1; - rel1 { - to: "prev_btn_left_padding"; - relative: 1.0 0.0; - } - rel2 { - to: "prev_btn_left_padding"; - relative: 1.0 1.0; - } - visible: 1; - } - desc { "hidden"; - inherit: "default"; - visible: 0; - } - } - spacer { "prev_btn_title_right_padding"; - scale: 1; - desc { "default"; - min: TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 0; - max: TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC -1; - align: 1.0 0.0; - fixed: 1 1; - rel1 { - to: "title_bg"; - relative: 1.0 0.0; - } - rel2 { - to: "title_bg"; - relative: 1.0 1.0; - } - } - } - swallow { "toolbar_more_btn"; - clip_to: "title_clipper"; - desc { "default"; - min: 0 0; - max: 0 0; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; - visible: 0; - } - } - } - programs { - program { "visible"; - signal: "elm,state,visible"; - source: "viewmgr"; - action: STATE_SET "default" 0.0; - target: "clipper"; - } - program { "invisible"; - signal: "elm,state,invisible"; - source: "viewmgr"; - action: STATE_SET "hidden" 0.0; - target: "clipper"; - } - program { "title_show_title_default"; - action: STATE_SET "default" 0.0; - target: "title_bg"; - target: "title_clipper"; - transition: DECELERATE TRANSITION_TIME; - } - program { "title_show_anim"; - signal: "elm,state,title,show,anim"; - source: "viewmgr"; - script { - run_program(PROGRAM:"title_show_title_default"); - } - } - program { "title_show"; - signal: "elm,state,title,show"; - source: "viewmgr"; - script { - set_state(PART:"title_bg", "default", 0.0); - set_state(PART:"title_clipper", "default", 0.0); - if (get_int(title_left_btn_visible)) { - set_state(PART:"title_left_padding", "hidden", 0.0); - set_state(PART:"title_left_btn_bg", "visible", 0.0); - set_state(PART:"title_left_btn", "visible", 0.0); - set_state(PART:"title_right_btn_bg", "visible", 0.0); - set_state(PART:"title_right_padding", "hidden", 0.0); - } - else if (get_int(prev_btn_visible)) { - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); - set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); - set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); - } - if (get_int(title_right_btn_visible)) { - set_state(PART:"title_right_padding", "hidden", 0.0); - set_state(PART:"title_right_btn_bg", "visible", 0.0); - set_state(PART:"title_right_btn", "visible", 0.0); - set_state(PART:"title_left_btn_bg", "visible", 0.0); - set_state(PART:"title_left_padding", "hidden", 0.0); - if (get_int(prev_btn_visible)) { - set_state(PART:"title_text_left_padding", "default", 0.0); - set_state(PART:"title_text_right_padding", "default", 0.0); - } - } - if (get_int(toolbar_visible)) { - set_state(PART:"toolbar", "visible", 0.0); - set_state(PART:"toolbar_top_divider", "visible", 0.0); - set_state(PART:"elm.swallow.content", "toolbar", 0.0); - } - } - } - program { "title_hide_title_hidden"; - action: STATE_SET "hidden" 0.0; - target: "title_bg"; - target: "title_clipper"; - target: "elm.swallow.prev_btn"; - transition: DECELERATE TRANSITION_TIME; - } - program { "title_hide_anim"; - signal: "elm,state,title,hide,anim"; - source: "viewmgr"; - script { - run_program(PROGRAM:"title_hide_title_hidden"); - } - } - program { "title_hide"; - signal: "elm,state,title,hide"; - source: "viewmgr"; - script { - set_state(PART:"title_bg", "hidden", 0.0); - set_state(PART:"title_clipper", "hidden", 0.0); - set_state(PART:"title_left_padding", "default", 0.0); - set_state(PART:"title_left_btn_bg", "default", 0.0); - set_state(PART:"title_left_btn", "default", 0.0); - set_state(PART:"title_right_btn_bg", "default", 0.0); - set_state(PART:"title_right_padding", "default", 0.0); - set_state(PART:"title_right_btn", "default", 0.0); - set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0); - if (get_int(prev_btn_visible)){ - set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); - set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); - } - set_state(PART:"toolbar", "default", 0.0); - set_state(PART:"toolbar_top_divider", "default", 0.0); - set_state(PART:"elm.swallow.content", "default", 0.0); - } - } - program { "toolbar_show"; - signal: "elm,state,toolbar,show"; - source: "viewmgr"; - script { - set_state(PART:"toolbar", "visible", 0.0); - set_state(PART:"toolbar_top_divider", "visible", 0.0); - set_state(PART:"elm.swallow.content", "toolbar", 0.0); - set_int(toolbar_visible, 1); - } - } - program { "toolbar_hide"; - signal: "elm,state,toolbar,hide"; - source: "viewmgr"; - script { - set_state(PART:"toolbar", "default", 0.0); - set_state(PART:"toolbar_top_divider", "default", 0.0); - set_state(PART:"elm.swallow.content", "default", 0.0); - set_int(toolbar_visible, 0); - } - } - program { "subtitle_show"; - signal: "elm,state,subtitle,show"; - source: "viewmgr"; - script { - set_state(PART:"elm.text.title", "subtitle_visible", 0.0); - } - } - program { "subtitle_hide"; - signal: "elm,state,subtitle,hide"; - source: "viewmgr"; - script { - set_state(PART:"elm.text.title", "default", 0.0); - } - } - program { "prev_btn_show"; - signal: "elm,state,prev_btn,show"; - source: "viewmgr"; - script { - set_int(prev_btn_visible, 1); - if (get_int(title_left_btn_visible) == 0) { - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); - set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); - set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); - } - } - } - program { "prev_btn_hide"; - signal: "elm,state,prev_btn,hide"; - source: "viewmgr"; - script { - set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0); - set_state(PART:"title_text_left_padding", "default", 0.0); - set_state(PART:"title_text_right_padding", "default", 0.0); - set_int(prev_btn_visible, 0); - } - } - program { "title_left_btn_show"; - signal: "elm,state,title_left_btn,show"; - source: "viewmgr"; - script { - set_state(PART:"title_left_padding", "hidden", 0.0); - set_state(PART:"title_left_btn_bg", "visible", 0.0); - set_state(PART:"title_left_btn", "visible", 0.0); - set_state(PART:"title_right_btn_bg", "visible", 0.0); - set_state(PART:"title_right_padding", "hidden", 0.0); - set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0); - set_state(PART:"title_text_left_padding", "default", 0.0); - set_state(PART:"title_text_right_padding", "default", 0.0); - set_int(title_left_btn_visible, 1); - } - } - program { "title_left_btn_hide"; - signal: "elm,state,title_left_btn,hide"; - source: "viewmgr"; - script { - set_state(PART:"title_left_padding", "default", 0.0); - set_state(PART:"title_left_btn_bg", "default", 0.0); - set_state(PART:"title_left_btn", "default", 0.0); - set_state(PART:"title_right_padding", "default", 0.0); - set_state(PART:"title_right_btn_bg", "default", 0.0); - set_int(title_left_btn_visible, 0); - if (get_int(prev_btn_visible) == 1) { - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); - set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); - set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); - } - } - } - program { "title_right_btn_show"; - signal: "elm,state,title_right_btn,show"; - source: "viewmgr"; - script { - set_state(PART:"title_right_padding", "hidden", 0.0); - set_state(PART:"title_right_btn_bg", "visible", 0.0); - set_state(PART:"title_right_btn", "visible", 0.0); - set_state(PART:"title_left_btn_bg", "visible", 0.0); - set_state(PART:"title_left_padding", "hidden", 0.0); - if (get_int(prev_btn_visible) == 1){ - set_state(PART:"title_text_left_padding", "default", 0.0); - set_state(PART:"title_text_right_padding", "default", 0.0); - } - set_int(title_right_btn_visible, 1); - } - } - program { "title_right_btn_hide"; - signal: "elm,state,title_right_btn,hide"; - source: "viewmgr"; - script { - set_state(PART:"title_right_padding", "default", 0.0); - set_state(PART:"title_right_btn_bg", "default", 0.0); - set_state(PART:"title_right_btn", "default", 0.0); - set_state(PART:"title_left_padding", "default", 0.0); - set_state(PART:"title_left_btn_bg", "default", 0.0); - set_int(title_right_btn_visible, 0); - if (get_int(prev_btn_visible) == 1){ - set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); - set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); - } - } - } - program { "title_badge_show"; - signal: "elm,state,title_badge,show"; - source: "viewmgr"; - script { - new buf[128]; - set_state(PART:"badge_text_left_padding", "visible", 0.0); - set_state(PART:"badge_text_right_padding", "visible", 0.0); - set_state(PART:"badge_icon", "visible", 0.0); - set_state(PART:"badge_icon_left_padding", "visible", 0.0); - get_text(PART:"title_badge", buf, 128); - set_text(PART:"title_badge2", buf); - set_state(PART:"title_badge2_padding", "visible", 0.0); - set_state(PART:"title_text_left_padding", "title_badge_visible", 0.0); - set_state(PART:"title_text_right_padding", "title_badge_visible", 0.0); - } - } - program { "title_badge_hide"; - signal: "elm,state,title_badge,hide"; - source: "viewmgr"; - script { - set_state(PART:"badge_text_left_padding", "default", 0.0); - set_state(PART:"badge_text_right_padding", "default", 0.0); - set_state(PART:"badge_icon", "default", 0.0); - set_state(PART:"badge_icon_left_padding", "default", 0.0); - set_text(PART:"title_badge2", ""); - set_state(PART:"title_badge2_padding", "default", 0.0); - set_state(PART:"title_text_left_padding", "default", 0.0); - set_state(PART:"title_text_right_padding", "default", 0.0); - } - } - program { "title_clicked"; - signal: "mouse,clicked,1"; - source: "click_event_area"; - script { - emit("elm,action,title,clicked", ""); - } - } - program { "change_to_landscape"; - script { - if (!get_int(landscape_mode)) { - set_int(landscape_mode, 1); - } - set_state(PART:"bg_img", "landscape", 0.0); - } - } - program { "change_to_portrait"; - script { - if (get_int(landscape_mode)) { - set_int(landscape_mode, 0); - } - set_state(PART:"bg_img", "default", 0.0); - } - } - program { "landscape_mode"; - source: "elm"; - signal: "elm,state,orient,90"; - after: "change_to_landscape"; - } - program { "landscape_mode2"; - source: "elm"; - signal: "elm,state,orient,270"; - after: "change_to_landscape"; - } - program { "portrait_mode"; - source: "elm"; - signal: "elm,state,orient,0"; - after: "change_to_portrait"; - } - program { "portrait_mode2"; - source: "elm"; - signal: "elm,state,orient,180"; - after: "change_to_portrait"; - } - } - } - - group { "tizen_view/tabbar/default"; - images { - image: "images/core_theme_bg_01.png" COMP; - image: "images/core_icon_badge_container.#.png" COMP; - } - script { - public landscape_mode = 0; - public tabbar_visible = 0; - } - parts{ - spacer { "base"; - desc { "default"; - } - } - image { "bg_img"; - scale: 1; - mouse_events: 0; - clip_to: "clipper"; - desc { "default"; - rel1.to: "base"; - rel2.to: "base"; - align: 0.5 0.0; - fixed: 0 1; - min: 0 TIZEN_VIEW_BG_PORTRAIT_HEIGHT_INC; - image.normal: "images/core_theme_bg_01.png"; - } - desc { "landscape"; - inherit: "default"; - min: 0 TIZEN_VIEW_BG_LANDSPACPE_HEIGHT_INC; - } - } - part { name: "clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - visible: 1; - } - description { state: "hidden" 0.0; - visible: 0; - } - } - swallow { "tabbar"; - scale: 1; - clip_to: "tabbar_clipper"; - description { state: "default" 0.0; - min: 0 0; - max: -1 0; - fixed: 0 1; - align: 0.5 0.0; - rel1 { to: "base"; relative: 0.0 0.0; } - rel2 { to: "base"; relative: 1.0 0.0; } - visible: 0; - } - description { state: "text_visible" 0.0; - inherit: "default" 0.0; - min: 0 TIZEN_VIEW_TAB1_HEIGHT_INC; - max: -1 TIZEN_VIEW_TAB1_HEIGHT_INC; - visible: 1; - } - description { state: "icon_visible" 0.0; - inherit: "default" 0.0; - min: 0 TIZEN_VIEW_TAB2_HEIGHT_INC; - max: -1 TIZEN_VIEW_TAB2_HEIGHT_INC; - visible: 1; - } - } - rect { "tabbar_clipper"; - mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.to_y: "tabbar"; - rel2.to_y: "tabbar"; - } - } - - swallow { "elm.swallow.content"; - scale: 1; - repeat_events: 0; - clip_to: "content_clipper"; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1 { to_x: "base"; to_y: "tabbar"; relative: 0.0 1.0; } - rel2 { to: "base"; relative: 1.0 1.0; } - } - } - rect { name: "content_clipper"; - mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.to_y: "elm.swallow.content"; - rel2.to_y: "elm.swallow.content"; - } - } - } - programs { - program { name: "title_show"; - signal: "elm,state,title,show"; - source: "viewmgr"; - script { - if (get_int(tabbar_visible)) { - set_state(PART:"tabbar", "text_visible", 0.0); - } - } - } - program { name: "title_hide"; - signal: "elm,state,title,hide"; - source: "viewmgr"; - script { - set_state(PART:"tabbar", "default", 0.0); - } - } - program { name: "tabbar_show"; - signal: "elm,state,tabbar,show"; - source: "viewmgr"; - script { - set_state(PART:"tabbar", "text_visible", 0.0); - set_int(tabbar_visible, 1); - } - } - program { name: "tabbar_icon_show"; - signal: "elm,state,tabbar,icon,show"; - source: "viewmgr"; - script { - set_state(PART:"tabbar", "icon_visible", 0.0); - set_int(tabbar_visible, 1); - } - } - program { name: "tabbar_hide"; - signal: "elm,state,tabbar,hide"; - source: "viewmgr"; - script { - set_state(PART:"tabbar", "default", 0.0); - set_int(tabbar_visible, 0); - } - } - program { "change_to_landscape"; - script { - if (!get_int(landscape_mode)) { - set_int(landscape_mode, 1); - } - set_state(PART:"bg_img", "landscape", 0.0); - } - } - program { "change_to_portrait"; - script { - if (get_int(landscape_mode)) { - set_int(landscape_mode, 0); - } - set_state(PART:"bg_img", "default", 0.0); - } - } - program { "landscape_mode"; - source: "elm"; - signal: "elm,state,orient,90"; - after: "change_to_landscape"; - } - program { "landscape_mode2"; - source: "elm"; - signal: "elm,state,orient,270"; - after: "change_to_landscape"; - } - program { "portrait_mode"; - source: "elm"; - signal: "elm,state,orient,0"; - after: "change_to_portrait"; - } - program { "portrait_mode2"; - source: "elm"; - signal: "elm,state,orient,180"; - after: "change_to_portrait"; - } - } - } - - /* Sliding Effect */ - group { "transition/default"; - alias: "transition/slide"; - parts { - swallow { "pcontent"; - desc { "default"; - } - desc {"pushed"; - rel1.relative: -1.0 0.0; - rel2.relative: 0.0 1.0; - } - desc {"popped"; - rel1.relative: 1.0 0.0; - rel2.relative: 2.0 1.0; - } - } - swallow { "content"; - desc { "default"; - } - desc { "push_ready"; - rel1.relative: 1.0 0.0; - rel2.relative: 2.0 1.0; - } - desc { "pop_ready"; - rel1.relative: -1.0 0.0; - rel2.relative: 0.0 1.0; - } - } - } - programs { - program { "push_finished"; - action: SIGNAL_EMIT "push,finished" "viewmgr"; - } - program { "push_pcontent"; - action: STATE_SET "pushed"; - target: "pcontent"; - transition: DECELERATE TRANSITION_TIME; - after: "push_finished"; - } - program { "push_content"; - action: STATE_SET "default"; - target: "content"; - transition: DECELERATE TRANSITION_TIME; - } - program { "push"; - signal: "view,push"; - source: "viewmgr"; - script { - set_state(PART:"pcontent", "default", 0.0); - set_state(PART:"content", "push_ready", 0.0); - run_program(PROGRAM:"push_pcontent"); - run_program(PROGRAM:"push_content"); - } - } - program { "pop_finished"; - action: SIGNAL_EMIT "pop,finished" "viewmgr"; - } - program { "pop_pcontent"; - action: STATE_SET "popped"; - target: "pcontent"; - transition: DECELERATE TRANSITION_TIME; - after: "pop_finished"; - } - program { "pop_content"; - action: STATE_SET "default"; - target: "content"; - transition: DECELERATE TRANSITION_TIME; - } - program { "pop"; - signal: "view,pop"; - source: "viewmgr"; - script { - set_state(PART:"pcontent", "default", 0.0); - set_state(PART:"content", "pop_ready", 0.0); - run_program(PROGRAM:"pop_pcontent"); - run_program(PROGRAM:"pop_content"); - } - } - } - } - /* Fade Effect */ - group { "transition/fade"; - parts { - rect { "pclipper"; - desc { "default"; - color: 0 0 0 255; - } - desc { "invisible"; - inherit: "default"; - } - desc { "visible"; - color: 255 255 255 255; - } - } - rect { "clipper"; - desc { "default"; - color: 255 255 255 255; - } - desc { "invisible"; - color: 0 0 0 255; - } - desc { "visible"; - color: 255 255 255 255; - } - } - swallow { "pcontent"; - clip_to: "pclipper"; - desc { "default"; - } - } - swallow { "content"; - clip_to: "clipper"; - desc { "default"; - } - } - } - programs { - program { "push_finished"; - action: SIGNAL_EMIT "push,finished" "viewmgr"; - } - program { "push_content"; - action: STATE_SET "default" 0.0; - target: "clipper"; - target: "pclipper"; - transition: DECELERATE (TRANSITION_TIME * 5); - after: "push_finished"; - } - program { "push"; - signal: "view,push"; - source: "viewmgr"; - script { - set_state(PART:"pclipper", "visible", 0.0); - set_state(PART:"clipper", "invisible", 0.0); - run_program(PROGRAM:"push_content"); - } - } - program { "pop_finished" - action: SIGNAL_EMIT "pop,finished" "viewmgr"; - } - program { "pop_content"; - action: STATE_SET "default" 0.0; - target: "pclipper"; - target: "clipper"; - transition: DECELERATE (TRANSITION_TIME * 5); - after: "pop_finished"; - } - program { "pop"; - signal: "view,pop"; - source: "viewmgr"; - script { - set_state(PART:"pclipper", "visible", 0.0); - set_state(PART:"clipper", "invisible", 0.0); - run_program(PROGRAM:"pop_content"); - } - } - } - } -} diff --git a/data/images/bg.png b/data/images/bg.png deleted file mode 100644 index da4b6b4..0000000 Binary files a/data/images/bg.png and /dev/null differ diff --git a/data/images/icon_alarm.png b/data/images/icon_alarm.png deleted file mode 100644 index 688b0cf..0000000 Binary files a/data/images/icon_alarm.png and /dev/null differ diff --git a/data/images/icon_timer.png b/data/images/icon_timer.png deleted file mode 100644 index fe2845d..0000000 Binary files a/data/images/icon_timer.png and /dev/null differ diff --git a/data/images/icon_worldclock.png b/data/images/icon_worldclock.png deleted file mode 100644 index b403ef5..0000000 Binary files a/data/images/icon_worldclock.png and /dev/null differ diff --git a/data/images/tizen.png b/data/images/tizen.png deleted file mode 100644 index 408188a..0000000 Binary files a/data/images/tizen.png and /dev/null differ diff --git a/packaging/ui-viewmgr.spec b/packaging/ui-viewmgr.spec index 3ddae03..1f0f374 100644 --- a/packaging/ui-viewmgr.spec +++ b/packaging/ui-viewmgr.spec @@ -73,7 +73,7 @@ cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name} %{_datadir}/packages/ui.viewmgr.demo.xml %manifest ui.viewmgr.demo.manifest /usr/apps/ui.viewmgr.demo/bin/* -/usr/apps/ui.viewmgr.demo/data/images/* +/usr/apps/ui.viewmgr.demo/res/images/* /usr/apps/ui.viewmgr.demo/shared/res/* %files devel diff --git a/res/edc/images/core_icon_badge_container.#.png b/res/edc/images/core_icon_badge_container.#.png new file mode 100644 index 0000000..bba06a6 Binary files /dev/null and b/res/edc/images/core_icon_badge_container.#.png differ diff --git a/res/edc/images/core_theme_bg_01.png b/res/edc/images/core_theme_bg_01.png new file mode 100644 index 0000000..477402f Binary files /dev/null and b/res/edc/images/core_theme_bg_01.png differ diff --git a/res/edc/ui-viewmgr.edc b/res/edc/ui-viewmgr.edc new file mode 100644 index 0000000..f3bb4fd --- /dev/null +++ b/res/edc/ui-viewmgr.edc @@ -0,0 +1,1452 @@ +/* + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define TIZEN_VIEW_BG_PORTRAIT_HEIGHT_INC 1280 +#define TIZEN_VIEW_BG_LANDSPACPE_HEIGHT_INC 720 +#define TIZEN_VIEW_TITLE_HEIGHT_INC 110 +#define TIZEN_VIEW_TITLE_TEXT_FONT_SIZE_INC 50 +#define TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC 42 +#define TIZEN_VIEW_VISIBLE_TEXT_FONT_SIZE_INC 28 +#define TIZEN_VIEW_TITLE_TEXT_FONT_RANGE_INC 36 50 +#define TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_RANGE_INC 36 42 +#define TIZEN_VIEW_TITLE_TOP_PADDING_HEIGHT_INC 3 +#define TIZEN_VIEW_SUBTITLE_HEIGHT_INC 38 +#define TIZEN_VIEW_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC 3 +#define TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC 22 +#define TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 22 +#define TIZEN_VIEW_BADGE_HEIGHT_INC 48 +#define TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC (TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC + TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC + TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC) +#define TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC 32 +#define TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC 176 110 +#define TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC 10 +#define TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 90 +#define BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC 80 80 +#define TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC 32 +#define TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC 80 +#define TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC 100 +#define TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC 80 +#define TIZEN_VIEW_TOOLBAR_LIGHT_VIEW_HEIGHT_INC 86 +#define TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC 0 +#define TRANSITION_TIME 0.2 +#define TIZEN_VIEW_TAB1_HEIGHT_INC 110 +#define TIZEN_VIEW_TAB2_HEIGHT_INC 144 + +collections { + base_scale: 2.6; + styles { + style { "tizen_view_title_style"; + base: "font=Tizen:style=Condensed align=center font_size="TIZEN_VIEW_TITLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=none ellipsis=1.0 text_class=tizen"; + tag: "br" "\n"; + tag: "tab" "\t"; + } + style { "tizen_view_subtitle_visible_style"; + base: "font=Tizen:style=Condensed align=center font_size="TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=none ellipsis=1.0 text_class=tizen"; + tag: "br" "\n"; + tag: "tab" "\t"; + } + style { "tizen_view_subtitle_style"; + base: "font=Tizen:style=Condensed align=center font_size="TIZEN_VIEW_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=none ellipsis=1.0 text_class=tizen"; + tag: "br" "\n"; + tag: "tab" "\t"; + } + } + group { "tizen_view/default"; + images { + image: "images/core_theme_bg_01.png" COMP; + image: "images/core_icon_badge_container.#.png" COMP; + } + script { + public landscape_mode = 0; //Landscape status + public prev_btn_visible = 0; //Previous button visible status + public title_left_btn_visible = 0; //Title left button visible status + public title_right_btn_visible = 0; //Title right button visible status + public toolbar_visible = 0; //Tabbar visible status (This value is used for toolbar group) + } + parts { + spacer { "base"; + desc { "default"; + } + } + image { "bg_img"; + scale: 1; + mouse_events: 0; + clip_to: "clipper"; + desc { "default"; + rel1.to: "base"; + rel2.to: "base"; + align: 0.5 0.0; + fixed: 0 1; + min: 0 TIZEN_VIEW_BG_PORTRAIT_HEIGHT_INC; + image.normal: "images/core_theme_bg_01.png"; + } + desc { "landscape"; + inherit: "default"; + min: 0 TIZEN_VIEW_BG_LANDSPACPE_HEIGHT_INC; + } + } + rect { "clipper"; + mouse_events: 0; + desc { "default"; + visible: 1; + } + desc { "hidden"; + visible: 0; + } + } + rect { "title_bg"; + scale: 1; + mouse_events: 0; + desc { "default"; + min: 0 TIZEN_VIEW_TITLE_HEIGHT_INC; + max: -1 TIZEN_VIEW_TITLE_HEIGHT_INC; + align: 0.0 0.0; + fixed: 0 1; + rel1 { + to: "base"; + relative: 0.0 0.0; + } + rel2 { + to: "base"; + relative: 1.0 0.0; + } + color: 61 185 204 255; + } + desc { "hidden"; + inherit: "default"; + min: 0 0; + max: -1 0; + } + } + spacer { "toolbar_top_padding"; + scale: 1; + repeat_events: 1; + desc { "default"; + min: 0 TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC; + max: -1 TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC; + fixed: 0 1; + align: 0.5 0.0; + rel1 { + to: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to: "title_bg"; + relative: 1.0 0.0; + } + } + } + swallow { "toolbar"; + scale: 1; + clip_to: "toolbar_clipper"; + desc { "default"; + min: 0 0; + max: -1 0; + fixed: 0 1; + align: 0.5 0.0; + rel1 { + to: "toolbar_top_padding"; + relative: 0.0 1.0; + } + rel2 { + to: "toolbar_top_padding"; + relative: 1.0 1.0; + } + visible: 0; + } + desc { "visible"; + inherit: "default"; + min: 0 TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC; + max: -1 TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC; + visible: 1; + } + } + rect { "toolbar_top_divider"; + scale: 1; + mouse_events: 0; + clip_to: "toolbar_clipper"; + desc { "default"; + min: 0 0; + max: -1 0; + fixed: 0 1; + align: 0.5 0.0; + rel1 { + to: "toolbar_clipper"; + relative: 0.0 0.0; + } + rel2 { + to: "toolbar_clipper"; + relative: 1.0 0.0; + } + color: 244 244 244 25; + visible: 0; + } + desc { "visible"; + inherit: "default"; + min: 0 TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC; + max: -1 TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC; + visible: 1; + } + } + rect { "toolbar_clipper"; + scale: 1; + mouse_events: 0; + clip_to: "clipper"; + desc { "default"; + min: 0 TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC; + max: -1 TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC; + fixed: 0 1; + align: 0.5 1.0; + rel1 { + to: "toolbar"; + relative: 0.0 1.0; + } + rel2 { + to: "toolbar"; + relative: 1.0 1.0; + } + } + } + rect { "title_clipper"; + mouse_events: 0; + clip_to: "clipper"; + desc { "default"; + rel1.to_y: "title_bg"; + rel2.to_y: "title_bg"; + } + desc { "hidden"; + inherit: "default"; + visible: 0; + } + } + spacer { "title_text_left_padding"; + scale: 1; + desc { "default"; + rel1.to: "title_bg"; + rel2.to: "title_left_btn_bg"; + } + desc { "title_badge_visible"; + rel1.to: "title_bg"; + rel2.to: "title_badge2_padding"; + } + desc { "prev_btn_visible"; + rel1.to: "title_bg"; + rel2 { + to_x: "elm.swallow.prev_btn"; + to_y: "title_bg"; + relative: 1.0 1.0; + } + } + } + spacer { "title_text_right_padding"; + scale: 1; + desc { "default"; + rel1.to: "title_right_btn_bg"; + rel2.to: "title_bg"; + } + desc { "title_badge_visible"; + rel1.to: "badge_icon_left_padding"; + rel2.to: "title_bg"; + } + desc { "prev_btn_visible"; + rel1.to: "prev_btn_title_right_padding"; + rel2.to: "title_bg"; + } + } + textblock { "elm.text.title"; + scale: 1; + mouse_events: 0; + clip_to: "title_text_clipper"; + desc { "default"; + text { + style: "tizen_view_title_style"; + size: TIZEN_VIEW_TITLE_TEXT_FONT_SIZE_INC; + size_range: TIZEN_VIEW_TITLE_TEXT_FONT_RANGE_INC; + fit: 1 0; + } + fixed: 1 1; + rel1 { + to_x: "title_text_left_padding"; + to_y: "title_bg"; + relative: 1.0 0.0; + } + rel2 { + to_x: "title_text_right_padding"; + to_y: "title_bg"; + relative: 0.0 1.0; + } + } + desc { "subtitle_visible"; + text { + style: "tizen_view_subtitle_visible_style"; + size: TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC; + size_range: TIZEN_VIEW_SUBTITLE_VISIBLE_TEXT_FONT_RANGE_INC; + fit: 1 0; + } + fixed: 1 1; + rel1 { + to_x: "title_text_left_padding"; + to_y: "title_top_padding"; + relative: 1.0 1.0; + } + rel2 { + to_x: "title_text_right_padding"; + to_y: "elm.text.subtitle"; + relative: 0.0 0.0; + } + } + } + rect { "title_text_clipper"; + mouse_events: 0; + clip_to: "title_clipper"; + desc { "default"; + rel1.to: "elm.text.title"; + rel2.to: "elm.text.title"; + } + } + spacer { "title_top_padding"; + scale: 1; + desc { "default"; + min: 0 TIZEN_VIEW_TITLE_TOP_PADDING_HEIGHT_INC; + max: -1 TIZEN_VIEW_TITLE_TOP_PADDING_HEIGHT_INC; + fixed: 0 1; + align: 0.5 0.0; + rel1 { + to: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to: "title_bg"; + relative: 1.0 0.0; + } + } + } + textblock { "elm.text.subtitle"; + scale: 1; + mouse_events: 0; + desc { "default"; + text { + style: "tizen_view_subtitle_style"; + } + min: 0 TIZEN_VIEW_SUBTITLE_HEIGHT_INC; + max: -1 TIZEN_VIEW_SUBTITLE_HEIGHT_INC; + fixed: 1 1; + align: 0.5 1.0; + rel1 { + to_x: "title_text_left_padding"; + to_y: "subtitle_bottom_padding"; + relative: 1.0 0.0; + } + rel2 { + to_x: "title_text_right_padding"; + to_y: "subtitle_bottom_padding"; + relative: 0.0 0.0; + } + } + } + spacer { "subtitle_bottom_padding"; + desc { "default"; + min: 0 TIZEN_VIEW_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC; + max: -1 TIZEN_VIEW_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC; + fixed: 0 1; + align: 0.5 1.0; + rel1 { + to: "title_bg"; + relative: 0.0 1.0; + } + rel2 { + to: "title_bg"; + relative: 1.0 1.0; + } + } + } + rect { "click_event_area"; + ignore_flags: ON_HOLD; + desc { "default"; + rel1.to: "title_bg"; + rel2.to: "title_bg"; + color: 0 0 0 0; + } + } + rect { "access.title"; + repeat_events: 1; + desc { "default"; + rel1.to: "title_bg"; + rel2.to: "title_bg"; + color: 0 0 0 0; + } + } + swallow { "elm.swallow.icon"; + scale: 1; + clip_to: "title_clipper"; + desc { "default"; + max: 0 0; + fixed: 1 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to: "title_left_padding"; + } + rel2 { + relative: 1.0 1.0; + to: "title_left_padding"; + } + visible: 0; + } + } + spacer { "badge_icon_left_padding"; + scale: 1; + desc { "default"; + min: 0 0; + max: 0 -1; + fixed: 1 0; + align: 1.0 0.5; + rel1 { + to_x: "badge_text_left_padding"; + to_y: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to_x: "badge_text_left_padding"; + to_y: "title_bg"; + relative: 0.0 1.0; + } + } + desc { "visible"; + inherit: "default"; + min: TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC -1; + } + } + image { "badge_icon"; + scale: 1; + mouse_events: 0; + clip_to: "title_clipper"; + desc { "default"; + min: 0 0; + max: 0 0; + fixed: 1 1; + rel1 { + to_x: "badge_text_left_padding"; + to_y: "title_badge"; + } + rel2 { + to_x: "badge_text_right_padding"; + to_y: "title_badge"; + } + color: 195 219 226 255; + image.normal: "images/core_icon_badge_container.#.png"; + visible: 0; + } + desc { "visible"; + rel1 { + to_x: "badge_text_left_padding"; + to_y: "title_badge"; + } + rel2 { + to_x: "badge_text_right_padding"; + to_y: "title_badge"; + } + color: 195 219 226 255; + image.normal: "images/core_icon_badge_container.#.png"; + visible: 1; + } + } + spacer { "badge_text_left_padding"; + scale: 1; + desc { "default"; + min: 0 0; + max: 0 -1; + fixed: 1 0; + align: 1.0 0.5; + rel1 { + to_x: "title_badge"; + to_y: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to_x: "title_badge"; + to_y: "title_bg"; + relative: 0.0 1.0; + } + } + desc { "visible"; + inherit: "default"; + min: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC -1; + } + } + spacer { "badge_text_right_padding"; + scale: 1; + desc { "default"; + min: 0 0; + max: 0 -1; + fixed: 1 0; + align: 1.0 0.5; + rel1 { + to_x: "title_right_padding"; + to_y: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to_x: "title_right_padding"; + to_y: "title_bg"; + relative: 0.0 1.0; + } + } + desc { "visible"; + inherit: "default"; + min: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC -1; + } + } + text { "title_badge"; + scale: 1; + mouse_events: 0; + clip_to: "title_clipper"; + desc { "default"; + text { + font: "Tizen:style=Regular"; + size: "32"; + text_class: "tizen"; + min: 1 0; + max: 1 0; + align: 1.0 0.5; + ellipsis: -1; + } + color: 7 7 7 255; + min: 0 TIZEN_VIEW_BADGE_HEIGHT_INC; + max: -1 TIZEN_VIEW_BADGE_HEIGHT_INC; + fixed: 1 1; + align: 1.0 0.5; + rel1 { + to_x: "badge_text_right_padding"; + to_y: "elm.text.title"; + relative: 0.0 0.0; + } + rel2 { + to_x: "badge_text_right_padding"; + to_y: "elm.text.title"; + relative: 0.0 1.0; + } + } + } + text { "title_badge2"; + scale: 1; + mouse_events: 0; + clip_to: "title_clipper"; + desc { "default"; + text { + font: "Tizen:style=Regular"; + size: "32"; + text_class: "tizen"; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + ellipsis: -1; + } + color: 7 7 7 255; + min: 0 TIZEN_VIEW_BADGE_HEIGHT_INC; + max: -1 TIZEN_VIEW_BADGE_HEIGHT_INC; + fixed: 1 1; + align: 0.0 0.5; + rel1 { + to_x: "title_left_padding"; + to_y: "elm.text.title"; + relative: 1.0 0.0; + } + rel2 { + to_x: "title_left_padding"; + to_y: "elm.text.title"; + relative: 1.0 1.0; + } + visible: 0; + } + } + spacer { "title_badge2_padding"; + scale: 1; + desc { "default"; + min: 0 0; + max: 0 -1; + fixed: 1 0; + align: 0.0 0.5; + rel1 { + to_x: "title_badge2"; + to_y: "title_bg"; + relative: 1.0 0.0; + } + rel2 { + to_x: "title_badge2"; + to_y: "title_bg"; + relative: 1.0 1.0; + } + } + desc { "visible"; + inherit: "default"; + min: TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC -1; + } + } + spacer { "title_left_padding"; + scale: 1; + desc { "default"; + min: TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC -1; + fixed: 1 0; + align: 0.0 0.0; + rel1 { + to: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to: "title_bg"; + relative: 0.0 1.0; + } + } + desc { "hidden"; + inherit: "default"; + min: 0 0; + max: 0 -1; + } + } + spacer { "title_left_btn_bg"; + scale: 1; + desc { "default"; + min: 0 0; + fixed: 1 0; + align: 0.0 0.5; + rel1 { + to: "title_left_padding"; + relative: 1.0 0.0; + } + rel2 { + to: "title_left_padding"; + relative: 1.0 1.0; + } + } + desc { "visible"; + inherit: "default"; + min: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; + max: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; + } + } + swallow { "title_left_btn"; + scale: 1; + clip_to: "title_clipper"; + desc { "default"; + fixed: 1 1; + rel1.to: "title_left_btn_bg"; + rel2.to: "title_left_btn_bg"; + visible: 0; + } + desc { "visible"; + inherit: "default"; + visible: 1; + } + } + spacer { "title_right_btn_bg"; + scale: 1; + desc { "default"; + min: 0 0; + fixed: 1 0; + align: 1.0 0.5; + rel1 { + to: "title_right_padding"; + relative: 0.0 0.0; + } + rel2 { + to: "title_right_padding"; + relative: 0.0 1.0; + } + } + desc { "visible"; + inherit: "default"; + min: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; + max: TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC; + } + } + spacer { "title_right_padding"; + scale: 1; + desc { "default"; + min: TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC -1; + fixed: 1 0; + align: 1.0 0.0; + rel1 { + to: "title_bg"; + relative: 1.0 0.0; + } + rel2 { + to: "title_bg"; + relative: 1.0 1.0; + } + } + desc { "hidden"; + inherit: "default"; + min: 0 0; + max: 0 -1; + } + } + swallow { "title_right_btn"; + scale: 1; + clip_to: "title_clipper"; + desc { "default"; + fixed: 1 1; + rel1.to: "title_right_btn_bg"; + rel2.to: "title_right_btn_bg"; + visible: 0; + } + desc { "visible"; + inherit: "default"; + visible: 1; + } + } + swallow { "elm.swallow.content"; + scale: 1; + repeat_events: 0; + clip_to: "content_clipper"; + desc { "default"; + align: 0.0 0.0; + rel1 { + to_x: "base"; + to_y: "title_bg"; + relative: 0.0 1.0; + } + rel2.to: "base"; + } + desc { "toolbar"; + align: 0.0 0.0; + rel1 { + to_x: "base"; + to_y: "toolbar"; + relative: 0.0 1.0; + } + rel2.to: "base"; + } + } + rect { "content_clipper"; + mouse_events: 0; + clip_to: "clipper"; + desc { "default"; + rel1.to_y: "elm.swallow.content"; + rel2.to_y: "elm.swallow.content"; + } + } + spacer { "prev_btn_left_padding"; + scale: 1; + desc { "default"; + min: TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC -1; + align: 0.0 0.0; + fixed: 1 1; + rel1 { + to: "title_bg"; + relative: 0.0 0.0; + } + rel2 { + to: "title_bg"; + relative: 0.0 1.0; + } + } + } + swallow { "elm.swallow.prev_btn"; + clip_to: "title_clipper"; + scale: 1; + desc { "default"; + min: BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC; + max: BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC; + align: 0.0 0.5; + fixed: 1 1; + rel1 { + to: "prev_btn_left_padding"; + relative: 1.0 0.0; + } + rel2 { + to: "prev_btn_left_padding"; + relative: 1.0 1.0; + } + visible: 1; + } + desc { "hidden"; + inherit: "default"; + visible: 0; + } + } + spacer { "prev_btn_title_right_padding"; + scale: 1; + desc { "default"; + min: TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 0; + max: TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC -1; + align: 1.0 0.0; + fixed: 1 1; + rel1 { + to: "title_bg"; + relative: 1.0 0.0; + } + rel2 { + to: "title_bg"; + relative: 1.0 1.0; + } + } + } + swallow { "toolbar_more_btn"; + clip_to: "title_clipper"; + desc { "default"; + min: 0 0; + max: 0 0; + align: 0.0 0.0; + fixed: 1 1; + rel1.to: "base"; + rel2.to: "base"; + visible: 0; + } + } + } + programs { + program { "visible"; + signal: "elm,state,visible"; + source: "viewmgr"; + action: STATE_SET "default" 0.0; + target: "clipper"; + } + program { "invisible"; + signal: "elm,state,invisible"; + source: "viewmgr"; + action: STATE_SET "hidden" 0.0; + target: "clipper"; + } + program { "title_show_title_default"; + action: STATE_SET "default" 0.0; + target: "title_bg"; + target: "title_clipper"; + transition: DECELERATE TRANSITION_TIME; + } + program { "title_show_anim"; + signal: "elm,state,title,show,anim"; + source: "viewmgr"; + script { + run_program(PROGRAM:"title_show_title_default"); + } + } + program { "title_show"; + signal: "elm,state,title,show"; + source: "viewmgr"; + script { + set_state(PART:"title_bg", "default", 0.0); + set_state(PART:"title_clipper", "default", 0.0); + if (get_int(title_left_btn_visible)) { + set_state(PART:"title_left_padding", "hidden", 0.0); + set_state(PART:"title_left_btn_bg", "visible", 0.0); + set_state(PART:"title_left_btn", "visible", 0.0); + set_state(PART:"title_right_btn_bg", "visible", 0.0); + set_state(PART:"title_right_padding", "hidden", 0.0); + } + else if (get_int(prev_btn_visible)) { + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); + set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); + } + if (get_int(title_right_btn_visible)) { + set_state(PART:"title_right_padding", "hidden", 0.0); + set_state(PART:"title_right_btn_bg", "visible", 0.0); + set_state(PART:"title_right_btn", "visible", 0.0); + set_state(PART:"title_left_btn_bg", "visible", 0.0); + set_state(PART:"title_left_padding", "hidden", 0.0); + if (get_int(prev_btn_visible)) { + set_state(PART:"title_text_left_padding", "default", 0.0); + set_state(PART:"title_text_right_padding", "default", 0.0); + } + } + if (get_int(toolbar_visible)) { + set_state(PART:"toolbar", "visible", 0.0); + set_state(PART:"toolbar_top_divider", "visible", 0.0); + set_state(PART:"elm.swallow.content", "toolbar", 0.0); + } + } + } + program { "title_hide_title_hidden"; + action: STATE_SET "hidden" 0.0; + target: "title_bg"; + target: "title_clipper"; + target: "elm.swallow.prev_btn"; + transition: DECELERATE TRANSITION_TIME; + } + program { "title_hide_anim"; + signal: "elm,state,title,hide,anim"; + source: "viewmgr"; + script { + run_program(PROGRAM:"title_hide_title_hidden"); + } + } + program { "title_hide"; + signal: "elm,state,title,hide"; + source: "viewmgr"; + script { + set_state(PART:"title_bg", "hidden", 0.0); + set_state(PART:"title_clipper", "hidden", 0.0); + set_state(PART:"title_left_padding", "default", 0.0); + set_state(PART:"title_left_btn_bg", "default", 0.0); + set_state(PART:"title_left_btn", "default", 0.0); + set_state(PART:"title_right_btn_bg", "default", 0.0); + set_state(PART:"title_right_padding", "default", 0.0); + set_state(PART:"title_right_btn", "default", 0.0); + set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0); + if (get_int(prev_btn_visible)){ + set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); + set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); + } + set_state(PART:"toolbar", "default", 0.0); + set_state(PART:"toolbar_top_divider", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); + } + } + program { "toolbar_show"; + signal: "elm,state,toolbar,show"; + source: "viewmgr"; + script { + set_state(PART:"toolbar", "visible", 0.0); + set_state(PART:"toolbar_top_divider", "visible", 0.0); + set_state(PART:"elm.swallow.content", "toolbar", 0.0); + set_int(toolbar_visible, 1); + } + } + program { "toolbar_hide"; + signal: "elm,state,toolbar,hide"; + source: "viewmgr"; + script { + set_state(PART:"toolbar", "default", 0.0); + set_state(PART:"toolbar_top_divider", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); + set_int(toolbar_visible, 0); + } + } + program { "subtitle_show"; + signal: "elm,state,subtitle,show"; + source: "viewmgr"; + script { + set_state(PART:"elm.text.title", "subtitle_visible", 0.0); + } + } + program { "subtitle_hide"; + signal: "elm,state,subtitle,hide"; + source: "viewmgr"; + script { + set_state(PART:"elm.text.title", "default", 0.0); + } + } + program { "prev_btn_show"; + signal: "elm,state,prev_btn,show"; + source: "viewmgr"; + script { + set_int(prev_btn_visible, 1); + if (get_int(title_left_btn_visible) == 0) { + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); + set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); + } + } + } + program { "prev_btn_hide"; + signal: "elm,state,prev_btn,hide"; + source: "viewmgr"; + script { + set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0); + set_state(PART:"title_text_left_padding", "default", 0.0); + set_state(PART:"title_text_right_padding", "default", 0.0); + set_int(prev_btn_visible, 0); + } + } + program { "title_left_btn_show"; + signal: "elm,state,title_left_btn,show"; + source: "viewmgr"; + script { + set_state(PART:"title_left_padding", "hidden", 0.0); + set_state(PART:"title_left_btn_bg", "visible", 0.0); + set_state(PART:"title_left_btn", "visible", 0.0); + set_state(PART:"title_right_btn_bg", "visible", 0.0); + set_state(PART:"title_right_padding", "hidden", 0.0); + set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0); + set_state(PART:"title_text_left_padding", "default", 0.0); + set_state(PART:"title_text_right_padding", "default", 0.0); + set_int(title_left_btn_visible, 1); + } + } + program { "title_left_btn_hide"; + signal: "elm,state,title_left_btn,hide"; + source: "viewmgr"; + script { + set_state(PART:"title_left_padding", "default", 0.0); + set_state(PART:"title_left_btn_bg", "default", 0.0); + set_state(PART:"title_left_btn", "default", 0.0); + set_state(PART:"title_right_padding", "default", 0.0); + set_state(PART:"title_right_btn_bg", "default", 0.0); + set_int(title_left_btn_visible, 0); + if (get_int(prev_btn_visible) == 1) { + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); + set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); + } + } + } + program { "title_right_btn_show"; + signal: "elm,state,title_right_btn,show"; + source: "viewmgr"; + script { + set_state(PART:"title_right_padding", "hidden", 0.0); + set_state(PART:"title_right_btn_bg", "visible", 0.0); + set_state(PART:"title_right_btn", "visible", 0.0); + set_state(PART:"title_left_btn_bg", "visible", 0.0); + set_state(PART:"title_left_padding", "hidden", 0.0); + if (get_int(prev_btn_visible) == 1){ + set_state(PART:"title_text_left_padding", "default", 0.0); + set_state(PART:"title_text_right_padding", "default", 0.0); + } + set_int(title_right_btn_visible, 1); + } + } + program { "title_right_btn_hide"; + signal: "elm,state,title_right_btn,hide"; + source: "viewmgr"; + script { + set_state(PART:"title_right_padding", "default", 0.0); + set_state(PART:"title_right_btn_bg", "default", 0.0); + set_state(PART:"title_right_btn", "default", 0.0); + set_state(PART:"title_left_padding", "default", 0.0); + set_state(PART:"title_left_btn_bg", "default", 0.0); + set_int(title_right_btn_visible, 0); + if (get_int(prev_btn_visible) == 1){ + set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0); + set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0); + } + } + } + program { "title_badge_show"; + signal: "elm,state,title_badge,show"; + source: "viewmgr"; + script { + new buf[128]; + set_state(PART:"badge_text_left_padding", "visible", 0.0); + set_state(PART:"badge_text_right_padding", "visible", 0.0); + set_state(PART:"badge_icon", "visible", 0.0); + set_state(PART:"badge_icon_left_padding", "visible", 0.0); + get_text(PART:"title_badge", buf, 128); + set_text(PART:"title_badge2", buf); + set_state(PART:"title_badge2_padding", "visible", 0.0); + set_state(PART:"title_text_left_padding", "title_badge_visible", 0.0); + set_state(PART:"title_text_right_padding", "title_badge_visible", 0.0); + } + } + program { "title_badge_hide"; + signal: "elm,state,title_badge,hide"; + source: "viewmgr"; + script { + set_state(PART:"badge_text_left_padding", "default", 0.0); + set_state(PART:"badge_text_right_padding", "default", 0.0); + set_state(PART:"badge_icon", "default", 0.0); + set_state(PART:"badge_icon_left_padding", "default", 0.0); + set_text(PART:"title_badge2", ""); + set_state(PART:"title_badge2_padding", "default", 0.0); + set_state(PART:"title_text_left_padding", "default", 0.0); + set_state(PART:"title_text_right_padding", "default", 0.0); + } + } + program { "title_clicked"; + signal: "mouse,clicked,1"; + source: "click_event_area"; + script { + emit("elm,action,title,clicked", ""); + } + } + program { "change_to_landscape"; + script { + if (!get_int(landscape_mode)) { + set_int(landscape_mode, 1); + } + set_state(PART:"bg_img", "landscape", 0.0); + } + } + program { "change_to_portrait"; + script { + if (get_int(landscape_mode)) { + set_int(landscape_mode, 0); + } + set_state(PART:"bg_img", "default", 0.0); + } + } + program { "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + after: "change_to_landscape"; + } + program { "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + after: "change_to_landscape"; + } + program { "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + after: "change_to_portrait"; + } + program { "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + after: "change_to_portrait"; + } + } + } + + group { "tizen_view/tabbar/default"; + images { + image: "images/core_theme_bg_01.png" COMP; + image: "images/core_icon_badge_container.#.png" COMP; + } + script { + public landscape_mode = 0; + public tabbar_visible = 0; + } + parts{ + spacer { "base"; + desc { "default"; + } + } + image { "bg_img"; + scale: 1; + mouse_events: 0; + clip_to: "clipper"; + desc { "default"; + rel1.to: "base"; + rel2.to: "base"; + align: 0.5 0.0; + fixed: 0 1; + min: 0 TIZEN_VIEW_BG_PORTRAIT_HEIGHT_INC; + image.normal: "images/core_theme_bg_01.png"; + } + desc { "landscape"; + inherit: "default"; + min: 0 TIZEN_VIEW_BG_LANDSPACPE_HEIGHT_INC; + } + } + part { name: "clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; + visible: 0; + } + } + swallow { "tabbar"; + scale: 1; + clip_to: "tabbar_clipper"; + description { state: "default" 0.0; + min: 0 0; + max: -1 0; + fixed: 0 1; + align: 0.5 0.0; + rel1 { to: "base"; relative: 0.0 0.0; } + rel2 { to: "base"; relative: 1.0 0.0; } + visible: 0; + } + description { state: "text_visible" 0.0; + inherit: "default" 0.0; + min: 0 TIZEN_VIEW_TAB1_HEIGHT_INC; + max: -1 TIZEN_VIEW_TAB1_HEIGHT_INC; + visible: 1; + } + description { state: "icon_visible" 0.0; + inherit: "default" 0.0; + min: 0 TIZEN_VIEW_TAB2_HEIGHT_INC; + max: -1 TIZEN_VIEW_TAB2_HEIGHT_INC; + visible: 1; + } + } + rect { "tabbar_clipper"; + mouse_events: 0; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to_y: "tabbar"; + rel2.to_y: "tabbar"; + } + } + + swallow { "elm.swallow.content"; + scale: 1; + repeat_events: 0; + clip_to: "content_clipper"; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1 { to_x: "base"; to_y: "tabbar"; relative: 0.0 1.0; } + rel2 { to: "base"; relative: 1.0 1.0; } + } + } + rect { name: "content_clipper"; + mouse_events: 0; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to_y: "elm.swallow.content"; + rel2.to_y: "elm.swallow.content"; + } + } + } + programs { + program { name: "title_show"; + signal: "elm,state,title,show"; + source: "viewmgr"; + script { + if (get_int(tabbar_visible)) { + set_state(PART:"tabbar", "text_visible", 0.0); + } + } + } + program { name: "title_hide"; + signal: "elm,state,title,hide"; + source: "viewmgr"; + script { + set_state(PART:"tabbar", "default", 0.0); + } + } + program { name: "tabbar_show"; + signal: "elm,state,tabbar,show"; + source: "viewmgr"; + script { + set_state(PART:"tabbar", "text_visible", 0.0); + set_int(tabbar_visible, 1); + } + } + program { name: "tabbar_icon_show"; + signal: "elm,state,tabbar,icon,show"; + source: "viewmgr"; + script { + set_state(PART:"tabbar", "icon_visible", 0.0); + set_int(tabbar_visible, 1); + } + } + program { name: "tabbar_hide"; + signal: "elm,state,tabbar,hide"; + source: "viewmgr"; + script { + set_state(PART:"tabbar", "default", 0.0); + set_int(tabbar_visible, 0); + } + } + program { "change_to_landscape"; + script { + if (!get_int(landscape_mode)) { + set_int(landscape_mode, 1); + } + set_state(PART:"bg_img", "landscape", 0.0); + } + } + program { "change_to_portrait"; + script { + if (get_int(landscape_mode)) { + set_int(landscape_mode, 0); + } + set_state(PART:"bg_img", "default", 0.0); + } + } + program { "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + after: "change_to_landscape"; + } + program { "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + after: "change_to_landscape"; + } + program { "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + after: "change_to_portrait"; + } + program { "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + after: "change_to_portrait"; + } + } + } + + /* Sliding Effect */ + group { "transition/default"; + alias: "transition/slide"; + parts { + swallow { "pcontent"; + desc { "default"; + } + desc {"pushed"; + rel1.relative: -1.0 0.0; + rel2.relative: 0.0 1.0; + } + desc {"popped"; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + } + } + swallow { "content"; + desc { "default"; + } + desc { "push_ready"; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + } + desc { "pop_ready"; + rel1.relative: -1.0 0.0; + rel2.relative: 0.0 1.0; + } + } + } + programs { + program { "push_finished"; + action: SIGNAL_EMIT "push,finished" "viewmgr"; + } + program { "push_pcontent"; + action: STATE_SET "pushed"; + target: "pcontent"; + transition: DECELERATE TRANSITION_TIME; + after: "push_finished"; + } + program { "push_content"; + action: STATE_SET "default"; + target: "content"; + transition: DECELERATE TRANSITION_TIME; + } + program { "push"; + signal: "view,push"; + source: "viewmgr"; + script { + set_state(PART:"pcontent", "default", 0.0); + set_state(PART:"content", "push_ready", 0.0); + run_program(PROGRAM:"push_pcontent"); + run_program(PROGRAM:"push_content"); + } + } + program { "pop_finished"; + action: SIGNAL_EMIT "pop,finished" "viewmgr"; + } + program { "pop_pcontent"; + action: STATE_SET "popped"; + target: "pcontent"; + transition: DECELERATE TRANSITION_TIME; + after: "pop_finished"; + } + program { "pop_content"; + action: STATE_SET "default"; + target: "content"; + transition: DECELERATE TRANSITION_TIME; + } + program { "pop"; + signal: "view,pop"; + source: "viewmgr"; + script { + set_state(PART:"pcontent", "default", 0.0); + set_state(PART:"content", "pop_ready", 0.0); + run_program(PROGRAM:"pop_pcontent"); + run_program(PROGRAM:"pop_content"); + } + } + } + } + /* Fade Effect */ + group { "transition/fade"; + parts { + rect { "pclipper"; + desc { "default"; + color: 0 0 0 255; + } + desc { "invisible"; + inherit: "default"; + } + desc { "visible"; + color: 255 255 255 255; + } + } + rect { "clipper"; + desc { "default"; + color: 255 255 255 255; + } + desc { "invisible"; + color: 0 0 0 255; + } + desc { "visible"; + color: 255 255 255 255; + } + } + swallow { "pcontent"; + clip_to: "pclipper"; + desc { "default"; + } + } + swallow { "content"; + clip_to: "clipper"; + desc { "default"; + } + } + } + programs { + program { "push_finished"; + action: SIGNAL_EMIT "push,finished" "viewmgr"; + } + program { "push_content"; + action: STATE_SET "default" 0.0; + target: "clipper"; + target: "pclipper"; + transition: DECELERATE (TRANSITION_TIME * 5); + after: "push_finished"; + } + program { "push"; + signal: "view,push"; + source: "viewmgr"; + script { + set_state(PART:"pclipper", "visible", 0.0); + set_state(PART:"clipper", "invisible", 0.0); + run_program(PROGRAM:"push_content"); + } + } + program { "pop_finished" + action: SIGNAL_EMIT "pop,finished" "viewmgr"; + } + program { "pop_content"; + action: STATE_SET "default" 0.0; + target: "pclipper"; + target: "clipper"; + transition: DECELERATE (TRANSITION_TIME * 5); + after: "pop_finished"; + } + program { "pop"; + signal: "view,pop"; + source: "viewmgr"; + script { + set_state(PART:"pclipper", "visible", 0.0); + set_state(PART:"clipper", "invisible", 0.0); + run_program(PROGRAM:"pop_content"); + } + } + } + } +} diff --git a/res/images/bg.png b/res/images/bg.png new file mode 100644 index 0000000..da4b6b4 Binary files /dev/null and b/res/images/bg.png differ diff --git a/res/images/icon_alarm.png b/res/images/icon_alarm.png new file mode 100644 index 0000000..688b0cf Binary files /dev/null and b/res/images/icon_alarm.png differ diff --git a/res/images/icon_timer.png b/res/images/icon_timer.png new file mode 100644 index 0000000..fe2845d Binary files /dev/null and b/res/images/icon_timer.png differ diff --git a/res/images/icon_worldclock.png b/res/images/icon_worldclock.png new file mode 100644 index 0000000..b403ef5 Binary files /dev/null and b/res/images/icon_worldclock.png differ diff --git a/res/images/tizen.png b/res/images/tizen.png new file mode 100644 index 0000000..408188a Binary files /dev/null and b/res/images/tizen.png differ diff --git a/src/examples/efl/c/contents.cpp b/src/examples/efl/c/contents.cpp index 24cf684..0342c19 100644 --- a/src/examples/efl/c/contents.cpp +++ b/src/examples/efl/c/contents.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + #include "main.h" Eo* @@ -31,7 +48,14 @@ create_landscape_content(Eo *parent, const char *text, Evas_Smart_Cb prev_btn_cl /* Image */ image = elm_image_add(grid); - snprintf(buf, sizeof(buf), "%s/data/images/tizen.png", BINDIR); + + char *res_path = app_get_resource_path(); + if (res_path) + { + snprintf(buf, sizeof(buf), "%s%s", res_path, "images/tizen.png"); + free(res_path); + } + elm_image_file_set(image, buf, NULL); evas_object_show(image); elm_grid_pack(grid, image, 50, 0, 50, 85); @@ -234,7 +258,14 @@ create_scrolling_content(Eo *parent) /* Image */ image = elm_image_add(parent); - snprintf(buf, sizeof(buf), "%s/data/images/bg.png", BINDIR); + + char *res_path = app_get_resource_path(); + if (res_path) + { + snprintf(buf, sizeof(buf), "%s%s", res_path, "images/bg.png"); + free(res_path); + } + elm_image_file_set(image, buf, NULL); elm_image_resizable_set(image, EINA_FALSE, EINA_FALSE); evas_object_show(image); @@ -249,13 +280,8 @@ create_toolbar(Eo *parent, const char *style) toolbar = elm_toolbar_add(parent); - //FIXME: :( UI_View can set this style instead. elm_object_style_set(toolbar, style); - //FIXME: If not call below API, toolbar items create with min size. - // It looks toolbar bug. - elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_toolbar_item_append(toolbar, NULL, "Tab1", NULL, NULL); elm_toolbar_item_append(toolbar, NULL, "Tab2", NULL, NULL); elm_toolbar_item_append(toolbar, NULL, "Tab3", NULL, NULL); diff --git a/src/examples/efl/c/main.cpp b/src/examples/efl/c/main.cpp index 82ee7c4..f829b87 100644 --- a/src/examples/efl/c/main.cpp +++ b/src/examples/efl/c/main.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + #include "main.h" static bool diff --git a/src/examples/efl/c/page1.cpp b/src/examples/efl/c/page1.cpp index e110030..a5ffb21 100644 --- a/src/examples/efl/c/page1.cpp +++ b/src/examples/efl/c/page1.cpp @@ -20,11 +20,10 @@ static void prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) { - //FIXME: deactivate??? or ui_app deactivate??? or ui_viewmgr pop??? - int ret = ui_viewmgr_pop_view(); + int ret = ui_viewmgr_deactivate(); if (ret != UI_VIEWMGR_ERROR_NONE) { - dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_pop_view() is failed. err = %d", ret); + dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_deactivate() is failed. err = %d", ret); } } diff --git a/src/examples/efl/cpp/contents.cpp b/src/examples/efl/cpp/contents.cpp index c25fe55..9fa3ee8 100644 --- a/src/examples/efl/cpp/contents.cpp +++ b/src/examples/efl/cpp/contents.cpp @@ -23,13 +23,8 @@ createToolbar(Eo *parent, const char *style) toolbar = elm_toolbar_add(parent); - //FIXME: :( UiView can set this style instead. elm_object_style_set(toolbar, style); - //FIXME: If not call below API, toolbar items create with min size. - // It looks toolbar bug. - elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_toolbar_item_append(toolbar, nullptr, "Tab1", nullptr, nullptr); elm_toolbar_item_append(toolbar, nullptr, "Tab2", nullptr, nullptr); elm_toolbar_item_append(toolbar, nullptr, "Tab3", nullptr, nullptr); @@ -46,7 +41,14 @@ createScrollingContent(Eo *parent) /* Image */ image = elm_image_add(parent); - snprintf(buf, sizeof(buf), "%s/data/images/bg.png", BINDIR); + + char *res_path = app_get_resource_path(); + if (res_path) + { + snprintf(buf, sizeof(buf), "%s%s", res_path, "images/bg.png"); + free(res_path); + } + elm_image_file_set(image, buf, nullptr); elm_image_resizable_set(image, EINA_FALSE, EINA_FALSE); evas_object_show(image); @@ -85,7 +87,14 @@ createLandscapeContent(Eo *parent, const char *text, Evas_Smart_Cb _prevBtnClick /* Image */ image = elm_image_add(grid); - snprintf(buf, sizeof(buf), "%s/data/images/tizen.png", BINDIR); + + char *res_path = app_get_resource_path(); + if (res_path) + { + snprintf(buf, sizeof(buf), "%s%s", res_path, "images/tizen.png"); + free(res_path); + } + elm_image_file_set(image, buf, nullptr); evas_object_show(image); elm_grid_pack(grid, image, 50, 0, 50, 85); diff --git a/src/examples/efl/cpp/page1.h b/src/examples/efl/cpp/page1.h index 3e225fc..a15d562 100644 --- a/src/examples/efl/cpp/page1.h +++ b/src/examples/efl/cpp/page1.h @@ -31,7 +31,7 @@ protected: //Prev Button Callback [](void *data, Eo *obj, void *event_info) { - UI_VIEWMGR->popView(); + UI_VIEWMGR->deactivate(); }, //Next Button Callback [](void *data, Eo *obj, void *event_info)