Peter M. Groen / dali-demo

Commit caccf5e5bf341494463d9c5aef8b6da01f65ca7f

Authored by Tom Robinson
2 parents 0d87f90a 3daf6de3

[dali_1.2.0] Merge branch 'devel/master' 

Change-Id: I728e2622825a3df86d0470b388b21a1d4c05310b
Inline Side-by-side
Showing 34 changed files with 1491 additions and 911 deletions
build/tizen/.gitignore
  View file @caccf5e
@@ -10,3 +10,4 @@ install_manifest.txt @@ -10,3 +10,4 @@ install_manifest.txt
10 /docs/dali.doxy 10 /docs/dali.doxy
11 /builder/dali-builder 11 /builder/dali-builder
12 /examples/*.demo 12 /examples/*.demo
  13 +/mo
build/tizen/CMakeLists.txt
  View file @caccf5e
@@ -101,11 +101,45 @@ ENDFOREACH(flag) @@ -101,11 +101,45 @@ ENDFOREACH(flag)
101 101
102 SET(DALI_DEMO_CFLAGS "-DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -fvisibility=hidden -DHIDE_DALI_INTERNALS -DDEMO_LANG=${DEMO_LANG}") 102 SET(DALI_DEMO_CFLAGS "-DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -fvisibility=hidden -DHIDE_DALI_INTERNALS -DDEMO_LANG=${DEMO_LANG}")
103 103
  104 +###########################################################################
  105 +# Internationalization
  106 +
  107 +SET(PO_DIR ${RESOURCE_DIR}/po)
  108 +
  109 +FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")
  110 +
  111 +SET(MSGFMT "/usr/bin/msgfmt")
  112 +SET(MO_FILES_DIR ${CMAKE_BINARY_DIR}/mo)
  113 +FILE(MAKE_DIRECTORY ${MO_FILES_DIR})
  114 +
  115 +FOREACH(PO_FILE ${PO_FILES})
  116 + SET(PO_FILE ${PO_DIR}/${PO_FILE})
  117 + MESSAGE("PO: ${PO_FILE}")
  118 + GET_FILENAME_COMPONENT(ABS_PO_FILE ${PO_FILE} ABSOLUTE)
  119 + GET_FILENAME_COMPONENT(lang ${ABS_PO_FILE} NAME_WE)
  120 + SET(MO_FILE ${MO_FILES_DIR}/${lang}.mo)
  121 + ADD_CUSTOM_COMMAND(OUTPUT ${MO_FILE}
  122 + COMMAND ${MSGFMT} -o ${MO_FILE} ${ABS_PO_FILE}
  123 + DEPENDS ${ABS_PO_FILE})
  124 + INSTALL(FILES ${MO_FILE} DESTINATION ${LOCALE_DIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
  125 + SET(MO_FILES ${MO_FILES} ${MO_FILE})
  126 +ENDFOREACH(PO_FILE)
  127 +
  128 +MESSAGE(".mo files: ${MO_FILES}")
  129 +ADD_CUSTOM_TARGET(po ALL DEPENDS ${MO_FILES})
  130 +
  131 +OPTION(INTERNATIONALIZATION "Internationalization demo string names" ON)
  132 +IF (INTERNATIONALIZATION)
  133 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DINTERNATIONALIZATION_ENABLED")
  134 +ENDIF(INTERNATIONALIZATION)
  135 +
  136 +###########################################################################
  137 +
104 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE") 138 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE")
105 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") 139 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
106 140
107 INCLUDE_DIRECTORIES(${ROOT_SRC_DIR}) 141 INCLUDE_DIRECTORIES(${ROOT_SRC_DIR})
108 -INCLUDE_DIRECTORIES(${DEMO_SRC_DIR}) 142 +#INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})
109 143
110 ADD_SUBDIRECTORY(demo) 144 ADD_SUBDIRECTORY(demo)
111 ADD_SUBDIRECTORY(examples) 145 ADD_SUBDIRECTORY(examples)
build/tizen/demo/CMakeLists.txt
  View file @caccf5e
@@ -7,26 +7,3 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie) @@ -7,26 +7,3 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie)
7 7
8 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) 8 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
9 9
10 -# Internationalization  
11 -  
12 -SET(PO_DIR ${DEMO_SRC_DIR}/po)  
13 -  
14 -FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")  
15 -  
16 -SET(MSGFMT "/usr/bin/msgfmt")  
17 -  
18 -FOREACH(PO_FILE ${PO_FILES})  
19 - SET(PO_FILE ${PO_DIR}/${PO_FILE})  
20 - MESSAGE("PO: ${PO_FILE}")  
21 - GET_FILENAME_COMPONENT(ABS_PO_FILE ${PO_FILE} ABSOLUTE)  
22 - GET_FILENAME_COMPONENT(lang ${ABS_PO_FILE} NAME_WE)  
23 - SET(MO_FILE ${PO_DIR}/${lang}.mo)  
24 - ADD_CUSTOM_COMMAND(OUTPUT ${MO_FILE}  
25 - COMMAND ${MSGFMT} -o ${MO_FILE} ${ABS_PO_FILE}  
26 - DEPENDS ${ABS_PO_FILE})  
27 - INSTALL(FILES ${MO_FILE} DESTINATION ${LOCALE_DIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)  
28 - SET(MO_FILES ${MO_FILES} ${MO_FILE})  
29 -ENDFOREACH(PO_FILE)  
30 -  
31 -MESSAGE(".mo files: ${MO_FILES}")  
32 -ADD_CUSTOM_TARGET(po ALL DEPENDS ${MO_FILES})  
demo/file.list deleted
View file @0d87f90
1 -# Add files to build with demo here  
2 -  
3 -common_src_files = \  
4 - $(demo_src_dir)/dali-table-view.cpp  
5 -  
6 -demo_src_files = \  
7 - $(common_src_files) \  
8 - $(demo_src_dir)/dali-demo.cpp  
9 -  
10 -# Add files to install here  
11 -  
12 -demo_image_files = \  
13 - $(demo_src_dir)/images/*.png \  
14 - $(demo_src_dir)/images/*.jpg \  
15 - $(demo_src_dir)/images/*.gif \  
16 - $(demo_src_dir)/images/*.bmp \  
17 - $(demo_src_dir)/images/*.ico \  
18 - $(demo_src_dir)/images/*.wbmp \  
19 - $(demo_src_dir)/images/*.svg  
20 -  
21 -demo_model_files = \  
22 - $(demo_src_dir)/models/*  
23 -  
24 -demo_script_files = \  
25 - $(demo_src_dir)/scripts/*  
demo/po/en.po deleted
View file @0d87f90
1 -msgid "DALI_DEMO_STR_TITLE_BUBBLES"  
2 -msgstr "Bubbles"  
3 -  
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "Blocks"  
6 -  
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "Cluster"  
9 -  
10 -msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"  
11 -msgstr "Cube Transition"  
12 -  
13 -msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"  
14 -msgstr "Dissolve Transition"  
15 -  
16 -msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"  
17 -msgstr "Item View"  
18 -  
19 -msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"  
20 -msgstr "Magnifier"  
21 -  
22 -msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"  
23 -msgstr "Motion Blur"  
24 -  
25 -msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"  
26 -msgstr "Motion Stretch"  
27 -  
28 -msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"  
29 -msgstr "Page Turn View"  
30 -  
31 -msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"  
32 -msgstr "Radial Menu"  
33 -  
34 -msgid "DALI_DEMO_STR_TITLE_REFRACTION"  
35 -msgstr "Refraction"  
36 -  
37 -msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"  
38 -msgstr "Scroll View"  
39 -  
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "Lights and shadows"  
42 -  
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "Script Based UI"  
45 -  
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "Image Scaling Modes"  
48 -  
49 -msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"  
50 -msgstr "Text Label"  
demo/po/en_GB.po deleted
View file @0d87f90
1 -msgid "DALI_DEMO_STR_TITLE_BUBBLES"  
2 -msgstr "Bubbles"  
3 -  
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "Blocks"  
6 -  
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "Cluster"  
9 -  
10 -msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"  
11 -msgstr "Cube Transition"  
12 -  
13 -msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"  
14 -msgstr "Dissolve Transition"  
15 -  
16 -msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"  
17 -msgstr "Item View"  
18 -  
19 -msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"  
20 -msgstr "Magnifier"  
21 -  
22 -msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"  
23 -msgstr "Motion Blur"  
24 -  
25 -msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"  
26 -msgstr "Motion Stretch"  
27 -  
28 -msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"  
29 -msgstr "Page Turn View"  
30 -  
31 -msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"  
32 -msgstr "Radial Menu"  
33 -  
34 -msgid "DALI_DEMO_STR_TITLE_REFRACTION"  
35 -msgstr "Refraction"  
36 -  
37 -msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"  
38 -msgstr "Scroll View"  
39 -  
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "Lights and shadows"  
42 -  
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "Script Based UI"  
45 -  
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "Image Scaling Modes"  
48 -  
49 -msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"  
50 -msgstr "Text Label"  
demo/po/en_US.po deleted
View file @0d87f90
1 -msgid "DALI_DEMO_STR_TITLE_BUBBLES"  
2 -msgstr "Bubbles"  
3 -  
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "Blocks"  
6 -  
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "Cluster"  
9 -  
10 -msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"  
11 -msgstr "Cube Transition"  
12 -  
13 -msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"  
14 -msgstr "Dissolve Transition"  
15 -  
16 -msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"  
17 -msgstr "Item View"  
18 -  
19 -msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"  
20 -msgstr "Magnifier"  
21 -  
22 -msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"  
23 -msgstr "Motion Blur"  
24 -  
25 -msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"  
26 -msgstr "Motion Stretch"  
27 -  
28 -msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"  
29 -msgstr "Page Turn View"  
30 -  
31 -msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"  
32 -msgstr "Radial Menu"  
33 -  
34 -msgid "DALI_DEMO_STR_TITLE_REFRACTION"  
35 -msgstr "Refraction"  
36 -  
37 -msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"  
38 -msgstr "Scroll View"  
39 -  
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "Lights and shadows"  
42 -  
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "Script Based UI"  
45 -  
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "Image Scaling Modes"  
48 -  
49 -msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"  
50 -msgstr "Text Label"  
demo/po/zn_CH.po deleted
View file @0d87f90
1 -msgid "DALI_DEMO_STR_TITLE_BUBBLES"  
2 -msgstr "气泡"  
3 -  
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "块体"  
6 -  
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "叢集"  
9 -  
10 -msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"  
11 -msgstr "方块 切换效果"  
12 -  
13 -msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"  
14 -msgstr "冰消瓦解 切换效果"  
15 -  
16 -msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"  
17 -msgstr "項目 檢視"  
18 -  
19 -msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"  
20 -msgstr "放大鏡"  
21 -  
22 -msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"  
23 -msgstr "动作 模糊"  
24 -  
25 -msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"  
26 -msgstr "动作 拉伸"  
27 -  
28 -msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"  
29 -msgstr "页面"  
30 -  
31 -msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"  
32 -msgstr "射线图"  
33 -  
34 -msgid "DALI_DEMO_STR_TITLE_REFRACTION"  
35 -msgstr "折光"  
36 -  
37 -msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"  
38 -msgstr "捲動"  
39 -  
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "阴影"  
42 -  
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "指令檔"  
45 -  
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "图像 制定級數"  
48 -  
49 -msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"  
50 -msgstr "标签"  
examples/blocks/blocks-example.cpp
  View file @caccf5e
@@ -228,6 +228,9 @@ public: @@ -228,6 +228,9 @@ public:
228 { 228 {
229 Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent); 229 Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
230 230
  231 + // Hide the indicator bar
  232 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  233 +
231 // Creates a default view with a default tool bar. 234 // Creates a default view with a default tool bar.
232 // The view is added to the stage. 235 // The view is added to the stage.
233 Toolkit::ToolBar toolBar; 236 Toolkit::ToolBar toolBar;
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @caccf5e
1 /* 1 /*
2 - * Copyright (c) 2014 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@ @@ -15,8 +15,9 @@
15 * 15 *
16 */ 16 */
17 17
  18 +// EXTERNAL INCLUDES
18 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
19 - 20 +#include <sstream>
20 #include <iostream> 21 #include <iostream>
21 22
22 using namespace Dali; 23 using namespace Dali;
@@ -24,319 +25,54 @@ using Dali::Toolkit::TextLabel; @@ -24,319 +25,54 @@ using Dali::Toolkit::TextLabel;
24 25
25 namespace 26 namespace
26 { 27 {
27 -const char* IMAGE_PATH[] = {  
28 - DEMO_IMAGE_DIR "application-icon-0.png",  
29 - DEMO_IMAGE_DIR "application-icon-100.png",  
30 - DEMO_IMAGE_DIR "application-icon-101.png",  
31 - DEMO_IMAGE_DIR "application-icon-102.png",  
32 - DEMO_IMAGE_DIR "application-icon-103.png",  
33 - DEMO_IMAGE_DIR "application-icon-104.png",  
34 - DEMO_IMAGE_DIR "application-icon-105.png",  
35 - DEMO_IMAGE_DIR "application-icon-106.png",  
36 - DEMO_IMAGE_DIR "application-icon-107.png",  
37 - DEMO_IMAGE_DIR "application-icon-108.png",  
38 - DEMO_IMAGE_DIR "application-icon-109.png",  
39 - DEMO_IMAGE_DIR "application-icon-10.png",  
40 - DEMO_IMAGE_DIR "application-icon-110.png",  
41 - DEMO_IMAGE_DIR "application-icon-111.png",  
42 - DEMO_IMAGE_DIR "application-icon-112.png",  
43 - DEMO_IMAGE_DIR "application-icon-113.png",  
44 - DEMO_IMAGE_DIR "application-icon-114.png",  
45 - DEMO_IMAGE_DIR "application-icon-115.png",  
46 - DEMO_IMAGE_DIR "application-icon-116.png",  
47 - DEMO_IMAGE_DIR "application-icon-117.png",  
48 - DEMO_IMAGE_DIR "application-icon-118.png",  
49 - DEMO_IMAGE_DIR "application-icon-119.png",  
50 - DEMO_IMAGE_DIR "application-icon-11.png",  
51 - DEMO_IMAGE_DIR "application-icon-120.png",  
52 - DEMO_IMAGE_DIR "application-icon-121.png",  
53 - DEMO_IMAGE_DIR "application-icon-122.png",  
54 - DEMO_IMAGE_DIR "application-icon-123.png",  
55 - DEMO_IMAGE_DIR "application-icon-124.png",  
56 - DEMO_IMAGE_DIR "application-icon-125.png",  
57 - DEMO_IMAGE_DIR "application-icon-126.png",  
58 - DEMO_IMAGE_DIR "application-icon-127.png",  
59 - DEMO_IMAGE_DIR "application-icon-128.png",  
60 - DEMO_IMAGE_DIR "application-icon-129.png",  
61 - DEMO_IMAGE_DIR "application-icon-12.png",  
62 - DEMO_IMAGE_DIR "application-icon-130.png",  
63 - DEMO_IMAGE_DIR "application-icon-131.png",  
64 - DEMO_IMAGE_DIR "application-icon-132.png",  
65 - DEMO_IMAGE_DIR "application-icon-133.png",  
66 - DEMO_IMAGE_DIR "application-icon-134.png",  
67 - DEMO_IMAGE_DIR "application-icon-135.png",  
68 - DEMO_IMAGE_DIR "application-icon-136.png",  
69 - DEMO_IMAGE_DIR "application-icon-137.png",  
70 - DEMO_IMAGE_DIR "application-icon-138.png",  
71 - DEMO_IMAGE_DIR "application-icon-139.png",  
72 - DEMO_IMAGE_DIR "application-icon-13.png",  
73 - DEMO_IMAGE_DIR "application-icon-140.png",  
74 - DEMO_IMAGE_DIR "application-icon-141.png",  
75 - DEMO_IMAGE_DIR "application-icon-142.png",  
76 - DEMO_IMAGE_DIR "application-icon-143.png",  
77 - DEMO_IMAGE_DIR "application-icon-144.png",  
78 - DEMO_IMAGE_DIR "application-icon-145.png",  
79 - DEMO_IMAGE_DIR "application-icon-146.png",  
80 - DEMO_IMAGE_DIR "application-icon-147.png",  
81 - DEMO_IMAGE_DIR "application-icon-14.png",  
82 - DEMO_IMAGE_DIR "application-icon-15.png",  
83 - DEMO_IMAGE_DIR "application-icon-16.png",  
84 - DEMO_IMAGE_DIR "application-icon-17.png",  
85 - DEMO_IMAGE_DIR "application-icon-18.png",  
86 - DEMO_IMAGE_DIR "application-icon-19.png",  
87 - DEMO_IMAGE_DIR "application-icon-1.png",  
88 - DEMO_IMAGE_DIR "application-icon-20.png",  
89 - DEMO_IMAGE_DIR "application-icon-21.png",  
90 - DEMO_IMAGE_DIR "application-icon-22.png",  
91 - DEMO_IMAGE_DIR "application-icon-23.png",  
92 - DEMO_IMAGE_DIR "application-icon-24.png",  
93 - DEMO_IMAGE_DIR "application-icon-25.png",  
94 - DEMO_IMAGE_DIR "application-icon-26.png",  
95 - DEMO_IMAGE_DIR "application-icon-27.png",  
96 - DEMO_IMAGE_DIR "application-icon-28.png",  
97 - DEMO_IMAGE_DIR "application-icon-29.png",  
98 - DEMO_IMAGE_DIR "application-icon-2.png",  
99 - DEMO_IMAGE_DIR "application-icon-30.png",  
100 - DEMO_IMAGE_DIR "application-icon-31.png",  
101 - DEMO_IMAGE_DIR "application-icon-32.png",  
102 - DEMO_IMAGE_DIR "application-icon-33.png",  
103 - DEMO_IMAGE_DIR "application-icon-34.png",  
104 - DEMO_IMAGE_DIR "application-icon-35.png",  
105 - DEMO_IMAGE_DIR "application-icon-36.png",  
106 - DEMO_IMAGE_DIR "application-icon-37.png",  
107 - DEMO_IMAGE_DIR "application-icon-38.png",  
108 - DEMO_IMAGE_DIR "application-icon-39.png",  
109 - DEMO_IMAGE_DIR "application-icon-3.png",  
110 - DEMO_IMAGE_DIR "application-icon-40.png",  
111 - DEMO_IMAGE_DIR "application-icon-41.png",  
112 - DEMO_IMAGE_DIR "application-icon-42.png",  
113 - DEMO_IMAGE_DIR "application-icon-43.png",  
114 - DEMO_IMAGE_DIR "application-icon-44.png",  
115 - DEMO_IMAGE_DIR "application-icon-45.png",  
116 - DEMO_IMAGE_DIR "application-icon-46.png",  
117 - DEMO_IMAGE_DIR "application-icon-47.png",  
118 - DEMO_IMAGE_DIR "application-icon-48.png",  
119 - DEMO_IMAGE_DIR "application-icon-49.png",  
120 - DEMO_IMAGE_DIR "application-icon-4.png",  
121 - DEMO_IMAGE_DIR "application-icon-50.png",  
122 - DEMO_IMAGE_DIR "application-icon-51.png",  
123 - DEMO_IMAGE_DIR "application-icon-52.png",  
124 - DEMO_IMAGE_DIR "application-icon-53.png",  
125 - DEMO_IMAGE_DIR "application-icon-54.png",  
126 - DEMO_IMAGE_DIR "application-icon-55.png",  
127 - DEMO_IMAGE_DIR "application-icon-56.png",  
128 - DEMO_IMAGE_DIR "application-icon-57.png",  
129 - DEMO_IMAGE_DIR "application-icon-58.png",  
130 - DEMO_IMAGE_DIR "application-icon-59.png",  
131 - DEMO_IMAGE_DIR "application-icon-5.png",  
132 - DEMO_IMAGE_DIR "application-icon-60.png",  
133 - DEMO_IMAGE_DIR "application-icon-61.png",  
134 - DEMO_IMAGE_DIR "application-icon-62.png",  
135 - DEMO_IMAGE_DIR "application-icon-63.png",  
136 - DEMO_IMAGE_DIR "application-icon-64.png",  
137 - DEMO_IMAGE_DIR "application-icon-65.png",  
138 - DEMO_IMAGE_DIR "application-icon-66.png",  
139 - DEMO_IMAGE_DIR "application-icon-67.png",  
140 - DEMO_IMAGE_DIR "application-icon-68.png",  
141 - DEMO_IMAGE_DIR "application-icon-69.png",  
142 - DEMO_IMAGE_DIR "application-icon-6.png",  
143 - DEMO_IMAGE_DIR "application-icon-70.png",  
144 - DEMO_IMAGE_DIR "application-icon-71.png",  
145 - DEMO_IMAGE_DIR "application-icon-72.png",  
146 - DEMO_IMAGE_DIR "application-icon-73.png",  
147 - DEMO_IMAGE_DIR "application-icon-74.png",  
148 - DEMO_IMAGE_DIR "application-icon-75.png",  
149 - DEMO_IMAGE_DIR "application-icon-76.png",  
150 - DEMO_IMAGE_DIR "application-icon-77.png",  
151 - DEMO_IMAGE_DIR "application-icon-78.png",  
152 - DEMO_IMAGE_DIR "application-icon-79.png",  
153 - DEMO_IMAGE_DIR "application-icon-7.png",  
154 - DEMO_IMAGE_DIR "application-icon-80.png",  
155 - DEMO_IMAGE_DIR "application-icon-81.png",  
156 - DEMO_IMAGE_DIR "application-icon-82.png",  
157 - DEMO_IMAGE_DIR "application-icon-83.png",  
158 - DEMO_IMAGE_DIR "application-icon-84.png",  
159 - DEMO_IMAGE_DIR "application-icon-85.png",  
160 - DEMO_IMAGE_DIR "application-icon-86.png",  
161 - DEMO_IMAGE_DIR "application-icon-87.png",  
162 - DEMO_IMAGE_DIR "application-icon-88.png",  
163 - DEMO_IMAGE_DIR "application-icon-89.png",  
164 - DEMO_IMAGE_DIR "application-icon-8.png",  
165 - DEMO_IMAGE_DIR "application-icon-90.png",  
166 - DEMO_IMAGE_DIR "application-icon-91.png",  
167 - DEMO_IMAGE_DIR "application-icon-92.png",  
168 - DEMO_IMAGE_DIR "application-icon-93.png",  
169 - DEMO_IMAGE_DIR "application-icon-94.png",  
170 - DEMO_IMAGE_DIR "application-icon-95.png",  
171 - DEMO_IMAGE_DIR "application-icon-96.png",  
172 - DEMO_IMAGE_DIR "application-icon-97.png",  
173 - DEMO_IMAGE_DIR "application-icon-98.png",  
174 - DEMO_IMAGE_DIR "application-icon-99.png",  
175 - DEMO_IMAGE_DIR "application-icon-9.png",  
176 - NULL  
177 -}; 28 +
  29 +const char* IMAGE_PATH_PREFIX ( DEMO_IMAGE_DIR "application-icon-" );
  30 +const char* IMAGE_PATH_POSTFIX ( ".png" );
  31 +const int TOTAL_ICON_DEFINITIONS ( 147 );
  32 +
  33 +const char* BACKGROUND_IMAGE ( DEMO_IMAGE_DIR "background-3.jpg" );
  34 +const float PAGE_SCALE_FACTOR_X ( 0.95f );
  35 +const float PAGE_SCALE_FACTOR_Y ( 0.95f );
  36 +const float PAGE_DURATION_SCALE_FACTOR ( 10.0f ); ///< Time-scale factor, larger = animation is slower
  37 +
  38 +const float DEFAULT_OPT_ROW_COUNT ( 5 );
  39 +const float DEFAULT_OPT_COL_COUNT ( 4 );
  40 +const float DEFAULT_OPT_PAGE_COUNT ( 10 );
  41 +const bool DEFAULT_OPT_USE_TABLEVIEW ( true );
  42 +const bool DEFAULT_OPT_BATCHING_ENABLED ( true );
  43 +const bool DEFAULT_OPT_ICON_LABELS ( true );
  44 +
  45 +// The image/label area tries to make sure the positioning will be relative to previous sibling
  46 +const float IMAGE_AREA ( 0.60f );
  47 +const float LABEL_AREA ( 0.50f );
178 48
179 /** 49 /**
180 - * Random words used as unique application names 50 + * Random words used as unique application names.
  51 + * The number matches the value of TOTAL_ICON_DEFINITIONS.
181 */ 52 */
182 const char* DEMO_APPS_NAMES[] = 53 const char* DEMO_APPS_NAMES[] =
183 { 54 {
184 - "Achdyer",  
185 - "Achtortor",  
186 - "Ackirlor",  
187 - "Ackptin",  
188 - "Aighte",  
189 - "Akala",  
190 - "Alealdny",  
191 - "Angash",  
192 - "Anglor",  
193 - "Anveraugh",  
194 - "Ardangas",  
195 - "Ardug",  
196 - "Ardworu",  
197 - "Ascerald",  
198 - "Ash'ach",  
199 - "Athiund",  
200 - "Aughm",  
201 - "Aughtheryer",  
202 - "Awitad",  
203 - "Banengon",  
204 - "Banhinat",  
205 - "Belrisash",  
206 - "Bilorm",  
207 - "Bleustcer",  
208 - "Bliagelor",  
209 - "Blorynton",  
210 - "Booten",  
211 - "Bripolqua",  
212 - "Bryray",  
213 - "Burust",  
214 - "Cataikel",  
215 - "Cerilwar",  
216 - "Cerl",  
217 - "Certin",  
218 - "Checerper",  
219 - "Chegit",  
220 - "Cheirat",  
221 - "Che'rak",  
222 - "Cheves",  
223 - "Chiperath",  
224 - "Chralerack",  
225 - "Chram",  
226 - "Clyimen",  
227 - "Coqueang",  
228 - "Craennther",  
229 - "Cykage",  
230 - "Dalek",  
231 - "Darhkel",  
232 - "Daril",  
233 - "Darpban",  
234 - "Dasrad",  
235 - "Deeqskel",  
236 - "Delurnther",  
237 - "Denalda",  
238 - "Derynkel",  
239 - "Deurnos",  
240 - "Doyaryke",  
241 - "Draithon",  
242 - "Drantess",  
243 - "Druardny",  
244 - "Dynsaytor",  
245 - "Dytinris",  
246 - "Eeni",  
247 - "Elmryn",  
248 - "Emgha",  
249 - "Emiton",  
250 - "Emworeng",  
251 - "Endnys",  
252 - "Enessray",  
253 - "Engyer",  
254 - "En'rady",  
255 - "Enthount",  
256 - "Enundem",  
257 - "Essina",  
258 - "Faughald",  
259 - "Fiummos",  
260 - "Garash",  
261 - "Garight",  
262 - "Garrynath",  
263 - "Ghalora",  
264 - "Ghatan",  
265 - "Gibanis",  
266 - "Hatdyn",  
267 - "Heesban",  
268 - "Hesub",  
269 - "Hinkelenth",  
270 - "Hirryer",  
271 - "Ideinta",  
272 - "Im'eld",  
273 - "Ina'ir",  
274 - "Ing'moro",  
275 - "Ingormess",  
276 - "Ingshy",  
277 - "Issath",  
278 - "Issendris",  
279 - "Issey",  
280 - "Issum",  
281 - "Itenthbel",  
282 - "K'ackves",  
283 - "Kagdra",  
284 - "Kalbankim",  
285 - "Kal'enda",  
286 - "Kimest",  
287 - "Kimundeng",  
288 - "Koachlor",  
289 - "Kuren",  
290 - "Kygver",  
291 - "Kyning",  
292 - "Laiyach",  
293 - "Lasuzu",  
294 - "Lekew",  
295 - "Lerengom",  
296 - "Lertan",  
297 - "Liadem",  
298 - "Liathar",  
299 - "Liephden",  
300 - "Likellor",  
301 - "Loightmos",  
302 - "Loromum",  
303 - "Lorr",  
304 - "Lortas",  
305 - "Lyerr",  
306 - "Maustbur",  
307 - "Menvor",  
308 - "Meusten",  
309 - "Mirodskel",  
310 - "Morhatrod",  
311 - "Moserbel",  
312 - "Mosorrad",  
313 - "Mosraye",  
314 - "Mosth",  
315 - "Neabar",  
316 - "Neerdem",  
317 - "Nichqua",  
318 - "Nudraough",  
319 - "Nuyim",  
320 - "Nycha",  
321 - "Nyia",  
322 - "Nyjac",  
323 - "Nystondar",  
324 - "Okine",  
325 - "Oldit",  
326 - "Om'mose",  
327 - "Onye",  
328 - "Ososrak",  
329 - "Pecertin",  
330 - "Perrd",  
331 - "Phutorny",  
332 - "Puizlye",  
333 - "Quirantai",  
334 - NULL 55 + "Achdyer", "Aughm", "Cerl", "Daril", "Emgha", "Ghatan", "Issum", "Lertan", "Mosorrad",
  56 + "Achtortor", "Aughtheryer", "Certin", "Darpban", "Emiton", "Gibanis", "Itenthbel", "Liadem", "Mosraye",
  57 + "Ackirlor", "Awitad", "Checerper", "Dasrad", "Emworeng", "Hatdyn", "K'ackves", "Liathar", "Mosth",
  58 + "Ackptin", "Banengon", "Chegit", "Deeqskel", "Endnys", "Heesban", "Kagdra", "Liephden", "Neabar",
  59 + "Aighte", "Banhinat", "Cheirat", "Delurnther", "Enessray", "Hesub", "Kalbankim", "Likellor", "Neerdem",
  60 + "Akala", "Belrisash", "Che'rak", "Denalda", "Engyer", "Hinkelenth", "Kal'enda", "Loightmos", "Nichqua",
  61 + "Alealdny", "Bilorm", "Cheves", "Derynkel", "En'rady", "Hirryer", "Kimest", "Loromum", "Nudraough",
  62 + "Angash", "Bleustcer", "Chiperath", "Deurnos", "Enthount", "Ideinta", "Kimundeng", "Lorr", "Nuyim",
  63 + "Anglor", "Bliagelor", "Chralerack", "Doyaryke", "Enundem", "Im'eld", "Koachlor", "Lortas", "Nycha",
  64 + "Anveraugh", "Blorynton", "Chram", "Draithon", "Essina", "Ina'ir", "Kuren", "Lyerr", "Nyia",
  65 + "Ardangas", "Booten", "Clyimen", "Drantess", "Faughald", "Ing'moro", "Kygver", "Maustbur", "Nyjac",
  66 + "Ardug", "Bripolqua", "Coqueang", "Druardny", "Fiummos", "Ingormess", "Kyning", "Menvor", "Nystondar",
  67 + "Ardworu", "Bryray", "Craennther", "Dynsaytor", "Garash", "Ingshy", "Laiyach", "Meusten", "Okine",
  68 + "Ascerald", "Burust", "Cykage", "Dytinris", "Garight", "Issath", "Lasuzu", "Mirodskel", "Oldit",
  69 + "Ash'ach", "Cataikel", "Dalek", "Eeni", "Garrynath", "Issendris", "Lekew", "Morhatrod", "Om'mose",
  70 + "Athiund", "Cerilwar", "Darhkel", "Elmryn", "Ghalora", "Issey", "Lerengom", "Moserbel", "Onye",
  71 + "Ososrak", "Pecertin", "Perrd"
335 }; 72 };
336 73
337 -// this code comes from command-line-options.cpp. the reason it's here is to  
338 -// keep consistent the extra-help formatting when '--help' used  
339 - 74 +// This code comes from command-line-options.cpp. the reason it's here is to
  75 +// keep consistent the extra-help formatting when '--help' used.
340 void PrintHelp( const char * const opt, const char * const optDescription) 76 void PrintHelp( const char * const opt, const char * const optDescription)
341 { 77 {
342 const std::ios_base::fmtflags flags = std::cout.flags(); 78 const std::ios_base::fmtflags flags = std::cout.flags();
@@ -348,74 +84,70 @@ void PrintHelp( const char * const opt, const char * const optDescription) @@ -348,74 +84,70 @@ void PrintHelp( const char * const opt, const char * const optDescription)
348 std::cout.flags( flags ); 84 std::cout.flags( flags );
349 } 85 }
350 86
351 -const float PAGE_SCALE_FACTOR_X ( 0.95f );  
352 -const float PAGE_SCALE_FACTOR_Y ( 0.95f );  
353 -const float PAGE_DURATION_SCALE_FACTOR ( 2.0f ); // time-scale factor, larger = animation is slower  
354 -  
355 -const float DEFAULT_OPT_ROW_COUNT ( 5 );  
356 -const float DEFAULT_OPT_COL_COUNT ( 4 );  
357 -const float DEFAULT_OPT_PAGE_COUNT ( 10 );  
358 -const bool DEFAULT_OPT_USETABLEVIEW ( false );  
359 -  
360 } 87 }
361 88
362 -// This example is a benchmark that mimics the paged applications list of the homescreen app  
363 -// 89 +/**
  90 + * @brief This example is a benchmark that mimics the paged applications list of the homescreen application.
  91 + */
364 class HomescreenBenchmark : public ConnectionTracker 92 class HomescreenBenchmark : public ConnectionTracker
365 { 93 {
366 public: 94 public:
367 95
368 // Config structure passed to the constructor. It makes easier to increase number 96 // Config structure passed to the constructor. It makes easier to increase number
369 - // of setup parameters if needed 97 + // of setup parameters if needed.
370 struct Config 98 struct Config
371 { 99 {
372 Config() : 100 Config() :
373 mRows( DEFAULT_OPT_ROW_COUNT ), 101 mRows( DEFAULT_OPT_ROW_COUNT ),
374 mCols( DEFAULT_OPT_COL_COUNT ), 102 mCols( DEFAULT_OPT_COL_COUNT ),
375 mPageCount( DEFAULT_OPT_PAGE_COUNT ), 103 mPageCount( DEFAULT_OPT_PAGE_COUNT ),
376 - mUseTableView( DEFAULT_OPT_USETABLEVIEW ) 104 + mTableViewEnabled( DEFAULT_OPT_USE_TABLEVIEW ),
  105 + mBatchingEnabled( DEFAULT_OPT_BATCHING_ENABLED ),
  106 + mIconLabelsEnabled( DEFAULT_OPT_ICON_LABELS )
377 { 107 {
378 } 108 }
379 109
380 - int mRows;  
381 - int mCols;  
382 - int mPageCount;  
383 - bool mUseTableView; 110 + int mRows;
  111 + int mCols;
  112 + int mPageCount;
  113 + bool mTableViewEnabled;
  114 + bool mBatchingEnabled;
  115 + bool mIconLabelsEnabled;
384 }; 116 };
385 117
386 // animation script data 118 // animation script data
387 struct ScriptData 119 struct ScriptData
388 { 120 {
389 ScriptData( int pages, float duration, bool flick ) 121 ScriptData( int pages, float duration, bool flick )
  122 + : mPages( pages ),
  123 + mDuration( duration ),
  124 + mFlick( flick )
390 { 125 {
391 - mPages = pages;  
392 - mDuration = duration;  
393 - mFlick = flick;  
394 } 126 }
395 127
396 - int mPages; // number of pages to scroll  
397 - float mDuration; // duration  
398 - bool mFlick; // use flick or 'one-by-one' scroll 128 + int mPages; ///< Number of pages to scroll
  129 + float mDuration; ///< Duration
  130 + bool mFlick; ///< Use flick or 'one-by-one' scroll
399 }; 131 };
400 132
401 HomescreenBenchmark( Application& application, const Config& config ) 133 HomescreenBenchmark( Application& application, const Config& config )
402 : mApplication( application ), 134 : mApplication( application ),
403 mConfig( config ), 135 mConfig( config ),
  136 + mScriptFrame( 0 ),
404 mCurrentPage( 0 ) 137 mCurrentPage( 0 )
405 { 138 {
406 - // Connect to the Application's Init signal 139 + // Connect to the Application's Init signal.
407 mApplication.InitSignal().Connect( this, &HomescreenBenchmark::Create ); 140 mApplication.InitSignal().Connect( this, &HomescreenBenchmark::Create );
408 } 141 }
409 142
410 ~HomescreenBenchmark() 143 ~HomescreenBenchmark()
411 { 144 {
412 - // Nothing to do here;  
413 } 145 }
414 146
415 - // The Init signal is received once (only) during the Application lifetime 147 + // The Init signal is received once (only) during the Application lifetime.
416 void Create( Application& application ) 148 void Create( Application& application )
417 { 149 {
418 - // create benchmark script 150 + // Create benchmark script
419 CreateScript(); 151 CreateScript();
420 152
421 // Get a handle to the stage 153 // Get a handle to the stage
@@ -427,35 +159,37 @@ public: @@ -427,35 +159,37 @@ public:
427 mScrollParent.SetParentOrigin( ParentOrigin::CENTER ); 159 mScrollParent.SetParentOrigin( ParentOrigin::CENTER );
428 160
429 // create background 161 // create background
430 - Toolkit::ImageView background = Toolkit::ImageView::New( DEMO_IMAGE_DIR "background-3.jpg");  
431 - Stage::GetCurrent().Add(background); 162 + Toolkit::ImageView background = Toolkit::ImageView::New( BACKGROUND_IMAGE );
  163 + Stage::GetCurrent().Add( background );
432 background.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); 164 background.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
433 background.SetAnchorPoint( AnchorPoint::CENTER ); 165 background.SetAnchorPoint( AnchorPoint::CENTER );
434 background.SetParentOrigin( ParentOrigin::CENTER ); 166 background.SetParentOrigin( ParentOrigin::CENTER );
435 167
436 PopulatePages(); 168 PopulatePages();
437 169
438 - stage.Add(mScrollParent); 170 + stage.Add( mScrollParent );
439 171
440 - // Respond to a click anywhere on the stage 172 + // Respond to a click anywhere on the stage.
441 stage.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch ); 173 stage.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch );
442 } 174 }
443 175
444 bool OnTouch( Actor actor, const TouchData& touch ) 176 bool OnTouch( Actor actor, const TouchData& touch )
445 { 177 {
446 - // quit the application 178 + // Quit the application.
447 mApplication.Quit(); 179 mApplication.Quit();
448 return true; 180 return true;
449 } 181 }
450 182
451 Actor AddPage() 183 Actor AddPage()
452 { 184 {
453 - // create root page actor 185 + // Create root page actor.
454 Actor pageActor; 186 Actor pageActor;
455 187
456 - if( mConfig.mUseTableView ) 188 + if( mConfig.mTableViewEnabled )
457 { 189 {
458 Toolkit::TableView tableView = Toolkit::TableView::New( mConfig.mRows, mConfig.mCols ); 190 Toolkit::TableView tableView = Toolkit::TableView::New( mConfig.mRows, mConfig.mCols );
  191 +
  192 + // Create geometry batcher for table view.
459 tableView.SetBackgroundColor( Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) ); 193 tableView.SetBackgroundColor( Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) );
460 pageActor = tableView; 194 pageActor = tableView;
461 } 195 }
@@ -468,38 +202,33 @@ public: @@ -468,38 +202,33 @@ public:
468 pageActor.SetParentOrigin( ParentOrigin::CENTER ); 202 pageActor.SetParentOrigin( ParentOrigin::CENTER );
469 pageActor.SetAnchorPoint( AnchorPoint::CENTER ); 203 pageActor.SetAnchorPoint( AnchorPoint::CENTER );
470 pageActor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); 204 pageActor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
471 - pageActor.SetSizeModeFactor(Vector3( PAGE_SCALE_FACTOR_X, PAGE_SCALE_FACTOR_Y, 1.0f ) ); 205 + pageActor.SetSizeModeFactor( Vector3( PAGE_SCALE_FACTOR_X, PAGE_SCALE_FACTOR_Y, 1.0f ) );
472 return pageActor; 206 return pageActor;
473 } 207 }
474 208
475 - void AddIconsToPage(Actor page) 209 + void AddIconsToPage( Actor page )
476 { 210 {
477 Size stageSize( Stage::GetCurrent().GetSize() ); 211 Size stageSize( Stage::GetCurrent().GetSize() );
478 const float scaledHeight = stageSize.y * PAGE_SCALE_FACTOR_Y; 212 const float scaledHeight = stageSize.y * PAGE_SCALE_FACTOR_Y;
479 const float scaledWidth = stageSize.x * PAGE_SCALE_FACTOR_X; 213 const float scaledWidth = stageSize.x * PAGE_SCALE_FACTOR_X;
480 -  
481 const float PADDING = stageSize.y / 64.0f; 214 const float PADDING = stageSize.y / 64.0f;
482 - const float ROW_HEIGHT = ( scaledHeight - (PADDING*2.0f) ) / (float)mConfig.mRows;  
483 - const float COL_WIDTH = ( scaledWidth - (PADDING*2.0f) ) / (float)mConfig.mCols; 215 + const float ROW_HEIGHT = ( scaledHeight - (PADDING*2.0f) ) / static_cast<float>( mConfig.mRows );
  216 + const float COL_WIDTH = ( scaledWidth - (PADDING*2.0f) ) / static_cast<float>( mConfig.mCols );
484 217
485 - // the image/label area tries to make sure the positioning will be relative to previous sibling  
486 - const float IMAGE_AREA = 0.60f;  
487 - const float LABEL_AREA = 0.50f; 218 + Vector2 dpi = Stage::GetCurrent().GetDpi();
488 219
489 static int currentIconIndex = 0; 220 static int currentIconIndex = 0;
490 221
491 - Vector2 dpi = Stage::GetCurrent().GetDpi();  
492 -  
493 for( int y = 0; y < mConfig.mRows; ++y ) 222 for( int y = 0; y < mConfig.mRows; ++y )
494 { 223 {
495 for( int x = 0; x < mConfig.mCols; ++x ) 224 for( int x = 0; x < mConfig.mCols; ++x )
496 { 225 {
497 - // create parent icon view 226 + // Create parent icon view
498 Toolkit::Control iconView = Toolkit::Control::New(); 227 Toolkit::Control iconView = Toolkit::Control::New();
499 iconView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 228 iconView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
500 iconView.SetParentOrigin( ParentOrigin::TOP_LEFT ); 229 iconView.SetParentOrigin( ParentOrigin::TOP_LEFT );
501 230
502 - if( !mConfig.mUseTableView ) 231 + if( !mConfig.mTableViewEnabled )
503 { 232 {
504 float rowX = x * COL_WIDTH + PADDING; 233 float rowX = x * COL_WIDTH + PADDING;
505 float rowY = y * ROW_HEIGHT + PADDING; 234 float rowY = y * ROW_HEIGHT + PADDING;
@@ -512,31 +241,45 @@ public: @@ -512,31 +241,45 @@ public:
512 iconView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); 241 iconView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
513 } 242 }
514 243
515 - // create image view  
516 - Toolkit::ImageView imageView = Toolkit::ImageView::New( IMAGE_PATH[currentIconIndex] ); 244 + // Create empty image to avoid early renderer creation
  245 + Toolkit::ImageView imageView = Toolkit::ImageView::New();
  246 +
  247 + // Auto-generate the Icons image URL.
  248 + Property::Map map;
  249 + std::stringstream imagePath;
  250 + imagePath << IMAGE_PATH_PREFIX << currentIconIndex << IMAGE_PATH_POSTFIX;
  251 + map[ Dali::Toolkit::ImageVisual::Property::URL ] = imagePath.str();
  252 +
  253 + // Enable/disable batching
  254 + map[ Toolkit::ImageVisual::Property::BATCHING_ENABLED ] = mConfig.mBatchingEnabled;
  255 +
  256 + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
517 imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); 257 imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
518 imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); 258 imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
519 imageView.SetAnchorPoint( AnchorPoint::CENTER ); 259 imageView.SetAnchorPoint( AnchorPoint::CENTER );
520 imageView.SetParentOrigin( ParentOrigin::CENTER ); 260 imageView.SetParentOrigin( ParentOrigin::CENTER );
521 - imageView.SetSizeModeFactor( Vector3(IMAGE_AREA, IMAGE_AREA, 1.0f) ); 261 + imageView.SetSizeModeFactor( Vector3( IMAGE_AREA, IMAGE_AREA, 1.0f ) );
522 262
523 - // create label  
524 - Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( DEMO_APPS_NAMES[currentIconIndex] );  
525 - textLabel.SetAnchorPoint( AnchorPoint::TOP_CENTER );  
526 - textLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );  
527 -  
528 - textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );  
529 - textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );  
530 - textLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, (((float)( ROW_HEIGHT * LABEL_AREA ) * 72.0f) / (dpi.y))*0.25f );  
531 - textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );  
532 - textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP" ); 263 + if( mConfig.mIconLabelsEnabled )
  264 + {
  265 + // create label
  266 + Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( DEMO_APPS_NAMES[currentIconIndex] );
  267 + textLabel.SetAnchorPoint( AnchorPoint::TOP_CENTER );
  268 + textLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
  269 + textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
  270 + textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
  271 + textLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f );
  272 + textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  273 + textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP" );
  274 + imageView.Add( textLabel );
  275 + }
533 276
534 iconView.Add( imageView ); 277 iconView.Add( imageView );
535 - imageView.Add( textLabel ); 278 + page.Add( iconView );
536 279
537 - page.Add(iconView);  
538 -  
539 - if( !IMAGE_PATH[ ++currentIconIndex ] ) 280 + // We only have images and names for a certain number of icons.
  281 + // Wrap around if we have used them all.
  282 + if( ++currentIconIndex == TOTAL_ICON_DEFINITIONS )
540 { 283 {
541 currentIconIndex = 0; 284 currentIconIndex = 0;
542 } 285 }
@@ -546,58 +289,62 @@ public: @@ -546,58 +289,62 @@ public:
546 289
547 void CreateScript() 290 void CreateScript()
548 { 291 {
549 - const int lastPage = mConfig.mPageCount-1;  
550 - const int halfA = lastPage/2;  
551 - const int halfB = lastPage/2 + lastPage%2;  
552 - mScriptFrameData.push_back( ScriptData( lastPage, 1.5f, true));  
553 - mScriptFrameData.push_back( ScriptData( -lastPage, 1.5f, true ));  
554 - mScriptFrameData.push_back( ScriptData( halfA, 1.0f, true ));  
555 - mScriptFrameData.push_back( ScriptData( halfB, 1.0f, true ));  
556 - mScriptFrameData.push_back( ScriptData( -lastPage, 0.5f, false ));  
557 - mScriptFrameData.push_back( ScriptData( halfA, 0.5f, false ));  
558 - mScriptFrameData.push_back( ScriptData( halfB, 1.0f, true ));  
559 - mScriptFrameData.push_back( ScriptData( -halfA, 1.0f, true ));  
560 - mScriptFrameData.push_back( ScriptData( 1, 0.1f, true ));  
561 - mScriptFrameData.push_back( ScriptData( -1, 0.1f, true ));  
562 - mScriptFrameData.push_back( ScriptData( 1, 0.1f, true ));  
563 - mScriptFrameData.push_back( ScriptData( -1, 0.1f, true ));  
564 - mScriptFrameData.push_back( ScriptData( 1, 0.1f, true ));  
565 - mScriptFrameData.push_back( ScriptData( -1, 0.1f, true ));  
566 - mScriptFrameData.push_back( ScriptData( halfA, 1.0f, true )); 292 + const int lastPage = mConfig.mPageCount - 1;
  293 + const int halfA = lastPage / 2;
  294 + const int halfB = lastPage / 2 + lastPage % 2;
  295 + mScriptFrameData.push_back( ScriptData( lastPage, 1.5f, true ) );
  296 + mScriptFrameData.push_back( ScriptData( -lastPage, 1.5f, true ) );
  297 + mScriptFrameData.push_back( ScriptData( halfA, 1.0f, true ) );
  298 + mScriptFrameData.push_back( ScriptData( halfB, 1.0f, true ) );
  299 + mScriptFrameData.push_back( ScriptData( -lastPage, 0.5f, false ) );
  300 + mScriptFrameData.push_back( ScriptData( halfA, 0.5f, false ) );
  301 + mScriptFrameData.push_back( ScriptData( halfB, 1.0f, true ) );
  302 + mScriptFrameData.push_back( ScriptData( -halfA, 1.0f, true ) );
  303 + mScriptFrameData.push_back( ScriptData( 1, 0.1f, true ) );
  304 + mScriptFrameData.push_back( ScriptData( -1, 0.1f, true ) );
  305 + mScriptFrameData.push_back( ScriptData( 1, 0.1f, true ) );
  306 + mScriptFrameData.push_back( ScriptData( -1, 0.1f, true ) );
  307 + mScriptFrameData.push_back( ScriptData( 1, 0.1f, true ) );
  308 + mScriptFrameData.push_back( ScriptData( -1, 0.1f, true ) );
  309 + mScriptFrameData.push_back( ScriptData( halfA, 1.0f, true ) );
567 } 310 }
568 311
569 void PopulatePages() 312 void PopulatePages()
570 { 313 {
571 Vector3 stageSize( Stage::GetCurrent().GetSize() ); 314 Vector3 stageSize( Stage::GetCurrent().GetSize() );
572 - const float SCALED_HEIGHT = stageSize.y * PAGE_SCALE_FACTOR_Y;  
573 315
574 for( int i = 0; i < mConfig.mPageCount; ++i ) 316 for( int i = 0; i < mConfig.mPageCount; ++i )
575 { 317 {
576 - // create page 318 + // Create page.
577 Actor page = AddPage(); 319 Actor page = AddPage();
578 320
579 - // populate icons  
580 - AddIconsToPage(page); 321 + // Populate icons.
  322 + AddIconsToPage( page );
581 323
582 - // move page 'a little bit up' 324 + // Move page 'a little bit up'.
583 page.SetParentOrigin( ParentOrigin::CENTER ); 325 page.SetParentOrigin( ParentOrigin::CENTER );
584 page.SetAnchorPoint( AnchorPoint::CENTER ); 326 page.SetAnchorPoint( AnchorPoint::CENTER );
585 - page.SetPosition( Vector3(stageSize.x*i, -0.30f*( stageSize.y-SCALED_HEIGHT ), 0.0f) ); 327 + page.SetPosition( Vector3( stageSize.x * i, 0.0f, 0.0f ) );
586 mScrollParent.Add( page ); 328 mScrollParent.Add( page );
  329 +
  330 + if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled )
  331 + {
  332 + page.SetProperty( Actor::Property::BATCH_PARENT, true );
  333 + }
587 } 334 }
588 335
589 - mScrollParent.SetOpacity( 0.0f );  
590 - mScrollParent.SetScale( Vector3(0.0f, 0.0f, 0.0f) ); 336 + mScrollParent.SetOpacity( 1.0f );
  337 + mScrollParent.SetScale( Vector3::ONE );
591 338
592 - // fade in 339 + // Fade in.
593 ShowAnimation(); 340 ShowAnimation();
594 } 341 }
595 342
596 void ShowAnimation() 343 void ShowAnimation()
597 { 344 {
598 - mShowAnimation = Animation::New(1.0f);  
599 - mShowAnimation.AnimateTo( Property(mScrollParent, Actor::Property::COLOR_ALPHA), 1.0f, AlphaFunction::EASE_IN_OUT );  
600 - mShowAnimation.AnimateTo( Property(mScrollParent, Actor::Property::SCALE), Vector3(1.0f, 1.0f, 1.0f), AlphaFunction::EASE_IN_OUT ); 345 + mShowAnimation = Animation::New( 1.0f );
  346 + mShowAnimation.AnimateTo( Property( mScrollParent, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN_OUT );
  347 + mShowAnimation.AnimateTo( Property( mScrollParent, Actor::Property::SCALE ), Vector3::ONE, AlphaFunction::EASE_IN_OUT );
601 mShowAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd ); 348 mShowAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd );
602 mShowAnimation.Play(); 349 mShowAnimation.Play();
603 } 350 }
@@ -606,16 +353,17 @@ public: @@ -606,16 +353,17 @@ public:
606 { 353 {
607 duration *= PAGE_DURATION_SCALE_FACTOR; 354 duration *= PAGE_DURATION_SCALE_FACTOR;
608 Vector3 stageSize( Stage::GetCurrent().GetSize() ); 355 Vector3 stageSize( Stage::GetCurrent().GetSize() );
609 - mScrollAnimation = Animation::New(duration); 356 + mScrollAnimation = Animation::New( duration );
610 if( flick ) 357 if( flick )
611 { 358 {
612 - mScrollAnimation.AnimateBy( Property(mScrollParent, Actor::Property::POSITION), Vector3(-stageSize.x*pages, 0.0f, 0.0f), AlphaFunction::EASE_IN_OUT ); 359 + mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( -stageSize.x * pages, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT );
613 } 360 }
614 else 361 else
615 { 362 {
616 - for( int i = 0; i < abs(pages); ++i ) 363 + int totalPages = abs( pages );
  364 + for( int i = 0; i < totalPages; ++i )
617 { 365 {
618 - mScrollAnimation.AnimateBy( Property(mScrollParent, Actor::Property::POSITION), Vector3(pages < 0 ? stageSize.x : -stageSize.x, 0.0f, 0.0f), AlphaFunction::EASE_IN_OUT, TimePeriod(duration*i, duration) ); 366 + mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( pages < 0 ? stageSize.x : -stageSize.x, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT, TimePeriod( duration * i, duration ) );
619 } 367 }
620 } 368 }
621 mScrollAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd ); 369 mScrollAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd );
@@ -625,13 +373,7 @@ public: @@ -625,13 +373,7 @@ public:
625 373
626 void OnAnimationEnd( Animation& source ) 374 void OnAnimationEnd( Animation& source )
627 { 375 {
628 - if( source == mShowAnimation )  
629 - {  
630 - ScriptData& frame = mScriptFrameData[0];  
631 - ScrollPages( frame.mPages, frame.mDuration, frame.mFlick );  
632 - mScriptFrame = 1;  
633 - }  
634 - else if( mScriptFrame < mScriptFrameData.size() && source == mScrollAnimation ) 376 + if( mScriptFrame < mScriptFrameData.size() )
635 { 377 {
636 ScriptData& frame = mScriptFrameData[mScriptFrame]; 378 ScriptData& frame = mScriptFrameData[mScriptFrame];
637 ScrollPages( frame.mPages, frame.mDuration, frame.mFlick ); 379 ScrollPages( frame.mPages, frame.mDuration, frame.mFlick );
@@ -644,18 +386,14 @@ public: @@ -644,18 +386,14 @@ public:
644 } 386 }
645 387
646 private: 388 private:
647 - Application& mApplication;  
648 389
  390 + Application& mApplication;
649 Actor mScrollParent; 391 Actor mScrollParent;
650 -  
651 Animation mShowAnimation; 392 Animation mShowAnimation;
652 Animation mScrollAnimation; 393 Animation mScrollAnimation;
653 -  
654 Config mConfig; 394 Config mConfig;
655 -  
656 std::vector<ScriptData> mScriptFrameData; 395 std::vector<ScriptData> mScriptFrameData;
657 size_t mScriptFrame; 396 size_t mScriptFrame;
658 -  
659 int mCurrentPage; 397 int mCurrentPage;
660 }; 398 };
661 399
@@ -665,26 +403,27 @@ void RunTest( Application&amp; application, const HomescreenBenchmark::Config&amp; confi @@ -665,26 +403,27 @@ void RunTest( Application&amp; application, const HomescreenBenchmark::Config&amp; confi
665 403
666 if( printHelpAndExit ) 404 if( printHelpAndExit )
667 { 405 {
668 - PrintHelp( "c<num>", " Number of columns");  
669 - PrintHelp( "r<num>", " Number of rows");  
670 - PrintHelp( "p<num>", " Number of pages ( must be greater than 1 )");  
671 - PrintHelp( "-use-tableview", " Uses TableView for layouting"); 406 + PrintHelp( "c<num>", " Number of columns" );
  407 + PrintHelp( "r<num>", " Number of rows" );
  408 + PrintHelp( "p<num>", " Number of pages ( must be greater than 1 )" );
  409 + PrintHelp( "-disable-tableview", " Disables the use of TableView for layouting (must be enabled for batching)" );
  410 + PrintHelp( "-disable-batching", " Disables geometry batching" );
  411 + PrintHelp( "-disable-icon-labels", " Disables labels for each icon" );
672 return; 412 return;
673 } 413 }
674 414
675 application.MainLoop(); 415 application.MainLoop();
676 } 416 }
677 417
678 -// Entry point for Linux & Tizen applications  
679 -// 418 +// Entry point for Linux & Tizen applications.
680 int DALI_EXPORT_API main( int argc, char **argv ) 419 int DALI_EXPORT_API main( int argc, char **argv )
681 { 420 {
682 - // default settings 421 + // Default settings.
683 HomescreenBenchmark::Config config; 422 HomescreenBenchmark::Config config;
684 423
685 bool printHelpAndExit = false; 424 bool printHelpAndExit = false;
686 425
687 - for( int i(1) ; i < argc; ++i ) 426 + for( int i = 1 ; i < argc; ++i )
688 { 427 {
689 std::string arg( argv[i] ); 428 std::string arg( argv[i] );
690 if( arg.compare( 0, 2, "-r" ) == 0 ) 429 if( arg.compare( 0, 2, "-r" ) == 0 )
@@ -699,15 +438,22 @@ int DALI_EXPORT_API main( int argc, char **argv ) @@ -699,15 +438,22 @@ int DALI_EXPORT_API main( int argc, char **argv )
699 { 438 {
700 config.mPageCount = atoi( arg.substr( 2 ).c_str() ); 439 config.mPageCount = atoi( arg.substr( 2 ).c_str() );
701 } 440 }
702 - else if( arg.compare( "--use-tableview" ) == 0 ) 441 + else if( arg.compare( "--disable-tableview" ) == 0 )
  442 + {
  443 + config.mTableViewEnabled = false;
  444 + }
  445 + else if( arg.compare( "--disable-batching" ) == 0 )
703 { 446 {
704 - config.mUseTableView = true; 447 + config.mBatchingEnabled = false;
  448 + }
  449 + else if( arg.compare( "--disable-icon-labels" ) == 0 )
  450 + {
  451 + config.mIconLabelsEnabled = false;
705 } 452 }
706 else if( arg.compare( "--help" ) == 0 ) 453 else if( arg.compare( "--help" ) == 0 )
707 { 454 {
708 printHelpAndExit = true; 455 printHelpAndExit = true;
709 } 456 }
710 -  
711 } 457 }
712 458
713 Application application = Application::New( &argc, &argv ); 459 Application application = Application::New( &argc, &argv );
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @caccf5e
@@ -175,6 +175,9 @@ public: @@ -175,6 +175,9 @@ public:
175 // Get a handle to the stage 175 // Get a handle to the stage
176 Stage stage = Stage::GetCurrent(); 176 Stage stage = Stage::GetCurrent();
177 177
  178 + // Hide the indicator bar
  179 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  180 +
178 // Background image: 181 // Background image:
179 Dali::Property::Map backgroundImage; 182 Dali::Property::Map backgroundImage;
180 backgroundImage.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); 183 backgroundImage.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
examples/image-view-svg/image-view-svg-example.cpp
  View file @caccf5e
@@ -66,6 +66,9 @@ public: @@ -66,6 +66,9 @@ public:
66 Vector2 stageSize = stage.GetSize(); 66 Vector2 stageSize = stage.GetSize();
67 mActorSize = stageSize/2.f; 67 mActorSize = stageSize/2.f;
68 68
  69 + // Hide the indicator bar
  70 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  71 +
69 stage.KeyEventSignal().Connect(this, &ImageSvgController::OnKeyEvent); 72 stage.KeyEventSignal().Connect(this, &ImageSvgController::OnKeyEvent);
70 73
71 // Background, for receiving gestures 74 // Background, for receiving gestures
examples/mesh-visual/mesh-visual-example.cpp
  View file @caccf5e
@@ -15,14 +15,14 @@ namespace @@ -15,14 +15,14 @@ namespace
15 }; 15 };
16 16
17 //Files for meshes 17 //Files for meshes
18 - const char * const MODEL_FILE[] = 18 + const char * const MODEL_FILE_TABLE[] =
19 { 19 {
20 DEMO_MODEL_DIR "Dino.obj", 20 DEMO_MODEL_DIR "Dino.obj",
21 DEMO_MODEL_DIR "ToyRobot-Metal.obj", 21 DEMO_MODEL_DIR "ToyRobot-Metal.obj",
22 DEMO_MODEL_DIR "Toyrobot-Plastic.obj" 22 DEMO_MODEL_DIR "Toyrobot-Plastic.obj"
23 }; 23 };
24 24
25 - const char * const MATERIAL_FILE[] = 25 + const char * const MATERIAL_FILE_TABLE[] =
26 { 26 {
27 DEMO_MODEL_DIR "Dino.mtl", 27 DEMO_MODEL_DIR "Dino.mtl",
28 DEMO_MODEL_DIR "ToyRobot-Metal.mtl", 28 DEMO_MODEL_DIR "ToyRobot-Metal.mtl",
@@ -39,13 +39,12 @@ namespace @@ -39,13 +39,12 @@ namespace
39 MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING 39 MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING
40 }; 40 };
41 41
42 - //Files for background and toolbar  
43 - const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-1.jpg");  
44 -  
45 const float X_ROTATION_DISPLACEMENT_FACTOR = 60.0f; 42 const float X_ROTATION_DISPLACEMENT_FACTOR = 60.0f;
46 const float Y_ROTATION_DISPLACEMENT_FACTOR = 60.0f; 43 const float Y_ROTATION_DISPLACEMENT_FACTOR = 60.0f;
47 - const float MODEL_SCALE = 0.75f;  
48 - const int NUM_MESHES = 3; 44 + const float MODEL_SCALE = 0.75f;
  45 + const float LIGHT_SCALE = 0.15f;
  46 + const float BUTTONS_OFFSET_BOTTOM = 0.9f;
  47 + const int NUM_MESHES = 2;
49 48
50 //Used to identify actors. 49 //Used to identify actors.
51 const int MODEL_TAG = 0; 50 const int MODEL_TAG = 0;
@@ -64,7 +63,8 @@ public: @@ -64,7 +63,8 @@ public:
64 mShadingModeIndex( 0 ), //Start with textured with detailed specular lighting. 63 mShadingModeIndex( 0 ), //Start with textured with detailed specular lighting.
65 mTag( -1 ), //Non-valid default, which will get set to a correct value when used. 64 mTag( -1 ), //Non-valid default, which will get set to a correct value when used.
66 mSelectedModelIndex( -1 ), //Non-valid default, which will get set to a correct value when used. 65 mSelectedModelIndex( -1 ), //Non-valid default, which will get set to a correct value when used.
67 - mPaused( false ) //Animations play by default. 66 + mPaused( false ), //Animations play by default.
  67 + mLightFixed( true ) //The light is fixed by default.
68 { 68 {
69 // Connect to the Application's Init signal 69 // Connect to the Application's Init signal
70 mApplication.InitSignal().Connect( this, &MeshVisualController::Create ); 70 mApplication.InitSignal().Connect( this, &MeshVisualController::Create );
@@ -79,23 +79,7 @@ public: @@ -79,23 +79,7 @@ public:
79 { 79 {
80 // Get a handle to the stage 80 // Get a handle to the stage
81 Stage stage = Stage::GetCurrent(); 81 Stage stage = Stage::GetCurrent();
82 -  
83 - //Add background  
84 - ImageView backView = ImageView::New( BACKGROUND_IMAGE );  
85 - backView.SetAnchorPoint( AnchorPoint::TOP_LEFT );  
86 - stage.Add( backView );  
87 -  
88 - //Setup and load the 3D models and buttons  
89 - LoadScene();  
90 -  
91 - //Allow for exiting of the application via key presses.  
92 - stage.KeyEventSignal().Connect( this, &MeshVisualController::OnKeyEvent );  
93 - }  
94 -  
95 - //Sets up the on-screen elements.  
96 - void LoadScene()  
97 - {  
98 - Stage stage = Stage::GetCurrent(); 82 + stage.SetBackgroundColor( Vector4( 0.0, 0.5, 1.0, 1.0 ) );
99 83
100 //Set up layer to place objects on. 84 //Set up layer to place objects on.
101 Layer baseLayer = Layer::New(); 85 Layer baseLayer = Layer::New();
@@ -108,41 +92,45 @@ public: @@ -108,41 +92,45 @@ public:
108 baseLayer.TouchedSignal().Connect( this, &MeshVisualController::OnTouch ); 92 baseLayer.TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
109 stage.Add( baseLayer ); 93 stage.Add( baseLayer );
110 94
111 - //Add containers to house each visual-holding-actor. 95 + //Place models on the scene.
  96 + SetupModels( baseLayer );
  97 +
  98 + //Place buttons on the scene.
  99 + SetupButtons( baseLayer );
  100 +
  101 + //Add a light to the scene.
  102 + SetupLight( baseLayer );
  103 +
  104 + //Allow for exiting of the application via key presses.
  105 + stage.KeyEventSignal().Connect( this, &MeshVisualController::OnKeyEvent );
  106 + }
  107 +
  108 + //Loads and adds the models to the scene, inside containers for hit detection.
  109 + void SetupModels( Layer layer )
  110 + {
  111 + //Add containers to house each renderer-holding-actor.
112 for( int i = 0; i < NUM_MESHES; i++ ) 112 for( int i = 0; i < NUM_MESHES; i++ )
113 { 113 {
114 mContainers[i] = Actor::New(); 114 mContainers[i] = Actor::New();
115 mContainers[i].SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); 115 mContainers[i].SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
116 mContainers[i].RegisterProperty( "Tag", MODEL_TAG ); //Used to differentiate between different kinds of actor. 116 mContainers[i].RegisterProperty( "Tag", MODEL_TAG ); //Used to differentiate between different kinds of actor.
117 mContainers[i].RegisterProperty( "Model", Property::Value( i ) ); //Used to index into the model. 117 mContainers[i].RegisterProperty( "Model", Property::Value( i ) ); //Used to index into the model.
118 -  
119 - //Position each container on screen  
120 - if( i == 0 )  
121 - {  
122 - //Main, central model  
123 - mContainers[i].SetSizeModeFactor( Vector3( MODEL_SCALE, MODEL_SCALE, 0.0f ) );  
124 - mContainers[i].SetParentOrigin( ParentOrigin::CENTER );  
125 - mContainers[i].SetAnchorPoint( AnchorPoint::CENTER );  
126 - }  
127 - else if( i == 1 )  
128 - {  
129 - //Top left model  
130 - mContainers[i].SetSizeModeFactor( Vector3( MODEL_SCALE / 3.0f, MODEL_SCALE / 3.0f, 0.0f ) );  
131 - mContainers[i].SetParentOrigin( Vector3( 0.05, 0.03, 0.5 ) ); //Offset from top left  
132 - mContainers[i].SetAnchorPoint( AnchorPoint::TOP_LEFT );  
133 - }  
134 - else if( i == 2 )  
135 - {  
136 - //Top right model  
137 - mContainers[i].SetSizeModeFactor( Vector3( MODEL_SCALE / 3.0f, MODEL_SCALE / 3.0f, 0.0f ) );  
138 - mContainers[i].SetParentOrigin( Vector3( 0.95, 0.03, 0.5 ) ); //Offset from top right  
139 - mContainers[i].SetAnchorPoint( AnchorPoint::TOP_RIGHT );  
140 - }  
141 -  
142 mContainers[i].TouchedSignal().Connect( this, &MeshVisualController::OnTouch ); 118 mContainers[i].TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
143 - baseLayer.Add( mContainers[i] ); 119 + layer.Add( mContainers[i] );
144 } 120 }
145 121
  122 + //Position each container individually on screen
  123 +
  124 + //Main, central model
  125 + mContainers[0].SetSizeModeFactor( Vector3( MODEL_SCALE, MODEL_SCALE, 0.0f ) );
  126 + mContainers[0].SetParentOrigin( ParentOrigin::CENTER );
  127 + mContainers[0].SetAnchorPoint( AnchorPoint::CENTER );
  128 +
  129 + //Top left model
  130 + mContainers[1].SetSizeModeFactor( Vector3( MODEL_SCALE / 3.0f, MODEL_SCALE / 3.0f, 0.0f ) );
  131 + mContainers[1].SetParentOrigin( Vector3( 0.05, 0.03, 0.5 ) ); //Offset from top left
  132 + mContainers[1].SetAnchorPoint( AnchorPoint::TOP_LEFT );
  133 +
146 //Set up models 134 //Set up models
147 for( int i = 0; i < NUM_MESHES; i++ ) 135 for( int i = 0; i < NUM_MESHES; i++ )
148 { 136 {
@@ -170,70 +158,120 @@ public: @@ -170,70 +158,120 @@ public:
170 158
171 //Calling this sets the model in the controls. 159 //Calling this sets the model in the controls.
172 ReloadModel(); 160 ReloadModel();
  161 + }
  162 +
  163 + //Place the various buttons on the bottom of the screen, with title labels where necessary.
  164 + void SetupButtons( Layer layer )
  165 + {
  166 + //Text label title for changing model or shader.
  167 + TextLabel changeTitleLabel = TextLabel::New( "Switch" );
  168 + changeTitleLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
  169 + changeTitleLabel.SetProperty( TextLabel::Property::UNDERLINE, "{\"thickness\":\"2.0\"}" );
  170 + changeTitleLabel.SetParentOrigin( Vector3( 0.2, BUTTONS_OFFSET_BOTTOM, 0.5 ) );
  171 + changeTitleLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
  172 + layer.Add( changeTitleLabel );
173 173
174 //Create button for model changing 174 //Create button for model changing
175 - Toolkit::PushButton modelButton = Toolkit::PushButton::New(); 175 + PushButton modelButton = Toolkit::PushButton::New();
176 modelButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 176 modelButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
177 modelButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeModelClicked ); 177 modelButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeModelClicked );
178 - modelButton.SetParentOrigin( Vector3( 0.05, 0.95, 0.5 ) ); //Offset from bottom left  
179 - modelButton.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT );  
180 - modelButton.SetLabelText( "Change Model" );  
181 - baseLayer.Add( modelButton ); 178 + modelButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
  179 + modelButton.SetAnchorPoint( AnchorPoint::TOP_RIGHT );
  180 + modelButton.SetLabelText( "Model" );
  181 + changeTitleLabel.Add( modelButton );
182 182
183 //Create button for shader changing 183 //Create button for shader changing
184 - Toolkit::PushButton shaderButton = Toolkit::PushButton::New(); 184 + PushButton shaderButton = Toolkit::PushButton::New();
185 shaderButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 185 shaderButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
186 shaderButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeShaderClicked ); 186 shaderButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeShaderClicked );
187 - shaderButton.SetParentOrigin( Vector3( 0.95, 0.95, 0.5 ) ); //Offset from bottom right  
188 - shaderButton.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );  
189 - shaderButton.SetLabelText( "Change Shader" );  
190 - baseLayer.Add( shaderButton ); 187 + shaderButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
  188 + shaderButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
  189 + shaderButton.SetLabelText( "Shader" );
  190 + changeTitleLabel.Add( shaderButton );
191 191
192 //Create button for pausing animations 192 //Create button for pausing animations
193 - Toolkit::PushButton pauseButton = Toolkit::PushButton::New(); 193 + PushButton pauseButton = Toolkit::PushButton::New();
194 pauseButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 194 pauseButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
195 pauseButton.ClickedSignal().Connect( this, &MeshVisualController::OnPauseClicked ); 195 pauseButton.ClickedSignal().Connect( this, &MeshVisualController::OnPauseClicked );
196 - pauseButton.SetParentOrigin( Vector3( 0.5, 0.95, 0.5 ) ); //Offset from bottom center  
197 - pauseButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); 196 + pauseButton.SetParentOrigin( Vector3( 0.5, BUTTONS_OFFSET_BOTTOM, 0.5 ) );
  197 + pauseButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
198 pauseButton.SetLabelText( " || " ); 198 pauseButton.SetLabelText( " || " );
199 - baseLayer.Add( pauseButton ); 199 + layer.Add( pauseButton );
  200 +
  201 + //Text label title for light position mode.
  202 + TextLabel lightTitleLabel = TextLabel::New( "Light Position" );
  203 + lightTitleLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
  204 + lightTitleLabel.SetProperty( TextLabel::Property::UNDERLINE, "{\"thickness\":\"2.0\"}" );
  205 + lightTitleLabel.SetParentOrigin( Vector3( 0.8, BUTTONS_OFFSET_BOTTOM, 0.5 ) );
  206 + lightTitleLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
  207 + layer.Add( lightTitleLabel );
  208 +
  209 + //Create button for switching between manual and fixed light position.
  210 + PushButton lightButton = Toolkit::PushButton::New();
  211 + lightButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
  212 + lightButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeLightModeClicked );
  213 + lightButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
  214 + lightButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
  215 + lightButton.SetLabelText( "FIXED" );
  216 + lightTitleLabel.Add( lightButton );
  217 + }
200 218
  219 + //Add a point light source the the scene, on a layer above the first.
  220 + void SetupLight( Layer baseLayer )
  221 + {
201 //Create control to act as light source of scene. 222 //Create control to act as light source of scene.
202 mLightSource = Control::New(); 223 mLightSource = Control::New();
203 - mLightSource.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );  
204 - mLightSource.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );  
205 mLightSource.RegisterProperty( "Tag", LIGHT_TAG ); 224 mLightSource.RegisterProperty( "Tag", LIGHT_TAG );
206 225
  226 + //Set size of control based on screen dimensions.
  227 + Stage stage = Stage::GetCurrent();
  228 + if( stage.GetSize().width < stage.GetSize().height )
  229 + {
  230 + //Scale to width.
  231 + mLightSource.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::WIDTH );
  232 + mLightSource.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
  233 + mLightSource.SetSizeModeFactor( Vector3( LIGHT_SCALE, 0.0f, 0.0f ) );
  234 + }
  235 + else
  236 + {
  237 + //Scale to height.
  238 + mLightSource.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::HEIGHT );
  239 + mLightSource.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::WIDTH );
  240 + mLightSource.SetSizeModeFactor( Vector3( 0.0f, LIGHT_SCALE, 0.0f ) );
  241 + }
  242 +
207 //Set position relative to top left, as the light source property is also relative to the top left. 243 //Set position relative to top left, as the light source property is also relative to the top left.
208 mLightSource.SetParentOrigin( ParentOrigin::TOP_LEFT ); 244 mLightSource.SetParentOrigin( ParentOrigin::TOP_LEFT );
209 mLightSource.SetAnchorPoint( AnchorPoint::CENTER ); 245 mLightSource.SetAnchorPoint( AnchorPoint::CENTER );
210 - mLightSource.SetPosition( Stage::GetCurrent().GetSize().x * 0.5f, Stage::GetCurrent().GetSize().y * 0.1f ); 246 + mLightSource.SetPosition( Stage::GetCurrent().GetSize().x * 0.85f, Stage::GetCurrent().GetSize().y * 0.125 );
211 247
212 - //Make white background. 248 + //Supply an image to represent the light.
213 Property::Map lightMap; 249 Property::Map lightMap;
214 - lightMap.Insert( Visual::Property::TYPE, Visual::COLOR );  
215 - lightMap.Insert( ColorVisual::Property::MIX_COLOR, Color::WHITE ); 250 + lightMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
  251 + lightMap.Insert( ImageVisual::Property::URL, DEMO_IMAGE_DIR "light-icon.png" );
216 mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) ); 252 mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) );
217 253
218 - //Label to show what this actor is for the user.  
219 - TextLabel lightLabel = TextLabel::New( "Light" );  
220 - lightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );  
221 - lightLabel.SetParentOrigin( ParentOrigin::CENTER );  
222 - lightLabel.SetAnchorPoint( AnchorPoint::CENTER );  
223 - float padding = 5.0f;  
224 - lightLabel.SetPadding( Padding( padding, padding, padding, padding ) );  
225 - mLightSource.Add( lightLabel );  
226 -  
227 //Connect to touch signal for dragging. 254 //Connect to touch signal for dragging.
228 mLightSource.TouchedSignal().Connect( this, &MeshVisualController::OnTouch ); 255 mLightSource.TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
229 256
230 //Place the light source on a layer above the base, so that it is rendered above everything else. 257 //Place the light source on a layer above the base, so that it is rendered above everything else.
231 Layer upperLayer = Layer::New(); 258 Layer upperLayer = Layer::New();
  259 + upperLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
  260 + upperLayer.SetParentOrigin( ParentOrigin::CENTER );
  261 + upperLayer.SetAnchorPoint( AnchorPoint::CENTER );
  262 +
232 baseLayer.Add( upperLayer ); 263 baseLayer.Add( upperLayer );
233 upperLayer.Add( mLightSource ); 264 upperLayer.Add( mLightSource );
234 265
235 - //Calling this sets the light position of each model to that of the light source control.  
236 - UpdateLight(); 266 + //Decide which light to use to begin with.
  267 + if( mLightFixed )
  268 + {
  269 + UseFixedLight();
  270 + }
  271 + else
  272 + {
  273 + UseManualLight();
  274 + }
237 } 275 }
238 276
239 //Updates the displayed models to account for parameter changes. 277 //Updates the displayed models to account for parameter changes.
@@ -242,11 +280,10 @@ public: @@ -242,11 +280,10 @@ public:
242 //Create mesh property map 280 //Create mesh property map
243 Property::Map map; 281 Property::Map map;
244 map.Insert( Visual::Property::TYPE, Visual::MESH ); 282 map.Insert( Visual::Property::TYPE, Visual::MESH );
245 - map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE[mModelIndex] );  
246 - map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE[mModelIndex] ); 283 + map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] );
  284 + map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] );
247 map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH ); 285 map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH );
248 map.Insert( MeshVisual::Property::SHADING_MODE, SHADING_MODE_TABLE[mShadingModeIndex] ); 286 map.Insert( MeshVisual::Property::SHADING_MODE, SHADING_MODE_TABLE[mShadingModeIndex] );
249 - map.Insert( MeshVisual::Property::USE_SOFT_NORMALS, false );  
250 287
251 //Set the two controls to use the mesh 288 //Set the two controls to use the mesh
252 for( int i = 0; i < NUM_MESHES; i++ ) 289 for( int i = 0; i < NUM_MESHES; i++ )
@@ -255,12 +292,39 @@ public: @@ -255,12 +292,39 @@ public:
255 } 292 }
256 } 293 }
257 294
  295 + void UseFixedLight()
  296 + {
  297 + //Hide draggable source
  298 + mLightSource.SetVisible( false );
  299 +
  300 + //Use stage dimensions to place light at center, offset outwards in z axis.
  301 + Stage stage = Stage::GetCurrent();
  302 + float width = stage.GetSize().width;
  303 + float height = stage.GetSize().height;
  304 + Vector3 lightPosition = Vector3( width / 2.0f, height / 2.0f, std::max( width, height ) * 5.0f );
  305 +
  306 + //Set global light position
  307 + for( int i = 0; i < NUM_MESHES; ++i )
  308 + {
  309 + mModels[i].control.RegisterProperty( "lightPosition", lightPosition, Property::ANIMATABLE );
  310 + }
  311 + }
  312 +
  313 + void UseManualLight()
  314 + {
  315 + //Show draggable source
  316 + mLightSource.SetVisible( true );
  317 +
  318 + //Update to switch light position to that off the source.
  319 + UpdateLight();
  320 + }
  321 +
258 //Updates the light position for each model to account for changes in the source on screen. 322 //Updates the light position for each model to account for changes in the source on screen.
259 void UpdateLight() 323 void UpdateLight()
260 { 324 {
261 //Set light position to the x and y of the light control, offset out of the screen. 325 //Set light position to the x and y of the light control, offset out of the screen.
262 Vector3 controlPosition = mLightSource.GetCurrentPosition(); 326 Vector3 controlPosition = mLightSource.GetCurrentPosition();
263 - Vector3 lightPosition = Vector3( controlPosition.x, controlPosition.y, Stage::GetCurrent().GetSize().x * 2.0f ); 327 + Vector3 lightPosition = Vector3( controlPosition.x, controlPosition.y, Stage::GetCurrent().GetSize().x / 2.0f );
264 328
265 for( int i = 0; i < NUM_MESHES; ++i ) 329 for( int i = 0; i < NUM_MESHES; ++i )
266 { 330 {
@@ -402,6 +466,29 @@ public: @@ -402,6 +466,29 @@ public:
402 return true; 466 return true;
403 } 467 }
404 468
  469 +
  470 + //Switch between a fixed light source in front of the screen, and a light source the user can drag around.
  471 + bool OnChangeLightModeClicked( Toolkit::Button button )
  472 + {
  473 + //Toggle state.
  474 + mLightFixed = !mLightFixed;
  475 +
  476 + if( mLightFixed )
  477 + {
  478 + UseFixedLight();
  479 +
  480 + button.SetLabelText( "FIXED" );
  481 + }
  482 + else
  483 + {
  484 + UseManualLight();
  485 +
  486 + button.SetLabelText( "MANUAL" );
  487 + }
  488 +
  489 + return true;
  490 + }
  491 +
405 //If escape or the back button is pressed, quit the application (and return to the launcher) 492 //If escape or the back button is pressed, quit the application (and return to the launcher)
406 void OnKeyEvent( const KeyEvent& event ) 493 void OnKeyEvent( const KeyEvent& event )
407 { 494 {
@@ -433,6 +520,7 @@ private: @@ -433,6 +520,7 @@ private:
433 int mTag; //Identifies what kind of actor has been selected in OnTouch. 520 int mTag; //Identifies what kind of actor has been selected in OnTouch.
434 int mSelectedModelIndex; //Index of model selected on screen. 521 int mSelectedModelIndex; //Index of model selected on screen.
435 bool mPaused; //If true, all animations are paused and should stay so. 522 bool mPaused; //If true, all animations are paused and should stay so.
  523 + bool mLightFixed; //If false, the light is in manual.
436 }; 524 };
437 525
438 // Entry point for Linux & Tizen applications 526 // Entry point for Linux & Tizen applications
examples/native-image-source/native-image-source-example.cpp
  View file @caccf5e
@@ -146,6 +146,10 @@ public: @@ -146,6 +146,10 @@ public:
146 // Get a handle to the stage 146 // Get a handle to the stage
147 Stage stage = Stage::GetCurrent(); 147 Stage stage = Stage::GetCurrent();
148 stage.SetBackgroundColor( Color::WHITE ); 148 stage.SetBackgroundColor( Color::WHITE );
  149 +
  150 + // Hide the indicator bar
  151 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  152 +
149 stage.KeyEventSignal().Connect(this, &NativeImageSourceController::OnKeyEvent); 153 stage.KeyEventSignal().Connect(this, &NativeImageSourceController::OnKeyEvent);
150 154
151 mButtonRefreshAlways = PushButton::New(); 155 mButtonRefreshAlways = PushButton::New();
examples/page-turn-view/page-turn-view-example.cpp
  View file @caccf5e
@@ -242,6 +242,9 @@ void PageTurnController::OnInit( Application&amp; app ) @@ -242,6 +242,9 @@ void PageTurnController::OnInit( Application&amp; app )
242 242
243 Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent); 243 Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent);
244 244
  245 + // Hide the indicator bar
  246 + app.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  247 +
245 Stage stage = Stage::GetCurrent(); 248 Stage stage = Stage::GetCurrent();
246 Vector2 stageSize = stage.GetSize(); 249 Vector2 stageSize = stage.GetSize();
247 250
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @caccf5e
@@ -68,6 +68,9 @@ public: @@ -68,6 +68,9 @@ public:
68 Stage stage = Stage::GetCurrent(); 68 Stage stage = Stage::GetCurrent();
69 stage.SetBackgroundColor( Color::WHITE ); 69 stage.SetBackgroundColor( Color::WHITE );
70 70
  71 + // Hide the indicator bar
  72 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  73 +
71 //Set up layer to place UI on. 74 //Set up layer to place UI on.
72 Layer layer = Layer::New(); 75 Layer layer = Layer::New();
73 layer.SetParentOrigin( ParentOrigin::CENTER ); 76 layer.SetParentOrigin( ParentOrigin::CENTER );
examples/renderer-stencil/renderer-stencil-example.cpp
  View file @caccf5e
@@ -33,7 +33,6 @@ namespace @@ -33,7 +33,6 @@ namespace
33 33
34 // Application constants: 34 // Application constants:
35 const char * const APPLICATION_TITLE( "Renderer Stencil API Demo" ); 35 const char * const APPLICATION_TITLE( "Renderer Stencil API Demo" );
36 -const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );  
37 const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); 36 const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
38 37
39 // Texture filenames: 38 // Texture filenames:
@@ -52,6 +51,7 @@ const float ANIMATION_BOUNCE_DEFORMATION_PERCENT( 20.0f ); ///&lt; Percentage (of t @@ -52,6 +51,7 @@ const float ANIMATION_BOUNCE_DEFORMATION_PERCENT( 20.0f ); ///&lt; Percentage (of t
52 const float ANIMATION_BOUNCE_HEIGHT_PERCENT( 40.0f ); ///< Percentage (of the cube's size) to bounce up in to the air by. 51 const float ANIMATION_BOUNCE_HEIGHT_PERCENT( 40.0f ); ///< Percentage (of the cube's size) to bounce up in to the air by.
53 52
54 // Base colors for the objects: 53 // Base colors for the objects:
  54 +const Vector4 TEXT_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White.
55 const Vector4 CUBE_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White. 55 const Vector4 CUBE_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White.
56 const Vector4 FLOOR_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White. 56 const Vector4 FLOOR_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White.
57 const Vector4 REFLECTION_COLOR( 0.6f, 0.6f, 0.6f, 0.6f ); ///< Note that alpha is not 1.0f, to make the blend more photo-realistic. 57 const Vector4 REFLECTION_COLOR( 0.6f, 0.6f, 0.6f, 0.6f ); ///< Note that alpha is not 1.0f, to make the blend more photo-realistic.
@@ -116,11 +116,29 @@ private: @@ -116,11 +116,29 @@ private:
116 { 116 {
117 Stage stage = Stage::GetCurrent(); 117 Stage stage = Stage::GetCurrent();
118 118
119 - // Creates a default view with a default tool-bar.  
120 - // The view is added to the stage.  
121 - Toolkit::ToolBar toolBar;  
122 - Layer toolBarLayer = DemoHelper::CreateView( application, mView, toolBar, BACKGROUND_IMAGE, TOOLBAR_IMAGE, APPLICATION_TITLE );  
123 - stage.Add( toolBarLayer ); 119 + // Hide the indicator bar
  120 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  121 +
  122 + // Creates the background image.
  123 + Toolkit::Control background = Dali::Toolkit::Control::New();
  124 + background.SetAnchorPoint( Dali::AnchorPoint::CENTER );
  125 + background.SetParentOrigin( Dali::ParentOrigin::CENTER );
  126 + background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
  127 + Dali::Property::Map map;
  128 + map["rendererType"] = "IMAGE";
  129 + map["url"] = BACKGROUND_IMAGE;
  130 + background.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
  131 + stage.Add( background );
  132 +
  133 + // Create a TextLabel for the application title.
  134 + Toolkit::TextLabel label = Toolkit::TextLabel::New( APPLICATION_TITLE );
  135 + label.SetAnchorPoint( AnchorPoint::TOP_CENTER );
  136 + // Set the parent origin to a small percentage below the top (so the demo will scale for different resolutions).
  137 + label.SetParentOrigin( Vector3( 0.5f, 0.03f, 0.5f ) );
  138 + label.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  139 + label.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  140 + label.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, TEXT_COLOR );
  141 + stage.Add( label );
124 142
125 // Layer to hold the 3D scene. 143 // Layer to hold the 3D scene.
126 Layer layer = Layer::New(); 144 Layer layer = Layer::New();
examples/text-editor/text-editor-example.cpp
  View file @caccf5e
@@ -131,6 +131,13 @@ public: @@ -131,6 +131,13 @@ public:
131 131
132 mEditor.SetBackgroundColor( TEXT_EDITOR_BACKGROUND_COLOR ); 132 mEditor.SetBackgroundColor( TEXT_EDITOR_BACKGROUND_COLOR );
133 133
  134 + const Size boundingBoxSize( stageSize * TEXT_EDITOR_RELATIVE_SIZE.GetVectorXY() );
  135 + Rect<int> boundingBox( 0,
  136 + static_cast<int>( toolBarHeight ),
  137 + static_cast<int>( boundingBoxSize.width ),
  138 + static_cast<int>( boundingBoxSize.height - toolBarHeight ) );
  139 +
  140 + mEditor.SetProperty( TextEditor::Property::DECORATION_BOUNDING_BOX, boundingBox );
134 mEditor.SetProperty( TextEditor::Property::TEXT_COLOR, Color::BLACK ); 141 mEditor.SetProperty( TextEditor::Property::TEXT_COLOR, Color::BLACK );
135 mEditor.SetProperty( TextEditor::Property::TEXT, 142 mEditor.SetProperty( TextEditor::Property::TEXT,
136 "Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.\n" 143 "Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.\n"
examples/text-field/text-field-example.cpp
  View file @caccf5e
@@ -75,6 +75,9 @@ public: @@ -75,6 +75,9 @@ public:
75 stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) ); 75 stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) );
76 stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent); 76 stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
77 77
  78 + // Hide the indicator bar
  79 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  80 +
78 mButton = CreateFolderButton(); 81 mButton = CreateFolderButton();
79 mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked ); 82 mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked );
80 stage.Add( mButton ); 83 stage.Add( mButton );
examples/tilt/tilt-example.cpp
  View file @caccf5e
@@ -59,6 +59,9 @@ public: @@ -59,6 +59,9 @@ public:
59 stage.GetRootLayer().TouchSignal().Connect( this, &TiltController::OnTouch ); 59 stage.GetRootLayer().TouchSignal().Connect( this, &TiltController::OnTouch );
60 60
61 CreateSensor(); 61 CreateSensor();
  62 +
  63 + // Connect signals to allow Back and Escape to exit.
  64 + stage.KeyEventSignal().Connect( this, &TiltController::OnKeyEvent );
62 } 65 }
63 66
64 void CreateSensor() 67 void CreateSensor()
@@ -88,6 +91,21 @@ public: @@ -88,6 +91,21 @@ public:
88 mTextLabel.RotateBy(pitchRot);; 91 mTextLabel.RotateBy(pitchRot);;
89 } 92 }
90 93
  94 + /**
  95 + * @brief OnKeyEvent signal handler.
  96 + * @param[in] event The key event information
  97 + */
  98 + void OnKeyEvent( const KeyEvent& event )
  99 + {
  100 + if( event.state == KeyEvent::Down )
  101 + {
  102 + if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
  103 + {
  104 + mApplication.Quit();
  105 + }
  106 + }
  107 + }
  108 +
91 private: 109 private:
92 Application& mApplication; 110 Application& mApplication;
93 TiltSensor mTiltSensor; 111 TiltSensor mTiltSensor;
packaging/com.samsung.dali-demo.spec
  View file @caccf5e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.1.45 5 +Version: 1.2.0
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
@@ -76,7 +76,9 @@ cmake -DDALI_APP_DIR=%{dali_app_ro_dir} \ @@ -76,7 +76,9 @@ cmake -DDALI_APP_DIR=%{dali_app_ro_dir} \
76 %if 0%{?enable_debug} 76 %if 0%{?enable_debug}
77 -DCMAKE_BUILD_TYPE=Debug \ 77 -DCMAKE_BUILD_TYPE=Debug \
78 %endif 78 %endif
79 - -DLOCAL_STYLE_DIR=%{local_style_dir} . 79 + -DLOCAL_STYLE_DIR=%{local_style_dir} \
  80 + -DINTERNATIONALIZATION:BOOL=OFF \
  81 + .
80 82
81 make %{?jobs:-j%jobs} 83 make %{?jobs:-j%jobs}
82 84
resources/images/light-icon.png 0 → 100644
View file @caccf5e

115 KB
demo/po/as.po renamed to resources/po/as.po
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "অৱৰুদ্ধ কৰক"
  3 +
1 msgid "DALI_DEMO_STR_TITLE_BUBBLES" 4 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
2 msgstr "বেলুন" 5 msgstr "বেলুন"
3 6
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "অৱৰুদ্ধ কৰক" 7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "ক্লিক্"
6 9
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "থুপ" 10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "ঝুৰ্"
9 12
10 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION" 13 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
11 msgstr "ঘনক পৰিৱৰ্তনীয় প্ৰভাৱ" 14 msgstr "ঘনক পৰিৱৰ্তনীয় প্ৰভাৱ"
@@ -13,38 +16,116 @@ msgstr &quot;ঘনক পৰিৱৰ্তনীয় প্ৰভাৱ&quot; @@ -13,38 +16,116 @@ msgstr &quot;ঘনক পৰিৱৰ্তনীয় প্ৰভাৱ&quot;
13 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION" 16 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
14 msgstr "পৰিৱৰ্তনীয় প্ৰভাৱ" 17 msgstr "পৰিৱৰ্তনীয় প্ৰভাৱ"
15 18
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "অকৃতকাৰ্য্য হ"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "Emoji"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "অনুবিম্ব ইজাৰ"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "প্ৰতিচ্ছবি স্কেল কৰক"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "অনুবিম্ব"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "অনুবিম্ব অনুৰেখ পত্ৰ"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "অনুবিম্ব Pixel Area"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "অনুবিম্ব SVG"
  42 +
16 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW" 43 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
17 msgstr "আইটেম দর্শন" 44 msgstr "আইটেম দর্শন"
18 45
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "ছাঁয়া"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "অঁকোৱা-পকোৱা"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "Logging"
  54 +
19 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER" 55 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
20 msgstr "পৰিবৰ্দ্ধক" 56 msgstr "পৰিবৰ্দ্ধক"
21 57
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "মেশ অঙ্কুৰিত"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "মেশ অসংযোগ"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "3D অনুগামী"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "মেটাবল মহা-বিস্ফোৰণবাদ"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "মেটাবল প্ৰতিসৰিত"
  72 +
22 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR" 73 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
23 msgstr "অস্পষ্ট" 74 msgstr "অস্পষ্ট"
24 75
25 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH" 76 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
26 msgstr "বিস্তাৰ" 77 msgstr "বিস্তাৰ"
27 78
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "অইন অনুবিম্ব"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "অকণমান আপোচ কৰ্"
  84 +
28 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW" 85 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
29 msgstr "পৃষ্ঠা লেআউট" 86 msgstr "পৃষ্ঠা লেআউট"
30 87
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "পোপা মেনু"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "অংশ্যমান অৰ্কিড"
  93 +
31 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU" 94 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
32 msgstr "ৰেডিয়েল নক্সা" 95 msgstr "ৰেডিয়েল নক্সা"
33 96
34 msgid "DALI_DEMO_STR_TITLE_REFRACTION" 97 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
35 msgstr "প্ৰতিফলিত কৰক" 98 msgstr "প্ৰতিফলিত কৰক"
36 99
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "চক্ৰলেখন"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "লিপি"
  105 +
37 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW" 106 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
38 msgstr "স্ক্ৰ'ল কৰক" 107 msgstr "স্ক্ৰ'ল কৰক"
39 108
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "ছাঁয়া" 109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "অস্পষ্টকৈ অপুষ্পক"
42 111
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "লিপি" 112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "টেক্সটারেদ মেশ"
45 114
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "প্ৰতিচ্ছবি স্কেল কৰক" 115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "অকনিষ্ঠ আনুবংশিক"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "অকনিষ্ঠ অগ্ৰণী"
48 120
49 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 121 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
50 msgstr "লেৱেল কৰক" 122 msgstr "লেৱেল কৰক"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "অক্ষশক্তি অঁকা অকনিষ্ঠ"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "অকনিষ্ঠ অৰ্জুন বঁটা"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "টিল্ট অনুভূতি"
51 \ No newline at end of file 132 \ No newline at end of file
demo/po/de.po renamed to resources/po/de.po
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "Blöcke"
  3 +
1 msgid "DALI_DEMO_STR_TITLE_BUBBLES" 4 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
2 msgstr "Schaumbildung" 5 msgstr "Schaumbildung"
3 6
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "Blöcke" 7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "Tasten"
6 9
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "Cluster" 10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "Farbverlauf "
9 12
10 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION" 13 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
11 msgstr "Würfel Übergangseffekt" 14 msgstr "Würfel Übergangseffekt"
@@ -13,38 +16,116 @@ msgstr &quot;Würfel Übergangseffekt&quot; @@ -13,38 +16,116 @@ msgstr &quot;Würfel Übergangseffekt&quot;
13 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION" 16 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
14 msgstr "Auflösen Übergangseffekt" 17 msgstr "Auflösen Übergangseffekt"
15 18
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "Auswirkungen"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "Emoji"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "Bild Montage und Sampling"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "Bildskalierung"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "Bildansicht "
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "Bildansicht mit Transparenz"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "Bildansicht Pixelbereich"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "Bildansicht SVG"
  42 +
16 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW" 43 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
17 msgstr "Item-Ansicht" 44 msgstr "Item-Ansicht"
18 45
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "Licht und Schatten"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "Linien"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "Logging"
  54 +
19 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER" 55 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
20 msgstr "Bildschirmlupe" 56 msgstr "Bildschirmlupe"
21 57
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "Mesh Veränderung"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "Mesh Sortierung"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "3D-Modelle"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "Metaball Explosion"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "Metaball Brechung"
  72 +
22 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR" 73 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
23 msgstr "Bewegungsunschärfe" 74 msgstr "Bewegungsunschärfe"
24 75
25 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH" 76 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
26 msgstr "Bewegung Strecke" 77 msgstr "Bewegung Strecke"
27 78
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "Nativen Bild"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "Größe Verhandlung"
  84 +
28 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW" 85 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
29 msgstr "Seite wechseln" 86 msgstr "Seite wechseln"
30 87
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "Popup-Menü"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "Grundformen"
  93 +
31 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU" 94 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
32 msgstr "Radialmenü" 95 msgstr "Radialmenü"
33 96
34 msgid "DALI_DEMO_STR_TITLE_REFRACTION" 97 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
35 msgstr "Brechung" 98 msgstr "Brechung"
36 99
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "Schablone"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "Scripting"
  105 +
37 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW" 106 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
38 msgstr "Scroll-Ansicht" 107 msgstr "Scroll-Ansicht"
39 108
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "Licht und Schatten" 109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "Unschärfe und blühen"
42 111
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "Scripting" 112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "Strukturiertem Mesh"
45 114
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "Bildskalierung" 115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "Texteditor"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "Textfeld"
48 120
49 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 121 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
50 msgstr "Beschriftung" 122 msgstr "Beschriftung"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "Mehrere Sprachen Beschriftung"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "Text Scrollen"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "Neigungssensor"
resources/po/en.po 0 → 120000
  View file @caccf5e
  1 +en_US.po
0 \ No newline at end of file 2 \ No newline at end of file
resources/po/en_GB.po 0 → 100755
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "Blocks"
  3 +
  4 +msgid "DALI_DEMO_STR_TITLE_BUBBLES"
  5 +msgstr "Bubbles"
  6 +
  7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "Buttons"
  9 +
  10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "Colour Gradient"
  12 +
  13 +msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
  14 +msgstr "Cube Effect"
  15 +
  16 +msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
  17 +msgstr "Dissolve Effect"
  18 +
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "Effects View"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "Emoji Text"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "Image Fitting and Sampling"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "Image Scaling Grid"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "Image View"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "Image View Alpha Blending"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "Image View Pixel Area"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "Image View SVG"
  42 +
  43 +msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
  44 +msgstr "Item View"
  45 +
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "Lights and Shadows"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "Mesh Line"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "Logging"
  54 +
  55 +msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
  56 +msgstr "Magnifier"
  57 +
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "Mesh Morph"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "Mesh Sorting"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "Mesh Visual"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "Metaball Explosion"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "Metaball Refraction"
  72 +
  73 +msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
  74 +msgstr "Motion Blur"
  75 +
  76 +msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
  77 +msgstr "Motion Stretch"
  78 +
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "Native Image Source"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "Negotiate Size"
  84 +
  85 +msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
  86 +msgstr "Page Turn View"
  87 +
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "Popup"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "Primitive Shapes"
  93 +
  94 +msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
  95 +msgstr "Radial Menu"
  96 +
  97 +msgid "DALI_DEMO_STR_TITLE_REFRACTION"
  98 +msgstr "Refraction"
  99 +
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "Renderer Stencil"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "Script-based UI"
  105 +
  106 +msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
  107 +msgstr "Scroll View"
  108 +
  109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "Super Blur and Bloom"
  111 +
  112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "Mesh Texture"
  114 +
  115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "Text Editor"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "Text Field"
  120 +
  121 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
  122 +msgstr "Text Label"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "Text Scripts"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "Text Scrolling"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "Tilt Sensor"
resources/po/en_US.po 0 → 100755
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "Blocks"
  3 +
  4 +msgid "DALI_DEMO_STR_TITLE_BUBBLES"
  5 +msgstr "Bubbles"
  6 +
  7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "Buttons"
  9 +
  10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "Color Gradient"
  12 +
  13 +msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
  14 +msgstr "Cube Effect"
  15 +
  16 +msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
  17 +msgstr "Dissolve Effect"
  18 +
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "Effects View"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "Emoji Text"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "Image Fitting and Sampling"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "Image Scaling Grid"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "Image View"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "Image View Alpha Blending"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "Image View Pixel Area"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "Image View SVG"
  42 +
  43 +msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
  44 +msgstr "Item View"
  45 +
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "Lights and Shadows"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "Mesh Line"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "Logging"
  54 +
  55 +msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
  56 +msgstr "Magnifier"
  57 +
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "Mesh Morph"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "Mesh Sorting"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "Mesh Visual"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "Metaball Explosion"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "Metaball Refraction"
  72 +
  73 +msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
  74 +msgstr "Motion Blur"
  75 +
  76 +msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
  77 +msgstr "Motion Stretch"
  78 +
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "Native Image Source"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "Negotiate Size"
  84 +
  85 +msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
  86 +msgstr "Page Turn View"
  87 +
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "Popup"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "Primitive Shapes"
  93 +
  94 +msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
  95 +msgstr "Radial Menu"
  96 +
  97 +msgid "DALI_DEMO_STR_TITLE_REFRACTION"
  98 +msgstr "Refraction"
  99 +
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "Renderer Stencil"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "Script-based UI"
  105 +
  106 +msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
  107 +msgstr "Scroll View"
  108 +
  109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "Super Blur and Bloom"
  111 +
  112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "Mesh Texture"
  114 +
  115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "Text Editor"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "Text Field"
  120 +
  121 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
  122 +msgstr "Text Label"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "Text Scripts"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "Text Scrolling"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "Tilt Sensor"
demo/po/es.po renamed to resources/po/es.po 100644 → 100755
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "Bloques"
  3 +
1 msgid "DALI_DEMO_STR_TITLE_BUBBLES" 4 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
2 msgstr "Burbujas" 5 msgstr "Burbujas"
3 6
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "Bloques" 7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "Botones"
6 9
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "Agrupación" 10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "Gradiente de color"
9 12
10 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION" 13 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
11 msgstr "Transición cubos" 14 msgstr "Transición cubos"
@@ -13,38 +16,116 @@ msgstr &quot;Transición cubos&quot; @@ -13,38 +16,116 @@ msgstr &quot;Transición cubos&quot;
13 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION" 16 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
14 msgstr "Transición disolver" 17 msgstr "Transición disolver"
15 18
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "Vista de efectos"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "Texto con emojis"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "Modo de encaje y muestreo"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "Modo de escalado de imagen"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "Control con imagenes"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "Control con imagenes con transparencias"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "Control con imagenes con area de pixeles"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "Control con imagenes SVG"
  42 +
16 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW" 43 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
17 msgstr "Vista de elementos" 44 msgstr "Vista de elementos"
18 45
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "Luces y sombras"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "Lineas"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "Control de entrada"
  54 +
19 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER" 55 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
20 msgstr "Lupa" 56 msgstr "Lupa"
21 57
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "Transformacion de geometrias"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "Ordenacion de geometrias"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "Gemeotria 3D"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "Explosion de metabolas"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "Refraccion de metabolas"
  72 +
22 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR" 73 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
23 msgstr "Desenfoque de movimiento" 74 msgstr "Desenfoque de movimiento"
24 75
25 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH" 76 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
26 msgstr "Movimiento con deformación" 77 msgstr "Movimiento con deformación"
27 78
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "Fuente de imagenes nativas"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "Negociacion de tamaño"
  84 +
28 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW" 85 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
29 msgstr "Vista de páginas" 86 msgstr "Vista de páginas"
30 87
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "Popup"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "Primitvas 3D"
  93 +
31 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU" 94 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
32 msgstr "Menú radial" 95 msgstr "Menú radial"
33 96
34 msgid "DALI_DEMO_STR_TITLE_REFRACTION" 97 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
35 msgstr "Refracción" 98 msgstr "Refracción"
36 99
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "Dibujado con stencil"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "Interfaz definida por Script"
  105 +
37 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW" 106 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
38 msgstr "Vista de desplazamiento" 107 msgstr "Vista de desplazamiento"
39 108
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "Luces y sombras" 109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "Efecto blur y bloom"
42 111
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "Interfaz definida por Script" 112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "Geometria con texturas"
45 114
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "Modos de escalado de imagen" 115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "Editor de texto"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "Campo de texto"
48 120
49 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 121 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
50 msgstr "Etiqueta de texto" 122 msgstr "Etiqueta de texto"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "Textos internacionales"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "Texto con desplazamiento"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "Sensor de inclinacion"
demo/po/ko.po renamed to resources/po/ko.po
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "블록"
  3 +
1 msgid "DALI_DEMO_STR_TITLE_BUBBLES" 4 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
2 msgstr "방울" 5 msgstr "방울"
3 6
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "블록" 7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr ""
6 9
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "클러스터" 10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr ""
9 12
10 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION" 13 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
11 msgstr "입방체 전환" 14 msgstr "입방체 전환"
@@ -13,38 +16,116 @@ msgstr &quot;입방체 전환&quot; @@ -13,38 +16,116 @@ msgstr &quot;입방체 전환&quot;
13 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION" 16 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
14 msgstr "디졸브 전환" 17 msgstr "디졸브 전환"
15 18
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr ""
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr ""
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr ""
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "이미지 확대"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr ""
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr ""
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr ""
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr ""
  42 +
16 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW" 43 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
17 msgstr "아이템 뷰" 44 msgstr "아이템 뷰"
18 45
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "빛과 그림자"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr ""
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr ""
  54 +
19 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER" 55 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
20 msgstr "돋보기" 56 msgstr "돋보기"
21 57
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr ""
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr ""
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr ""
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr ""
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr ""
  72 +
22 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR" 73 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
23 msgstr "모션 블러" 74 msgstr "모션 블러"
24 75
25 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH" 76 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
26 msgstr "늘이기" 77 msgstr "늘이기"
27 78
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr ""
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr ""
  84 +
28 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW" 85 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
29 msgstr "책장 넘기기" 86 msgstr "책장 넘기기"
30 87
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr ""
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr ""
  93 +
31 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU" 94 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
32 msgstr "레이디 얼 메뉴" 95 msgstr "레이디 얼 메뉴"
33 96
34 msgid "DALI_DEMO_STR_TITLE_REFRACTION" 97 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
35 msgstr "굴절 효과" 98 msgstr "굴절 효과"
36 99
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr ""
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "스크립팅"
  105 +
37 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW" 106 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
38 msgstr "스크롤 뷰" 107 msgstr "스크롤 뷰"
39 108
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "빛과 그림자" 109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr ""
42 111
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "스크립팅" 112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr ""
45 114
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "이미지 확대" 115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr ""
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr ""
48 120
49 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 121 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
50 msgstr "텍스트 라벨" 122 msgstr "텍스트 라벨"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr ""
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr ""
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr ""
51 \ No newline at end of file 132 \ No newline at end of file
demo/po/ml.po renamed to resources/po/ml.po
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "തടയപàµà´ªàµ†à´Ÿàµà´Ÿ"
  3 +
1 msgid "DALI_DEMO_STR_TITLE_BUBBLES" 4 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
2 msgstr "à´•àµà´®à´¿à´³" 5 msgstr "à´•àµà´®à´¿à´³"
3 6
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "തടയപàµà´ªàµ†à´Ÿàµà´Ÿ" 7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "ബടàµà´Ÿà´£àµà´•àµ¾"
6 9
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "à´•àµà´²à´¸àµà´±àµà´±à´°àµ" 10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "വർണàµà´£ à´—àµà´°àµ‡à´¡à´¿à´¯à´¨àµà´±àµ"
9 12
10 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION" 13 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
11 msgstr "സമചതàµà´°à´•àµà´•à´Ÿàµà´Ÿ സംകàµà´°à´®à´£ ഇഫകàµà´Ÿàµ" 14 msgstr "സമചതàµà´°à´•àµà´•à´Ÿàµà´Ÿ സംകàµà´°à´®à´£ ഇഫകàµà´Ÿàµ"
@@ -13,38 +16,116 @@ msgstr &quot;സമചതàµà´°à´•àµà´•à´Ÿàµà´Ÿ സംകàµà´°à´®à´£ ഇഫകàµà @@ -13,38 +16,116 @@ msgstr &quot;സമചതàµà´°à´•àµà´•à´Ÿàµà´Ÿ സംകàµà´°à´®à´£ ഇഫകàµà
13 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION" 16 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
14 msgstr "à´¸àµà´¥à´¾à´¨à´¾à´¨àµà´¤à´°à´‚ സംകàµà´°à´®à´£ ഇഫകàµà´Ÿàµ" 17 msgstr "à´¸àµà´¥à´¾à´¨à´¾à´¨àµà´¤à´°à´‚ സംകàµà´°à´®à´£ ഇഫകàµà´Ÿàµ"
15 18
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "à´Žà´«à´•àµà´±àµà´±àµà´•àµ¾"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "ഇമോടàµà´Ÿà´¿à´•àµ‡à´¾à´£àµà´•àµ¾"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "à´šà´¿à´¤àµà´°à´‚ ഉചിതമാണൠആൻഡൠഒരàµà´ªà´±àµà´±à´‚"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "ഇമേജിംഗàµ"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "à´šà´¿à´¤àµà´°à´‚ കാഴàµà´š"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "à´šà´¿à´¤àµà´°à´‚ കാഴàµà´š"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "à´¸àµà´¤à´¾à´°àµà´¯à´¤ ഉപയോഗിചàµà´šàµ ഇമേജൠകാഴàµà´š"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "à´šà´¿à´¤àµà´°à´‚ കാഴàµà´š SVG"
  42 +
16 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW" 43 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
17 msgstr "ഇനം കാഴàµà´š" 44 msgstr "ഇനം കാഴàµà´š"
18 45
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "നിഴലàµ"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "വര"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "ലോഗിംഗàµ"
  54 +
19 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER" 55 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
20 msgstr "ഭൂതകàµà´•à´£àµà´£à´¾à´Ÿà´¿" 56 msgstr "ഭൂതകàµà´•à´£àµà´£à´¾à´Ÿà´¿"
21 57
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "മോർഫൠmesh"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "തരംതിരികàµà´•à´²à´¿à´¨à´¾à´¯à´¿ mesh"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "3D മോഡലിങàµ"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "മെറàµà´±à´¾ പനàµà´¤àµ à´¸àµà´«àµ‡à´¾à´Ÿà´¨à´‚"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "മെറàµà´±à´¾ പനàµà´¤àµ അപവർതàµà´¤à´¨à´‚"
  72 +
22 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR" 73 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
23 msgstr "à´…à´µàµà´¯à´•àµà´¤à´®à´¾à´•àµà´•à´²àµ" 74 msgstr "à´…à´µàµà´¯à´•àµà´¤à´®à´¾à´•àµà´•à´²àµ"
24 75
25 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH" 76 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
26 msgstr "à´¸àµà´Ÿàµà´°àµ†à´šàµà´šàµ" 77 msgstr "à´¸àµà´Ÿàµà´°àµ†à´šàµà´šàµ"
27 78
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "നേറàµà´±àµ€à´µàµ à´šà´¿à´¤àµà´°à´‚"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "വലàµà´ªàµà´ªà´‚ കൂടിയാലോചന"
  84 +
28 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW" 85 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
29 msgstr "പേജൠലേഔടàµà´Ÿàµ" 86 msgstr "പേജൠലേഔടàµà´Ÿàµ"
30 87
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "പോപപàµà´ªàµ മെനàµà´µà´¿àµ½"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "à´…à´Ÿà´¿à´¸àµà´¥à´¾à´¨ രൂപങàµà´™àµ¾"
  93 +
31 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU" 94 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
32 msgstr "റേഡിയലൠരേഖാചിതàµà´°à´‚" 95 msgstr "റേഡിയലൠരേഖാചിതàµà´°à´‚"
33 96
34 msgid "DALI_DEMO_STR_TITLE_REFRACTION" 97 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
35 msgstr "à´ªàµà´°à´¤à´¿à´«à´²à´¿à´•àµà´•àµà´•" 98 msgstr "à´ªàµà´°à´¤à´¿à´«à´²à´¿à´•àµà´•àµà´•"
36 99
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "സീരിയോലിതàµà´¤àµ‡à´¾à´—àµà´°à´¾à´«àµ"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "à´¸àµà´•àµà´°à´¿à´ªàµà´±àµà´±àµ"
  105 +
37 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW" 106 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
38 msgstr "à´¸àµà´•àµà´°àµ‹à´³àµà´šàµ†à´¯àµà´¯àµà´• കാഴàµà´š" 107 msgstr "à´¸àµà´•àµà´°àµ‹à´³àµà´šàµ†à´¯àµà´¯àµà´• കാഴàµà´š"
39 108
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "നിഴലàµ" 109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "മങàµà´™àµ½ പൂകàµà´•àµ½"
42 111
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "à´¸àµà´•àµà´°à´¿à´ªàµà´±àµà´±àµ" 112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "ടെകàµà´¸àµà´šàµ¼ mesh"
45 114
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "ഇമേജിംഗàµ" 115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "ടെകàµà´¸àµà´±àµà´±àµ à´Žà´¡à´¿à´±àµà´±àµ¼"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "ടെകàµà´¸àµà´±àµà´±àµ ഫീൽഡàµ"
48 120
49 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 121 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
50 msgstr "ലേബലàµà´šàµ†à´¯àµà´¯àµà´•" 122 msgstr "ലേബലàµà´šàµ†à´¯àµà´¯àµà´•"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "à´’à´¨àµà´¨à´¿à´²à´§à´¿à´•à´‚ ഭാഷ വാചകം"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "ടെകàµà´¸àµà´±àµà´±àµ à´¸àµà´•àµà´°àµ‡à´¾à´³à´¿à´‚à´—àµ"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "ചെരിവൠസെൻസർ"
51 \ No newline at end of file 132 \ No newline at end of file
demo/po/ur.po renamed to resources/po/ur.po 100644 → 100755
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "اینٹیں"
  3 +
1 msgid "DALI_DEMO_STR_TITLE_BUBBLES" 4 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
2 msgstr "بلبلے" 5 msgstr "بلبلے"
3 6
4 -msgid "DALI_DEMO_STR_TITLE_BLOCKS"  
5 -msgstr "اینٹیں" 7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "بٹنوں"
6 9
7 -msgid "DALI_DEMO_STR_TITLE_CLUSTER"  
8 -msgstr "کلسٹر" 10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "رنگ میلان"
9 12
10 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION" 13 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
11 msgstr "کیوب منتقلی" 14 msgstr "کیوب منتقلی"
@@ -13,38 +16,116 @@ msgstr &quot;کیوب منتقلی&quot; @@ -13,38 +16,116 @@ msgstr &quot;کیوب منتقلی&quot;
13 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION" 16 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
14 msgstr "حل منتقلی" 17 msgstr "حل منتقلی"
15 18
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "اثرات"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "اموٹکان"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "تصویر فٹنگ"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "تصویر پیمائی"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "تصویر کنٹرول"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "تصویر کنٹرول"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "تصویر کنٹرول شفافیت کے ساتھ"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "تصویر کنٹرول SVG"
  42 +
16 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW" 43 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
17 msgstr "چیزوں کی فہرست" 44 msgstr "چیزوں کی فہرست"
18 45
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "روشنی اور سائے"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "لکیریں"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "لاگنگ"
  54 +
19 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER" 55 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
20 msgstr "مکبر" 56 msgstr "مکبر"
21 57
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "میش کی تبدیلی"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "میش کی چھنٹائی"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "3D میش"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "میٹابال دھماکہ"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "میٹابال اپورتن"
  72 +
22 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR" 73 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
23 msgstr "دھندلانے کی حرکت" 74 msgstr "دھندلانے کی حرکت"
24 75
25 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH" 76 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
26 msgstr "کھینچھنے کی حرکت" 77 msgstr "کھینچھنے کی حرکت"
27 78
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "نیٹو تصویر"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "سائز مذاکرات"
  84 +
28 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW" 85 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
29 msgstr "کتاب" 86 msgstr "کتاب"
30 87
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "پاپ اپ"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "سادہ ماڈلیے"
  93 +
31 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU" 94 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
32 msgstr "ریڈیل مینو" 95 msgstr "ریڈیل مینو"
33 96
34 msgid "DALI_DEMO_STR_TITLE_REFRACTION" 97 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
35 msgstr "رفراکشن" 98 msgstr "رفراکشن"
36 99
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "سٹینسل"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "سکرپٹ"
  105 +
37 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW" 106 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
38 msgstr "سکرول ویو" 107 msgstr "سکرول ویو"
39 108
40 -msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"  
41 -msgstr "روشنی اور سائے" 109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "دھندلاپن اور بلوم"
42 111
43 -msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"  
44 -msgstr "سکرپٹ" 112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "ٹیکسچرد میش"
45 114
46 -msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"  
47 -msgstr "تصویر پیمائی" 115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "حروف ایڈیٹر"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "حروف لائن ایڈیٹر"
48 120
49 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 121 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
50 -msgstr "لیبل" 122 +msgstr "حروف کا لیبل"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "کئی زبانوں"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "حروف کاسکرال "
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "ٹلٹ سینسر"
resources/po/zn_CH.po 0 → 100755
  View file @caccf5e
  1 +msgid "DALI_DEMO_STR_TITLE_BLOCKS"
  2 +msgstr "块体"
  3 +
  4 +msgid "DALI_DEMO_STR_TITLE_BUBBLES"
  5 +msgstr "气泡"
  6 +
  7 +msgid "DALI_DEMO_STR_TITLE_BUTTONS"
  8 +msgstr "按钮"
  9 +
  10 +msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
  11 +msgstr "颜色梯度"
  12 +
  13 +msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
  14 +msgstr "方块切换效果"
  15 +
  16 +msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
  17 +msgstr "冰消瓦解切换效果"
  18 +
  19 +msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
  20 +msgstr "效果视图"
  21 +
  22 +msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
  23 +msgstr "表情符号"
  24 +
  25 +msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
  26 +msgstr "图像填充及采样"
  27 +
  28 +msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
  29 +msgstr "图像缩放"
  30 +
  31 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
  32 +msgstr "图像视图"
  33 +
  34 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
  35 +msgstr "图像视图透明度"
  36 +
  37 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
  38 +msgstr "图像视图像素区域"
  39 +
  40 +msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
  41 +msgstr "图像视图 SVG"
  42 +
  43 +msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
  44 +msgstr "项目视图"
  45 +
  46 +msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
  47 +msgstr "阴影"
  48 +
  49 +msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
  50 +msgstr "线条"
  51 +
  52 +msgid "DALI_DEMO_STR_TITLE_LOGGING"
  53 +msgstr "记录"
  54 +
  55 +msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
  56 +msgstr "放大鏡"
  57 +
  58 +msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
  59 +msgstr "网格变形"
  60 +
  61 +msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
  62 +msgstr "网格排序"
  63 +
  64 +msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
  65 +msgstr "3D模型"
  66 +
  67 +msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
  68 +msgstr "元球爆炸"
  69 +
  70 +msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
  71 +msgstr "元球折射"
  72 +
  73 +msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
  74 +msgstr "动作模糊"
  75 +
  76 +msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
  77 +msgstr "动作拉伸"
  78 +
  79 +msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
  80 +msgstr "本地图像"
  81 +
  82 +msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
  83 +msgstr "尺寸协商"
  84 +
  85 +msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
  86 +msgstr "翻页"
  87 +
  88 +msgid "DALI_DEMO_STR_TITLE_POPUP"
  89 +msgstr "弹窗"
  90 +
  91 +msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
  92 +msgstr "基本形状"
  93 +
  94 +msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
  95 +msgstr "径向菜单"
  96 +
  97 +msgid "DALI_DEMO_STR_TITLE_REFRACTION"
  98 +msgstr "折射"
  99 +
  100 +msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
  101 +msgstr "模板缓冲"
  102 +
  103 +msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
  104 +msgstr "脚本用户界面"
  105 +
  106 +msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
  107 +msgstr "滚动视图"
  108 +
  109 +msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
  110 +msgstr "模糊及泛光"
  111 +
  112 +msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
  113 +msgstr "纹理网格"
  114 +
  115 +msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
  116 +msgstr "文字编辑器"
  117 +
  118 +msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
  119 +msgstr "文字栏"
  120 +
  121 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
  122 +msgstr "标签"
  123 +
  124 +msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
  125 +msgstr "多语言标签"
  126 +
  127 +msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
  128 +msgstr "滚动文字"
  129 +
  130 +msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
  131 +msgstr "倾斜传感器"
0 \ No newline at end of file 132 \ No newline at end of file
shared/dali-demo-strings.h
  View file @caccf5e
@@ -32,91 +32,100 @@ extern &quot;C&quot; @@ -32,91 +32,100 @@ extern &quot;C&quot;
32 32
33 #ifdef INTERNATIONALIZATION_ENABLED 33 #ifdef INTERNATIONALIZATION_ENABLED
34 34
35 -#define DALI_DEMO_STR_TITLE_BUBBLES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUBBLES")  
36 -#define DALI_DEMO_STR_TITLE_BLOCKS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BLOCKS")  
37 -#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CUBE_TRANSITION")  
38 -#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION")  
39 -#define DALI_DEMO_STR_TITLE_ITEM_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")  
40 -#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")  
41 -#define DALI_DEMO_STR_TITLE_MAGNIFIER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")  
42 -#define DALI_DEMO_STR_TITLE_MOTION_BLUR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_BLUR")  
43 -#define DALI_DEMO_STR_TITLE_MOTION_STRETCH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_STRETCH")  
44 -#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW")  
45 -#define DALI_DEMO_STR_TITLE_RADIAL_MENU dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RADIAL_MENU")  
46 -#define DALI_DEMO_STR_TITLE_REFRACTION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_REFRACTION")  
47 -#define DALI_DEMO_STR_TITLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")  
48 -#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")  
49 -#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")  
50 -#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING")  
51 -#define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")  
52 -#define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD")  
53 -#define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")  
54 -#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")  
55 -#define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")  
56 -#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE")  
57 -#define DALI_DEMO_STR_TITLE_POPUP dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_POPUP")  
58 -#define DALI_DEMO_STR_TITLE_BUTTONS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS")  
59 -#define DALI_DEMO_STR_TITLE_LOGGING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")  
60 -#define DALI_DEMO_STR_TITLE_MESH_MORPH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_MORPH")  
61 -#define DALI_DEMO_STR_TITLE_MESH_SORTING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_SORTING")  
62 -#define DALI_DEMO_STR_TITLE_TEXTURED_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TEXTURED_MESH")  
63 -#define DALI_DEMO_STR_TITLE_LINE_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_LINE_MESH")  
64 -#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_COLOR_GRADIENT")  
65 -#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_SUPER_BLUR_BLOOM")  
66 -#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_EFFECTS_VIEW") 35 +#define DALI_DEMO_STR_TITLE_BLOCKS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BLOCKS")
  36 +#define DALI_DEMO_STR_TITLE_BUBBLES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUBBLES")
  37 +#define DALI_DEMO_STR_TITLE_BUTTONS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS")
  38 +#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_COLOR_GRADIENT")
  39 +#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CUBE_TRANSITION")
  40 +#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION")
  41 +#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EFFECTS_VIEW")
  42 +#define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
  43 +#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING")
  44 +#define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
  45 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW")
  46 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING")
  47 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA")
  48 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG")
  49 +#define DALI_DEMO_STR_TITLE_ITEM_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")
  50 +#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
  51 +#define DALI_DEMO_STR_TITLE_LINE_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LINE_MESH")
  52 +#define DALI_DEMO_STR_TITLE_LOGGING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")
  53 +#define DALI_DEMO_STR_TITLE_MAGNIFIER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")
  54 +#define DALI_DEMO_STR_TITLE_MESH_MORPH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_MORPH")
  55 +#define DALI_DEMO_STR_TITLE_MESH_SORTING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_SORTING")
  56 +#define DALI_DEMO_STR_TITLE_MESH_VISUAL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_VISUAL")
  57 +#define DALI_DEMO_STR_TITLE_METABALL_EXPLOSION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION")
  58 +#define DALI_DEMO_STR_TITLE_METABALL_REFRAC dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_METABALL_REFRAC")
  59 +#define DALI_DEMO_STR_TITLE_MOTION_BLUR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_BLUR")
  60 +#define DALI_DEMO_STR_TITLE_MOTION_STRETCH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_STRETCH")
  61 +#define DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE")
  62 +#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE")
  63 +#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW")
  64 +#define DALI_DEMO_STR_TITLE_POPUP dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_POPUP")
  65 +#define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES")
  66 +#define DALI_DEMO_STR_TITLE_RADIAL_MENU dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RADIAL_MENU")
  67 +#define DALI_DEMO_STR_TITLE_REFRACTION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_REFRACTION")
  68 +#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")
  69 +#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
  70 +#define DALI_DEMO_STR_TITLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
  71 +#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM")
  72 +#define DALI_DEMO_STR_TITLE_TEXTURED_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXTURED_MESH")
  73 +#define DALI_DEMO_STR_TITLE_TEXT_EDITOR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_EDITOR")
  74 +#define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD")
  75 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
  76 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
  77 +#define DALI_DEMO_STR_TITLE_TEXT_SCROLLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_SCROLLING")
  78 +#define DALI_DEMO_STR_TITLE_TILT_SENSOR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TILT_SENSOR")
67 79
68 #else // !INTERNATIONALIZATION_ENABLED 80 #else // !INTERNATIONALIZATION_ENABLED
69 81
70 -#define DALI_DEMO_STR_TITLE_BUBBLES "Bubbles"  
71 -#define DALI_DEMO_STR_TITLE_BLOCKS "Blocks"  
72 -#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION "Cube Effect"  
73 -#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Effect"  
74 -#define DALI_DEMO_STR_TITLE_ITEM_VIEW "Item View"  
75 -#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL "Renderer Stencils"  
76 -#define DALI_DEMO_STR_TITLE_MAGNIFIER "Magnifier"  
77 -#define DALI_DEMO_STR_TITLE_MODEL_3D_VIEWER "Model 3D Viewer"  
78 -#define DALI_DEMO_STR_TITLE_MOTION_BLUR "Motion Blur"  
79 -#define DALI_DEMO_STR_TITLE_MOTION_STRETCH "Motion Stretch"  
80 -#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW "Page Turn View"  
81 -#define DALI_DEMO_STR_TITLE_RADIAL_MENU "Radial Menu"  
82 -#define DALI_DEMO_STR_TITLE_REFRACTION "Refract Effect"  
83 -#define DALI_DEMO_STR_TITLE_SCROLL_VIEW "Scroll View"  
84 -#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS "Lights and shadows"  
85 -#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI "Script Based UI"  
86 -#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING "Image Fitting and Sampling"  
87 -#define DALI_DEMO_STR_TITLE_IMAGE_SCALING "Image Scaling Grid"  
88 -#define DALI_DEMO_STR_TITLE_TEXT_FIELD "Text Field"  
89 -#define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label"  
90 -#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"  
91 -#define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"  
92 -#define DALI_DEMO_STR_TITLE_TEXT_SCROLLING "Text Scrolling"  
93 -#define DALI_DEMO_STR_TITLE_TEXT_EDITOR "Text Editor"  
94 -#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE "Negotiate Size"  
95 -#define DALI_DEMO_STR_TITLE_POPUP "Popup"  
96 -#define DALI_DEMO_STR_TITLE_BUTTONS "Buttons"  
97 -#define DALI_DEMO_STR_TITLE_LOGGING "Logging"  
98 -#define DALI_DEMO_STR_TITLE_MESH_MORPH "Mesh Morph"  
99 -#define DALI_DEMO_STR_TITLE_MESH_SORTING "Mesh Sorting"  
100 -#define DALI_DEMO_STR_TITLE_METABALL_EXPLOSION "Metaball Explosion"  
101 -#define DALI_DEMO_STR_TITLE_METABALL_REFRAC "Metaball Refractions"  
102 -#define DALI_DEMO_STR_TITLE_TEXTURED_MESH "Mesh Texture"  
103 -#define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line"  
104 -#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT "Color Gradient"  
105 -#define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View"  
106 -#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA "Image View Pixel Area"  
107 -#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING "Image View Alpha Blending"  
108 -#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG "Image View SVG"  
109 -#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM "Super Blur and Bloom"  
110 -#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW "Effects View"  
111 -#define DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE "Native Image Source"  
112 -#define DALI_DEMO_STR_TITLE_MESH_VISUAL "Mesh Visual"  
113 -#define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES "Primitive Shapes" 82 +#define DALI_DEMO_STR_TITLE_BLOCKS "Blocks"
  83 +#define DALI_DEMO_STR_TITLE_BUBBLES "Bubbles"
  84 +#define DALI_DEMO_STR_TITLE_BUTTONS "Buttons"
  85 +#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT "Color Gradient"
  86 +#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION "Cube Effect"
  87 +#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Effect"
  88 +#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW "Effects View"
  89 +#define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"
  90 +#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING "Image Fitting and Sampling"
  91 +#define DALI_DEMO_STR_TITLE_IMAGE_SCALING "Image Scaling Grid"
  92 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View"
  93 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING "Image View Alpha Blending"
  94 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA "Image View Pixel Area"
  95 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG "Image View SVG"
  96 +#define DALI_DEMO_STR_TITLE_ITEM_VIEW "Item View"
  97 +#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS "Lights and shadows"
  98 +#define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line"
  99 +#define DALI_DEMO_STR_TITLE_LOGGING "Logging"
  100 +#define DALI_DEMO_STR_TITLE_MAGNIFIER "Magnifier"
  101 +#define DALI_DEMO_STR_TITLE_MESH_MORPH "Mesh Morph"
  102 +#define DALI_DEMO_STR_TITLE_MESH_SORTING "Mesh Sorting"
  103 +#define DALI_DEMO_STR_TITLE_MESH_VISUAL "Mesh Visual"
  104 +#define DALI_DEMO_STR_TITLE_METABALL_EXPLOSION "Metaball Explosion"
  105 +#define DALI_DEMO_STR_TITLE_METABALL_REFRAC "Metaball Refractions"
  106 +#define DALI_DEMO_STR_TITLE_MOTION_BLUR "Motion Blur"
  107 +#define DALI_DEMO_STR_TITLE_MOTION_STRETCH "Motion Stretch"
  108 +#define DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE "Native Image Source"
  109 +#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE "Negotiate Size"
  110 +#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW "Page Turn View"
  111 +#define DALI_DEMO_STR_TITLE_POPUP "Popup"
  112 +#define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES "Primitive Shapes"
  113 +#define DALI_DEMO_STR_TITLE_RADIAL_MENU "Radial Menu"
  114 +#define DALI_DEMO_STR_TITLE_REFRACTION "Refract Effect"
  115 +#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL "Renderer Stencils"
  116 +#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI "Script Based UI"
  117 +#define DALI_DEMO_STR_TITLE_SCROLL_VIEW "Scroll View"
  118 +#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM "Super Blur and Bloom"
  119 +#define DALI_DEMO_STR_TITLE_TEXTURED_MESH "Mesh Texture"
  120 +#define DALI_DEMO_STR_TITLE_TEXT_EDITOR "Text Editor"
  121 +#define DALI_DEMO_STR_TITLE_TEXT_FIELD "Text Field"
  122 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label"
  123 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
  124 +#define DALI_DEMO_STR_TITLE_TEXT_SCROLLING "Text Scrolling"
  125 +#define DALI_DEMO_STR_TITLE_TILT_SENSOR "Tilt Sensor"
114 126
115 #endif 127 #endif
116 128
117 -#define DALI_DEMO_STR_TITLE_TILT_SENSOR "Tilt Sensor"  
118 -  
119 -  
120 #ifdef __cplusplus 129 #ifdef __cplusplus
121 } 130 }
122 #endif // __cplusplus 131 #endif // __cplusplus
shared/view.h
  View file @caccf5e
@@ -118,6 +118,9 @@ Dali::Layer CreateView( Dali::Application&amp; application, @@ -118,6 +118,9 @@ Dali::Layer CreateView( Dali::Application&amp; application,
118 { 118 {
119 Dali::Stage stage = Dali::Stage::GetCurrent(); 119 Dali::Stage stage = Dali::Stage::GetCurrent();
120 120
  121 + // Hide the indicator bar
  122 + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
  123 +
121 // Create default View. 124 // Create default View.
122 view = Dali::Toolkit::Control::New(); 125 view = Dali::Toolkit::Control::New();
123 view.SetAnchorPoint( Dali::AnchorPoint::CENTER ); 126 view.SetAnchorPoint( Dali::AnchorPoint::CENTER );