Peter M. Groen / dali-demo

Commit d143329bbf55451e73772b589d2a7c3de401e4b0

Authored by Richard Huang
2 parents c674e501 5c07b69f

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

Change-Id: Ief0adf7ca2a0d0c76b689909efeb8b9dfdf4f83e
Inline Side-by-side
Showing 67 changed files with 1103 additions and 1172 deletions
.gitignore
  View file @d143329
@@ -36,3 +36,4 @@ dali-builder @@ -36,3 +36,4 @@ dali-builder
36 /build/desktop 36 /build/desktop
37 /packaging/home* 37 /packaging/home*
38 *.mo 38 *.mo
  39 +demo-theme.json
build/tizen/CMakeLists.txt
  View file @d143329
@@ -33,14 +33,14 @@ IF(NOT DEFINED LOCALE_DIR) @@ -33,14 +33,14 @@ IF(NOT DEFINED LOCALE_DIR)
33 SET(LOCALE_DIR ${PREFIX}/share/locale) 33 SET(LOCALE_DIR ${PREFIX}/share/locale)
34 ENDIF() 34 ENDIF()
35 35
36 -SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\")  
37 -SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\")  
38 -SET(DALI_SCRIPT_DIR \\"${SCRIPTS_DIR}\\")  
39 -SET(DALI_STYLE_DIR \\"${STYLE_DIR}\\")  
40 -SET(DALI_DEMO_THEME_PATH \\"${STYLE_DIR}/demo-theme.json\\")  
41 -SET(DALI_EXAMPLE_BIN \\"${BINDIR}/\\")  
42 -SET(DALI_LOCALE_DIR \\"${LOCALE_DIR}\\")  
43 -SET(DALI_LANG \\"${LANG}\\") 36 +SET(DEMO_IMAGE_DIR \\"${IMAGES_DIR}\\")
  37 +SET(DEMO_MODEL_DIR \\"${MODELS_DIR}\\")
  38 +SET(DEMO_SCRIPT_DIR \\"${SCRIPTS_DIR}\\")
  39 +SET(DEMO_STYLE_DIR \\"${STYLE_DIR}\\")
  40 +SET(DEMO_THEME_PATH \\"${STYLE_DIR}/demo-theme.json\\")
  41 +SET(DEMO_EXAMPLE_BIN \\"${BINDIR}/\\")
  42 +SET(DEMO_LOCALE_DIR \\"${LOCALE_DIR}\\")
  43 +SET(DEMO_LANG \\"${LANG}\\")
44 44
45 FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png") 45 FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
46 FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg") 46 FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
@@ -66,9 +66,13 @@ FOREACH(flag ${LOCAL_SCRIPTS_LIST}) @@ -66,9 +66,13 @@ FOREACH(flag ${LOCAL_SCRIPTS_LIST})
66 INSTALL(FILES ${LOCAL_SCRIPTS_DIR}/${flag} DESTINATION ${SCRIPTS_DIR}) 66 INSTALL(FILES ${LOCAL_SCRIPTS_DIR}/${flag} DESTINATION ${SCRIPTS_DIR})
67 ENDFOREACH(flag) 67 ENDFOREACH(flag)
68 68
  69 +#Replace @DEMO_STYLE_IMAGE_DIR@ in following files
  70 +SET(DEMO_STYLE_IMAGE_DIR ${IMAGES_DIR})
  71 +CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/demo-theme.json.in ${LOCAL_STYLE_DIR}/demo-theme.json )
69 INSTALL(FILES ${LOCAL_STYLE_DIR}/demo-theme.json DESTINATION ${STYLE_DIR}) 72 INSTALL(FILES ${LOCAL_STYLE_DIR}/demo-theme.json DESTINATION ${STYLE_DIR})
70 73
71 -SET(PKG_LIST dali 74 +SET(PKG_LIST dali-core
  75 + dali-adaptor
72 dali-toolkit) 76 dali-toolkit)
73 77
74 INCLUDE(FindPkgConfig) 78 INCLUDE(FindPkgConfig)
@@ -78,7 +82,7 @@ FOREACH(flag ${REQUIRED_PKGS_CFLAGS}) @@ -78,7 +82,7 @@ FOREACH(flag ${REQUIRED_PKGS_CFLAGS})
78 SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}") 82 SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
79 ENDFOREACH(flag) 83 ENDFOREACH(flag)
80 84
81 -SET(DALI_DEMO_CFLAGS "-DDALI_IMAGE_DIR=${DALI_IMAGE_DIR} -DDALI_MODEL_DIR=${DALI_MODEL_DIR} -DDALI_SCRIPT_DIR=${DALI_SCRIPT_DIR} -DDALI_DEMO_THEME_PATH=${DALI_DEMO_THEME_PATH} -DDALI_EXAMPLE_BIN=${DALI_EXAMPLE_BIN} -DDALI_LOCALE_DIR=${DALI_LOCALE_DIR} -fvisibility=hidden -DHIDE_DALI_INTERNALS -DDALI_LANG=${DALI_LANG}") 85 +SET(DALI_DEMO_CFLAGS "-DDEMO_IMAGE_DIR=${DEMO_IMAGE_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}")
82 86
83 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall") 87 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall")
84 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") 88 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
builder/dali-builder.cpp
  View file @d143329
@@ -199,9 +199,9 @@ private: @@ -199,9 +199,9 @@ private:
199 builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit ); 199 builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
200 200
201 Property::Map defaultDirs; 201 Property::Map defaultDirs;
202 - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;  
203 - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR;  
204 - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; 202 + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR;
  203 + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR;
  204 + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR;
205 205
206 builder.AddConstants( defaultDirs ); 206 builder.AddConstants( defaultDirs );
207 207
@@ -297,15 +297,10 @@ private: @@ -297,15 +297,10 @@ private:
297 //------------------------------------------------------------------------------ 297 //------------------------------------------------------------------------------
298 int main(int argc, char **argv) 298 int main(int argc, char **argv)
299 { 299 {
300 - Application dali_app = Application::New(&argc, &argv);  
301 300
  301 + Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH);
302 ExampleApp app(dali_app); 302 ExampleApp app(dali_app);
303 303
304 - std::cout << "DALi Core: \t" << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << " (" << CORE_BUILD_DATE << ")" << std::endl;  
305 - std::cout << "DALi Adaptor: \t" << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << " (" << ADAPTOR_BUILD_DATE << ")\n";  
306 - std::cout << "DALi Toolkit: \t" << Toolkit::TOOLKIT_MAJOR_VERSION << "." << Toolkit::TOOLKIT_MINOR_VERSION << "." << Toolkit::TOOLKIT_MICRO_VERSION << " (" << Toolkit::TOOLKIT_BUILD_DATE << ")\n";  
307 -  
308 -  
309 if(argc > 1) 304 if(argc > 1)
310 { 305 {
311 std::cout << "Loading file:" << argc << " " << argv[1] << std::endl; 306 std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;
com.samsung.dali-demo.xml
  View file @d143329
@@ -127,4 +127,10 @@ @@ -127,4 +127,10 @@
127 <ui-application appid="image-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 127 <ui-application appid="image-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
128 <label>Image View</label> 128 <label>Image View</label>
129 </ui-application> 129 </ui-application>
  130 + <ui-application appid="image-view-pixel-area.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-view-pixel-area.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
  131 + <label>ImageView Pixel Area</label>
  132 + </ui-application>
  133 + <ui-application appid="image-view-alpha-blending.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-view-alpha-blending.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
  134 + <label>ImageView Alpha Blending</label>
  135 + </ui-application>
130 </manifest> 136 </manifest>
demo/dali-demo.cpp
  View file @d143329
@@ -27,11 +27,11 @@ using namespace Dali; @@ -27,11 +27,11 @@ using namespace Dali;
27 int main(int argc, char **argv) 27 int main(int argc, char **argv)
28 { 28 {
29 // Configure gettext for internalization 29 // Configure gettext for internalization
30 - bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DALI_LOCALE_DIR); 30 + bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DEMO_LOCALE_DIR);
31 textdomain(DALI_DEMO_DOMAIN_LOCAL); 31 textdomain(DALI_DEMO_DOMAIN_LOCAL);
32 - setlocale(LC_ALL, DALI_LANG); 32 + setlocale(LC_ALL, DEMO_LANG);
33 33
34 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 34 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
35 35
36 // Create the demo launcher 36 // Create the demo launcher
37 DaliTableView demo(app); 37 DaliTableView demo(app);
@@ -69,6 +69,8 @@ int main(int argc, char **argv) @@ -69,6 +69,8 @@ int main(int argc, char **argv)
69 demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH)); 69 demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
70 demo.AddExample(Example("gradients.example", DALI_DEMO_STR_TITLE_COLOR_GRADIENT)); 70 demo.AddExample(Example("gradients.example", DALI_DEMO_STR_TITLE_COLOR_GRADIENT));
71 demo.AddExample(Example("image-view.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW)); 71 demo.AddExample(Example("image-view.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW));
  72 + demo.AddExample(Example("image-view-pixel-area.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA));
  73 + demo.AddExample(Example("image-view-alpha-blending.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING));
72 demo.AddExample(Example("super-blur-bloom.example", DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM)); 74 demo.AddExample(Example("super-blur-bloom.example", DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM));
73 75
74 demo.SortAlphabetically( true ); 76 demo.SortAlphabetically( true );
demo/dali-table-view.cpp
  View file @d143329
@@ -37,10 +37,10 @@ using namespace Dali::Toolkit; @@ -37,10 +37,10 @@ using namespace Dali::Toolkit;
37 namespace 37 namespace
38 { 38 {
39 39
40 -const std::string LOGO_PATH( DALI_IMAGE_DIR "Logo-for-demo.png" );  
41 -const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DALI_IMAGE_DIR "top-bar.png" );  
42 -const std::string TILE_BACKGROUND(DALI_IMAGE_DIR "item-background.9.png");  
43 -const std::string TILE_BACKGROUND_ALPHA(DALI_IMAGE_DIR "item-background-alpha.9.png"); 40 +const std::string LOGO_PATH( DEMO_IMAGE_DIR "Logo-for-demo.png" );
  41 +const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DEMO_IMAGE_DIR "top-bar.png" );
  42 +const std::string TILE_BACKGROUND(DEMO_IMAGE_DIR "item-background.9.png");
  43 +const std::string TILE_BACKGROUND_ALPHA(DEMO_IMAGE_DIR "item-background-alpha.9.png");
44 44
45 const char * const DEFAULT_TOOLBAR_TEXT( "TOUCH TO LAUNCH EXAMPLE" ); 45 const char * const DEFAULT_TOOLBAR_TEXT( "TOUCH TO LAUNCH EXAMPLE" );
46 46
@@ -562,7 +562,7 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source ) @@ -562,7 +562,7 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source )
562 std::string name = mPressedActor.GetName(); 562 std::string name = mPressedActor.GetName();
563 563
564 std::stringstream stream; 564 std::stringstream stream;
565 - stream << DALI_EXAMPLE_BIN << name.c_str(); 565 + stream << DEMO_EXAMPLE_BIN << name.c_str();
566 pid_t pid = fork(); 566 pid_t pid = fork();
567 if( pid == 0) 567 if( pid == 0)
568 { 568 {
examples/atlas/atlas-example.cpp
  View file @d143329
@@ -28,10 +28,10 @@ class AtlasController; @@ -28,10 +28,10 @@ class AtlasController;
28 28
29 namespace 29 namespace
30 { 30 {
31 -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" );  
32 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
33 -const char * const LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" );  
34 -const char * const LOSE_CONTEXT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-cluster-wobble-selected.png" ); 31 +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
  32 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  33 +const char * const LOSE_CONTEXT_IMAGE( DEMO_IMAGE_DIR "icon-cluster-wobble.png" );
  34 +const char * const LOSE_CONTEXT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-cluster-wobble-selected.png" );
35 35
36 Application gApplication; 36 Application gApplication;
37 AtlasController* gAtlasController(NULL); 37 AtlasController* gAtlasController(NULL);
@@ -79,28 +79,28 @@ public: @@ -79,28 +79,28 @@ public:
79 79
80 mAtlas = Atlas::New( 400,700, Pixel::RGBA8888); 80 mAtlas = Atlas::New( 400,700, Pixel::RGBA8888);
81 mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.25f)); 81 mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.25f));
82 - mAtlas.Upload( DALI_IMAGE_DIR "icon-change.png", 50, 30 );  
83 - mAtlas.Upload( DALI_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 );  
84 - mAtlas.Upload( DALI_IMAGE_DIR "icon-effects-on.png", 150, 30 );  
85 - mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-cross.png", 100, 80 );  
86 - mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-fold.png", 150, 80 );  
87 - mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-wave.png", 200, 80 );  
88 - mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 );  
89 - mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 );  
90 - mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 ); 82 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-change.png", 50, 30 );
  83 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 );
  84 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effects-on.png", 150, 30 );
  85 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-cross.png", 100, 80 );
  86 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-fold.png", 150, 80 );
  87 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-wave.png", 200, 80 );
  88 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 );
  89 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 );
  90 + mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 );
91 91
92 UploadBufferImages(); 92 UploadBufferImages();
93 UploadPixelData(); 93 UploadPixelData();
94 94
95 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-1.jpg", 4, 304 );  
96 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-2.jpg", 136, 304 );  
97 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-3.jpg", 268, 304 );  
98 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-4.jpg", 4, 436 );  
99 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-5.jpg", 136, 436 );  
100 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-6.jpg", 268, 436 );  
101 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 4, 568 );  
102 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 136, 568 );  
103 - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 568 ); 95 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-1.jpg", 4, 304 );
  96 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-2.jpg", 136, 304 );
  97 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-3.jpg", 268, 304 );
  98 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-4.jpg", 4, 436 );
  99 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-5.jpg", 136, 436 );
  100 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-6.jpg", 268, 436 );
  101 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 4, 568 );
  102 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 136, 568 );
  103 + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 268, 568 );
104 104
105 105
106 Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas ); 106 Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas );
@@ -236,7 +236,7 @@ void RunTest( Application&amp; application ) @@ -236,7 +236,7 @@ void RunTest( Application&amp; application )
236 // 236 //
237 int main( int argc, char **argv ) 237 int main( int argc, char **argv )
238 { 238 {
239 - gApplication = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 239 + gApplication = Application::New( &argc, &argv, DEMO_THEME_PATH );
240 240
241 RunTest( gApplication ); 241 RunTest( gApplication );
242 242
examples/benchmark/benchmark.cpp
  View file @d143329
@@ -29,115 +29,115 @@ using namespace Dali::Toolkit; @@ -29,115 +29,115 @@ using namespace Dali::Toolkit;
29 namespace 29 namespace
30 { 30 {
31 const char* IMAGE_PATH[] = { 31 const char* IMAGE_PATH[] = {
32 - DALI_IMAGE_DIR "gallery-medium-1.jpg",  
33 - DALI_IMAGE_DIR "gallery-medium-2.jpg",  
34 - DALI_IMAGE_DIR "gallery-medium-3.jpg",  
35 - DALI_IMAGE_DIR "gallery-medium-4.jpg",  
36 - DALI_IMAGE_DIR "gallery-medium-5.jpg",  
37 - DALI_IMAGE_DIR "gallery-medium-6.jpg",  
38 - DALI_IMAGE_DIR "gallery-medium-7.jpg",  
39 - DALI_IMAGE_DIR "gallery-medium-8.jpg",  
40 - DALI_IMAGE_DIR "gallery-medium-9.jpg",  
41 - DALI_IMAGE_DIR "gallery-medium-10.jpg",  
42 - DALI_IMAGE_DIR "gallery-medium-11.jpg",  
43 - DALI_IMAGE_DIR "gallery-medium-12.jpg",  
44 - DALI_IMAGE_DIR "gallery-medium-13.jpg",  
45 - DALI_IMAGE_DIR "gallery-medium-14.jpg",  
46 - DALI_IMAGE_DIR "gallery-medium-15.jpg",  
47 - DALI_IMAGE_DIR "gallery-medium-16.jpg",  
48 - DALI_IMAGE_DIR "gallery-medium-17.jpg",  
49 - DALI_IMAGE_DIR "gallery-medium-18.jpg",  
50 - DALI_IMAGE_DIR "gallery-medium-19.jpg",  
51 - DALI_IMAGE_DIR "gallery-medium-20.jpg",  
52 - DALI_IMAGE_DIR "gallery-medium-21.jpg",  
53 - DALI_IMAGE_DIR "gallery-medium-22.jpg",  
54 - DALI_IMAGE_DIR "gallery-medium-23.jpg",  
55 - DALI_IMAGE_DIR "gallery-medium-24.jpg",  
56 - DALI_IMAGE_DIR "gallery-medium-25.jpg",  
57 - DALI_IMAGE_DIR "gallery-medium-26.jpg",  
58 - DALI_IMAGE_DIR "gallery-medium-27.jpg",  
59 - DALI_IMAGE_DIR "gallery-medium-28.jpg",  
60 - DALI_IMAGE_DIR "gallery-medium-29.jpg",  
61 - DALI_IMAGE_DIR "gallery-medium-30.jpg",  
62 - DALI_IMAGE_DIR "gallery-medium-31.jpg",  
63 - DALI_IMAGE_DIR "gallery-medium-32.jpg",  
64 - DALI_IMAGE_DIR "gallery-medium-33.jpg",  
65 - DALI_IMAGE_DIR "gallery-medium-34.jpg",  
66 - DALI_IMAGE_DIR "gallery-medium-35.jpg",  
67 - DALI_IMAGE_DIR "gallery-medium-36.jpg",  
68 - DALI_IMAGE_DIR "gallery-medium-37.jpg",  
69 - DALI_IMAGE_DIR "gallery-medium-38.jpg",  
70 - DALI_IMAGE_DIR "gallery-medium-39.jpg",  
71 - DALI_IMAGE_DIR "gallery-medium-40.jpg",  
72 - DALI_IMAGE_DIR "gallery-medium-41.jpg",  
73 - DALI_IMAGE_DIR "gallery-medium-42.jpg",  
74 - DALI_IMAGE_DIR "gallery-medium-43.jpg",  
75 - DALI_IMAGE_DIR "gallery-medium-44.jpg",  
76 - DALI_IMAGE_DIR "gallery-medium-45.jpg",  
77 - DALI_IMAGE_DIR "gallery-medium-46.jpg",  
78 - DALI_IMAGE_DIR "gallery-medium-47.jpg",  
79 - DALI_IMAGE_DIR "gallery-medium-48.jpg",  
80 - DALI_IMAGE_DIR "gallery-medium-49.jpg",  
81 - DALI_IMAGE_DIR "gallery-medium-50.jpg",  
82 - DALI_IMAGE_DIR "gallery-medium-51.jpg",  
83 - DALI_IMAGE_DIR "gallery-medium-52.jpg",  
84 - DALI_IMAGE_DIR "gallery-medium-53.jpg", 32 + DEMO_IMAGE_DIR "gallery-medium-1.jpg",
  33 + DEMO_IMAGE_DIR "gallery-medium-2.jpg",
  34 + DEMO_IMAGE_DIR "gallery-medium-3.jpg",
  35 + DEMO_IMAGE_DIR "gallery-medium-4.jpg",
  36 + DEMO_IMAGE_DIR "gallery-medium-5.jpg",
  37 + DEMO_IMAGE_DIR "gallery-medium-6.jpg",
  38 + DEMO_IMAGE_DIR "gallery-medium-7.jpg",
  39 + DEMO_IMAGE_DIR "gallery-medium-8.jpg",
  40 + DEMO_IMAGE_DIR "gallery-medium-9.jpg",
  41 + DEMO_IMAGE_DIR "gallery-medium-10.jpg",
  42 + DEMO_IMAGE_DIR "gallery-medium-11.jpg",
  43 + DEMO_IMAGE_DIR "gallery-medium-12.jpg",
  44 + DEMO_IMAGE_DIR "gallery-medium-13.jpg",
  45 + DEMO_IMAGE_DIR "gallery-medium-14.jpg",
  46 + DEMO_IMAGE_DIR "gallery-medium-15.jpg",
  47 + DEMO_IMAGE_DIR "gallery-medium-16.jpg",
  48 + DEMO_IMAGE_DIR "gallery-medium-17.jpg",
  49 + DEMO_IMAGE_DIR "gallery-medium-18.jpg",
  50 + DEMO_IMAGE_DIR "gallery-medium-19.jpg",
  51 + DEMO_IMAGE_DIR "gallery-medium-20.jpg",
  52 + DEMO_IMAGE_DIR "gallery-medium-21.jpg",
  53 + DEMO_IMAGE_DIR "gallery-medium-22.jpg",
  54 + DEMO_IMAGE_DIR "gallery-medium-23.jpg",
  55 + DEMO_IMAGE_DIR "gallery-medium-24.jpg",
  56 + DEMO_IMAGE_DIR "gallery-medium-25.jpg",
  57 + DEMO_IMAGE_DIR "gallery-medium-26.jpg",
  58 + DEMO_IMAGE_DIR "gallery-medium-27.jpg",
  59 + DEMO_IMAGE_DIR "gallery-medium-28.jpg",
  60 + DEMO_IMAGE_DIR "gallery-medium-29.jpg",
  61 + DEMO_IMAGE_DIR "gallery-medium-30.jpg",
  62 + DEMO_IMAGE_DIR "gallery-medium-31.jpg",
  63 + DEMO_IMAGE_DIR "gallery-medium-32.jpg",
  64 + DEMO_IMAGE_DIR "gallery-medium-33.jpg",
  65 + DEMO_IMAGE_DIR "gallery-medium-34.jpg",
  66 + DEMO_IMAGE_DIR "gallery-medium-35.jpg",
  67 + DEMO_IMAGE_DIR "gallery-medium-36.jpg",
  68 + DEMO_IMAGE_DIR "gallery-medium-37.jpg",
  69 + DEMO_IMAGE_DIR "gallery-medium-38.jpg",
  70 + DEMO_IMAGE_DIR "gallery-medium-39.jpg",
  71 + DEMO_IMAGE_DIR "gallery-medium-40.jpg",
  72 + DEMO_IMAGE_DIR "gallery-medium-41.jpg",
  73 + DEMO_IMAGE_DIR "gallery-medium-42.jpg",
  74 + DEMO_IMAGE_DIR "gallery-medium-43.jpg",
  75 + DEMO_IMAGE_DIR "gallery-medium-44.jpg",
  76 + DEMO_IMAGE_DIR "gallery-medium-45.jpg",
  77 + DEMO_IMAGE_DIR "gallery-medium-46.jpg",
  78 + DEMO_IMAGE_DIR "gallery-medium-47.jpg",
  79 + DEMO_IMAGE_DIR "gallery-medium-48.jpg",
  80 + DEMO_IMAGE_DIR "gallery-medium-49.jpg",
  81 + DEMO_IMAGE_DIR "gallery-medium-50.jpg",
  82 + DEMO_IMAGE_DIR "gallery-medium-51.jpg",
  83 + DEMO_IMAGE_DIR "gallery-medium-52.jpg",
  84 + DEMO_IMAGE_DIR "gallery-medium-53.jpg",
85 }; 85 };
86 86
87 const char* NINEPATCH_IMAGE_PATH[] = { 87 const char* NINEPATCH_IMAGE_PATH[] = {
88 - DALI_IMAGE_DIR "selection-popup-bg.1.9.png",  
89 - DALI_IMAGE_DIR "selection-popup-bg.2.9.png",  
90 - DALI_IMAGE_DIR "selection-popup-bg.3.9.png",  
91 - DALI_IMAGE_DIR "selection-popup-bg.4.9.png",  
92 - DALI_IMAGE_DIR "selection-popup-bg.5.9.png",  
93 - DALI_IMAGE_DIR "selection-popup-bg.6.9.png",  
94 - DALI_IMAGE_DIR "selection-popup-bg.7.9.png",  
95 - DALI_IMAGE_DIR "selection-popup-bg.8.9.png",  
96 - DALI_IMAGE_DIR "selection-popup-bg.9.9.png",  
97 - DALI_IMAGE_DIR "selection-popup-bg.10.9.png",  
98 - DALI_IMAGE_DIR "selection-popup-bg.11.9.png",  
99 - DALI_IMAGE_DIR "selection-popup-bg.12.9.png",  
100 - DALI_IMAGE_DIR "selection-popup-bg.13.9.png",  
101 - DALI_IMAGE_DIR "selection-popup-bg.14.9.png",  
102 - DALI_IMAGE_DIR "selection-popup-bg.15.9.png",  
103 - DALI_IMAGE_DIR "selection-popup-bg.16.9.png",  
104 - DALI_IMAGE_DIR "selection-popup-bg.17.9.png",  
105 - DALI_IMAGE_DIR "selection-popup-bg.18.9.png",  
106 - DALI_IMAGE_DIR "selection-popup-bg.19.9.png",  
107 - DALI_IMAGE_DIR "selection-popup-bg.20.9.png",  
108 - DALI_IMAGE_DIR "selection-popup-bg.21.9.png",  
109 - DALI_IMAGE_DIR "selection-popup-bg.22.9.png",  
110 - DALI_IMAGE_DIR "selection-popup-bg.23.9.png",  
111 - DALI_IMAGE_DIR "selection-popup-bg.24.9.png",  
112 - DALI_IMAGE_DIR "selection-popup-bg.25.9.png",  
113 - DALI_IMAGE_DIR "selection-popup-bg.26.9.png",  
114 - DALI_IMAGE_DIR "selection-popup-bg.27.9.png",  
115 - DALI_IMAGE_DIR "selection-popup-bg.28.9.png",  
116 - DALI_IMAGE_DIR "selection-popup-bg.29.9.png",  
117 - DALI_IMAGE_DIR "selection-popup-bg.30.9.png",  
118 - DALI_IMAGE_DIR "selection-popup-bg.31.9.png",  
119 - DALI_IMAGE_DIR "selection-popup-bg.32.9.png",  
120 - DALI_IMAGE_DIR "selection-popup-bg.33.9.png",  
121 - DALI_IMAGE_DIR "button-disabled.9.png",  
122 - DALI_IMAGE_DIR "button-down.9.png",  
123 - DALI_IMAGE_DIR "button-down-disabled.9.png",  
124 - DALI_IMAGE_DIR "button-up-1.9.png",  
125 - DALI_IMAGE_DIR "button-up-2.9.png",  
126 - DALI_IMAGE_DIR "button-up-3.9.png",  
127 - DALI_IMAGE_DIR "button-up-4.9.png",  
128 - DALI_IMAGE_DIR "button-up-5.9.png",  
129 - DALI_IMAGE_DIR "button-up-6.9.png",  
130 - DALI_IMAGE_DIR "button-up-7.9.png",  
131 - DALI_IMAGE_DIR "button-up-8.9.png",  
132 - DALI_IMAGE_DIR "button-up-9.9.png",  
133 - DALI_IMAGE_DIR "button-up-10.9.png",  
134 - DALI_IMAGE_DIR "button-up-11.9.png",  
135 - DALI_IMAGE_DIR "button-up-12.9.png",  
136 - DALI_IMAGE_DIR "button-up-13.9.png",  
137 - DALI_IMAGE_DIR "button-up-14.9.png",  
138 - DALI_IMAGE_DIR "button-up-15.9.png",  
139 - DALI_IMAGE_DIR "button-up-16.9.png",  
140 - DALI_IMAGE_DIR "button-up-17.9.png", 88 + DEMO_IMAGE_DIR "selection-popup-bg.1.9.png",
  89 + DEMO_IMAGE_DIR "selection-popup-bg.2.9.png",
  90 + DEMO_IMAGE_DIR "selection-popup-bg.3.9.png",
  91 + DEMO_IMAGE_DIR "selection-popup-bg.4.9.png",
  92 + DEMO_IMAGE_DIR "selection-popup-bg.5.9.png",
  93 + DEMO_IMAGE_DIR "selection-popup-bg.6.9.png",
  94 + DEMO_IMAGE_DIR "selection-popup-bg.7.9.png",
  95 + DEMO_IMAGE_DIR "selection-popup-bg.8.9.png",
  96 + DEMO_IMAGE_DIR "selection-popup-bg.9.9.png",
  97 + DEMO_IMAGE_DIR "selection-popup-bg.10.9.png",
  98 + DEMO_IMAGE_DIR "selection-popup-bg.11.9.png",
  99 + DEMO_IMAGE_DIR "selection-popup-bg.12.9.png",
  100 + DEMO_IMAGE_DIR "selection-popup-bg.13.9.png",
  101 + DEMO_IMAGE_DIR "selection-popup-bg.14.9.png",
  102 + DEMO_IMAGE_DIR "selection-popup-bg.15.9.png",
  103 + DEMO_IMAGE_DIR "selection-popup-bg.16.9.png",
  104 + DEMO_IMAGE_DIR "selection-popup-bg.17.9.png",
  105 + DEMO_IMAGE_DIR "selection-popup-bg.18.9.png",
  106 + DEMO_IMAGE_DIR "selection-popup-bg.19.9.png",
  107 + DEMO_IMAGE_DIR "selection-popup-bg.20.9.png",
  108 + DEMO_IMAGE_DIR "selection-popup-bg.21.9.png",
  109 + DEMO_IMAGE_DIR "selection-popup-bg.22.9.png",
  110 + DEMO_IMAGE_DIR "selection-popup-bg.23.9.png",
  111 + DEMO_IMAGE_DIR "selection-popup-bg.24.9.png",
  112 + DEMO_IMAGE_DIR "selection-popup-bg.25.9.png",
  113 + DEMO_IMAGE_DIR "selection-popup-bg.26.9.png",
  114 + DEMO_IMAGE_DIR "selection-popup-bg.27.9.png",
  115 + DEMO_IMAGE_DIR "selection-popup-bg.28.9.png",
  116 + DEMO_IMAGE_DIR "selection-popup-bg.29.9.png",
  117 + DEMO_IMAGE_DIR "selection-popup-bg.30.9.png",
  118 + DEMO_IMAGE_DIR "selection-popup-bg.31.9.png",
  119 + DEMO_IMAGE_DIR "selection-popup-bg.32.9.png",
  120 + DEMO_IMAGE_DIR "selection-popup-bg.33.9.png",
  121 + DEMO_IMAGE_DIR "button-disabled.9.png",
  122 + DEMO_IMAGE_DIR "button-down.9.png",
  123 + DEMO_IMAGE_DIR "button-down-disabled.9.png",
  124 + DEMO_IMAGE_DIR "button-up-1.9.png",
  125 + DEMO_IMAGE_DIR "button-up-2.9.png",
  126 + DEMO_IMAGE_DIR "button-up-3.9.png",
  127 + DEMO_IMAGE_DIR "button-up-4.9.png",
  128 + DEMO_IMAGE_DIR "button-up-5.9.png",
  129 + DEMO_IMAGE_DIR "button-up-6.9.png",
  130 + DEMO_IMAGE_DIR "button-up-7.9.png",
  131 + DEMO_IMAGE_DIR "button-up-8.9.png",
  132 + DEMO_IMAGE_DIR "button-up-9.9.png",
  133 + DEMO_IMAGE_DIR "button-up-10.9.png",
  134 + DEMO_IMAGE_DIR "button-up-11.9.png",
  135 + DEMO_IMAGE_DIR "button-up-12.9.png",
  136 + DEMO_IMAGE_DIR "button-up-13.9.png",
  137 + DEMO_IMAGE_DIR "button-up-14.9.png",
  138 + DEMO_IMAGE_DIR "button-up-15.9.png",
  139 + DEMO_IMAGE_DIR "button-up-16.9.png",
  140 + DEMO_IMAGE_DIR "button-up-17.9.png",
141 }; 141 };
142 142
143 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*); 143 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
examples/blocks/blocks-example.cpp
  View file @d143329
@@ -31,17 +31,17 @@ using namespace DemoHelper; @@ -31,17 +31,17 @@ using namespace DemoHelper;
31 31
32 namespace 32 namespace
33 { 33 {
34 -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-blocks.jpg" );  
35 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 34 +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-blocks.jpg" );
  35 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
36 const char* APPLICATION_TITLE( "DALi Blocks" ); 36 const char* APPLICATION_TITLE( "DALi Blocks" );
37 -const char* BALL_IMAGE = DALI_IMAGE_DIR "blocks-ball.png";  
38 -const char* PADDLE_IMAGE = DALI_IMAGE_DIR "blocks-paddle.png";  
39 -const char* PADDLE_HANDLE_IMAGE = DALI_IMAGE_DIR "blocks-paddle-handle.png"; 37 +const char* BALL_IMAGE = DEMO_IMAGE_DIR "blocks-ball.png";
  38 +const char* PADDLE_IMAGE = DEMO_IMAGE_DIR "blocks-paddle.png";
  39 +const char* PADDLE_HANDLE_IMAGE = DEMO_IMAGE_DIR "blocks-paddle-handle.png";
40 40
41 -const char* BRICK_IMAGE_PATH[] = { DALI_IMAGE_DIR "blocks-brick-1.png",  
42 - DALI_IMAGE_DIR "blocks-brick-2.png",  
43 - DALI_IMAGE_DIR "blocks-brick-3.png",  
44 - DALI_IMAGE_DIR "blocks-brick-4.png" }; 41 +const char* BRICK_IMAGE_PATH[] = { DEMO_IMAGE_DIR "blocks-brick-1.png",
  42 + DEMO_IMAGE_DIR "blocks-brick-2.png",
  43 + DEMO_IMAGE_DIR "blocks-brick-3.png",
  44 + DEMO_IMAGE_DIR "blocks-brick-4.png" };
45 45
46 const int TOTAL_BRICKS(4); ///< Total bricks in game. 46 const int TOTAL_BRICKS(4); ///< Total bricks in game.
47 const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f); 47 const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f);
@@ -838,7 +838,7 @@ void RunTest(Application&amp; app) @@ -838,7 +838,7 @@ void RunTest(Application&amp; app)
838 838
839 int main(int argc, char **argv) 839 int main(int argc, char **argv)
840 { 840 {
841 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 841 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
842 842
843 RunTest(app); 843 RunTest(app);
844 844
examples/bubble-effect/bubble-effect-example.cpp
  View file @d143329
@@ -24,29 +24,29 @@ using namespace Dali; @@ -24,29 +24,29 @@ using namespace Dali;
24 24
25 namespace 25 namespace
26 { 26 {
27 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 27 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
28 const char * const APPLICATION_TITLE( "Bubble Effect" ); 28 const char * const APPLICATION_TITLE( "Bubble Effect" );
29 -const char * const CHANGE_BACKGROUND_ICON( DALI_IMAGE_DIR "icon-change.png" );  
30 -const char * const CHANGE_BACKGROUND_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" );  
31 -const char * const CHANGE_BUBBLE_SHAPE_ICON( DALI_IMAGE_DIR "icon-replace.png" );  
32 -const char * const CHANGE_BUBBLE_SHAPE_ICON_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); 29 +const char * const CHANGE_BACKGROUND_ICON( DEMO_IMAGE_DIR "icon-change.png" );
  30 +const char * const CHANGE_BACKGROUND_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
  31 +const char * const CHANGE_BUBBLE_SHAPE_ICON( DEMO_IMAGE_DIR "icon-replace.png" );
  32 +const char * const CHANGE_BUBBLE_SHAPE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" );
33 33
34 const char* BACKGROUND_IMAGES[]= 34 const char* BACKGROUND_IMAGES[]=
35 { 35 {
36 - DALI_IMAGE_DIR "background-1.jpg",  
37 - DALI_IMAGE_DIR "background-2.jpg",  
38 - DALI_IMAGE_DIR "background-3.jpg",  
39 - DALI_IMAGE_DIR "background-4.jpg",  
40 - DALI_IMAGE_DIR "background-5.jpg", 36 + DEMO_IMAGE_DIR "background-1.jpg",
  37 + DEMO_IMAGE_DIR "background-2.jpg",
  38 + DEMO_IMAGE_DIR "background-3.jpg",
  39 + DEMO_IMAGE_DIR "background-4.jpg",
  40 + DEMO_IMAGE_DIR "background-5.jpg",
41 }; 41 };
42 const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) ); 42 const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) );
43 43
44 const char* BUBBLE_SHAPE_IMAGES[] = 44 const char* BUBBLE_SHAPE_IMAGES[] =
45 { 45 {
46 - DALI_IMAGE_DIR "bubble-ball.png",  
47 - DALI_IMAGE_DIR "icon-effect-cross.png",  
48 - DALI_IMAGE_DIR "icon-item-view-layout-spiral.png",  
49 - DALI_IMAGE_DIR "icon-replace.png" 46 + DEMO_IMAGE_DIR "bubble-ball.png",
  47 + DEMO_IMAGE_DIR "icon-effect-cross.png",
  48 + DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png",
  49 + DEMO_IMAGE_DIR "icon-replace.png"
50 }; 50 };
51 const unsigned int NUM_BUBBLE_SHAPE_IMAGES( sizeof( BUBBLE_SHAPE_IMAGES ) / sizeof( BUBBLE_SHAPE_IMAGES[0] ) ); 51 const unsigned int NUM_BUBBLE_SHAPE_IMAGES( sizeof( BUBBLE_SHAPE_IMAGES ) / sizeof( BUBBLE_SHAPE_IMAGES[0] ) );
52 52
@@ -322,12 +322,9 @@ RunTest(Application&amp; app) @@ -322,12 +322,9 @@ RunTest(Application&amp; app)
322 int 322 int
323 main(int argc, char **argv) 323 main(int argc, char **argv)
324 { 324 {
325 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 325 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
326 326
327 RunTest(app); 327 RunTest(app);
328 328
329 return 0; 329 return 0;
330 } 330 }
331 -  
332 -  
333 -  
examples/builder/examples.cpp
  View file @d143329
@@ -51,9 +51,9 @@ namespace @@ -51,9 +51,9 @@ namespace
51 { 51 {
52 52
53 const char* BACKGROUND_IMAGE( "" ); 53 const char* BACKGROUND_IMAGE( "" );
54 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
55 -const char* EDIT_IMAGE( DALI_IMAGE_DIR "icon-change.png" );  
56 -const char* EDIT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); 54 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  55 +const char* EDIT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
  56 +const char* EDIT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
57 57
58 std::string USER_DIRECTORY; 58 std::string USER_DIRECTORY;
59 59
@@ -306,7 +306,7 @@ public: @@ -306,7 +306,7 @@ public:
306 } 306 }
307 else 307 else
308 { 308 {
309 - DirectoryFilesByType( DALI_SCRIPT_DIR, "json", files ); 309 + DirectoryFilesByType( DEMO_SCRIPT_DIR, "json", files );
310 } 310 }
311 311
312 std::sort(files.begin(), files.end()); 312 std::sort(files.begin(), files.end());
@@ -414,9 +414,9 @@ public: @@ -414,9 +414,9 @@ public:
414 builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit ); 414 builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
415 415
416 Property::Map defaultDirs; 416 Property::Map defaultDirs;
417 - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;  
418 - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR;  
419 - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; 417 + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR;
  418 + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR;
  419 + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR;
420 420
421 builder.AddConstants( defaultDirs ); 421 builder.AddConstants( defaultDirs );
422 422
@@ -618,7 +618,7 @@ int main(int argc, char **argv) @@ -618,7 +618,7 @@ int main(int argc, char **argv)
618 } 618 }
619 } 619 }
620 620
621 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 621 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
622 622
623 ExampleApp dali_app(app); 623 ExampleApp dali_app(app);
624 624
examples/buttons/buttons-example.cpp
  View file @d143329
@@ -29,21 +29,21 @@ using namespace Dali; @@ -29,21 +29,21 @@ using namespace Dali;
29 namespace 29 namespace
30 { 30 {
31 31
32 -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";  
33 -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; 32 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  33 +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
34 34
35 const char* const TOOLBAR_TITLE = "Buttons"; 35 const char* const TOOLBAR_TITLE = "Buttons";
36 36
37 -const char* const SMALL_IMAGE_1 = DALI_IMAGE_DIR "gallery-small-14.jpg";  
38 -const char* const BIG_IMAGE_1 = DALI_IMAGE_DIR "gallery-large-4.jpg"; 37 +const char* const SMALL_IMAGE_1 = DEMO_IMAGE_DIR "gallery-small-14.jpg";
  38 +const char* const BIG_IMAGE_1 = DEMO_IMAGE_DIR "gallery-large-4.jpg";
39 39
40 -const char* const SMALL_IMAGE_2 = DALI_IMAGE_DIR "gallery-small-20.jpg";  
41 -const char* const BIG_IMAGE_2 = DALI_IMAGE_DIR "gallery-large-11.jpg"; 40 +const char* const SMALL_IMAGE_2 = DEMO_IMAGE_DIR "gallery-small-20.jpg";
  41 +const char* const BIG_IMAGE_2 = DEMO_IMAGE_DIR "gallery-large-11.jpg";
42 42
43 -const char* const SMALL_IMAGE_3 = DALI_IMAGE_DIR "gallery-small-25.jpg";  
44 -const char* const BIG_IMAGE_3 = DALI_IMAGE_DIR "gallery-large-13.jpg"; 43 +const char* const SMALL_IMAGE_3 = DEMO_IMAGE_DIR "gallery-small-25.jpg";
  44 +const char* const BIG_IMAGE_3 = DEMO_IMAGE_DIR "gallery-large-13.jpg";
45 45
46 -const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png"; 46 +const char* const ENABLED_IMAGE = DEMO_IMAGE_DIR "item-select-check.png";
47 47
48 const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); 48 const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
49 49
@@ -546,7 +546,7 @@ void RunTest( Application&amp; application ) @@ -546,7 +546,7 @@ void RunTest( Application&amp; application )
546 // 546 //
547 int main( int argc, char **argv ) 547 int main( int argc, char **argv )
548 { 548 {
549 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 549 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
550 550
551 RunTest( application ); 551 RunTest( application );
552 552
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
  View file @d143329
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
20 using namespace Dali; 20 using namespace Dali;
21 using Dali::Toolkit::TextLabel; 21 using Dali::Toolkit::TextLabel;
22 22
23 -const char* IMAGE_FILENAME_ETC = DALI_IMAGE_DIR "tx-etc1.ktx";  
24 -const char* IMAGE_FILENAME_ASTC_LINEAR = DALI_IMAGE_DIR "tx-astc-4x4-linear.ktx";  
25 -const char* IMAGE_FILENAME_ASTC_LINEAR_NATIVE = DALI_IMAGE_DIR "tx-astc-4x4-linear-native.astc"; 23 +const char* IMAGE_FILENAME_ETC = DEMO_IMAGE_DIR "tx-etc1.ktx";
  24 +const char* IMAGE_FILENAME_ASTC_LINEAR = DEMO_IMAGE_DIR "tx-astc-4x4-linear.ktx";
  25 +const char* IMAGE_FILENAME_ASTC_LINEAR_NATIVE = DEMO_IMAGE_DIR "tx-astc-4x4-linear-native.astc";
26 26
27 /** 27 /**
28 * @brief This example shows 3 images, each of a different compressed texture type. 28 * @brief This example shows 3 images, each of a different compressed texture type.
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @d143329
@@ -37,44 +37,44 @@ using Dali::Toolkit::TextLabel; @@ -37,44 +37,44 @@ using Dali::Toolkit::TextLabel;
37 namespace 37 namespace
38 { 38 {
39 39
40 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 40 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
41 const char * const APPLICATION_TITLE_WAVE( "Cube Transition: Wave" ); 41 const char * const APPLICATION_TITLE_WAVE( "Cube Transition: Wave" );
42 const char * const APPLICATION_TITLE_CROSS( "Cube Transition: Cross" ); 42 const char * const APPLICATION_TITLE_CROSS( "Cube Transition: Cross" );
43 const char * const APPLICATION_TITLE_FOLD( "Cube Transition: Fold" ); 43 const char * const APPLICATION_TITLE_FOLD( "Cube Transition: Fold" );
44 -const char * const EFFECT_WAVE_IMAGE( DALI_IMAGE_DIR "icon-effect-wave.png" );  
45 -const char * const EFFECT_WAVE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-effect-wave-selected.png" );  
46 -const char * const EFFECT_CROSS_IMAGE( DALI_IMAGE_DIR "icon-effect-cross.png" );  
47 -const char * const EFFECT_CROSS_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-effect-cross-selected.png" );  
48 -const char * const EFFECT_FOLD_IMAGE( DALI_IMAGE_DIR "icon-effect-fold.png" );  
49 -const char * const EFFECT_FOLD_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-effect-fold-selected.png" );  
50 -const char * const SLIDE_SHOW_START_ICON( DALI_IMAGE_DIR "icon-play.png" );  
51 -const char * const SLIDE_SHOW_START_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" );  
52 -const char * const SLIDE_SHOW_STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" );  
53 -const char * const SLIDE_SHOW_STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" ); 44 +const char * const EFFECT_WAVE_IMAGE( DEMO_IMAGE_DIR "icon-effect-wave.png" );
  45 +const char * const EFFECT_WAVE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-wave-selected.png" );
  46 +const char * const EFFECT_CROSS_IMAGE( DEMO_IMAGE_DIR "icon-effect-cross.png" );
  47 +const char * const EFFECT_CROSS_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-cross-selected.png" );
  48 +const char * const EFFECT_FOLD_IMAGE( DEMO_IMAGE_DIR "icon-effect-fold.png" );
  49 +const char * const EFFECT_FOLD_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-fold-selected.png" );
  50 +const char * const SLIDE_SHOW_START_ICON( DEMO_IMAGE_DIR "icon-play.png" );
  51 +const char * const SLIDE_SHOW_START_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" );
  52 +const char * const SLIDE_SHOW_STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" );
  53 +const char * const SLIDE_SHOW_STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" );
54 54
55 const char* IMAGES[] = 55 const char* IMAGES[] =
56 { 56 {
57 - DALI_IMAGE_DIR "gallery-large-1.jpg",  
58 - DALI_IMAGE_DIR "gallery-large-2.jpg",  
59 - DALI_IMAGE_DIR "gallery-large-3.jpg",  
60 - DALI_IMAGE_DIR "gallery-large-4.jpg",  
61 - DALI_IMAGE_DIR "gallery-large-5.jpg",  
62 - DALI_IMAGE_DIR "gallery-large-6.jpg",  
63 - DALI_IMAGE_DIR "gallery-large-7.jpg",  
64 - DALI_IMAGE_DIR "gallery-large-8.jpg",  
65 - DALI_IMAGE_DIR "gallery-large-9.jpg",  
66 - DALI_IMAGE_DIR "gallery-large-10.jpg",  
67 - DALI_IMAGE_DIR "gallery-large-11.jpg",  
68 - DALI_IMAGE_DIR "gallery-large-12.jpg",  
69 - DALI_IMAGE_DIR "gallery-large-13.jpg",  
70 - DALI_IMAGE_DIR "gallery-large-14.jpg",  
71 - DALI_IMAGE_DIR "gallery-large-15.jpg",  
72 - DALI_IMAGE_DIR "gallery-large-16.jpg",  
73 - DALI_IMAGE_DIR "gallery-large-17.jpg",  
74 - DALI_IMAGE_DIR "gallery-large-18.jpg",  
75 - DALI_IMAGE_DIR "gallery-large-19.jpg",  
76 - DALI_IMAGE_DIR "gallery-large-20.jpg",  
77 - DALI_IMAGE_DIR "gallery-large-21.jpg", 57 + DEMO_IMAGE_DIR "gallery-large-1.jpg",
  58 + DEMO_IMAGE_DIR "gallery-large-2.jpg",
  59 + DEMO_IMAGE_DIR "gallery-large-3.jpg",
  60 + DEMO_IMAGE_DIR "gallery-large-4.jpg",
  61 + DEMO_IMAGE_DIR "gallery-large-5.jpg",
  62 + DEMO_IMAGE_DIR "gallery-large-6.jpg",
  63 + DEMO_IMAGE_DIR "gallery-large-7.jpg",
  64 + DEMO_IMAGE_DIR "gallery-large-8.jpg",
  65 + DEMO_IMAGE_DIR "gallery-large-9.jpg",
  66 + DEMO_IMAGE_DIR "gallery-large-10.jpg",
  67 + DEMO_IMAGE_DIR "gallery-large-11.jpg",
  68 + DEMO_IMAGE_DIR "gallery-large-12.jpg",
  69 + DEMO_IMAGE_DIR "gallery-large-13.jpg",
  70 + DEMO_IMAGE_DIR "gallery-large-14.jpg",
  71 + DEMO_IMAGE_DIR "gallery-large-15.jpg",
  72 + DEMO_IMAGE_DIR "gallery-large-16.jpg",
  73 + DEMO_IMAGE_DIR "gallery-large-17.jpg",
  74 + DEMO_IMAGE_DIR "gallery-large-18.jpg",
  75 + DEMO_IMAGE_DIR "gallery-large-19.jpg",
  76 + DEMO_IMAGE_DIR "gallery-large-20.jpg",
  77 + DEMO_IMAGE_DIR "gallery-large-21.jpg",
78 }; 78 };
79 const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) ); 79 const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) );
80 80
@@ -432,7 +432,7 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent&amp; event) @@ -432,7 +432,7 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent&amp; event)
432 // Entry point for Linux & Tizen applications 432 // Entry point for Linux & Tizen applications
433 int main( int argc, char **argv ) 433 int main( int argc, char **argv )
434 { 434 {
435 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 435 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
436 CubeTransitionApp test( application ); 436 CubeTransitionApp test( application );
437 application.MainLoop(); 437 application.MainLoop();
438 438
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @d143329
@@ -33,41 +33,41 @@ using Dali::Toolkit::TextLabel; @@ -33,41 +33,41 @@ using Dali::Toolkit::TextLabel;
33 namespace 33 namespace
34 { 34 {
35 35
36 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 36 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
37 const char * const APPLICATION_TITLE_HIGHP( "Dissolve Effect(highp)" ); 37 const char * const APPLICATION_TITLE_HIGHP( "Dissolve Effect(highp)" );
38 const char * const APPLICATION_TITLE_MEDIUMP( "Dissolve Effect(mediump)" ); 38 const char * const APPLICATION_TITLE_MEDIUMP( "Dissolve Effect(mediump)" );
39 -const char * const EFFECT_HIGHP_IMAGE( DALI_IMAGE_DIR "icon-highp.png" );  
40 -const char * const EFFECT_HIGHP_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-highp-selected.png" );  
41 -const char * const EFFECT_MEDIUMP_IMAGE( DALI_IMAGE_DIR "icon-mediump.png" );  
42 -const char * const EFFECT_MEDIUMP_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-mediump-selected.png" );  
43 -const char * const PLAY_ICON( DALI_IMAGE_DIR "icon-play.png" );  
44 -const char * const PLAY_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" );  
45 -const char * const STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" );  
46 -const char * const STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" ); 39 +const char * const EFFECT_HIGHP_IMAGE( DEMO_IMAGE_DIR "icon-highp.png" );
  40 +const char * const EFFECT_HIGHP_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-highp-selected.png" );
  41 +const char * const EFFECT_MEDIUMP_IMAGE( DEMO_IMAGE_DIR "icon-mediump.png" );
  42 +const char * const EFFECT_MEDIUMP_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-mediump-selected.png" );
  43 +const char * const PLAY_ICON( DEMO_IMAGE_DIR "icon-play.png" );
  44 +const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" );
  45 +const char * const STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" );
  46 +const char * const STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" );
47 47
48 const char* IMAGES[] = 48 const char* IMAGES[] =
49 { 49 {
50 - DALI_IMAGE_DIR "gallery-large-1.jpg",  
51 - DALI_IMAGE_DIR "gallery-large-2.jpg",  
52 - DALI_IMAGE_DIR "gallery-large-3.jpg",  
53 - DALI_IMAGE_DIR "gallery-large-4.jpg",  
54 - DALI_IMAGE_DIR "gallery-large-5.jpg",  
55 - DALI_IMAGE_DIR "gallery-large-6.jpg",  
56 - DALI_IMAGE_DIR "gallery-large-7.jpg",  
57 - DALI_IMAGE_DIR "gallery-large-8.jpg",  
58 - DALI_IMAGE_DIR "gallery-large-9.jpg",  
59 - DALI_IMAGE_DIR "gallery-large-10.jpg",  
60 - DALI_IMAGE_DIR "gallery-large-11.jpg",  
61 - DALI_IMAGE_DIR "gallery-large-12.jpg",  
62 - DALI_IMAGE_DIR "gallery-large-13.jpg",  
63 - DALI_IMAGE_DIR "gallery-large-14.jpg",  
64 - DALI_IMAGE_DIR "gallery-large-15.jpg",  
65 - DALI_IMAGE_DIR "gallery-large-16.jpg",  
66 - DALI_IMAGE_DIR "gallery-large-17.jpg",  
67 - DALI_IMAGE_DIR "gallery-large-18.jpg",  
68 - DALI_IMAGE_DIR "gallery-large-19.jpg",  
69 - DALI_IMAGE_DIR "gallery-large-20.jpg",  
70 - DALI_IMAGE_DIR "gallery-large-21.jpg", 50 + DEMO_IMAGE_DIR "gallery-large-1.jpg",
  51 + DEMO_IMAGE_DIR "gallery-large-2.jpg",
  52 + DEMO_IMAGE_DIR "gallery-large-3.jpg",
  53 + DEMO_IMAGE_DIR "gallery-large-4.jpg",
  54 + DEMO_IMAGE_DIR "gallery-large-5.jpg",
  55 + DEMO_IMAGE_DIR "gallery-large-6.jpg",
  56 + DEMO_IMAGE_DIR "gallery-large-7.jpg",
  57 + DEMO_IMAGE_DIR "gallery-large-8.jpg",
  58 + DEMO_IMAGE_DIR "gallery-large-9.jpg",
  59 + DEMO_IMAGE_DIR "gallery-large-10.jpg",
  60 + DEMO_IMAGE_DIR "gallery-large-11.jpg",
  61 + DEMO_IMAGE_DIR "gallery-large-12.jpg",
  62 + DEMO_IMAGE_DIR "gallery-large-13.jpg",
  63 + DEMO_IMAGE_DIR "gallery-large-14.jpg",
  64 + DEMO_IMAGE_DIR "gallery-large-15.jpg",
  65 + DEMO_IMAGE_DIR "gallery-large-16.jpg",
  66 + DEMO_IMAGE_DIR "gallery-large-17.jpg",
  67 + DEMO_IMAGE_DIR "gallery-large-18.jpg",
  68 + DEMO_IMAGE_DIR "gallery-large-19.jpg",
  69 + DEMO_IMAGE_DIR "gallery-large-20.jpg",
  70 + DEMO_IMAGE_DIR "gallery-large-21.jpg",
71 }; 71 };
72 72
73 const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) ); 73 const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) );
@@ -443,7 +443,7 @@ bool DissolveEffectApp::OnTimerTick() @@ -443,7 +443,7 @@ bool DissolveEffectApp::OnTimerTick()
443 // Entry point for Linux & Tizen applications 443 // Entry point for Linux & Tizen applications
444 int main( int argc, char **argv ) 444 int main( int argc, char **argv )
445 { 445 {
446 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 446 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
447 DissolveEffectApp test( application ); 447 DissolveEffectApp test( application );
448 application.MainLoop(); 448 application.MainLoop();
449 449
examples/gradients/gradients-example.cpp
  View file @d143329
@@ -27,9 +27,9 @@ namespace @@ -27,9 +27,9 @@ namespace
27 { 27 {
28 const char * const APPLICATION_TITLE( "Color Gradients" ); 28 const char * const APPLICATION_TITLE( "Color Gradients" );
29 29
30 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
31 -const char * const CHANGE_ICON( DALI_IMAGE_DIR "icon-change.png" );  
32 -const char * const CHANGE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); 30 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  31 +const char * const CHANGE_ICON( DEMO_IMAGE_DIR "icon-change.png" );
  32 +const char * const CHANGE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
33 } 33 }
34 34
35 // This example shows how to render color gradients 35 // This example shows how to render color gradients
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @d143329
@@ -27,18 +27,18 @@ using Toolkit::TextLabel; @@ -27,18 +27,18 @@ using Toolkit::TextLabel;
27 namespace 27 namespace
28 { 28 {
29 29
30 -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); 30 +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
31 const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); 31 const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
32 32
33 -const char* BORDER_IMAGE( DALI_IMAGE_DIR "border-4px.9.png" ); 33 +const char* BORDER_IMAGE( DEMO_IMAGE_DIR "border-4px.9.png" );
34 const int BORDER_WIDTH = ( 11.0f + 4.0f ); // Shadow size = 11, border size = 4. 34 const int BORDER_WIDTH = ( 11.0f + 4.0f ); // Shadow size = 11, border size = 4.
35 -const char* RESIZE_HANDLE_IMAGE( DALI_IMAGE_DIR "resize-handle.png" ); 35 +const char* RESIZE_HANDLE_IMAGE( DEMO_IMAGE_DIR "resize-handle.png" );
36 36
37 const int MARGIN_SIZE = 10; 37 const int MARGIN_SIZE = 10;
38 38
39 const char* const NEXT_BUTTON_ID = "NEXT_BUTTON"; 39 const char* const NEXT_BUTTON_ID = "NEXT_BUTTON";
40 const char* const PREVIOUS_BUTTON_ID = "PREVIOUS_BUTTON"; 40 const char* const PREVIOUS_BUTTON_ID = "PREVIOUS_BUTTON";
41 -const char * const DALI_ICON_PLAY = DALI_IMAGE_DIR "icon-play.png"; 41 +const char * const DALI_ICON_PLAY = DEMO_IMAGE_DIR "icon-play.png";
42 42
43 const char* const FITTING_BUTTON_ID = "FITTING_BUTTON"; 43 const char* const FITTING_BUTTON_ID = "FITTING_BUTTON";
44 const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON"; 44 const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON";
@@ -52,29 +52,29 @@ const char* const STYLE_BUTTON_TEXT = &quot;buttonlabel&quot;; @@ -52,29 +52,29 @@ const char* const STYLE_BUTTON_TEXT = &quot;buttonlabel&quot;;
52 const char* IMAGE_PATHS[] = 52 const char* IMAGE_PATHS[] =
53 { 53 {
54 // Variety of sizes, shapes and formats: 54 // Variety of sizes, shapes and formats:
55 - DALI_IMAGE_DIR "dali-logo.png",  
56 - DALI_IMAGE_DIR "layer1.png",  
57 - DALI_IMAGE_DIR "layer2.png",  
58 - DALI_IMAGE_DIR "animation-list.png",  
59 - DALI_IMAGE_DIR "music-libray-main-screen.png",  
60 - DALI_IMAGE_DIR "music-libray-record-cover.png",  
61 - DALI_IMAGE_DIR "contacts-background.png",  
62 - DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif",  
63 - DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif",  
64 - DALI_IMAGE_DIR "square_primitive_shapes.bmp",  
65 - DALI_IMAGE_DIR "gallery-large-14.jpg",  
66 - DALI_IMAGE_DIR "book-landscape-cover.jpg",  
67 - DALI_IMAGE_DIR "book-portrait-p1.jpg",  
68 - DALI_IMAGE_DIR "book-landscape-cover-back.jpg", 55 + DEMO_IMAGE_DIR "dali-logo.png",
  56 + DEMO_IMAGE_DIR "layer1.png",
  57 + DEMO_IMAGE_DIR "layer2.png",
  58 + DEMO_IMAGE_DIR "animation-list.png",
  59 + DEMO_IMAGE_DIR "music-libray-main-screen.png",
  60 + DEMO_IMAGE_DIR "music-libray-record-cover.png",
  61 + DEMO_IMAGE_DIR "contacts-background.png",
  62 + DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif",
  63 + DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif",
  64 + DEMO_IMAGE_DIR "square_primitive_shapes.bmp",
  65 + DEMO_IMAGE_DIR "gallery-large-14.jpg",
  66 + DEMO_IMAGE_DIR "book-landscape-cover.jpg",
  67 + DEMO_IMAGE_DIR "book-portrait-p1.jpg",
  68 + DEMO_IMAGE_DIR "book-landscape-cover-back.jpg",
69 69
70 // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered 70 // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered
71 // black and white image: 71 // black and white image:
72 - DALI_IMAGE_DIR "gallery-large-14.wbmp", 72 + DEMO_IMAGE_DIR "gallery-large-14.wbmp",
73 73
74 - DALI_IMAGE_DIR "background-1.jpg",  
75 - DALI_IMAGE_DIR "background-blocks.jpg",  
76 - DALI_IMAGE_DIR "background-magnifier.jpg",  
77 - DALI_IMAGE_DIR "gallery-large-14.jpg", 74 + DEMO_IMAGE_DIR "background-1.jpg",
  75 + DEMO_IMAGE_DIR "background-blocks.jpg",
  76 + DEMO_IMAGE_DIR "background-magnifier.jpg",
  77 + DEMO_IMAGE_DIR "gallery-large-14.jpg",
78 NULL 78 NULL
79 }; 79 };
80 const int NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; 80 const int NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u;
@@ -761,7 +761,7 @@ void RunTest( Application&amp; application ) @@ -761,7 +761,7 @@ void RunTest( Application&amp; application )
761 // Entry point for Linux & Tizen applications 761 // Entry point for Linux & Tizen applications
762 int main( int argc, char **argv ) 762 int main( int argc, char **argv )
763 { 763 {
764 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 764 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
765 765
766 RunTest( application ); 766 RunTest( application );
767 767
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @d143329
@@ -61,11 +61,11 @@ namespace @@ -61,11 +61,11 @@ namespace
61 /** Controls the output of application logging. */ 61 /** Controls the output of application logging. */
62 //#define DEBUG_PRINT_DIAGNOSTICS; 62 //#define DEBUG_PRINT_DIAGNOSTICS;
63 63
64 -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" );  
65 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 64 +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
  65 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
66 const char* APPLICATION_TITLE( "Image Scaling Modes" ); 66 const char* APPLICATION_TITLE( "Image Scaling Modes" );
67 -const char* TOGGLE_SCALING_IMAGE( DALI_IMAGE_DIR "icon-change.png" );  
68 -const char* TOGGLE_SCALING_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); 67 +const char* TOGGLE_SCALING_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
  68 +const char* TOGGLE_SCALING_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
69 69
70 /** The width of the grid in whole grid cells. */ 70 /** The width of the grid in whole grid cells. */
71 const unsigned GRID_WIDTH = 9; 71 const unsigned GRID_WIDTH = 9;
@@ -104,64 +104,64 @@ const unsigned NUM_IMAGE_SIZES = sizeof(IMAGE_SIZES) / sizeof(IMAGE_SIZES[0]); @@ -104,64 +104,64 @@ const unsigned NUM_IMAGE_SIZES = sizeof(IMAGE_SIZES) / sizeof(IMAGE_SIZES[0]);
104 * show the scaling. */ 104 * show the scaling. */
105 const char* IMAGE_PATHS[] = { 105 const char* IMAGE_PATHS[] = {
106 106
107 - DALI_IMAGE_DIR "dali-logo.png",  
108 - DALI_IMAGE_DIR "com.samsung.dali-demo.ico",  
109 - DALI_IMAGE_DIR "square_primitive_shapes.bmp",  
110 - DALI_IMAGE_DIR "gallery-large-14.wbmp", 107 + DEMO_IMAGE_DIR "dali-logo.png",
  108 + DEMO_IMAGE_DIR "com.samsung.dali-demo.ico",
  109 + DEMO_IMAGE_DIR "square_primitive_shapes.bmp",
  110 + DEMO_IMAGE_DIR "gallery-large-14.wbmp",
111 111
112 // Images that show aspect ratio changes clearly in primitive shapes: 112 // Images that show aspect ratio changes clearly in primitive shapes:
113 113
114 - DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif",  
115 - DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif", 114 + DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif",
  115 + DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif",
116 116
117 // Images from other demos that are tall, wide or just large: 117 // Images from other demos that are tall, wide or just large:
118 118
119 - DALI_IMAGE_DIR "gallery-large-1.jpg",  
120 - DALI_IMAGE_DIR "gallery-large-2.jpg",  
121 - DALI_IMAGE_DIR "gallery-large-3.jpg",  
122 - DALI_IMAGE_DIR "gallery-large-4.jpg",  
123 - DALI_IMAGE_DIR "gallery-large-5.jpg",  
124 - DALI_IMAGE_DIR "gallery-large-6.jpg",  
125 - DALI_IMAGE_DIR "gallery-large-7.jpg",  
126 - DALI_IMAGE_DIR "gallery-large-8.jpg",  
127 - DALI_IMAGE_DIR "gallery-large-9.jpg",  
128 - DALI_IMAGE_DIR "gallery-large-10.jpg",  
129 - DALI_IMAGE_DIR "gallery-large-11.jpg",  
130 - DALI_IMAGE_DIR "gallery-large-12.jpg",  
131 - DALI_IMAGE_DIR "gallery-large-13.jpg",  
132 - DALI_IMAGE_DIR "gallery-large-14.jpg",  
133 - DALI_IMAGE_DIR "gallery-large-15.jpg",  
134 - DALI_IMAGE_DIR "gallery-large-16.jpg",  
135 - DALI_IMAGE_DIR "gallery-large-17.jpg",  
136 - DALI_IMAGE_DIR "gallery-large-18.jpg",  
137 - DALI_IMAGE_DIR "gallery-large-19.jpg",  
138 - DALI_IMAGE_DIR "gallery-large-20.jpg",  
139 - DALI_IMAGE_DIR "gallery-large-21.jpg",  
140 -  
141 - DALI_IMAGE_DIR "background-1.jpg",  
142 - DALI_IMAGE_DIR "background-2.jpg",  
143 - DALI_IMAGE_DIR "background-3.jpg",  
144 - DALI_IMAGE_DIR "background-4.jpg",  
145 - DALI_IMAGE_DIR "background-5.jpg",  
146 - DALI_IMAGE_DIR "background-blocks.jpg",  
147 - DALI_IMAGE_DIR "background-magnifier.jpg",  
148 -  
149 - DALI_IMAGE_DIR "background-1.jpg",  
150 - DALI_IMAGE_DIR "background-2.jpg",  
151 - DALI_IMAGE_DIR "background-3.jpg",  
152 - DALI_IMAGE_DIR "background-4.jpg",  
153 - DALI_IMAGE_DIR "background-5.jpg",  
154 - DALI_IMAGE_DIR "background-blocks.jpg",  
155 - DALI_IMAGE_DIR "background-magnifier.jpg",  
156 -  
157 - DALI_IMAGE_DIR "book-landscape-cover-back.jpg",  
158 - DALI_IMAGE_DIR "book-landscape-cover.jpg",  
159 - DALI_IMAGE_DIR "book-landscape-p1.jpg",  
160 - DALI_IMAGE_DIR "book-landscape-p2.jpg",  
161 -  
162 - DALI_IMAGE_DIR "book-portrait-cover.jpg",  
163 - DALI_IMAGE_DIR "book-portrait-p1.jpg",  
164 - DALI_IMAGE_DIR "book-portrait-p2.jpg", 119 + DEMO_IMAGE_DIR "gallery-large-1.jpg",
  120 + DEMO_IMAGE_DIR "gallery-large-2.jpg",
  121 + DEMO_IMAGE_DIR "gallery-large-3.jpg",
  122 + DEMO_IMAGE_DIR "gallery-large-4.jpg",
  123 + DEMO_IMAGE_DIR "gallery-large-5.jpg",
  124 + DEMO_IMAGE_DIR "gallery-large-6.jpg",
  125 + DEMO_IMAGE_DIR "gallery-large-7.jpg",
  126 + DEMO_IMAGE_DIR "gallery-large-8.jpg",
  127 + DEMO_IMAGE_DIR "gallery-large-9.jpg",
  128 + DEMO_IMAGE_DIR "gallery-large-10.jpg",
  129 + DEMO_IMAGE_DIR "gallery-large-11.jpg",
  130 + DEMO_IMAGE_DIR "gallery-large-12.jpg",
  131 + DEMO_IMAGE_DIR "gallery-large-13.jpg",
  132 + DEMO_IMAGE_DIR "gallery-large-14.jpg",
  133 + DEMO_IMAGE_DIR "gallery-large-15.jpg",
  134 + DEMO_IMAGE_DIR "gallery-large-16.jpg",
  135 + DEMO_IMAGE_DIR "gallery-large-17.jpg",
  136 + DEMO_IMAGE_DIR "gallery-large-18.jpg",
  137 + DEMO_IMAGE_DIR "gallery-large-19.jpg",
  138 + DEMO_IMAGE_DIR "gallery-large-20.jpg",
  139 + DEMO_IMAGE_DIR "gallery-large-21.jpg",
  140 +
  141 + DEMO_IMAGE_DIR "background-1.jpg",
  142 + DEMO_IMAGE_DIR "background-2.jpg",
  143 + DEMO_IMAGE_DIR "background-3.jpg",
  144 + DEMO_IMAGE_DIR "background-4.jpg",
  145 + DEMO_IMAGE_DIR "background-5.jpg",
  146 + DEMO_IMAGE_DIR "background-blocks.jpg",
  147 + DEMO_IMAGE_DIR "background-magnifier.jpg",
  148 +
  149 + DEMO_IMAGE_DIR "background-1.jpg",
  150 + DEMO_IMAGE_DIR "background-2.jpg",
  151 + DEMO_IMAGE_DIR "background-3.jpg",
  152 + DEMO_IMAGE_DIR "background-4.jpg",
  153 + DEMO_IMAGE_DIR "background-5.jpg",
  154 + DEMO_IMAGE_DIR "background-blocks.jpg",
  155 + DEMO_IMAGE_DIR "background-magnifier.jpg",
  156 +
  157 + DEMO_IMAGE_DIR "book-landscape-cover-back.jpg",
  158 + DEMO_IMAGE_DIR "book-landscape-cover.jpg",
  159 + DEMO_IMAGE_DIR "book-landscape-p1.jpg",
  160 + DEMO_IMAGE_DIR "book-landscape-p2.jpg",
  161 +
  162 + DEMO_IMAGE_DIR "book-portrait-cover.jpg",
  163 + DEMO_IMAGE_DIR "book-portrait-p1.jpg",
  164 + DEMO_IMAGE_DIR "book-portrait-p2.jpg",
165 NULL 165 NULL
166 }; 166 };
167 const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; 167 const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u;
@@ -616,7 +616,7 @@ void RunTest( Application&amp; application ) @@ -616,7 +616,7 @@ void RunTest( Application&amp; application )
616 /** Entry point for Linux & Tizen applications */ 616 /** Entry point for Linux & Tizen applications */
617 int main( int argc, char **argv ) 617 int main( int argc, char **argv )
618 { 618 {
619 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 619 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
620 620
621 RunTest( application ); 621 RunTest( application );
622 622
examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp 0 → 100644
  View file @d143329
  1 +/*
  2 + * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +#include <dali-toolkit/dali-toolkit.h>
  19 +
  20 +using namespace Dali;
  21 +
  22 +class ImageViewAlphaBlendApp : public ConnectionTracker
  23 +{
  24 +public:
  25 + ImageViewAlphaBlendApp( Application& application )
  26 + : mApplication( application ),
  27 + mIndex(0u)
  28 + {
  29 + // Connect to the Application's Init signal
  30 + mApplication.InitSignal().Connect( this, &ImageViewAlphaBlendApp::Create );
  31 + }
  32 +
  33 + ~ImageViewAlphaBlendApp()
  34 + {
  35 + // Nothing to do here;
  36 + }
  37 +
  38 +private:
  39 + // The Init signal is received once (only) during the Application lifetime
  40 + void Create( Application& application )
  41 + {
  42 + // Get a handle to the stage
  43 + Stage stage = Stage::GetCurrent();
  44 + stage.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent);
  45 +
  46 + Vector4 green0 = Vector4( 0.f, 1.f, 0.f, 0.25f );
  47 + Vector4 green1 = Vector4( 0.f, 0.25f, 0.f, 0.25f );
  48 + BufferImage redGreen0 = CreateBufferImage( Color::RED, green0 );
  49 + BufferImage redGreen1 = CreateBufferImage( Color::RED, green1 );
  50 + ResourceImage testImage = ResourceImage::New( DEMO_IMAGE_DIR "gallery-large-20.jpg" );
  51 + float imageSize = 512.f;
  52 +
  53 + Toolkit::ImageView imageView0 = Toolkit::ImageView::New( testImage );
  54 + imageView0.SetSize(imageSize, imageSize);
  55 + imageView0.SetParentOrigin( ParentOrigin::CENTER );
  56 + imageView0.SetY( -imageSize*0.5f );
  57 + stage.Add(imageView0);
  58 + Toolkit::ImageView imageView1 = Toolkit::ImageView::New( redGreen0 );
  59 + imageView1.SetParentOrigin( ParentOrigin::CENTER );
  60 + imageView1.SetSize(imageSize, imageSize);
  61 + imageView0.Add(imageView1);
  62 +
  63 + Toolkit::ImageView imageView2 = Toolkit::ImageView::New( testImage);
  64 + imageView2.SetSize(imageSize, imageSize);
  65 + imageView2.SetParentOrigin( ParentOrigin::CENTER );
  66 + imageView2.SetY( imageSize*0.5f );
  67 + stage.Add(imageView2);
  68 + Toolkit::ImageView imageView3 = Toolkit::ImageView::New( redGreen1);
  69 + imageView3.SetParentOrigin( ParentOrigin::CENTER );
  70 + imageView3.SetSize(imageSize, imageSize);
  71 + imageView2.Add(imageView3);
  72 +
  73 + imageView2.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true );
  74 + imageView3.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true );
  75 +
  76 + Animation animation = Animation::New( 10.f );
  77 + animation.AnimateTo(Property(imageView0, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod( 2.f, 8.f ));
  78 + animation.AnimateTo(Property(imageView2, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod( 2.f, 8.f ));
  79 + animation.SetLooping( true );
  80 + animation.Play();
  81 + }
  82 +
  83 + void OnKeyEvent(const KeyEvent& event)
  84 + {
  85 + if(event.state == KeyEvent::Down)
  86 + {
  87 + if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
  88 + {
  89 + mApplication.Quit();
  90 + }
  91 + }
  92 + }
  93 +
  94 + BufferImage CreateBufferImage( const Vector4& color1, const Vector4& color2 )
  95 + {
  96 + BufferImage image = BufferImage::New( 2, 1, Pixel::RGBA8888 );
  97 + PixelBuffer* pixelBuffer = image.GetBuffer();
  98 + pixelBuffer[0]=0xFF * color1.x;
  99 + pixelBuffer[1]=0xFF * color1.y;
  100 + pixelBuffer[2]=0xFF * color1.z;
  101 + pixelBuffer[3]=0xFF * color1.w;
  102 + pixelBuffer[4]=0xFF * color2.x;
  103 + pixelBuffer[5]=0xFF * color2.y;
  104 + pixelBuffer[6]=0xFF * color2.z;
  105 + pixelBuffer[7]=0xFF * color2.w;
  106 + image.Update();
  107 + return image;
  108 + }
  109 +
  110 +
  111 +private:
  112 + Application& mApplication;
  113 + unsigned int mIndex;
  114 +};
  115 +
  116 +void RunTest( Application& application )
  117 +{
  118 + ImageViewAlphaBlendApp test( application );
  119 +
  120 + application.MainLoop();
  121 +}
  122 +
  123 +// Entry point for Linux & Tizen applications
  124 +//
  125 +int main( int argc, char **argv )
  126 +{
  127 + Application application = Application::New( &argc, &argv );
  128 +
  129 + RunTest( application );
  130 +
  131 + return 0;
  132 +}
examples/image-view-pixel-area/image-view-pixel-area-example.cpp 0 → 100644
  View file @d143329
  1 +/*
  2 + * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +#include <dali-toolkit/dali-toolkit.h>
  19 +
  20 +using namespace Dali;
  21 +
  22 +namespace
  23 +{
  24 +const char* IMAGE_PATH[] = { DEMO_IMAGE_DIR "gallery-large-7.jpg",
  25 + DEMO_IMAGE_DIR "gallery-large-12.jpg",
  26 + DEMO_IMAGE_DIR "gallery-large-18.jpg" };
  27 +
  28 +const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
  29 +}
  30 +
  31 +class ImageViewPixelAreaApp : public ConnectionTracker
  32 +{
  33 +public:
  34 + ImageViewPixelAreaApp( Application& application )
  35 + : mApplication( application ),
  36 + mIndex(0u)
  37 + {
  38 + // Connect to the Application's Init signal
  39 + mApplication.InitSignal().Connect( this, &ImageViewPixelAreaApp::Create );
  40 + }
  41 +
  42 + ~ImageViewPixelAreaApp()
  43 + {
  44 + // Nothing to do here;
  45 + }
  46 +
  47 +private:
  48 + // The Init signal is received once (only) during the Application lifetime
  49 + void Create( Application& application )
  50 + {
  51 + // Get a handle to the stage
  52 + Stage stage = Stage::GetCurrent();
  53 + stage.KeyEventSignal().Connect(this, &ImageViewPixelAreaApp::OnKeyEvent);
  54 +
  55 + ImageDimensions size( 510, 510 );
  56 + float subSize = 170.f;
  57 + float relativeSubSize = 0.33;
  58 + Animation animation = Animation::New( 10.f );
  59 + for( int i=0; i<3;i++ )
  60 + for( int j=0; j<3; j++ )
  61 + {
  62 + mImageView[i][j] = Toolkit::ImageView::New( IMAGE_PATH[mIndex], size );
  63 + mImageView[i][j].SetParentOrigin( ParentOrigin::CENTER );
  64 + mImageView[i][j].SetAnchorPoint(AnchorPoint::CENTER );
  65 + mImageView[i][j].SetPosition( subSize*(i-1)*1.1f, subSize*(j-1)*1.1f );
  66 + mImageView[i][j].SetSize( subSize, subSize );
  67 + stage.Add(mImageView[i][j]);
  68 +
  69 + animation.AnimateTo( Property(mImageView[i][j], Toolkit::ImageView::Property::PIXEL_AREA),
  70 + Vector4( relativeSubSize*i, relativeSubSize*j, relativeSubSize, relativeSubSize ),
  71 + AlphaFunction::BOUNCE );
  72 + }
  73 + animation.SetLooping( true );
  74 + animation.Play();
  75 +
  76 + // Respond to a click anywhere on the stage
  77 + stage.GetRootLayer().TouchedSignal().Connect( this, &ImageViewPixelAreaApp::OnTouch );
  78 + }
  79 +
  80 + bool OnTouch( Actor actor, const TouchEvent& touch )
  81 + {
  82 + const TouchPoint &point = touch.GetPoint(0);
  83 + if(point.state == TouchPoint::Down)
  84 + {
  85 + mIndex++;
  86 + for( int i=0; i<3;i++ )
  87 + for( int j=0; j<3; j++ )
  88 + {
  89 + mImageView[i][j].SetImage( IMAGE_PATH[mIndex%NUM_IMAGES] );
  90 + }
  91 + }
  92 + return true;
  93 + }
  94 +
  95 + void OnKeyEvent(const KeyEvent& event)
  96 + {
  97 + if(event.state == KeyEvent::Down)
  98 + {
  99 + if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
  100 + {
  101 + mApplication.Quit();
  102 + }
  103 + }
  104 + }
  105 +
  106 +private:
  107 + Application& mApplication;
  108 + Toolkit::ImageView mImageView[3][3];
  109 + unsigned int mIndex;
  110 +};
  111 +
  112 +void RunTest( Application& application )
  113 +{
  114 + ImageViewPixelAreaApp test( application );
  115 +
  116 + application.MainLoop();
  117 +}
  118 +
  119 +// Entry point for Linux & Tizen applications
  120 +//
  121 +int main( int argc, char **argv )
  122 +{
  123 + Application application = Application::New( &argc, &argv );
  124 +
  125 + RunTest( application );
  126 +
  127 + return 0;
  128 +}
examples/image-view/image-view-example.cpp
  View file @d143329
@@ -25,22 +25,22 @@ using namespace Dali; @@ -25,22 +25,22 @@ using namespace Dali;
25 namespace 25 namespace
26 { 26 {
27 27
28 -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" );  
29 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 28 +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
  29 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
30 const char* APPLICATION_TITLE( "Image view" ); 30 const char* APPLICATION_TITLE( "Image view" );
31 31
32 const char* IMAGE_PATH[] = { 32 const char* IMAGE_PATH[] = {
33 - DALI_IMAGE_DIR "blocks-ball.png",  
34 - DALI_IMAGE_DIR "gallery-small-23.jpg",  
35 - DALI_IMAGE_DIR "selection-popup-bg.2.9.png",  
36 - DALI_IMAGE_DIR "heartsframe.9.png", 33 + DEMO_IMAGE_DIR "blocks-ball.png",
  34 + DEMO_IMAGE_DIR "gallery-small-23.jpg",
  35 + DEMO_IMAGE_DIR "selection-popup-bg.2.9.png",
  36 + DEMO_IMAGE_DIR "heartsframe.9.png",
37 }; 37 };
38 38
39 const char* RESOURCE_IMAGE_PATH[] = { 39 const char* RESOURCE_IMAGE_PATH[] = {
40 - DALI_IMAGE_DIR "contacts-image.png",  
41 - DALI_IMAGE_DIR "gallery-small-27.jpg",  
42 - DALI_IMAGE_DIR "selection-popup-bg.8.9.png",  
43 - DALI_IMAGE_DIR "heartsframe.9.png", 40 + DEMO_IMAGE_DIR "contacts-image.png",
  41 + DEMO_IMAGE_DIR "gallery-small-27.jpg",
  42 + DEMO_IMAGE_DIR "selection-popup-bg.8.9.png",
  43 + DEMO_IMAGE_DIR "heartsframe.9.png",
44 }; 44 };
45 45
46 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*); 46 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
@@ -265,7 +265,7 @@ void RunTest( Application&amp; application ) @@ -265,7 +265,7 @@ void RunTest( Application&amp; application )
265 // 265 //
266 int main( int argc, char **argv ) 266 int main( int argc, char **argv )
267 { 267 {
268 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 268 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
269 269
270 RunTest( application ); 270 RunTest( application );
271 271
examples/item-view/item-view-example.cpp
  View file @d143329
@@ -37,80 +37,80 @@ enum AllImagesLayouts @@ -37,80 +37,80 @@ enum AllImagesLayouts
37 }; 37 };
38 38
39 const char* IMAGE_PATHS[] = { 39 const char* IMAGE_PATHS[] = {
40 - DALI_IMAGE_DIR "gallery-medium-1.jpg",  
41 - DALI_IMAGE_DIR "gallery-medium-2.jpg",  
42 - DALI_IMAGE_DIR "gallery-medium-3.jpg",  
43 - DALI_IMAGE_DIR "gallery-medium-4.jpg",  
44 - DALI_IMAGE_DIR "gallery-medium-5.jpg",  
45 - DALI_IMAGE_DIR "gallery-medium-6.jpg",  
46 - DALI_IMAGE_DIR "gallery-medium-7.jpg",  
47 - DALI_IMAGE_DIR "gallery-medium-8.jpg",  
48 - DALI_IMAGE_DIR "gallery-medium-9.jpg",  
49 - DALI_IMAGE_DIR "gallery-medium-10.jpg",  
50 - DALI_IMAGE_DIR "gallery-medium-11.jpg",  
51 - DALI_IMAGE_DIR "gallery-medium-12.jpg",  
52 - DALI_IMAGE_DIR "gallery-medium-13.jpg",  
53 - DALI_IMAGE_DIR "gallery-medium-14.jpg",  
54 - DALI_IMAGE_DIR "gallery-medium-15.jpg",  
55 - DALI_IMAGE_DIR "gallery-medium-16.jpg",  
56 - DALI_IMAGE_DIR "gallery-medium-17.jpg",  
57 - DALI_IMAGE_DIR "gallery-medium-18.jpg",  
58 - DALI_IMAGE_DIR "gallery-medium-19.jpg",  
59 - DALI_IMAGE_DIR "gallery-medium-20.jpg",  
60 - DALI_IMAGE_DIR "gallery-medium-21.jpg",  
61 - DALI_IMAGE_DIR "gallery-medium-22.jpg",  
62 - DALI_IMAGE_DIR "gallery-medium-23.jpg",  
63 - DALI_IMAGE_DIR "gallery-medium-24.jpg",  
64 - DALI_IMAGE_DIR "gallery-medium-25.jpg",  
65 - DALI_IMAGE_DIR "gallery-medium-26.jpg",  
66 - DALI_IMAGE_DIR "gallery-medium-27.jpg",  
67 - DALI_IMAGE_DIR "gallery-medium-28.jpg",  
68 - DALI_IMAGE_DIR "gallery-medium-29.jpg",  
69 - DALI_IMAGE_DIR "gallery-medium-30.jpg",  
70 - DALI_IMAGE_DIR "gallery-medium-31.jpg",  
71 - DALI_IMAGE_DIR "gallery-medium-32.jpg",  
72 - DALI_IMAGE_DIR "gallery-medium-33.jpg",  
73 - DALI_IMAGE_DIR "gallery-medium-34.jpg",  
74 - DALI_IMAGE_DIR "gallery-medium-35.jpg",  
75 - DALI_IMAGE_DIR "gallery-medium-36.jpg",  
76 - DALI_IMAGE_DIR "gallery-medium-37.jpg",  
77 - DALI_IMAGE_DIR "gallery-medium-38.jpg",  
78 - DALI_IMAGE_DIR "gallery-medium-39.jpg",  
79 - DALI_IMAGE_DIR "gallery-medium-40.jpg",  
80 - DALI_IMAGE_DIR "gallery-medium-41.jpg",  
81 - DALI_IMAGE_DIR "gallery-medium-42.jpg",  
82 - DALI_IMAGE_DIR "gallery-medium-43.jpg",  
83 - DALI_IMAGE_DIR "gallery-medium-44.jpg",  
84 - DALI_IMAGE_DIR "gallery-medium-45.jpg",  
85 - DALI_IMAGE_DIR "gallery-medium-46.jpg",  
86 - DALI_IMAGE_DIR "gallery-medium-47.jpg",  
87 - DALI_IMAGE_DIR "gallery-medium-48.jpg",  
88 - DALI_IMAGE_DIR "gallery-medium-49.jpg",  
89 - DALI_IMAGE_DIR "gallery-medium-50.jpg",  
90 - DALI_IMAGE_DIR "gallery-medium-51.jpg",  
91 - DALI_IMAGE_DIR "gallery-medium-52.jpg",  
92 - DALI_IMAGE_DIR "gallery-medium-53.jpg", 40 + DEMO_IMAGE_DIR "gallery-medium-1.jpg",
  41 + DEMO_IMAGE_DIR "gallery-medium-2.jpg",
  42 + DEMO_IMAGE_DIR "gallery-medium-3.jpg",
  43 + DEMO_IMAGE_DIR "gallery-medium-4.jpg",
  44 + DEMO_IMAGE_DIR "gallery-medium-5.jpg",
  45 + DEMO_IMAGE_DIR "gallery-medium-6.jpg",
  46 + DEMO_IMAGE_DIR "gallery-medium-7.jpg",
  47 + DEMO_IMAGE_DIR "gallery-medium-8.jpg",
  48 + DEMO_IMAGE_DIR "gallery-medium-9.jpg",
  49 + DEMO_IMAGE_DIR "gallery-medium-10.jpg",
  50 + DEMO_IMAGE_DIR "gallery-medium-11.jpg",
  51 + DEMO_IMAGE_DIR "gallery-medium-12.jpg",
  52 + DEMO_IMAGE_DIR "gallery-medium-13.jpg",
  53 + DEMO_IMAGE_DIR "gallery-medium-14.jpg",
  54 + DEMO_IMAGE_DIR "gallery-medium-15.jpg",
  55 + DEMO_IMAGE_DIR "gallery-medium-16.jpg",
  56 + DEMO_IMAGE_DIR "gallery-medium-17.jpg",
  57 + DEMO_IMAGE_DIR "gallery-medium-18.jpg",
  58 + DEMO_IMAGE_DIR "gallery-medium-19.jpg",
  59 + DEMO_IMAGE_DIR "gallery-medium-20.jpg",
  60 + DEMO_IMAGE_DIR "gallery-medium-21.jpg",
  61 + DEMO_IMAGE_DIR "gallery-medium-22.jpg",
  62 + DEMO_IMAGE_DIR "gallery-medium-23.jpg",
  63 + DEMO_IMAGE_DIR "gallery-medium-24.jpg",
  64 + DEMO_IMAGE_DIR "gallery-medium-25.jpg",
  65 + DEMO_IMAGE_DIR "gallery-medium-26.jpg",
  66 + DEMO_IMAGE_DIR "gallery-medium-27.jpg",
  67 + DEMO_IMAGE_DIR "gallery-medium-28.jpg",
  68 + DEMO_IMAGE_DIR "gallery-medium-29.jpg",
  69 + DEMO_IMAGE_DIR "gallery-medium-30.jpg",
  70 + DEMO_IMAGE_DIR "gallery-medium-31.jpg",
  71 + DEMO_IMAGE_DIR "gallery-medium-32.jpg",
  72 + DEMO_IMAGE_DIR "gallery-medium-33.jpg",
  73 + DEMO_IMAGE_DIR "gallery-medium-34.jpg",
  74 + DEMO_IMAGE_DIR "gallery-medium-35.jpg",
  75 + DEMO_IMAGE_DIR "gallery-medium-36.jpg",
  76 + DEMO_IMAGE_DIR "gallery-medium-37.jpg",
  77 + DEMO_IMAGE_DIR "gallery-medium-38.jpg",
  78 + DEMO_IMAGE_DIR "gallery-medium-39.jpg",
  79 + DEMO_IMAGE_DIR "gallery-medium-40.jpg",
  80 + DEMO_IMAGE_DIR "gallery-medium-41.jpg",
  81 + DEMO_IMAGE_DIR "gallery-medium-42.jpg",
  82 + DEMO_IMAGE_DIR "gallery-medium-43.jpg",
  83 + DEMO_IMAGE_DIR "gallery-medium-44.jpg",
  84 + DEMO_IMAGE_DIR "gallery-medium-45.jpg",
  85 + DEMO_IMAGE_DIR "gallery-medium-46.jpg",
  86 + DEMO_IMAGE_DIR "gallery-medium-47.jpg",
  87 + DEMO_IMAGE_DIR "gallery-medium-48.jpg",
  88 + DEMO_IMAGE_DIR "gallery-medium-49.jpg",
  89 + DEMO_IMAGE_DIR "gallery-medium-50.jpg",
  90 + DEMO_IMAGE_DIR "gallery-medium-51.jpg",
  91 + DEMO_IMAGE_DIR "gallery-medium-52.jpg",
  92 + DEMO_IMAGE_DIR "gallery-medium-53.jpg",
93 }; 93 };
94 94
95 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATHS) / sizeof(char*); 95 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATHS) / sizeof(char*);
96 96
97 const char* BACKGROUND_IMAGE( "" ); 97 const char* BACKGROUND_IMAGE( "" );
98 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
99 -const char* EDIT_IMAGE( DALI_IMAGE_DIR "icon-edit.png" );  
100 -const char* EDIT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-edit-selected.png" );  
101 -const char* SPIRAL_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png" );  
102 -const char* SPIRAL_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-spiral-selected.png" );  
103 -const char* GRID_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-grid.png" );  
104 -const char* GRID_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-grid-selected.png" );  
105 -const char* DEPTH_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-depth.png" );  
106 -const char* DEPTH_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-depth-selected.png" );  
107 -const char* DELETE_IMAGE( DALI_IMAGE_DIR "icon-delete.png" );  
108 -const char* DELETE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-delete-selected.png" );  
109 -const char* REPLACE_IMAGE( DALI_IMAGE_DIR "icon-replace.png" );  
110 -const char* REPLACE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" );  
111 -const char* INSERT_IMAGE( DALI_IMAGE_DIR "icon-insert.png" );  
112 -const char* INSERT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-insert-selected.png" );  
113 -const char* SELECTED_IMAGE( DALI_IMAGE_DIR "item-select-check.png" ); 98 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  99 +const char* EDIT_IMAGE( DEMO_IMAGE_DIR "icon-edit.png" );
  100 +const char* EDIT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-edit-selected.png" );
  101 +const char* SPIRAL_LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png" );
  102 +const char* SPIRAL_LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-item-view-layout-spiral-selected.png" );
  103 +const char* GRID_LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-item-view-layout-grid.png" );
  104 +const char* GRID_LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-item-view-layout-grid-selected.png" );
  105 +const char* DEPTH_LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-item-view-layout-depth.png" );
  106 +const char* DEPTH_LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-item-view-layout-depth-selected.png" );
  107 +const char* DELETE_IMAGE( DEMO_IMAGE_DIR "icon-delete.png" );
  108 +const char* DELETE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-delete-selected.png" );
  109 +const char* REPLACE_IMAGE( DEMO_IMAGE_DIR "icon-replace.png" );
  110 +const char* REPLACE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" );
  111 +const char* INSERT_IMAGE( DEMO_IMAGE_DIR "icon-insert.png" );
  112 +const char* INSERT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-insert-selected.png" );
  113 +const char* SELECTED_IMAGE( DEMO_IMAGE_DIR "item-select-check.png" );
114 const char* APPLICATION_TITLE( "ItemView" ); 114 const char* APPLICATION_TITLE( "ItemView" );
115 115
116 const char* SPIRAL_LABEL("Spiral"); 116 const char* SPIRAL_LABEL("Spiral");
@@ -984,7 +984,7 @@ void RunTest(Application&amp; app) @@ -984,7 +984,7 @@ void RunTest(Application&amp; app)
984 984
985 int main(int argc, char **argv) 985 int main(int argc, char **argv)
986 { 986 {
987 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 987 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
988 988
989 RunTest(app); 989 RunTest(app);
990 990
examples/line-mesh/line-mesh-example.cpp
  View file @d143329
@@ -26,8 +26,8 @@ using namespace Dali; @@ -26,8 +26,8 @@ using namespace Dali;
26 26
27 namespace 27 namespace
28 { 28 {
29 -const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" );  
30 -const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" ); 29 +const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" );
  30 +const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" );
31 31
32 #define MAKE_SHADER(A)#A 32 #define MAKE_SHADER(A)#A
33 33
examples/logging/logging-example.cpp
  View file @d143329
@@ -44,8 +44,8 @@ using namespace Dali; @@ -44,8 +44,8 @@ using namespace Dali;
44 namespace 44 namespace
45 { 45 {
46 46
47 -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";  
48 -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; 47 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  48 +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
49 49
50 const char* const TOOLBAR_TITLE = "Logging"; 50 const char* const TOOLBAR_TITLE = "Logging";
51 //const int TOOLBAR_HEIGHT = 62; 51 //const int TOOLBAR_HEIGHT = 62;
@@ -712,7 +712,7 @@ void RunTest( Application&amp; application ) @@ -712,7 +712,7 @@ void RunTest( Application&amp; application )
712 // 712 //
713 int main( int argc, char **argv ) 713 int main( int argc, char **argv )
714 { 714 {
715 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 715 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
716 716
717 RunTest( application ); 717 RunTest( application );
718 718
examples/magnifier/magnifier-example.cpp
  View file @d143329
@@ -26,8 +26,8 @@ using namespace Dali; @@ -26,8 +26,8 @@ using namespace Dali;
26 26
27 namespace 27 namespace
28 { 28 {
29 -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-magnifier.jpg" );  
30 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 29 +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-magnifier.jpg" );
  30 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
31 const char* APPLICATION_TITLE( "Magnifier Example" ); 31 const char* APPLICATION_TITLE( "Magnifier Example" );
32 const Vector3 MAGNIFIER_SIZE(0.25f, 0.25f, 0.0f); ///< Magnifier sides should be 25% of the width of the stage 32 const Vector3 MAGNIFIER_SIZE(0.25f, 0.25f, 0.0f); ///< Magnifier sides should be 25% of the width of the stage
33 const float ANIMATION_DURATION(60.0f); ///< Run animation for a minute before repeating. 33 const float ANIMATION_DURATION(60.0f); ///< Run animation for a minute before repeating.
@@ -413,7 +413,7 @@ void RunTest( Application&amp; application ) @@ -413,7 +413,7 @@ void RunTest( Application&amp; application )
413 // 413 //
414 int main( int argc, char **argv ) 414 int main( int argc, char **argv )
415 { 415 {
416 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 416 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
417 417
418 RunTest( application ); 418 RunTest( application );
419 419
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @d143329
@@ -32,12 +32,12 @@ namespace @@ -32,12 +32,12 @@ namespace
32 32
33 const char* MATERIAL_SAMPLES[] = 33 const char* MATERIAL_SAMPLES[] =
34 { 34 {
35 - DALI_IMAGE_DIR "people-medium-1.jpg",  
36 - DALI_IMAGE_DIR "people-medium-4.jpg",  
37 - DALI_IMAGE_DIR "people-medium-11.jpg",  
38 - DALI_IMAGE_DIR "people-small-16.jpg",  
39 - DALI_IMAGE_DIR "people-medium-15.jpg",  
40 - DALI_IMAGE_DIR "people-medium-6.jpg", 35 + DEMO_IMAGE_DIR "people-medium-1.jpg",
  36 + DEMO_IMAGE_DIR "people-medium-4.jpg",
  37 + DEMO_IMAGE_DIR "people-medium-11.jpg",
  38 + DEMO_IMAGE_DIR "people-small-16.jpg",
  39 + DEMO_IMAGE_DIR "people-medium-15.jpg",
  40 + DEMO_IMAGE_DIR "people-medium-6.jpg",
41 }; 41 };
42 const unsigned int NUMBER_OF_SAMPLES(sizeof(MATERIAL_SAMPLES)/sizeof(const char*)); 42 const unsigned int NUMBER_OF_SAMPLES(sizeof(MATERIAL_SAMPLES)/sizeof(const char*));
43 43
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @d143329
@@ -31,8 +31,8 @@ using namespace Dali::Toolkit; @@ -31,8 +31,8 @@ using namespace Dali::Toolkit;
31 31
32 namespace 32 namespace
33 { 33 {
34 -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" );  
35 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 34 +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-2.jpg" );
  35 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
36 36
37 const float GRAVITY_X(0); 37 const float GRAVITY_X(0);
38 const float GRAVITY_Y(-0.09); 38 const float GRAVITY_Y(-0.09);
@@ -299,7 +299,7 @@ private: @@ -299,7 +299,7 @@ private:
299 299
300 //----------------------------------------------------------------------------------------------- 300 //-----------------------------------------------------------------------------------------------
301 // 301 //
302 -// IMPLEMENTATION 302 +// IMPLEMENTATION
303 // 303 //
304 //---------------- 304 //----------------
305 305
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @d143329
@@ -27,8 +27,8 @@ using namespace Dali::Toolkit; @@ -27,8 +27,8 @@ using namespace Dali::Toolkit;
27 27
28 namespace 28 namespace
29 { 29 {
30 -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" );  
31 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 30 +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-2.jpg" );
  31 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
32 32
33 const float GRAVITY_X(0); 33 const float GRAVITY_X(0);
34 const float GRAVITY_Y(-0.09); 34 const float GRAVITY_Y(-0.09);
@@ -230,7 +230,7 @@ private: @@ -230,7 +230,7 @@ private:
230 230
231 //----------------------------------------------------------------------------------------------- 231 //-----------------------------------------------------------------------------------------------
232 // 232 //
233 -// IMPLEMENTATION 233 +// IMPLEMENTATION
234 // 234 //
235 //---------------- 235 //----------------
236 236
@@ -875,4 +875,3 @@ int main( int argc, char **argv ) @@ -875,4 +875,3 @@ int main( int argc, char **argv )
875 875
876 return 0; 876 return 0;
877 } 877 }
878 -  
examples/model3d-view/model3d-view-example.cpp
  View file @d143329
@@ -25,20 +25,20 @@ namespace @@ -25,20 +25,20 @@ namespace
25 const int MODEL_NUMBER(3); 25 const int MODEL_NUMBER(3);
26 26
27 const char * const MODEL_FILE[] = { 27 const char * const MODEL_FILE[] = {
28 - DALI_MODEL_DIR "Dino.obj",  
29 - DALI_MODEL_DIR "ToyRobot-Metal.obj",  
30 - DALI_MODEL_DIR "Toyrobot-Plastic.obj" 28 + DEMO_MODEL_DIR "Dino.obj",
  29 + DEMO_MODEL_DIR "ToyRobot-Metal.obj",
  30 + DEMO_MODEL_DIR "Toyrobot-Plastic.obj"
31 }; 31 };
32 32
33 const char * const MATERIAL_FILE[] = { 33 const char * const MATERIAL_FILE[] = {
34 - DALI_MODEL_DIR "Dino.mtl",  
35 - DALI_MODEL_DIR "ToyRobot-Metal.mtl",  
36 - DALI_MODEL_DIR "Toyrobot-Plastic.mtl" 34 + DEMO_MODEL_DIR "Dino.mtl",
  35 + DEMO_MODEL_DIR "ToyRobot-Metal.mtl",
  36 + DEMO_MODEL_DIR "Toyrobot-Plastic.mtl"
37 }; 37 };
38 38
39 -const char * const IMAGE_PATH( DALI_IMAGE_DIR "" ); 39 +const char * const IMAGE_PATH( DEMO_IMAGE_DIR "" );
40 40
41 -const char * BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-1.jpg"); 41 +const char * BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-1.jpg");
42 42
43 } 43 }
44 44
examples/motion-blur/motion-blur-example.cpp
  View file @d143329
@@ -54,11 +54,11 @@ const float MOTION_BLUR_ACTOR_HEIGHT = 112; @@ -54,11 +54,11 @@ const float MOTION_BLUR_ACTOR_HEIGHT = 112;
54 const unsigned int MOTION_BLUR_NUM_SAMPLES = 8; 54 const unsigned int MOTION_BLUR_NUM_SAMPLES = 8;
55 55
56 const int MOTION_BLUR_NUM_ACTOR_IMAGES = 5; 56 const int MOTION_BLUR_NUM_ACTOR_IMAGES = 5;
57 -const char* MOTION_BLUR_ACTOR_IMAGE1( DALI_IMAGE_DIR "image-with-border-1.jpg" );  
58 -const char* MOTION_BLUR_ACTOR_IMAGE2( DALI_IMAGE_DIR "image-with-border-2.jpg" );  
59 -const char* MOTION_BLUR_ACTOR_IMAGE3( DALI_IMAGE_DIR "image-with-border-3.jpg" );  
60 -const char* MOTION_BLUR_ACTOR_IMAGE4( DALI_IMAGE_DIR "image-with-border-4.jpg" );  
61 -const char* MOTION_BLUR_ACTOR_IMAGE5( DALI_IMAGE_DIR "image-with-border-1.jpg" ); 57 +const char* MOTION_BLUR_ACTOR_IMAGE1( DEMO_IMAGE_DIR "image-with-border-1.jpg" );
  58 +const char* MOTION_BLUR_ACTOR_IMAGE2( DEMO_IMAGE_DIR "image-with-border-2.jpg" );
  59 +const char* MOTION_BLUR_ACTOR_IMAGE3( DEMO_IMAGE_DIR "image-with-border-3.jpg" );
  60 +const char* MOTION_BLUR_ACTOR_IMAGE4( DEMO_IMAGE_DIR "image-with-border-4.jpg" );
  61 +const char* MOTION_BLUR_ACTOR_IMAGE5( DEMO_IMAGE_DIR "image-with-border-1.jpg" );
62 62
63 const char* MOTION_BLUR_ACTOR_IMAGES[] = { 63 const char* MOTION_BLUR_ACTOR_IMAGES[] = {
64 MOTION_BLUR_ACTOR_IMAGE1, 64 MOTION_BLUR_ACTOR_IMAGE1,
@@ -72,16 +72,16 @@ const int NUM_ACTOR_ANIMATIONS = 4; @@ -72,16 +72,16 @@ const int NUM_ACTOR_ANIMATIONS = 4;
72 const int NUM_CAMERA_ANIMATIONS = 2; 72 const int NUM_CAMERA_ANIMATIONS = 2;
73 73
74 74
75 -const char* BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "background-default.png"; 75 +const char* BACKGROUND_IMAGE_PATH = DEMO_IMAGE_DIR "background-default.png";
76 76
77 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
78 -const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-change.png" );  
79 -const char* LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); 77 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  78 +const char* LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
  79 +const char* LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
80 const char* APPLICATION_TITLE( "Motion Blur" ); 80 const char* APPLICATION_TITLE( "Motion Blur" );
81 -const char* EFFECTS_OFF_ICON( DALI_IMAGE_DIR "icon-effects-off.png" );  
82 -const char* EFFECTS_OFF_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-off-selected.png" );  
83 -const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" );  
84 -const char* EFFECTS_ON_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-on-selected.png" ); 81 +const char* EFFECTS_OFF_ICON( DEMO_IMAGE_DIR "icon-effects-off.png" );
  82 +const char* EFFECTS_OFF_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-off-selected.png" );
  83 +const char* EFFECTS_ON_ICON( DEMO_IMAGE_DIR "icon-effects-on.png" );
  84 +const char* EFFECTS_ON_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-on-selected.png" );
85 85
86 const float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons 86 const float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons
87 87
@@ -560,7 +560,7 @@ void RunTest(Application&amp; app) @@ -560,7 +560,7 @@ void RunTest(Application&amp; app)
560 // 560 //
561 int main(int argc, char **argv) 561 int main(int argc, char **argv)
562 { 562 {
563 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 563 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
564 564
565 RunTest(app); 565 RunTest(app);
566 566
examples/motion-stretch/motion-stretch-example.cpp
  View file @d143329
@@ -40,11 +40,11 @@ const float MOTION_STRETCH_ACTOR_WIDTH = 256; @@ -40,11 +40,11 @@ const float MOTION_STRETCH_ACTOR_WIDTH = 256;
40 const float MOTION_STRETCH_ACTOR_HEIGHT = 256; // "" 40 const float MOTION_STRETCH_ACTOR_HEIGHT = 256; // ""
41 41
42 const int MOTION_STRETCH_NUM_ACTOR_IMAGES = 5; 42 const int MOTION_STRETCH_NUM_ACTOR_IMAGES = 5;
43 -const char* MOTION_STRETCH_ACTOR_IMAGE1( DALI_IMAGE_DIR "image-with-border-1.jpg" );  
44 -const char* MOTION_STRETCH_ACTOR_IMAGE2( DALI_IMAGE_DIR "image-with-border-2.jpg" );  
45 -const char* MOTION_STRETCH_ACTOR_IMAGE3( DALI_IMAGE_DIR "image-with-border-3.jpg" );  
46 -const char* MOTION_STRETCH_ACTOR_IMAGE4( DALI_IMAGE_DIR "image-with-border-4.jpg" );  
47 -const char* MOTION_STRETCH_ACTOR_IMAGE5( DALI_IMAGE_DIR "image-with-border-5.jpg" ); 43 +const char* MOTION_STRETCH_ACTOR_IMAGE1( DEMO_IMAGE_DIR "image-with-border-1.jpg" );
  44 +const char* MOTION_STRETCH_ACTOR_IMAGE2( DEMO_IMAGE_DIR "image-with-border-2.jpg" );
  45 +const char* MOTION_STRETCH_ACTOR_IMAGE3( DEMO_IMAGE_DIR "image-with-border-3.jpg" );
  46 +const char* MOTION_STRETCH_ACTOR_IMAGE4( DEMO_IMAGE_DIR "image-with-border-4.jpg" );
  47 +const char* MOTION_STRETCH_ACTOR_IMAGE5( DEMO_IMAGE_DIR "image-with-border-5.jpg" );
48 48
49 const char* MOTION_STRETCH_ACTOR_IMAGES[] = { 49 const char* MOTION_STRETCH_ACTOR_IMAGES[] = {
50 MOTION_STRETCH_ACTOR_IMAGE1, 50 MOTION_STRETCH_ACTOR_IMAGE1,
@@ -58,16 +58,16 @@ const int NUM_ACTOR_ANIMATIONS = 4; @@ -58,16 +58,16 @@ const int NUM_ACTOR_ANIMATIONS = 4;
58 const int NUM_CAMERA_ANIMATIONS = 2; 58 const int NUM_CAMERA_ANIMATIONS = 2;
59 59
60 60
61 -const char* BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "background-default.png"; 61 +const char* BACKGROUND_IMAGE_PATH = DEMO_IMAGE_DIR "background-default.png";
62 62
63 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
64 -const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-change.png" );  
65 -const char* LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); 63 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  64 +const char* LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
  65 +const char* LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
66 const char* APPLICATION_TITLE( "Motion Stretch" ); 66 const char* APPLICATION_TITLE( "Motion Stretch" );
67 -const char* EFFECTS_OFF_ICON( DALI_IMAGE_DIR "icon-effects-off.png" );  
68 -const char* EFFECTS_OFF_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-off-selected.png" );  
69 -const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" );  
70 -const char* EFFECTS_ON_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-on-selected.png" ); 67 +const char* EFFECTS_OFF_ICON( DEMO_IMAGE_DIR "icon-effects-off.png" );
  68 +const char* EFFECTS_OFF_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-off-selected.png" );
  69 +const char* EFFECTS_ON_ICON( DEMO_IMAGE_DIR "icon-effects-on.png" );
  70 +const char* EFFECTS_ON_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-on-selected.png" );
71 71
72 // These values depend on the button background image 72 // These values depend on the button background image
73 const Vector4 BUTTON_IMAGE_BORDER( Vector4::ONE * 3.0f ); 73 const Vector4 BUTTON_IMAGE_BORDER( Vector4::ONE * 3.0f );
@@ -443,7 +443,7 @@ void RunTest(Application&amp; app) @@ -443,7 +443,7 @@ void RunTest(Application&amp; app)
443 // 443 //
444 int main(int argc, char **argv) 444 int main(int argc, char **argv)
445 { 445 {
446 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 446 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
447 447
448 RunTest(app); 448 RunTest(app);
449 449
examples/new-window/new-window-example.cpp
  View file @d143329
@@ -32,13 +32,13 @@ class NewWindowController; @@ -32,13 +32,13 @@ class NewWindowController;
32 32
33 namespace 33 namespace
34 { 34 {
35 -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" );  
36 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
37 -const char * const LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" );  
38 -const char * const LOSE_CONTEXT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-cluster-wobble-selected.png" );  
39 -const char * const BASE_IMAGE( DALI_IMAGE_DIR "gallery-large-14.jpg" );  
40 -const char * const EFFECT_IMAGE( DALI_IMAGE_DIR "gallery-large-18.jpg" );  
41 -const char * const LOGO_IMAGE(DALI_IMAGE_DIR "dali-logo.png"); 35 +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-2.jpg" );
  36 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  37 +const char * const LOSE_CONTEXT_IMAGE( DEMO_IMAGE_DIR "icon-cluster-wobble.png" );
  38 +const char * const LOSE_CONTEXT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-cluster-wobble-selected.png" );
  39 +const char * const BASE_IMAGE( DEMO_IMAGE_DIR "gallery-large-14.jpg" );
  40 +const char * const EFFECT_IMAGE( DEMO_IMAGE_DIR "gallery-large-18.jpg" );
  41 +const char * const LOGO_IMAGE(DEMO_IMAGE_DIR "dali-logo.png");
42 42
43 const float EXPLOSION_DURATION(1.2f); 43 const float EXPLOSION_DURATION(1.2f);
44 const unsigned int EMIT_INTERVAL_IN_MS(40); 44 const unsigned int EMIT_INTERVAL_IN_MS(40);
@@ -241,7 +241,7 @@ void NewWindowController::Destroy( Application&amp; app ) @@ -241,7 +241,7 @@ void NewWindowController::Destroy( Application&amp; app )
241 void NewWindowController::AddBubbles( Actor& parentActor, const Vector2& stageSize) 241 void NewWindowController::AddBubbles( Actor& parentActor, const Vector2& stageSize)
242 { 242 {
243 mEmitter = Toolkit::BubbleEmitter::New( stageSize, 243 mEmitter = Toolkit::BubbleEmitter::New( stageSize,
244 - ResourceImage::New( DALI_IMAGE_DIR "bubble-ball.png" ), 244 + ResourceImage::New( DEMO_IMAGE_DIR "bubble-ball.png" ),
245 200, Vector2( 5.0f, 5.0f ) ); 245 200, Vector2( 5.0f, 5.0f ) );
246 246
247 Image background = ResourceImage::New(BACKGROUND_IMAGE); 247 Image background = ResourceImage::New(BACKGROUND_IMAGE);
@@ -563,7 +563,7 @@ void RunTest(Application&amp; app) @@ -563,7 +563,7 @@ void RunTest(Application&amp; app)
563 // 563 //
564 int main(int argc, char **argv) 564 int main(int argc, char **argv)
565 { 565 {
566 - gApplication = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 566 + gApplication = Application::New(&argc, &argv, DEMO_THEME_PATH);
567 RunTest(gApplication); 567 RunTest(gApplication);
568 568
569 return 0; 569 return 0;
examples/page-turn-view/page-turn-view-example.cpp
  View file @d143329
@@ -31,37 +31,37 @@ using namespace Dali::Toolkit; @@ -31,37 +31,37 @@ using namespace Dali::Toolkit;
31 // LOCAL STUFF 31 // LOCAL STUFF
32 namespace 32 namespace
33 { 33 {
34 -const char* const CHANGE_IMAGE_ICON(DALI_IMAGE_DIR "icon-change.png");  
35 -const char* const CHANGE_IMAGE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); 34 +const char* const CHANGE_IMAGE_ICON(DEMO_IMAGE_DIR "icon-change.png");
  35 +const char* const CHANGE_IMAGE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
36 36
37 // The content amount of one page between portrait and landscape view are different 37 // The content amount of one page between portrait and landscape view are different
38 // set a ratio to modify the current page number when the rotation is changed 38 // set a ratio to modify the current page number when the rotation is changed
39 const float PAGE_NUMBER_CORRESPONDING_RATIO(1.25f); 39 const float PAGE_NUMBER_CORRESPONDING_RATIO(1.25f);
40 40
41 -const char* BOOK_COVER_PORTRAIT = ( DALI_IMAGE_DIR "book-portrait-cover.jpg" );  
42 -const char* BOOK_COVER_LANDSCAPE = ( DALI_IMAGE_DIR "book-landscape-cover.jpg" );  
43 -const char* BOOK_COVER_BACK_LANDSCAPE = ( DALI_IMAGE_DIR "book-landscape-cover-back.jpg" ); 41 +const char* BOOK_COVER_PORTRAIT = ( DEMO_IMAGE_DIR "book-portrait-cover.jpg" );
  42 +const char* BOOK_COVER_LANDSCAPE = ( DEMO_IMAGE_DIR "book-landscape-cover.jpg" );
  43 +const char* BOOK_COVER_BACK_LANDSCAPE = ( DEMO_IMAGE_DIR "book-landscape-cover-back.jpg" );
44 44
45 const char* PAGE_IMAGES_PORTRAIT[] = 45 const char* PAGE_IMAGES_PORTRAIT[] =
46 { 46 {
47 - DALI_IMAGE_DIR "book-portrait-p1.jpg",  
48 - DALI_IMAGE_DIR "book-portrait-p2.jpg",  
49 - DALI_IMAGE_DIR "book-portrait-p3.jpg",  
50 - DALI_IMAGE_DIR "book-portrait-p4.jpg",  
51 - DALI_IMAGE_DIR "book-portrait-p5.jpg" 47 + DEMO_IMAGE_DIR "book-portrait-p1.jpg",
  48 + DEMO_IMAGE_DIR "book-portrait-p2.jpg",
  49 + DEMO_IMAGE_DIR "book-portrait-p3.jpg",
  50 + DEMO_IMAGE_DIR "book-portrait-p4.jpg",
  51 + DEMO_IMAGE_DIR "book-portrait-p5.jpg"
52 }; 52 };
53 const unsigned int NUMBER_OF_PORTRAIT_IMAGE( sizeof(PAGE_IMAGES_PORTRAIT) / sizeof(PAGE_IMAGES_PORTRAIT[0]) ); 53 const unsigned int NUMBER_OF_PORTRAIT_IMAGE( sizeof(PAGE_IMAGES_PORTRAIT) / sizeof(PAGE_IMAGES_PORTRAIT[0]) );
54 54
55 const char* PAGE_IMAGES_LANDSCAPE[] = 55 const char* PAGE_IMAGES_LANDSCAPE[] =
56 { 56 {
57 - DALI_IMAGE_DIR "book-landscape-p1.jpg",  
58 - DALI_IMAGE_DIR "book-landscape-p2.jpg",  
59 - DALI_IMAGE_DIR "book-landscape-p3.jpg",  
60 - DALI_IMAGE_DIR "book-landscape-p4.jpg",  
61 - DALI_IMAGE_DIR "book-landscape-p5.jpg",  
62 - DALI_IMAGE_DIR "book-landscape-p6.jpg",  
63 - DALI_IMAGE_DIR "book-landscape-p7.jpg",  
64 - DALI_IMAGE_DIR "book-landscape-p8.jpg" 57 + DEMO_IMAGE_DIR "book-landscape-p1.jpg",
  58 + DEMO_IMAGE_DIR "book-landscape-p2.jpg",
  59 + DEMO_IMAGE_DIR "book-landscape-p3.jpg",
  60 + DEMO_IMAGE_DIR "book-landscape-p4.jpg",
  61 + DEMO_IMAGE_DIR "book-landscape-p5.jpg",
  62 + DEMO_IMAGE_DIR "book-landscape-p6.jpg",
  63 + DEMO_IMAGE_DIR "book-landscape-p7.jpg",
  64 + DEMO_IMAGE_DIR "book-landscape-p8.jpg"
65 }; 65 };
66 const unsigned int NUMBER_OF_LANDSCAPE_IMAGE( sizeof(PAGE_IMAGES_LANDSCAPE) / sizeof(PAGE_IMAGES_LANDSCAPE[0]) ); 66 const unsigned int NUMBER_OF_LANDSCAPE_IMAGE( sizeof(PAGE_IMAGES_LANDSCAPE) / sizeof(PAGE_IMAGES_LANDSCAPE[0]) );
67 67
@@ -347,11 +347,10 @@ void PageTurnController::OnPageFinishedPan( PageTurnView pageTurnView ) @@ -347,11 +347,10 @@ void PageTurnController::OnPageFinishedPan( PageTurnView pageTurnView )
347 // Entry point for applications 347 // Entry point for applications
348 int main( int argc, char **argv ) 348 int main( int argc, char **argv )
349 { 349 {
350 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 350 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
351 PageTurnController test ( app ); 351 PageTurnController test ( app );
352 352
353 app.MainLoop(); 353 app.MainLoop();
354 354
355 return 0; 355 return 0;
356 } 356 }
357 -  
examples/point-mesh/point-mesh-example.cpp
  View file @d143329
@@ -26,8 +26,8 @@ using namespace Dali; @@ -26,8 +26,8 @@ using namespace Dali;
26 26
27 namespace 27 namespace
28 { 28 {
29 -const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" );  
30 -const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" ); 29 +const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" );
  30 +const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" );
31 31
32 #define MAKE_SHADER(A)#A 32 #define MAKE_SHADER(A)#A
33 33
examples/popup/popup-example.cpp
  View file @d143329
@@ -34,15 +34,15 @@ struct ButtonItem @@ -34,15 +34,15 @@ struct ButtonItem
34 namespace 34 namespace
35 { 35 {
36 36
37 -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";  
38 -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; 37 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  38 +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
39 39
40 const char* const TOOLBAR_TITLE = "Popup"; 40 const char* const TOOLBAR_TITLE = "Popup";
41 41
42 -const char* CONTEXT_DISABLED_ICON_IMAGE = DALI_IMAGE_DIR "icon-scroll-view-carousel.png";  
43 -const char* CONTEXT_ENABLED_ICON_IMAGE = DALI_IMAGE_DIR "icon-scroll-view-spiral.png";  
44 -const char* ANIMATION_FADE_ICON_IMAGE = DALI_IMAGE_DIR "icon-effects-off.png";  
45 -const char* ANIMATION_ZOOM_ICON_IMAGE = DALI_IMAGE_DIR "icon-effects-on.png"; 42 +const char* CONTEXT_DISABLED_ICON_IMAGE = DEMO_IMAGE_DIR "icon-scroll-view-carousel.png";
  43 +const char* CONTEXT_ENABLED_ICON_IMAGE = DEMO_IMAGE_DIR "icon-scroll-view-spiral.png";
  44 +const char* ANIMATION_FADE_ICON_IMAGE = DEMO_IMAGE_DIR "icon-effects-off.png";
  45 +const char* ANIMATION_ZOOM_ICON_IMAGE = DEMO_IMAGE_DIR "icon-effects-on.png";
46 46
47 const char* const POPUP_BUTTON_TITLE_ID = "POPUP_BUTTON_TITLE"; 47 const char* const POPUP_BUTTON_TITLE_ID = "POPUP_BUTTON_TITLE";
48 const char* const POPUP_BUTTON_BUTTONS_1_ID = "POPUP_BUTTON_BUTTONS_1"; 48 const char* const POPUP_BUTTON_BUTTONS_1_ID = "POPUP_BUTTON_BUTTONS_1";
@@ -61,11 +61,11 @@ const char* const POPUP_CONTROL_OK_NAME = &quot;controlOk&quot;; @@ -61,11 +61,11 @@ const char* const POPUP_CONTROL_OK_NAME = &quot;controlOk&quot;;
61 const char* const POPUP_CONTROL_CANCEL_NAME = "controlCancel"; 61 const char* const POPUP_CONTROL_CANCEL_NAME = "controlCancel";
62 62
63 const char* const CONTENT_TEXT = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; 63 const char* const CONTENT_TEXT = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
64 -const char* const IMAGE1 = DALI_IMAGE_DIR "gallery-medium-5.jpg";  
65 -const char* const IMAGE2 = DALI_IMAGE_DIR "background-magnifier.jpg"; 64 +const char* const IMAGE1 = DEMO_IMAGE_DIR "gallery-medium-5.jpg";
  65 +const char* const IMAGE2 = DEMO_IMAGE_DIR "background-magnifier.jpg";
66 66
67 // Control area image. 67 // Control area image.
68 -const char* DEFAULT_CONTROL_AREA_IMAGE_PATH = DALI_IMAGE_DIR "popup_button_background.9.png"; ///< Control area image for the popup. 68 +const char* DEFAULT_CONTROL_AREA_IMAGE_PATH = DEMO_IMAGE_DIR "popup_button_background.9.png"; ///< Control area image for the popup.
69 69
70 const ButtonItem POPUP_BUTTON_ITEMS[] = { 70 const ButtonItem POPUP_BUTTON_ITEMS[] = {
71 { POPUP_BUTTON_COMPLEX_ID, "Complex" }, 71 { POPUP_BUTTON_COMPLEX_ID, "Complex" },
@@ -733,7 +733,7 @@ void RunTest( Application&amp; application ) @@ -733,7 +733,7 @@ void RunTest( Application&amp; application )
733 // Entry point for Linux & SLP applications 733 // Entry point for Linux & SLP applications
734 int main( int argc, char **argv ) 734 int main( int argc, char **argv )
735 { 735 {
736 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 736 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
737 737
738 RunTest( application ); 738 RunTest( application );
739 739
examples/radial-menu/radial-menu-example.cpp
  View file @d143329
@@ -26,16 +26,16 @@ using namespace Dali::Toolkit; @@ -26,16 +26,16 @@ using namespace Dali::Toolkit;
26 26
27 namespace 27 namespace
28 { 28 {
29 -const char* TEST_OUTER_RING_FILENAME = DALI_IMAGE_DIR "layer2.png"; // Image to be masked  
30 -const char* TEST_INNER_RING_FILENAME = DALI_IMAGE_DIR "layer1.png"; // Image to be masked  
31 -const char* TEST_MENU_FILENAME = DALI_IMAGE_DIR "layer3.png"; // Image to be masked  
32 -const char* TEST_DIAL_FILENAME = DALI_IMAGE_DIR "layer4.png"; // Image to be masked  
33 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); // Background for toolbar 29 +const char* TEST_OUTER_RING_FILENAME = DEMO_IMAGE_DIR "layer2.png"; // Image to be masked
  30 +const char* TEST_INNER_RING_FILENAME = DEMO_IMAGE_DIR "layer1.png"; // Image to be masked
  31 +const char* TEST_MENU_FILENAME = DEMO_IMAGE_DIR "layer3.png"; // Image to be masked
  32 +const char* TEST_DIAL_FILENAME = DEMO_IMAGE_DIR "layer4.png"; // Image to be masked
  33 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); // Background for toolbar
34 const char* APPLICATION_TITLE( "Radial Menu" ); 34 const char* APPLICATION_TITLE( "Radial Menu" );
35 -const char * const PLAY_ICON( DALI_IMAGE_DIR "icon-play.png" );  
36 -const char * const PLAY_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" );  
37 -const char * const STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" );  
38 -const char * const STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" ); 35 +const char * const PLAY_ICON( DEMO_IMAGE_DIR "icon-play.png" );
  36 +const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" );
  37 +const char * const STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" );
  38 +const char * const STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" );
39 } 39 }
40 40
41 41
@@ -301,7 +301,7 @@ void RunTest(Application app) @@ -301,7 +301,7 @@ void RunTest(Application app)
301 // Entry point for Linux & Tizen applications 301 // Entry point for Linux & Tizen applications
302 int main(int argc, char **argv) 302 int main(int argc, char **argv)
303 { 303 {
304 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 304 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
305 305
306 RunTest(app); 306 RunTest(app);
307 307
examples/refraction-effect/refraction-effect-example.cpp
  View file @d143329
@@ -32,25 +32,25 @@ using namespace Dali; @@ -32,25 +32,25 @@ using namespace Dali;
32 namespace 32 namespace
33 { 33 {
34 const char * const APPLICATION_TITLE( "Refraction Effect" ); 34 const char * const APPLICATION_TITLE( "Refraction Effect" );
35 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );  
36 -const char * const CHANGE_TEXTURE_ICON( DALI_IMAGE_DIR "icon-change.png" );  
37 -const char * const CHANGE_TEXTURE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" );  
38 -const char * const CHANGE_MESH_ICON( DALI_IMAGE_DIR "icon-replace.png" );  
39 -const char * const CHANGE_MESH_ICON_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); 35 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  36 +const char * const CHANGE_TEXTURE_ICON( DEMO_IMAGE_DIR "icon-change.png" );
  37 +const char * const CHANGE_TEXTURE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
  38 +const char * const CHANGE_MESH_ICON( DEMO_IMAGE_DIR "icon-replace.png" );
  39 +const char * const CHANGE_MESH_ICON_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" );
40 40
41 const char* MESH_FILES[] = 41 const char* MESH_FILES[] =
42 { 42 {
43 - DALI_MODEL_DIR "surface_pattern_v01.obj",  
44 - DALI_MODEL_DIR "surface_pattern_v02.obj" 43 + DEMO_MODEL_DIR "surface_pattern_v01.obj",
  44 + DEMO_MODEL_DIR "surface_pattern_v02.obj"
45 }; 45 };
46 const unsigned int NUM_MESH_FILES( sizeof( MESH_FILES ) / sizeof( MESH_FILES[0] ) ); 46 const unsigned int NUM_MESH_FILES( sizeof( MESH_FILES ) / sizeof( MESH_FILES[0] ) );
47 47
48 const char* TEXTURE_IMAGES[]= 48 const char* TEXTURE_IMAGES[]=
49 { 49 {
50 - DALI_IMAGE_DIR "background-1.jpg",  
51 - DALI_IMAGE_DIR "background-2.jpg",  
52 - DALI_IMAGE_DIR "background-3.jpg",  
53 - DALI_IMAGE_DIR "background-4.jpg" 50 + DEMO_IMAGE_DIR "background-1.jpg",
  51 + DEMO_IMAGE_DIR "background-2.jpg",
  52 + DEMO_IMAGE_DIR "background-3.jpg",
  53 + DEMO_IMAGE_DIR "background-4.jpg"
54 }; 54 };
55 const unsigned int NUM_TEXTURE_IMAGES( sizeof( TEXTURE_IMAGES ) / sizeof( TEXTURE_IMAGES[0] ) ); 55 const unsigned int NUM_TEXTURE_IMAGES( sizeof( TEXTURE_IMAGES ) / sizeof( TEXTURE_IMAGES[0] ) );
56 56
@@ -599,7 +599,7 @@ RunTest(Application&amp; app) @@ -599,7 +599,7 @@ RunTest(Application&amp; app)
599 int 599 int
600 main(int argc, char **argv) 600 main(int argc, char **argv)
601 { 601 {
602 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 602 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
603 603
604 RunTest(app); 604 RunTest(app);
605 605
examples/scripting/launcher.cpp
  View file @d143329
@@ -79,9 +79,9 @@ void Launcher::Create( Dali::Application&amp; application ) @@ -79,9 +79,9 @@ void Launcher::Create( Dali::Application&amp; application )
79 mBuilder = Toolkit::Builder::New(); 79 mBuilder = Toolkit::Builder::New();
80 80
81 Property::Map defaultDirs; 81 Property::Map defaultDirs;
82 - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;  
83 - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR;  
84 - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; 82 + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR;
  83 + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR;
  84 + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR;
85 mBuilder.AddConstants( defaultDirs ); 85 mBuilder.AddConstants( defaultDirs );
86 86
87 std::string json_data(GetFileContents( mJSONFileName )); 87 std::string json_data(GetFileContents( mJSONFileName ));
examples/scripting/scripting-example.cpp
  View file @d143329
@@ -86,7 +86,7 @@ int main( int argc, char* argv[] ) @@ -86,7 +86,7 @@ int main( int argc, char* argv[] )
86 } 86 }
87 87
88 88
89 - Launcher daliApplication( Dali::Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ), jSONFileName, javaScriptFileName ); 89 + Launcher daliApplication( Dali::Application::New( &argc, &argv, DEMO_THEME_PATH ), jSONFileName, javaScriptFileName );
90 90
91 daliApplication.MainLoop(); 91 daliApplication.MainLoop();
92 92
examples/scroll-view/scroll-view-example.cpp
  View file @d143329
@@ -28,11 +28,11 @@ using namespace Dali::Toolkit; @@ -28,11 +28,11 @@ using namespace Dali::Toolkit;
28 28
29 namespace 29 namespace
30 { 30 {
31 -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-default.png" );  
32 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 31 +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-default.png" );
  32 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
33 const char * const APPLICATION_TITLE( "ScrollView" ); 33 const char * const APPLICATION_TITLE( "ScrollView" );
34 -const char * const EFFECT_CAROUSEL_IMAGE( DALI_IMAGE_DIR "icon-scroll-view-carousel.png" );  
35 -const char * const EFFECT_CAROUSEL_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-scroll-view-carousel-selected.png" ); 34 +const char * const EFFECT_CAROUSEL_IMAGE( DEMO_IMAGE_DIR "icon-scroll-view-carousel.png" );
  35 +const char * const EFFECT_CAROUSEL_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-scroll-view-carousel-selected.png" );
36 36
37 const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f); 37 const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f);
38 38
@@ -44,59 +44,59 @@ const char* EFFECT_MODE_NAME[] = { @@ -44,59 +44,59 @@ const char* EFFECT_MODE_NAME[] = {
44 }; 44 };
45 45
46 const char * const IMAGE_PATHS[] = { 46 const char * const IMAGE_PATHS[] = {
47 - DALI_IMAGE_DIR "gallery-medium-1.jpg",  
48 - DALI_IMAGE_DIR "gallery-medium-2.jpg",  
49 - DALI_IMAGE_DIR "gallery-medium-3.jpg",  
50 - DALI_IMAGE_DIR "gallery-medium-4.jpg",  
51 - DALI_IMAGE_DIR "gallery-medium-5.jpg",  
52 - DALI_IMAGE_DIR "gallery-medium-6.jpg",  
53 - DALI_IMAGE_DIR "gallery-medium-7.jpg",  
54 - DALI_IMAGE_DIR "gallery-medium-8.jpg",  
55 - DALI_IMAGE_DIR "gallery-medium-9.jpg",  
56 - DALI_IMAGE_DIR "gallery-medium-10.jpg",  
57 - DALI_IMAGE_DIR "gallery-medium-11.jpg",  
58 - DALI_IMAGE_DIR "gallery-medium-12.jpg",  
59 - DALI_IMAGE_DIR "gallery-medium-13.jpg",  
60 - DALI_IMAGE_DIR "gallery-medium-14.jpg",  
61 - DALI_IMAGE_DIR "gallery-medium-15.jpg",  
62 - DALI_IMAGE_DIR "gallery-medium-16.jpg",  
63 - DALI_IMAGE_DIR "gallery-medium-17.jpg",  
64 - DALI_IMAGE_DIR "gallery-medium-18.jpg",  
65 - DALI_IMAGE_DIR "gallery-medium-19.jpg",  
66 - DALI_IMAGE_DIR "gallery-medium-20.jpg",  
67 - DALI_IMAGE_DIR "gallery-medium-21.jpg",  
68 - DALI_IMAGE_DIR "gallery-medium-22.jpg",  
69 - DALI_IMAGE_DIR "gallery-medium-23.jpg",  
70 - DALI_IMAGE_DIR "gallery-medium-24.jpg",  
71 - DALI_IMAGE_DIR "gallery-medium-25.jpg",  
72 - DALI_IMAGE_DIR "gallery-medium-26.jpg",  
73 - DALI_IMAGE_DIR "gallery-medium-27.jpg",  
74 - DALI_IMAGE_DIR "gallery-medium-28.jpg",  
75 - DALI_IMAGE_DIR "gallery-medium-29.jpg",  
76 - DALI_IMAGE_DIR "gallery-medium-30.jpg",  
77 - DALI_IMAGE_DIR "gallery-medium-31.jpg",  
78 - DALI_IMAGE_DIR "gallery-medium-32.jpg",  
79 - DALI_IMAGE_DIR "gallery-medium-33.jpg",  
80 - DALI_IMAGE_DIR "gallery-medium-34.jpg",  
81 - DALI_IMAGE_DIR "gallery-medium-35.jpg",  
82 - DALI_IMAGE_DIR "gallery-medium-36.jpg",  
83 - DALI_IMAGE_DIR "gallery-medium-37.jpg",  
84 - DALI_IMAGE_DIR "gallery-medium-38.jpg",  
85 - DALI_IMAGE_DIR "gallery-medium-39.jpg",  
86 - DALI_IMAGE_DIR "gallery-medium-40.jpg",  
87 - DALI_IMAGE_DIR "gallery-medium-41.jpg",  
88 - DALI_IMAGE_DIR "gallery-medium-42.jpg",  
89 - DALI_IMAGE_DIR "gallery-medium-43.jpg",  
90 - DALI_IMAGE_DIR "gallery-medium-44.jpg",  
91 - DALI_IMAGE_DIR "gallery-medium-45.jpg",  
92 - DALI_IMAGE_DIR "gallery-medium-46.jpg",  
93 - DALI_IMAGE_DIR "gallery-medium-47.jpg",  
94 - DALI_IMAGE_DIR "gallery-medium-48.jpg",  
95 - DALI_IMAGE_DIR "gallery-medium-49.jpg",  
96 - DALI_IMAGE_DIR "gallery-medium-50.jpg",  
97 - DALI_IMAGE_DIR "gallery-medium-51.jpg",  
98 - DALI_IMAGE_DIR "gallery-medium-52.jpg",  
99 - DALI_IMAGE_DIR "gallery-medium-53.jpg", 47 + DEMO_IMAGE_DIR "gallery-medium-1.jpg",
  48 + DEMO_IMAGE_DIR "gallery-medium-2.jpg",
  49 + DEMO_IMAGE_DIR "gallery-medium-3.jpg",
  50 + DEMO_IMAGE_DIR "gallery-medium-4.jpg",
  51 + DEMO_IMAGE_DIR "gallery-medium-5.jpg",
  52 + DEMO_IMAGE_DIR "gallery-medium-6.jpg",
  53 + DEMO_IMAGE_DIR "gallery-medium-7.jpg",
  54 + DEMO_IMAGE_DIR "gallery-medium-8.jpg",
  55 + DEMO_IMAGE_DIR "gallery-medium-9.jpg",
  56 + DEMO_IMAGE_DIR "gallery-medium-10.jpg",
  57 + DEMO_IMAGE_DIR "gallery-medium-11.jpg",
  58 + DEMO_IMAGE_DIR "gallery-medium-12.jpg",
  59 + DEMO_IMAGE_DIR "gallery-medium-13.jpg",
  60 + DEMO_IMAGE_DIR "gallery-medium-14.jpg",
  61 + DEMO_IMAGE_DIR "gallery-medium-15.jpg",
  62 + DEMO_IMAGE_DIR "gallery-medium-16.jpg",
  63 + DEMO_IMAGE_DIR "gallery-medium-17.jpg",
  64 + DEMO_IMAGE_DIR "gallery-medium-18.jpg",
  65 + DEMO_IMAGE_DIR "gallery-medium-19.jpg",
  66 + DEMO_IMAGE_DIR "gallery-medium-20.jpg",
  67 + DEMO_IMAGE_DIR "gallery-medium-21.jpg",
  68 + DEMO_IMAGE_DIR "gallery-medium-22.jpg",
  69 + DEMO_IMAGE_DIR "gallery-medium-23.jpg",
  70 + DEMO_IMAGE_DIR "gallery-medium-24.jpg",
  71 + DEMO_IMAGE_DIR "gallery-medium-25.jpg",
  72 + DEMO_IMAGE_DIR "gallery-medium-26.jpg",
  73 + DEMO_IMAGE_DIR "gallery-medium-27.jpg",
  74 + DEMO_IMAGE_DIR "gallery-medium-28.jpg",
  75 + DEMO_IMAGE_DIR "gallery-medium-29.jpg",
  76 + DEMO_IMAGE_DIR "gallery-medium-30.jpg",
  77 + DEMO_IMAGE_DIR "gallery-medium-31.jpg",
  78 + DEMO_IMAGE_DIR "gallery-medium-32.jpg",
  79 + DEMO_IMAGE_DIR "gallery-medium-33.jpg",
  80 + DEMO_IMAGE_DIR "gallery-medium-34.jpg",
  81 + DEMO_IMAGE_DIR "gallery-medium-35.jpg",
  82 + DEMO_IMAGE_DIR "gallery-medium-36.jpg",
  83 + DEMO_IMAGE_DIR "gallery-medium-37.jpg",
  84 + DEMO_IMAGE_DIR "gallery-medium-38.jpg",
  85 + DEMO_IMAGE_DIR "gallery-medium-39.jpg",
  86 + DEMO_IMAGE_DIR "gallery-medium-40.jpg",
  87 + DEMO_IMAGE_DIR "gallery-medium-41.jpg",
  88 + DEMO_IMAGE_DIR "gallery-medium-42.jpg",
  89 + DEMO_IMAGE_DIR "gallery-medium-43.jpg",
  90 + DEMO_IMAGE_DIR "gallery-medium-44.jpg",
  91 + DEMO_IMAGE_DIR "gallery-medium-45.jpg",
  92 + DEMO_IMAGE_DIR "gallery-medium-46.jpg",
  93 + DEMO_IMAGE_DIR "gallery-medium-47.jpg",
  94 + DEMO_IMAGE_DIR "gallery-medium-48.jpg",
  95 + DEMO_IMAGE_DIR "gallery-medium-49.jpg",
  96 + DEMO_IMAGE_DIR "gallery-medium-50.jpg",
  97 + DEMO_IMAGE_DIR "gallery-medium-51.jpg",
  98 + DEMO_IMAGE_DIR "gallery-medium-52.jpg",
  99 + DEMO_IMAGE_DIR "gallery-medium-53.jpg",
100 100
101 NULL 101 NULL
102 }; 102 };
@@ -581,7 +581,7 @@ private: @@ -581,7 +581,7 @@ private:
581 581
582 int main(int argc, char **argv) 582 int main(int argc, char **argv)
583 { 583 {
584 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 584 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
585 ExampleController test(app); 585 ExampleController test(app);
586 app.MainLoop(); 586 app.MainLoop();
587 return 0; 587 return 0;
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
  View file @d143329
@@ -31,21 +31,21 @@ using namespace DemoHelper; @@ -31,21 +31,21 @@ using namespace DemoHelper;
31 31
32 namespace 32 namespace
33 { 33 {
34 -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-default.png" );  
35 -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 34 +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-default.png" );
  35 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
36 36
37 const char* APPLICATION_TITLE_PAN_LIGHT( "Lighting: Pan Light" ); 37 const char* APPLICATION_TITLE_PAN_LIGHT( "Lighting: Pan Light" );
38 const char* APPLICATION_TITLE_PAN_OBJECT( "Lighting: Rotate Object" ); 38 const char* APPLICATION_TITLE_PAN_OBJECT( "Lighting: Rotate Object" );
39 const char* APPLICATION_TITLE_PAN_SCENE( "Lighting: Pan Scene" ); 39 const char* APPLICATION_TITLE_PAN_SCENE( "Lighting: Pan Scene" );
40 const char* APPLICATION_TITLE_ROTATE_SCENE( "Lighting: Rotate Scene" ); 40 const char* APPLICATION_TITLE_ROTATE_SCENE( "Lighting: Rotate Scene" );
41 -const char* CHANGE_EFFECT_IMAGE( DALI_IMAGE_DIR "icon-change.png" );  
42 -const char* CHANGE_EFFECT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" );  
43 -const char* RESET_ICON( DALI_IMAGE_DIR "icon-reset.png" );  
44 -const char* RESET_ICON_SELECTED( DALI_IMAGE_DIR "icon-reset-selected.png" ); 41 +const char* CHANGE_EFFECT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
  42 +const char* CHANGE_EFFECT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
  43 +const char* RESET_ICON( DEMO_IMAGE_DIR "icon-reset.png" );
  44 +const char* RESET_ICON_SELECTED( DEMO_IMAGE_DIR "icon-reset-selected.png" );
45 45
46 -const char* SCENE_IMAGE_1( DALI_IMAGE_DIR "gallery-small-10.jpg");  
47 -const char* SCENE_IMAGE_2( DALI_IMAGE_DIR "gallery-small-42.jpg");  
48 -const char* SCENE_IMAGE_3( DALI_IMAGE_DIR "gallery-small-48.jpg"); 46 +const char* SCENE_IMAGE_1( DEMO_IMAGE_DIR "gallery-small-10.jpg");
  47 +const char* SCENE_IMAGE_2( DEMO_IMAGE_DIR "gallery-small-42.jpg");
  48 +const char* SCENE_IMAGE_3( DEMO_IMAGE_DIR "gallery-small-48.jpg");
49 49
50 const float MIN_PINCH_SCALE( 0.3f ); 50 const float MIN_PINCH_SCALE( 0.3f );
51 const float MAX_PINCH_SCALE( 2.05f ); 51 const float MAX_PINCH_SCALE( 2.05f );
@@ -199,7 +199,7 @@ public: @@ -199,7 +199,7 @@ public:
199 mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f); 199 mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f);
200 mContents.Add(mShadowView); 200 mContents.Add(mShadowView);
201 201
202 - mShadowPlaneBg = ImageView::New( DALI_IMAGE_DIR "brick-wall.jpg" ); 202 + mShadowPlaneBg = ImageView::New( DEMO_IMAGE_DIR "brick-wall.jpg" );
203 mShadowPlaneBg.SetParentOrigin(ParentOrigin::CENTER); 203 mShadowPlaneBg.SetParentOrigin(ParentOrigin::CENTER);
204 mShadowPlaneBg.SetAnchorPoint(AnchorPoint::CENTER); 204 mShadowPlaneBg.SetAnchorPoint(AnchorPoint::CENTER);
205 mShadowPlaneBg.SetName("Plane"); 205 mShadowPlaneBg.SetName("Plane");
@@ -503,7 +503,7 @@ RunTest(Application&amp; app) @@ -503,7 +503,7 @@ RunTest(Application&amp; app)
503 int 503 int
504 main(int argc, char **argv) 504 main(int argc, char **argv)
505 { 505 {
506 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 506 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
507 507
508 RunTest(app); 508 RunTest(app);
509 509
examples/size-negotiation/size-negotiation-example.cpp
  View file @d143329
@@ -33,9 +33,9 @@ struct ButtonItem @@ -33,9 +33,9 @@ struct ButtonItem
33 namespace 33 namespace
34 { 34 {
35 35
36 -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";  
37 -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png";  
38 -const char* const IMAGE = DALI_IMAGE_DIR "background-magnifier.jpg"; 36 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  37 +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
  38 +const char* const IMAGE = DEMO_IMAGE_DIR "background-magnifier.jpg";
39 39
40 const char* const TOOLBAR_TITLE = "Negotiate Size"; 40 const char* const TOOLBAR_TITLE = "Negotiate Size";
41 41
@@ -815,7 +815,7 @@ void RunTest( Application&amp; application ) @@ -815,7 +815,7 @@ void RunTest( Application&amp; application )
815 // Entry point for Linux & SLP applications 815 // Entry point for Linux & SLP applications
816 int main( int argc, char **argv ) 816 int main( int argc, char **argv )
817 { 817 {
818 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 818 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
819 819
820 RunTest( application ); 820 RunTest( application );
821 821
examples/super-blur-bloom/super-blur-bloom-example.cpp
  View file @d143329
@@ -24,22 +24,22 @@ using namespace Dali; @@ -24,22 +24,22 @@ using namespace Dali;
24 24
25 namespace 25 namespace
26 { 26 {
27 -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); 27 +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
28 const char * const TITLE_SUPER_BLUR( "Super Blur" ); 28 const char * const TITLE_SUPER_BLUR( "Super Blur" );
29 const char * const TITLE_BLOOM( "Bloom" ); 29 const char * const TITLE_BLOOM( "Bloom" );
30 -const char * const CHANGE_BACKGROUND_ICON( DALI_IMAGE_DIR "icon-change.png" );  
31 -const char * const CHANGE_BACKGROUND_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" );  
32 -const char * const CHANGE_BLUR_ICON( DALI_IMAGE_DIR "icon-replace.png" );  
33 -const char * const CHANGE_BLUR_ICON_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); 30 +const char * const CHANGE_BACKGROUND_ICON( DEMO_IMAGE_DIR "icon-change.png" );
  31 +const char * const CHANGE_BACKGROUND_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
  32 +const char * const CHANGE_BLUR_ICON( DEMO_IMAGE_DIR "icon-replace.png" );
  33 +const char * const CHANGE_BLUR_ICON_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" );
34 34
35 const char* BACKGROUND_IMAGES[]= 35 const char* BACKGROUND_IMAGES[]=
36 { 36 {
37 - DALI_IMAGE_DIR "background-1.jpg",  
38 - DALI_IMAGE_DIR "background-2.jpg",  
39 - DALI_IMAGE_DIR "background-3.jpg",  
40 - DALI_IMAGE_DIR "background-4.jpg",  
41 - DALI_IMAGE_DIR "background-5.jpg",  
42 - DALI_IMAGE_DIR "background-magnifier.jpg", 37 + DEMO_IMAGE_DIR "background-1.jpg",
  38 + DEMO_IMAGE_DIR "background-2.jpg",
  39 + DEMO_IMAGE_DIR "background-3.jpg",
  40 + DEMO_IMAGE_DIR "background-4.jpg",
  41 + DEMO_IMAGE_DIR "background-5.jpg",
  42 + DEMO_IMAGE_DIR "background-magnifier.jpg",
43 }; 43 };
44 const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) ); 44 const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) );
45 } 45 }
@@ -314,7 +314,7 @@ RunTest(Application&amp; app) @@ -314,7 +314,7 @@ RunTest(Application&amp; app)
314 int 314 int
315 main(int argc, char **argv) 315 main(int argc, char **argv)
316 { 316 {
317 - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); 317 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
318 318
319 RunTest(app); 319 RunTest(app);
320 320
examples/text-field/text-field-example.cpp
  View file @d143329
@@ -37,8 +37,8 @@ using namespace MultiLanguageStrings; @@ -37,8 +37,8 @@ using namespace MultiLanguageStrings;
37 namespace 37 namespace
38 { 38 {
39 39
40 - const char* const FOLDER_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_bg.png";  
41 - const char* const FOLDER_OPEN_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_open_bg.png"; 40 + const char* const FOLDER_ICON_IMAGE = DEMO_IMAGE_DIR "folder_appicon_empty_bg.png";
  41 + const char* const FOLDER_OPEN_ICON_IMAGE = DEMO_IMAGE_DIR "folder_appicon_empty_open_bg.png";
42 42
43 const float BORDER_WIDTH = 4.0f; 43 const float BORDER_WIDTH = 4.0f;
44 44
examples/text-fonts/text-fonts-example.cpp
  View file @d143329
@@ -255,7 +255,7 @@ void RunTest( Application&amp; application ) @@ -255,7 +255,7 @@ void RunTest( Application&amp; application )
255 /** Entry point for Linux & Tizen applications */ 255 /** Entry point for Linux & Tizen applications */
256 int main( int argc, char **argv ) 256 int main( int argc, char **argv )
257 { 257 {
258 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 258 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
259 259
260 RunTest( application ); 260 RunTest( application );
261 261
examples/text-label-emojis/text-label-emojis.cpp
  View file @d143329
@@ -142,7 +142,7 @@ void RunTest( Application&amp; application ) @@ -142,7 +142,7 @@ void RunTest( Application&amp; application )
142 // 142 //
143 int main( int argc, char **argv ) 143 int main( int argc, char **argv )
144 { 144 {
145 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 145 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
146 146
147 RunTest( application ); 147 RunTest( application );
148 148
examples/text-label-multi-language/text-label-multi-language-example.cpp
  View file @d143329
@@ -144,7 +144,7 @@ void RunTest( Application&amp; application ) @@ -144,7 +144,7 @@ void RunTest( Application&amp; application )
144 /** Entry point for Linux & Tizen applications */ 144 /** Entry point for Linux & Tizen applications */
145 int main( int argc, char **argv ) 145 int main( int argc, char **argv )
146 { 146 {
147 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 147 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
148 148
149 RunTest( application ); 149 RunTest( application );
150 150
examples/text-label/text-label-example.cpp
  View file @d143329
@@ -34,7 +34,7 @@ using namespace MultiLanguageStrings; @@ -34,7 +34,7 @@ using namespace MultiLanguageStrings;
34 34
35 namespace 35 namespace
36 { 36 {
37 - const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "grab-handle.png"; 37 + const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "grab-handle.png";
38 38
39 const unsigned int KEY_ZERO = 10; 39 const unsigned int KEY_ZERO = 10;
40 const unsigned int KEY_ONE = 11; 40 const unsigned int KEY_ONE = 11;
@@ -297,7 +297,7 @@ void RunTest( Application&amp; application ) @@ -297,7 +297,7 @@ void RunTest( Application&amp; application )
297 /** Entry point for Linux & Tizen applications */ 297 /** Entry point for Linux & Tizen applications */
298 int main( int argc, char **argv ) 298 int main( int argc, char **argv )
299 { 299 {
300 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 300 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
301 301
302 RunTest( application ); 302 RunTest( application );
303 303
examples/text-message-field/text-message-field-example.cpp
  View file @d143329
@@ -28,7 +28,7 @@ using namespace Dali::Toolkit; @@ -28,7 +28,7 @@ using namespace Dali::Toolkit;
28 28
29 namespace 29 namespace
30 { 30 {
31 - const char* DESKTOP_IMAGE( DALI_IMAGE_DIR "woodEffect.jpg" ); 31 + const char* DESKTOP_IMAGE( DEMO_IMAGE_DIR "woodEffect.jpg" );
32 const Vector2 DESKTOP_SIZE( Vector2( 1440, 1600 ) ); 32 const Vector2 DESKTOP_SIZE( Vector2( 1440, 1600 ) );
33 const Vector2 PHOTOBOX_SIZE( Vector2(330.0f, 80.0f ) ); 33 const Vector2 PHOTOBOX_SIZE( Vector2(330.0f, 80.0f ) );
34 const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f; 34 const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f;
@@ -163,7 +163,7 @@ void RunTest( Application&amp; application ) @@ -163,7 +163,7 @@ void RunTest( Application&amp; application )
163 /** Entry point for Linux & Tizen applications */ 163 /** Entry point for Linux & Tizen applications */
164 int main( int argc, char **argv ) 164 int main( int argc, char **argv )
165 { 165 {
166 - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); 166 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
167 167
168 RunTest( application ); 168 RunTest( application );
169 169
examples/textured-mesh/textured-mesh-example.cpp
  View file @d143329
@@ -26,8 +26,8 @@ using namespace Dali; @@ -26,8 +26,8 @@ using namespace Dali;
26 26
27 namespace 27 namespace
28 { 28 {
29 -const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" );  
30 -const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" ); 29 +const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" );
  30 +const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" );
31 31
32 #define MAKE_SHADER(A)#A 32 #define MAKE_SHADER(A)#A
33 33
packaging/com.samsung.dali-demo.spec
  View file @d143329
@@ -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.17 5 +Version: 1.1.18
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
@@ -11,17 +11,18 @@ Source0: %{name}-%{version}.tar.gz @@ -11,17 +11,18 @@ Source0: %{name}-%{version}.tar.gz
11 11
12 Requires(post): /sbin/ldconfig 12 Requires(post): /sbin/ldconfig
13 Requires(postun): /sbin/ldconfig 13 Requires(postun): /sbin/ldconfig
14 -Requires: dali  
15 -Requires: dali-adaptor  
16 -Requires: dali-toolkit 14 +
17 BuildRequires: cmake 15 BuildRequires: cmake
18 BuildRequires: pkgconfig 16 BuildRequires: pkgconfig
19 BuildRequires: pkgconfig(capi-appfw-application) 17 BuildRequires: pkgconfig(capi-appfw-application)
20 BuildRequires: pkgconfig(capi-media-player) 18 BuildRequires: pkgconfig(capi-media-player)
21 -BuildRequires: dali-toolkit-devel  
22 -BuildRequires: dali-adaptor-devel  
23 BuildRequires: pkgconfig(dlog) 19 BuildRequires: pkgconfig(dlog)
24 BuildRequires: gettext-tools 20 BuildRequires: gettext-tools
  21 +BuildRequires: pkgconfig(dali-core)
  22 +BuildRequires: pkgconfig(dali-toolkit)
  23 +
  24 +# DALi C++ applications always run on dali-adaptor.
  25 +BuildRequires: pkgconfig(dali-adaptor)
25 26
26 %description 27 %description
27 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations 28 The OpenGLES Canvas Core Demo is a collection of examples and demonstrations
resources/images/00_popup_bg.9.png 0 → 100644
View file @d143329

1.55 KB
resources/scripts/animated-buttons.json
  View file @d143329
@@ -4,25 +4,13 @@ @@ -4,25 +4,13 @@
4 "type": "ImageActor", 4 "type": "ImageActor",
5 "name": "On", 5 "name": "On",
6 "relayoutEnabled": false, 6 "relayoutEnabled": false,
7 - "position": [  
8 - 374,  
9 - 215,  
10 - 0  
11 - ],  
12 - "size": [  
13 - 144,  
14 - 144,  
15 - 1  
16 - ], 7 + "position": [ 374, 215, 0 ],
  8 + "size": [ 144, 144, 1 ],
17 "sizeAspectRatio": false, 9 "sizeAspectRatio": false,
18 - "color": [  
19 - 1,  
20 - 1,  
21 - 1,  
22 - 1 10 + "color": [ 1, 1, 1, 1
23 ], 11 ],
24 "image": { 12 "image": {
25 - "filename": "{DALI_IMAGE_DIR}spot_button_on.png", 13 + "filename": "{DEMO_IMAGE_DIR}spot_button_on.png",
26 "width": 144, 14 "width": 144,
27 "height": 144, 15 "height": 144,
28 "loadPolicy": "IMMEDIATE", 16 "loadPolicy": "IMMEDIATE",
@@ -35,25 +23,12 @@ @@ -35,25 +23,12 @@
35 "type": "ImageActor", 23 "type": "ImageActor",
36 "name": "Off", 24 "name": "Off",
37 "relayoutEnabled": false, 25 "relayoutEnabled": false,
38 - "position": [  
39 - 129,  
40 - 215,  
41 - 0  
42 - ],  
43 - "size": [  
44 - 144,  
45 - 144,  
46 - 1  
47 - ], 26 + "position": [ 129, 215, 0 ],
  27 + "size": [ 144, 144, 1 ],
48 "sizeAspectRatio": false, 28 "sizeAspectRatio": false,
49 - "color": [  
50 - 1,  
51 - 1,  
52 - 1,  
53 - 1  
54 - ], 29 + "color": [ 1, 1, 1, 1 ],
55 "image": { 30 "image": {
56 - "filename": "{DALI_IMAGE_DIR}spot_button_off.png", 31 + "filename": "{DEMO_IMAGE_DIR}spot_button_off.png",
57 "width": 144, 32 "width": 144,
58 "height": 144, 33 "height": 144,
59 "loadPolicy": "IMMEDIATE", 34 "loadPolicy": "IMMEDIATE",
@@ -66,26 +41,13 @@ @@ -66,26 +41,13 @@
66 "type": "ImageActor", 41 "type": "ImageActor",
67 "name": "Right", 42 "name": "Right",
68 "relayoutEnabled": false, 43 "relayoutEnabled": false,
69 - "position": [  
70 - 418.5,  
71 - 214.5,  
72 - 0  
73 - ],  
74 - "size": [  
75 - 85,  
76 - 161,  
77 - 1  
78 - ], 44 + "position": [ 418.5, 214.5, 0 ],
  45 + "size": [ 85, 161, 1 ],
79 "sizeAspectRatio": false, 46 "sizeAspectRatio": false,
80 "visible": true, 47 "visible": true,
81 - "color": [  
82 - 0,  
83 - 0,  
84 - 0,  
85 - 1  
86 - ], 48 + "color": [ 0, 0, 0, 1 ],
87 "image": { 49 "image": {
88 - "filename": "{DALI_IMAGE_DIR}curve-right.png", 50 + "filename": "{DEMO_IMAGE_DIR}curve-right.png",
89 "width": 85, 51 "width": 85,
90 "height": 161, 52 "height": 161,
91 "loadPolicy": "IMMEDIATE", 53 "loadPolicy": "IMMEDIATE",
@@ -98,26 +60,13 @@ @@ -98,26 +60,13 @@
98 "type": "ImageActor", 60 "type": "ImageActor",
99 "name": "Left", 61 "name": "Left",
100 "relayoutEnabled": false, 62 "relayoutEnabled": false,
101 - "position": [  
102 - 331,  
103 - 214.5,  
104 - 0  
105 - ],  
106 - "size": [  
107 - 88,  
108 - 161,  
109 - 1  
110 - ], 63 + "position": [ 331, 214.5, 0 ],
  64 + "size": [ 88, 161, 1 ],
111 "sizeAspectRatio": false, 65 "sizeAspectRatio": false,
112 "visible": true, 66 "visible": true,
113 - "color": [  
114 - 0,  
115 - 0,  
116 - 0,  
117 - 1  
118 - ], 67 + "color": [ 0, 0, 0, 1 ],
119 "image": { 68 "image": {
120 - "filename": "{DALI_IMAGE_DIR}curve-left.png", 69 + "filename": "{DEMO_IMAGE_DIR}curve-left.png",
121 "width": 87, 70 "width": 87,
122 "height": 161, 71 "height": 161,
123 "loadPolicy": "IMMEDIATE", 72 "loadPolicy": "IMMEDIATE",
@@ -130,30 +79,13 @@ @@ -130,30 +79,13 @@
130 "type": "ImageActor", 79 "type": "ImageActor",
131 "name": "Middle", 80 "name": "Middle",
132 "relayoutEnabled": false, 81 "relayoutEnabled": false,
133 - "position": [  
134 - 375.5,  
135 - 214.5,  
136 - 0  
137 - ],  
138 - "anchorPoint": [  
139 - 0,  
140 - 0.5,  
141 - 0.5  
142 - ],  
143 - "size": [  
144 - 1,  
145 - 161,  
146 - 1  
147 - ], 82 + "position": [ 375.5, 214.5, 0 ],
  83 + "anchorPoint": [ 0, 0.5, 0.5 ],
  84 + "size": [ 1, 161, 1 ],
148 "sizeAspectRatio": false, 85 "sizeAspectRatio": false,
149 - "color": [  
150 - 0,  
151 - 0,  
152 - 0,  
153 - 1  
154 - ], 86 + "color": [ 0, 0, 0, 1 ],
155 "image": { 87 "image": {
156 - "filename": "{DALI_IMAGE_DIR}curve-middle.png", 88 + "filename": "{DEMO_IMAGE_DIR}curve-middle.png",
157 "width": 13, 89 "width": 13,
158 "height": 161, 90 "height": 161,
159 "loadPolicy": "IMMEDIATE", 91 "loadPolicy": "IMMEDIATE",
@@ -166,25 +98,12 @@ @@ -166,25 +98,12 @@
166 "type": "ImageActor", 98 "type": "ImageActor",
167 "name": "Jelly", 99 "name": "Jelly",
168 "relayoutEnabled": false, 100 "relayoutEnabled": false,
169 - "position": [  
170 - 374,  
171 - 215,  
172 - 0  
173 - ],  
174 - "size": [  
175 - 144,  
176 - 144,  
177 - 1  
178 - ], 101 + "position": [ 374, 215, 0 ],
  102 + "size": [ 144, 144, 1 ],
179 "sizeAspectRatio": false, 103 "sizeAspectRatio": false,
180 - "color": [  
181 - 1,  
182 - 1,  
183 - 1,  
184 - 1  
185 - ], 104 + "color": [ 1, 1, 1, 1 ],
186 "image": { 105 "image": {
187 - "filename": "{DALI_IMAGE_DIR}spot_jelly_on.png", 106 + "filename": "{DEMO_IMAGE_DIR}spot_jelly_on.png",
188 "width": 144, 107 "width": 144,
189 "height": 144, 108 "height": 144,
190 "loadPolicy": "IMMEDIATE", 109 "loadPolicy": "IMMEDIATE",
@@ -197,73 +116,34 @@ @@ -197,73 +116,34 @@
197 "type": "Control", 116 "type": "Control",
198 "name": "Left Crop", 117 "name": "Left Crop",
199 "relayoutEnabled": false, 118 "relayoutEnabled": false,
200 - "position": [  
201 - 144.5,  
202 - 218.5,  
203 - 0.5  
204 - ],  
205 - "size": [  
206 - 275,  
207 - 243,  
208 - 1  
209 - ], 119 + "position": [ 144.5, 218.5, 0.5 ],
  120 + "size": [ 275, 243, 1 ],
210 "sizeAspectRatio": false, 121 "sizeAspectRatio": false,
211 "background": {"color": [ 1, 1, 1, 1 ]}, 122 "background": {"color": [ 1, 1, 1, 1 ]},
212 - "color": [  
213 - 1,  
214 - 1,  
215 - 1,  
216 - 1  
217 - ], 123 + "color": [ 1, 1, 1, 1 ],
218 "actors": [] 124 "actors": []
219 }, 125 },
220 { 126 {
221 "type": "Control", 127 "type": "Control",
222 "name": "Right Crop", 128 "name": "Right Crop",
223 "relayoutEnabled": false, 129 "relayoutEnabled": false,
224 - "position": [  
225 - 629.5,  
226 - 218.5,  
227 - 0.5  
228 - ],  
229 - "size": [  
230 - 335,  
231 - 243,  
232 - 1  
233 - ], 130 + "position": [ 629.5, 218.5, 0.5 ],
  131 + "size": [ 335, 243, 1 ],
234 "sizeAspectRatio": false, 132 "sizeAspectRatio": false,
235 "background": {"color": [ 1, 1, 1, 1 ]}, 133 "background": {"color": [ 1, 1, 1, 1 ]},
236 - "color": [  
237 - 1,  
238 - 1,  
239 - 1,  
240 - 1  
241 - ], 134 + "color": [ 1, 1, 1, 1 ],
242 "actors": [] 135 "actors": []
243 }, 136 },
244 { 137 {
245 "type": "ImageActor", 138 "type": "ImageActor",
246 "name": "JellyOff", 139 "name": "JellyOff",
247 "relayoutEnabled": false, 140 "relayoutEnabled": false,
248 - "position": [  
249 - 121,  
250 - -117,  
251 - 0  
252 - ],  
253 - "size": [  
254 - 144,  
255 - 144,  
256 - 1  
257 - ], 141 + "position": [ 121, -117, 0 ],
  142 + "size": [ 144, 144, 1 ],
258 "sizeAspectRatio": false, 143 "sizeAspectRatio": false,
259 - "color": [  
260 - 1,  
261 - 1,  
262 - 1,  
263 - 1  
264 - ], 144 + "color": [ 1, 1, 1, 1 ],
265 "image": { 145 "image": {
266 - "filename": "{DALI_IMAGE_DIR}spot_jelly_off.png", 146 + "filename": "{DEMO_IMAGE_DIR}spot_jelly_off.png",
267 "width": 144, 147 "width": 144,
268 "height": 144, 148 "height": 144,
269 "loadPolicy": "IMMEDIATE", 149 "loadPolicy": "IMMEDIATE",
@@ -281,23 +161,10 @@ @@ -281,23 +161,10 @@
281 217.33333333333331, 161 217.33333333333331,
282 0 162 0
283 ], 163 ],
284 - "size": [  
285 - 196,  
286 - 184,  
287 - 1  
288 - ], 164 + "size": [ 196, 184, 1 ],
289 "sizeAspectRatio": false, 165 "sizeAspectRatio": false,
290 - "scale": [  
291 - 1,  
292 - 1,  
293 - 1  
294 - ],  
295 - "color": [  
296 - 1,  
297 - 1,  
298 - 1,  
299 - 1  
300 - ], 166 + "scale": [ 1, 1, 1 ],
  167 + "color": [ 1, 1, 1, 1 ],
301 "actors": [], 168 "actors": [],
302 "signals": [ 169 "signals": [
303 { 170 {
@@ -311,23 +178,10 @@ @@ -311,23 +178,10 @@
311 "type": "Control", 178 "type": "Control",
312 "name": "Control Off", 179 "name": "Control Off",
313 "relayoutEnabled": false, 180 "relayoutEnabled": false,
314 - "position": [  
315 - 123.5,  
316 - -117,  
317 - 0  
318 - ],  
319 - "size": [  
320 - 193,  
321 - 182,  
322 - 1  
323 - ], 181 + "position": [ 123.5, -117, 0 ],
  182 + "size": [ 193, 182, 1 ],
324 "sizeAspectRatio": false, 183 "sizeAspectRatio": false,
325 - "color": [  
326 - 1,  
327 - 1,  
328 - 1,  
329 - 1  
330 - ], 184 + "color": [ 1, 1, 1, 1 ],
331 "actors": [], 185 "actors": [],
332 "signals": [ 186 "signals": [
333 { 187 {
@@ -344,11 +198,7 @@ @@ -344,11 +198,7 @@
344 { 198 {
345 "actor": "Left", 199 "actor": "Left",
346 "property": "position", 200 "property": "position",
347 - "value": [  
348 - 331,  
349 - 214.5,  
350 - 0  
351 - ], 201 + "value": [ 331, 214.5, 0 ],
352 "alphaFunction": "EASE_OUT", 202 "alphaFunction": "EASE_OUT",
353 "timePeriod": { 203 "timePeriod": {
354 "delay": 3.106, 204 "delay": 3.106,
@@ -359,11 +209,7 @@ @@ -359,11 +209,7 @@
359 { 209 {
360 "actor": "Middle", 210 "actor": "Middle",
361 "property": "position", 211 "property": "position",
362 - "value": [  
363 - 375.5,  
364 - 214.5,  
365 - 0  
366 - ], 212 + "value": [ 375.5, 214.5, 0 ],
367 "alphaFunction": "EASE_OUT", 213 "alphaFunction": "EASE_OUT",
368 "timePeriod": { 214 "timePeriod": {
369 "delay": 3.106, 215 "delay": 3.106,
@@ -374,11 +220,7 @@ @@ -374,11 +220,7 @@
374 { 220 {
375 "actor": "Middle", 221 "actor": "Middle",
376 "property": "size", 222 "property": "size",
377 - "value": [  
378 - 250,  
379 - 161,  
380 - 1  
381 - ], 223 + "value": [ 250, 161, 1 ],
382 "alphaFunction": "EASE_OUT", 224 "alphaFunction": "EASE_OUT",
383 "timePeriod": { 225 "timePeriod": {
384 "delay": 0, 226 "delay": 0,
@@ -389,11 +231,7 @@ @@ -389,11 +231,7 @@
389 { 231 {
390 "actor": "Middle", 232 "actor": "Middle",
391 "property": "size", 233 "property": "size",
392 - "value": [  
393 - 1,  
394 - 161,  
395 - 1  
396 - ], 234 + "value": [ 1, 161, 1 ],
397 "alphaFunction": "EASE_OUT", 235 "alphaFunction": "EASE_OUT",
398 "timePeriod": { 236 "timePeriod": {
399 "delay": 3.127, 237 "delay": 3.127,
@@ -404,11 +242,7 @@ @@ -404,11 +242,7 @@
404 { 242 {
405 "actor": "JellyOff", 243 "actor": "JellyOff",
406 "property": "position", 244 "property": "position",
407 - "value": [  
408 - 374,  
409 - 215,  
410 - 0  
411 - ], 245 + "value": [ 374, 215, 0 ],
412 "alphaFunction": "EASE_OUT", 246 "alphaFunction": "EASE_OUT",
413 "timePeriod": { 247 "timePeriod": {
414 "delay": 1.486, 248 "delay": 1.486,
@@ -419,11 +253,7 @@ @@ -419,11 +253,7 @@
419 { 253 {
420 "actor": "Left Crop", 254 "actor": "Left Crop",
421 "property": "position", 255 "property": "position",
422 - "value": [  
423 - 144.5,  
424 - 218.5,  
425 - 0.5  
426 - ], 256 + "value": [ 144.5, 218.5, 0.5 ],
427 "alphaFunction": "EASE_OUT", 257 "alphaFunction": "EASE_OUT",
428 "timePeriod": { 258 "timePeriod": {
429 "delay": 3.106, 259 "delay": 3.106,
@@ -434,11 +264,7 @@ @@ -434,11 +264,7 @@
434 { 264 {
435 "actor": "Right", 265 "actor": "Right",
436 "property": "position", 266 "property": "position",
437 - "value": [  
438 - 418.5,  
439 - 214.5,  
440 - 0  
441 - ], 267 + "value": [ 418.5, 214.5, 0 ],
442 "alphaFunction": "EASE_OUT", 268 "alphaFunction": "EASE_OUT",
443 "timePeriod": { 269 "timePeriod": {
444 "delay": 0, 270 "delay": 0,
@@ -449,11 +275,7 @@ @@ -449,11 +275,7 @@
449 { 275 {
450 "actor": "Right Crop", 276 "actor": "Right Crop",
451 "property": "position", 277 "property": "position",
452 - "value": [  
453 - 629.5,  
454 - 218.5,  
455 - 0.5  
456 - ], 278 + "value": [ 629.5, 218.5, 0.5 ],
457 "alphaFunction": "EASE_OUT", 279 "alphaFunction": "EASE_OUT",
458 "timePeriod": { 280 "timePeriod": {
459 "delay": 0, 281 "delay": 0,
@@ -479,11 +301,7 @@ @@ -479,11 +301,7 @@
479 { 301 {
480 "actor": "Jelly", 302 "actor": "Jelly",
481 "property": "position", 303 "property": "position",
482 - "value": [  
483 - 121,  
484 - -117,  
485 - 0  
486 - ], 304 + "value": [ 121, -117, 0 ],
487 "alphaFunction": "LINEAR", 305 "alphaFunction": "LINEAR",
488 "timePeriod": { 306 "timePeriod": {
489 "delay": 0, 307 "delay": 0,
@@ -494,11 +312,7 @@ @@ -494,11 +312,7 @@
494 { 312 {
495 "actor": "Jelly", 313 "actor": "Jelly",
496 "property": "position", 314 "property": "position",
497 - "value": [  
498 - 374,  
499 - 215,  
500 - 0  
501 - ], 315 + "value": [ 374, 215, 0 ],
502 "alphaFunction": "LINEAR", 316 "alphaFunction": "LINEAR",
503 "timePeriod": { 317 "timePeriod": {
504 "delay": 2.765, 318 "delay": 2.765,
@@ -509,11 +323,7 @@ @@ -509,11 +323,7 @@
509 { 323 {
510 "actor": "JellyOff", 324 "actor": "JellyOff",
511 "property": "position", 325 "property": "position",
512 - "value": [  
513 - 121,  
514 - -117,  
515 - 0  
516 - ], 326 + "value": [ 121, -117, 0 ],
517 "alphaFunction": "LINEAR", 327 "alphaFunction": "LINEAR",
518 "timePeriod": { 328 "timePeriod": {
519 "delay": 2.765, 329 "delay": 2.765,
@@ -524,11 +334,7 @@ @@ -524,11 +334,7 @@
524 { 334 {
525 "actor": "Control Off", 335 "actor": "Control Off",
526 "property": "position", 336 "property": "position",
527 - "value": [  
528 - 123.5,  
529 - -117,  
530 - 0  
531 - ], 337 + "value": [ 123.5, -117, 0 ],
532 "alphaFunction": "LINEAR", 338 "alphaFunction": "LINEAR",
533 "timePeriod": { 339 "timePeriod": {
534 "delay": 0, 340 "delay": 0,
@@ -544,11 +350,7 @@ @@ -544,11 +350,7 @@
544 { 350 {
545 "actor": "Left", 351 "actor": "Left",
546 "property": "position", 352 "property": "position",
547 - "value": [  
548 - 86,  
549 - 214.5,  
550 - 0  
551 - ], 353 + "value": [ 86, 214.5, 0 ],
552 "alphaFunction": "EASE_OUT", 354 "alphaFunction": "EASE_OUT",
553 "timePeriod": { 355 "timePeriod": {
554 "delay": 0, 356 "delay": 0,
@@ -559,11 +361,7 @@ @@ -559,11 +361,7 @@
559 { 361 {
560 "actor": "Middle", 362 "actor": "Middle",
561 "property": "position", 363 "property": "position",
562 - "value": [  
563 - 130,  
564 - 214.5,  
565 - 0  
566 - ], 364 + "value": [ 130, 214.5, 0 ],
567 "alphaFunction": "EASE_OUT", 365 "alphaFunction": "EASE_OUT",
568 "timePeriod": { 366 "timePeriod": {
569 "delay": 0, 367 "delay": 0,
@@ -574,11 +372,7 @@ @@ -574,11 +372,7 @@
574 { 372 {
575 "actor": "Middle", 373 "actor": "Middle",
576 "property": "size", 374 "property": "size",
577 - "value": [  
578 - 250,  
579 - 161,  
580 - 1  
581 - ], 375 + "value": [ 250, 161, 1 ],
582 "alphaFunction": "EASE_OUT", 376 "alphaFunction": "EASE_OUT",
583 "timePeriod": { 377 "timePeriod": {
584 "delay": 0, 378 "delay": 0,
@@ -589,11 +383,7 @@ @@ -589,11 +383,7 @@
589 { 383 {
590 "actor": "Middle", 384 "actor": "Middle",
591 "property": "size", 385 "property": "size",
592 - "value": [  
593 - 1,  
594 - 161,  
595 - 1  
596 - ], 386 + "value": [ 1, 161, 1 ],
597 "alphaFunction": "EASE_OUT", 387 "alphaFunction": "EASE_OUT",
598 "timePeriod": { 388 "timePeriod": {
599 "delay": 3.127, 389 "delay": 3.127,
@@ -604,11 +394,7 @@ @@ -604,11 +394,7 @@
604 { 394 {
605 "actor": "Jelly", 395 "actor": "Jelly",
606 "property": "position", 396 "property": "position",
607 - "value": [  
608 - 130,  
609 - 215,  
610 - 0  
611 - ], 397 + "value": [ 130, 215, 0 ],
612 "alphaFunction": "EASE_OUT", 398 "alphaFunction": "EASE_OUT",
613 "timePeriod": { 399 "timePeriod": {
614 "delay": 1.486, 400 "delay": 1.486,
@@ -619,11 +405,7 @@ @@ -619,11 +405,7 @@
619 { 405 {
620 "actor": "Left Crop", 406 "actor": "Left Crop",
621 "property": "position", 407 "property": "position",
622 - "value": [  
623 - -95,  
624 - 219,  
625 - 0  
626 - ], 408 + "value": [ -95, 219, 0 ],
627 "alphaFunction": "EASE_OUT", 409 "alphaFunction": "EASE_OUT",
628 "timePeriod": { 410 "timePeriod": {
629 "delay": 0, 411 "delay": 0,
@@ -634,11 +416,7 @@ @@ -634,11 +416,7 @@
634 { 416 {
635 "actor": "Right", 417 "actor": "Right",
636 "property": "position", 418 "property": "position",
637 - "value": [  
638 - 172,  
639 - 214.5,  
640 - 0.5  
641 - ], 419 + "value": [ 172, 214.5, 0.5 ],
642 "alphaFunction": "EASE_OUT", 420 "alphaFunction": "EASE_OUT",
643 "timePeriod": { 421 "timePeriod": {
644 "delay": 3.106, 422 "delay": 3.106,
@@ -649,11 +427,7 @@ @@ -649,11 +427,7 @@
649 { 427 {
650 "actor": "Right Crop", 428 "actor": "Right Crop",
651 "property": "position", 429 "property": "position",
652 - "value": [  
653 - 383,  
654 - 218.5,  
655 - 0.5  
656 - ], 430 + "value": [ 383, 218.5, 0.5 ],
657 "alphaFunction": "EASE_OUT", 431 "alphaFunction": "EASE_OUT",
658 "timePeriod": { 432 "timePeriod": {
659 "delay": 3.106, 433 "delay": 3.106,
@@ -664,11 +438,7 @@ @@ -664,11 +438,7 @@
664 { 438 {
665 "actor": "Control On", 439 "actor": "Control On",
666 "property": "position", 440 "property": "position",
667 - "value": [  
668 - 371.26,  
669 - -131,  
670 - 0  
671 - ], 441 + "value": [ 371.26, -131, 0 ],
672 "alphaFunction": "LINEAR", 442 "alphaFunction": "LINEAR",
673 "timePeriod": { 443 "timePeriod": {
674 "delay": 0, 444 "delay": 0,
@@ -679,11 +449,7 @@ @@ -679,11 +449,7 @@
679 { 449 {
680 "actor": "JellyOff", 450 "actor": "JellyOff",
681 "property": "position", 451 "property": "position",
682 - "value": [  
683 - 130,  
684 - 215,  
685 - 0  
686 - ], 452 + "value": [ 130, 215, 0 ],
687 "alphaFunction": "LINEAR", 453 "alphaFunction": "LINEAR",
688 "timePeriod": { 454 "timePeriod": {
689 "delay": 2.765, 455 "delay": 2.765,
@@ -694,11 +460,7 @@ @@ -694,11 +460,7 @@
694 { 460 {
695 "actor": "Jelly", 461 "actor": "Jelly",
696 "property": "position", 462 "property": "position",
697 - "value": [  
698 - 121,  
699 - -117,  
700 - 0  
701 - ], 463 + "value": [ 121, -117, 0 ],
702 "alphaFunction": "LINEAR", 464 "alphaFunction": "LINEAR",
703 "timePeriod": { 465 "timePeriod": {
704 "delay": 2.765, 466 "delay": 2.765,
@@ -709,11 +471,7 @@ @@ -709,11 +471,7 @@
709 { 471 {
710 "actor": "Control Off", 472 "actor": "Control Off",
711 "property": "position", 473 "property": "position",
712 - "value": [  
713 - 123.5,  
714 - 215,  
715 - 0  
716 - ], 474 + "value": [ 123.5, 215, 0 ],
717 "alphaFunction": "LINEAR", 475 "alphaFunction": "LINEAR",
718 "timePeriod": { 476 "timePeriod": {
719 "delay": 2.765, 477 "delay": 2.765,
resources/scripts/animation.json
  View file @d143329
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 "name": "image", 120 "name": "image",
121 "type": "ImageActor", 121 "type": "ImageActor",
122 "image": { 122 "image": {
123 - "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg" 123 + "filename": "{DEMO_IMAGE_DIR}gallery-large-21.jpg"
124 }, 124 },
125 "relayoutEnabled": false, 125 "relayoutEnabled": false,
126 "position": [0, 200, 0], 126 "position": [0, 200, 0],
resources/scripts/background-color.json
  View file @d143329
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 "anchorPoint": "TOP_CENTER", 51 "anchorPoint": "TOP_CENTER",
52 "size": [400, 150, 1], 52 "size": [400, 150, 1],
53 "background": { 53 "background": {
54 - "filename": "{DALI_IMAGE_DIR}button-background.png" 54 + "filename": "{DEMO_IMAGE_DIR}button-background.png"
55 } 55 }
56 }, 56 },
57 57
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 "anchorPoint": "BOTTOM_CENTER", 63 "anchorPoint": "BOTTOM_CENTER",
64 "size": [400, 150, 1], 64 "size": [400, 150, 1],
65 "background": { 65 "background": {
66 - "filename": "{DALI_IMAGE_DIR}button-background.png" 66 + "filename": "{DEMO_IMAGE_DIR}button-background.png"
67 } 67 }
68 } 68 }
69 ] 69 ]
resources/scripts/button.json
  View file @d143329
@@ -26,8 +26,8 @@ @@ -26,8 +26,8 @@
26 "anchorPoint": "TOP_CENTER", 26 "anchorPoint": "TOP_CENTER",
27 "position": [0, 0, 0], 27 "position": [0, 0, 0],
28 "size": [400, 200, 0], 28 "size": [400, 200, 0],
29 - "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png",  
30 - "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png", 29 + "unselectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-1.png",
  30 + "selectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-2.png",
31 "labelText": "Normal" 31 "labelText": "Normal"
32 }, 32 },
33 33
@@ -39,9 +39,9 @@ @@ -39,9 +39,9 @@
39 "position": [0, 0, 0], 39 "position": [0, 0, 0],
40 "size": [400, 200, 0], 40 "size": [400, 200, 0],
41 "disabled": true, 41 "disabled": true,
42 - "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png",  
43 - "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png",  
44 - "disabledStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png", 42 + "unselectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-1.png",
  43 + "selectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-2.png",
  44 + "disabledStateImage": "{DEMO_IMAGE_DIR}blocks-brick-3.png",
45 "labelText": "Disabled" 45 "labelText": "Disabled"
46 }, 46 },
47 47
@@ -54,8 +54,8 @@ @@ -54,8 +54,8 @@
54 "position": [0, 0, 0], 54 "position": [0, 0, 0],
55 "size": [400, 200, 0], 55 "size": [400, 200, 0],
56 "togglable": true, 56 "togglable": true,
57 - "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png",  
58 - "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png", 57 + "unselectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-1.png",
  58 + "selectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-3.png",
59 "labelText": "Toggle", 59 "labelText": "Toggle",
60 "signals": [{ 60 "signals": [{
61 "name": "selected", 61 "name": "selected",
resources/scripts/choreography.json
  View file @d143329
@@ -5,29 +5,16 @@ @@ -5,29 +5,16 @@
5 { 5 {
6 "type": "ImageActor", 6 "type": "ImageActor",
7 "inheritPosition": true, 7 "inheritPosition": true,
8 - "size": [  
9 - 70,  
10 - 70,  
11 - 1  
12 - ],  
13 - "color": [  
14 - 0.85,  
15 - 0.75,  
16 - 0.45,  
17 - 1  
18 - ], 8 + "size": [ 70, 70, 1 ],
  9 + "color": [ 0.85, 0.75, 0.45, 1 ],
19 "image": { 10 "image": {
20 - "filename": "{DALI_IMAGE_DIR}circle.png" 11 + "filename": "{DEMO_IMAGE_DIR}circle.png"
21 } 12 }
22 }, 13 },
23 "rectangleControl": 14 "rectangleControl":
24 { 15 {
25 "type": "Control", 16 "type": "Control",
26 - "size": [  
27 - 60,  
28 - 60,  
29 - 1  
30 - ], 17 + "size": [ 60, 60, 1 ],
31 "background": {"color": [0.95, 0.41, 0.18, 1] }, 18 "background": {"color": [0.95, 0.41, 0.18, 1] },
32 "colorAlpha": 0 19 "colorAlpha": 0
33 } 20 }
@@ -37,17 +24,9 @@ @@ -37,17 +24,9 @@
37 "type": "Control", 24 "type": "Control",
38 "actors": [], 25 "actors": [],
39 "name": "topContainer", 26 "name": "topContainer",
40 - "position": [  
41 - 180,  
42 - 105,  
43 - 0  
44 - ], 27 + "position": [ 180, 105, 0 ],
45 "inheritPosition": true, 28 "inheritPosition": true,
46 - "size": [  
47 - 20,  
48 - 20,  
49 - 1  
50 - ], 29 + "size": [ 20, 20, 1 ],
51 "sizeAspectRatio": false, 30 "sizeAspectRatio": false,
52 "background": { "color": [0.85, 0.75, 0.45, 1] }, 31 "background": { "color": [0.85, 0.75, 0.45, 1] },
53 "colorAlpha": 0 32 "colorAlpha": 0
@@ -55,11 +34,7 @@ @@ -55,11 +34,7 @@
55 { 34 {
56 "type": "circleControl", 35 "type": "circleControl",
57 "name": "Circle1", 36 "name": "Circle1",
58 - "position": [  
59 - 84,  
60 - 198,  
61 - -1  
62 - ], 37 + "position": [ 84, 198, -1 ],
63 "signals": [ 38 "signals": [
64 { 39 {
65 "name": "touched", 40 "name": "touched",
@@ -71,65 +46,37 @@ @@ -71,65 +46,37 @@
71 { 46 {
72 "type": "circleControl", 47 "type": "circleControl",
73 "name": "Circle2", 48 "name": "Circle2",
74 - "position": [  
75 - 151,  
76 - 198,  
77 - -1  
78 - ] 49 + "position": [ 151, 198, -1 ]
79 }, 50 },
80 { 51 {
81 "type": "circleControl", 52 "type": "circleControl",
82 "name": "Circle3", 53 "name": "Circle3",
83 - "position": [  
84 - 285,  
85 - 198,  
86 - -1  
87 - ] 54 + "position": [ 285, 198, -1 ]
88 }, 55 },
89 { 56 {
90 "type": "circleControl", 57 "type": "circleControl",
91 "name": "Circle4", 58 "name": "Circle4",
92 - "position": [  
93 - 218,  
94 - 198,  
95 - -1  
96 - ] 59 + "position": [ 218, 198, -1 ]
97 }, 60 },
98 { 61 {
99 "type": "rectangleControl", 62 "type": "rectangleControl",
100 "name": "Rect1", 63 "name": "Rect1",
101 - "position": [  
102 - 50,  
103 - 292,  
104 - 0  
105 - ] 64 + "position": [ 50, 292, 0 ]
106 }, 65 },
107 { 66 {
108 "type": "rectangleControl", 67 "type": "rectangleControl",
109 "name": "Rect2", 68 "name": "Rect2",
110 - "position": [  
111 - 120,  
112 - 292,  
113 - 0  
114 - ] 69 + "position": [ 120, 292, 0 ]
115 }, 70 },
116 { 71 {
117 "type": "rectangleControl", 72 "type": "rectangleControl",
118 "name": "Rect3", 73 "name": "Rect3",
119 - "position": [  
120 - 190,  
121 - 292,  
122 - 0  
123 - ] 74 + "position": [ 190, 292, 0 ]
124 }, 75 },
125 { 76 {
126 "type": "rectangleControl", 77 "type": "rectangleControl",
127 "name": "Rect4", 78 "name": "Rect4",
128 - "position": [  
129 - 260,  
130 - 292,  
131 - 0  
132 - ] 79 + "position": [ 260, 292, 0 ]
133 } 80 }
134 ], 81 ],
135 "animations": { 82 "animations": {
@@ -138,11 +85,7 @@ @@ -138,11 +85,7 @@
138 { 85 {
139 "actor": "Circle1", 86 "actor": "Circle1",
140 "property": "position", 87 "property": "position",
141 - "value": [  
142 - 84,  
143 - 198,  
144 - -1  
145 - ], 88 + "value": [ 84, 198, -1 ],
146 "alphaFunction": "LINEAR", 89 "alphaFunction": "LINEAR",
147 "timePeriod": { 90 "timePeriod": {
148 "delay": 0, 91 "delay": 0,
@@ -153,11 +96,7 @@ @@ -153,11 +96,7 @@
153 { 96 {
154 "actor": "Circle1", 97 "actor": "Circle1",
155 "property": "position", 98 "property": "position",
156 - "value": [  
157 - 130,  
158 - 190,  
159 - -1  
160 - ], 99 + "value": [ 130, 190, -1 ],
161 "alphaFunction": "LINEAR", 100 "alphaFunction": "LINEAR",
162 "timePeriod": { 101 "timePeriod": {
163 "delay": 0, 102 "delay": 0,
@@ -168,11 +107,7 @@ @@ -168,11 +107,7 @@
168 { 107 {
169 "actor": "Circle1", 108 "actor": "Circle1",
170 "property": "position", 109 "property": "position",
171 - "value": [  
172 - 150,  
173 - 170,  
174 - -1  
175 - ], 110 + "value": [ 150, 170, -1 ],
176 "alphaFunction": "LINEAR", 111 "alphaFunction": "LINEAR",
177 "timePeriod": { 112 "timePeriod": {
178 "delay": 0.05, 113 "delay": 0.05,
@@ -183,11 +118,7 @@ @@ -183,11 +118,7 @@
183 { 118 {
184 "actor": "Circle1", 119 "actor": "Circle1",
185 "property": "position", 120 "property": "position",
186 - "value": [  
187 - 160,  
188 - 150,  
189 - -1  
190 - ], 121 + "value": [ 160, 150, -1 ],
191 "alphaFunction": "LINEAR", 122 "alphaFunction": "LINEAR",
192 "timePeriod": { 123 "timePeriod": {
193 "delay": 0.1, 124 "delay": 0.1,
@@ -198,11 +129,7 @@ @@ -198,11 +129,7 @@
198 { 129 {
199 "actor": "Circle1", 130 "actor": "Circle1",
200 "property": "position", 131 "property": "position",
201 - "value": [  
202 - 170,  
203 - 125,  
204 - -1  
205 - ], 132 + "value": [ 170, 125, -1 ],
206 "alphaFunction": "LINEAR", 133 "alphaFunction": "LINEAR",
207 "timePeriod": { 134 "timePeriod": {
208 "delay": 0.151, 135 "delay": 0.151,
@@ -213,11 +140,7 @@ @@ -213,11 +140,7 @@
213 { 140 {
214 "actor": "Circle1", 141 "actor": "Circle1",
215 "property": "position", 142 "property": "position",
216 - "value": [  
217 - 180,  
218 - 100,  
219 - -1  
220 - ], 143 + "value": [ 180, 100, -1 ],
221 "alphaFunction": "LINEAR", 144 "alphaFunction": "LINEAR",
222 "timePeriod": { 145 "timePeriod": {
223 "delay": 0.2, 146 "delay": 0.2,
@@ -228,11 +151,7 @@ @@ -228,11 +151,7 @@
228 { 151 {
229 "actor": "Circle1", 152 "actor": "Circle1",
230 "property": "size", 153 "property": "size",
231 - "value": [  
232 - 70,  
233 - 70,  
234 - 1  
235 - ], 154 + "value": [ 70, 70, 1 ],
236 "alphaFunction": "LINEAR", 155 "alphaFunction": "LINEAR",
237 "timePeriod": { 156 "timePeriod": {
238 "delay": 0, 157 "delay": 0,
@@ -243,11 +162,7 @@ @@ -243,11 +162,7 @@
243 { 162 {
244 "actor": "Circle1", 163 "actor": "Circle1",
245 "property": "size", 164 "property": "size",
246 - "value": [  
247 - 20,  
248 - 20,  
249 - 1  
250 - ], 165 + "value": [ 20, 20, 1 ],
251 "alphaFunction": "LINEAR", 166 "alphaFunction": "LINEAR",
252 "timePeriod": { 167 "timePeriod": {
253 "delay": 0.151, 168 "delay": 0.151,
@@ -258,11 +173,7 @@ @@ -258,11 +173,7 @@
258 { 173 {
259 "actor": "Circle2", 174 "actor": "Circle2",
260 "property": "scale", 175 "property": "scale",
261 - "value": [  
262 - 1,  
263 - 1,  
264 - 1  
265 - ], 176 + "value": [ 1, 1, 1 ],
266 "alphaFunction": "LINEAR", 177 "alphaFunction": "LINEAR",
267 "timePeriod": { 178 "timePeriod": {
268 "delay": 0, 179 "delay": 0,
@@ -273,11 +184,7 @@ @@ -273,11 +184,7 @@
273 { 184 {
274 "actor": "Circle2", 185 "actor": "Circle2",
275 "property": "scale", 186 "property": "scale",
276 - "value": [  
277 - 0.1,  
278 - 0.1,  
279 - 1  
280 - ], 187 + "value": [ 0.1, 0.1, 1 ],
281 "alphaFunction": "LINEAR", 188 "alphaFunction": "LINEAR",
282 "timePeriod": { 189 "timePeriod": {
283 "delay": 0, 190 "delay": 0,
resources/scripts/contacts.json
  View file @d143329
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 ], 25 ],
26 "sizeAspectRatio": false, 26 "sizeAspectRatio": false,
27 "image": { 27 "image": {
28 - "filename": "{DALI_IMAGE_DIR}contacts-main.png", 28 + "filename": "{DEMO_IMAGE_DIR}contacts-main.png",
29 "width": 361, 29 "width": 361,
30 "height": 640, 30 "height": 640,
31 "loadPolicy": "IMMEDIATE", 31 "loadPolicy": "IMMEDIATE",
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 ], 56 ],
57 "sizeAspectRatio": false, 57 "sizeAspectRatio": false,
58 "image": { 58 "image": {
59 - "filename": "{DALI_IMAGE_DIR}contacts-background.png", 59 + "filename": "{DEMO_IMAGE_DIR}contacts-background.png",
60 "width": 360, 60 "width": 360,
61 "height": 282, 61 "height": 282,
62 "loadPolicy": "IMMEDIATE", 62 "loadPolicy": "IMMEDIATE",
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 ], 104 ],
105 "sizeAspectRatio": false, 105 "sizeAspectRatio": false,
106 "image": { 106 "image": {
107 - "filename": "{DALI_IMAGE_DIR}contacts-image.png", 107 + "filename": "{DEMO_IMAGE_DIR}contacts-image.png",
108 "width": 53, 108 "width": 53,
109 "height": 52, 109 "height": 52,
110 "loadPolicy": "IMMEDIATE", 110 "loadPolicy": "IMMEDIATE",
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 1 135 1
136 ], 136 ],
137 "image": { 137 "image": {
138 - "filename": "{DALI_IMAGE_DIR}contacts-text.png" 138 + "filename": "{DEMO_IMAGE_DIR}contacts-text.png"
139 } 139 }
140 }, 140 },
141 { 141 {
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 ], 155 ],
156 "sizeAspectRatio": false, 156 "sizeAspectRatio": false,
157 "image": { 157 "image": {
158 - "filename": "{DALI_IMAGE_DIR}contacts-add.png", 158 + "filename": "{DEMO_IMAGE_DIR}contacts-add.png",
159 "width": 80, 159 "width": 80,
160 "height": 71, 160 "height": 71,
161 "loadPolicy": "IMMEDIATE", 161 "loadPolicy": "IMMEDIATE",
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 ], 179 ],
180 "sizeAspectRatio": false, 180 "sizeAspectRatio": false,
181 "image": { 181 "image": {
182 - "filename": "{DALI_IMAGE_DIR}contacts-messenger.png", 182 + "filename": "{DEMO_IMAGE_DIR}contacts-messenger.png",
183 "width": 360, 183 "width": 360,
184 "height": 77, 184 "height": 77,
185 "loadPolicy": "IMMEDIATE", 185 "loadPolicy": "IMMEDIATE",
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 ], 203 ],
204 "sizeAspectRatio": false, 204 "sizeAspectRatio": false,
205 "image": { 205 "image": {
206 - "filename": "{DALI_IMAGE_DIR}contacts-email.png", 206 + "filename": "{DEMO_IMAGE_DIR}contacts-email.png",
207 "width": 360, 207 "width": 360,
208 "height": 79, 208 "height": 79,
209 "loadPolicy": "IMMEDIATE", 209 "loadPolicy": "IMMEDIATE",
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
227 ], 227 ],
228 "sizeAspectRatio": false, 228 "sizeAspectRatio": false,
229 "image": { 229 "image": {
230 - "filename": "{DALI_IMAGE_DIR}contacts-mobile.png", 230 + "filename": "{DEMO_IMAGE_DIR}contacts-mobile.png",
231 "width": 360, 231 "width": 360,
232 "height": 80, 232 "height": 80,
233 "loadPolicy": "IMMEDIATE", 233 "loadPolicy": "IMMEDIATE",
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 ], 251 ],
252 "sizeAspectRatio": false, 252 "sizeAspectRatio": false,
253 "image": { 253 "image": {
254 - "filename": "{DALI_IMAGE_DIR}contacts-home.png", 254 + "filename": "{DEMO_IMAGE_DIR}contacts-home.png",
255 "width": 360, 255 "width": 360,
256 "height": 75, 256 "height": 75,
257 "loadPolicy": "IMMEDIATE", 257 "loadPolicy": "IMMEDIATE",
@@ -275,7 +275,7 @@ @@ -275,7 +275,7 @@
275 ], 275 ],
276 "sizeAspectRatio": false, 276 "sizeAspectRatio": false,
277 "image": { 277 "image": {
278 - "filename": "{DALI_IMAGE_DIR}contacts-circle.png", 278 + "filename": "{DEMO_IMAGE_DIR}contacts-circle.png",
279 "width": 100, 279 "width": 100,
280 "height": 100, 280 "height": 100,
281 "loadPolicy": "IMMEDIATE", 281 "loadPolicy": "IMMEDIATE",
@@ -299,7 +299,7 @@ @@ -299,7 +299,7 @@
299 ], 299 ],
300 "sizeAspectRatio": false, 300 "sizeAspectRatio": false,
301 "image": { 301 "image": {
302 - "filename": "{DALI_IMAGE_DIR}contacts-plain.png", 302 + "filename": "{DEMO_IMAGE_DIR}contacts-plain.png",
303 "width": 360, 303 "width": 360,
304 "height": 77, 304 "height": 77,
305 "loadPolicy": "IMMEDIATE", 305 "loadPolicy": "IMMEDIATE",
resources/scripts/gallery.json
  View file @d143329
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 "position": [ 0, 0, -1 ], 53 "position": [ 0, 0, -1 ],
54 "size": [ 450, 795, 1 ], 54 "size": [ 450, 795, 1 ],
55 "image": { 55 "image": {
56 - "filename": "{DALI_IMAGE_DIR}animation-list.png" 56 + "filename": "{DEMO_IMAGE_DIR}animation-list.png"
57 } 57 }
58 }, 58 },
59 { 59 {
@@ -120,35 +120,35 @@ @@ -120,35 +120,35 @@
120 "type": "imageType", 120 "type": "imageType",
121 "name": "picture1", 121 "name": "picture1",
122 "image": { 122 "image": {
123 - "filename": "{DALI_IMAGE_DIR}animation-picture-1.png" 123 + "filename": "{DEMO_IMAGE_DIR}animation-picture-1.png"
124 } 124 }
125 }, 125 },
126 { 126 {
127 "type": "imageType", 127 "type": "imageType",
128 "name": "picture2", 128 "name": "picture2",
129 "image": { 129 "image": {
130 - "filename": "{DALI_IMAGE_DIR}animation-picture-2.png" 130 + "filename": "{DEMO_IMAGE_DIR}animation-picture-2.png"
131 } 131 }
132 }, 132 },
133 { 133 {
134 "type": "imageType", 134 "type": "imageType",
135 "name": "picture3", 135 "name": "picture3",
136 "image": { 136 "image": {
137 - "filename": "{DALI_IMAGE_DIR}animation-picture-3.png" 137 + "filename": "{DEMO_IMAGE_DIR}animation-picture-3.png"
138 } 138 }
139 }, 139 },
140 { 140 {
141 "type": "imageType", 141 "type": "imageType",
142 "name": "picture4", 142 "name": "picture4",
143 "image": { 143 "image": {
144 - "filename": "{DALI_IMAGE_DIR}animation-picture-4.png" 144 + "filename": "{DEMO_IMAGE_DIR}animation-picture-4.png"
145 } 145 }
146 }, 146 },
147 { 147 {
148 "type": "imageType", 148 "type": "imageType",
149 "name": "picture5", 149 "name": "picture5",
150 "image": { 150 "image": {
151 - "filename": "{DALI_IMAGE_DIR}animation-picture-5.png" 151 + "filename": "{DEMO_IMAGE_DIR}animation-picture-5.png"
152 } 152 }
153 } 153 }
154 ], 154 ],
resources/scripts/music-library.json
  View file @d143329
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 ], 25 ],
26 "sizeAspectRatio": false, 26 "sizeAspectRatio": false,
27 "image": { 27 "image": {
28 - "filename": "{DALI_IMAGE_DIR}music-libray-main-screen.png", 28 + "filename": "{DEMO_IMAGE_DIR}music-libray-main-screen.png",
29 "width": 545, 29 "width": 545,
30 "height": 860, 30 "height": 860,
31 "loadPolicy": "IMMEDIATE", 31 "loadPolicy": "IMMEDIATE",
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 ], 52 ],
53 "sizeAspectRatio": true, 53 "sizeAspectRatio": true,
54 "image": { 54 "image": {
55 - "filename": "{DALI_IMAGE_DIR}music-libray-circle.png", 55 + "filename": "{DEMO_IMAGE_DIR}music-libray-circle.png",
56 "width": 128, 56 "width": 128,
57 "height": 128, 57 "height": 128,
58 "loadPolicy": "IMMEDIATE", 58 "loadPolicy": "IMMEDIATE",
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 ], 76 ],
77 "sizeAspectRatio": true, 77 "sizeAspectRatio": true,
78 "image": { 78 "image": {
79 - "filename": "{DALI_IMAGE_DIR}music-libray-triangle.png", 79 + "filename": "{DEMO_IMAGE_DIR}music-libray-triangle.png",
80 "width": 185, 80 "width": 185,
81 "height": 198, 81 "height": 198,
82 "loadPolicy": "IMMEDIATE", 82 "loadPolicy": "IMMEDIATE",
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 ], 100 ],
101 "sizeAspectRatio": true, 101 "sizeAspectRatio": true,
102 "image": { 102 "image": {
103 - "filename": "{DALI_IMAGE_DIR}music-libray-rectangle.png", 103 + "filename": "{DEMO_IMAGE_DIR}music-libray-rectangle.png",
104 "width": 128, 104 "width": 128,
105 "height": 128, 105 "height": 128,
106 "loadPolicy": "IMMEDIATE", 106 "loadPolicy": "IMMEDIATE",
@@ -195,7 +195,7 @@ @@ -195,7 +195,7 @@
195 "color":[0,0,0,0], 195 "color":[0,0,0,0],
196 "sizeAspectRatio": false, 196 "sizeAspectRatio": false,
197 "image": { 197 "image": {
198 - "filename": "{DALI_IMAGE_DIR}music-libray-foxtrot-oscar.png", 198 + "filename": "{DEMO_IMAGE_DIR}music-libray-foxtrot-oscar.png",
199 "width": 545, 199 "width": 545,
200 "height": 95, 200 "height": 95,
201 "loadPolicy": "IMMEDIATE", 201 "loadPolicy": "IMMEDIATE",
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 ], 251 ],
252 "sizeAspectRatio": true, 252 "sizeAspectRatio": true,
253 "image": { 253 "image": {
254 - "filename": "{DALI_IMAGE_DIR}music-libray-the-solars.png", 254 + "filename": "{DEMO_IMAGE_DIR}music-libray-the-solars.png",
255 "width": 545, 255 "width": 545,
256 "height": 218, 256 "height": 218,
257 "loadPolicy": "IMMEDIATE", 257 "loadPolicy": "IMMEDIATE",
@@ -317,7 +317,7 @@ @@ -317,7 +317,7 @@
317 ], 317 ],
318 "sizeAspectRatio": false, 318 "sizeAspectRatio": false,
319 "image": { 319 "image": {
320 - "filename": "{DALI_IMAGE_DIR}music-libray-record-cover.png", 320 + "filename": "{DEMO_IMAGE_DIR}music-libray-record-cover.png",
321 "width": 545, 321 "width": 545,
322 "height": 502, 322 "height": 502,
323 "loadPolicy": "IMMEDIATE", 323 "loadPolicy": "IMMEDIATE",
@@ -341,7 +341,7 @@ @@ -341,7 +341,7 @@
341 ], 341 ],
342 "sizeAspectRatio": true, 342 "sizeAspectRatio": true,
343 "image": { 343 "image": {
344 - "filename": "{DALI_IMAGE_DIR}music-libray-arrow.png", 344 + "filename": "{DEMO_IMAGE_DIR}music-libray-arrow.png",
345 "width": 128, 345 "width": 128,
346 "height": 128, 346 "height": 128,
347 "loadPolicy": "IMMEDIATE", 347 "loadPolicy": "IMMEDIATE",
@@ -365,7 +365,7 @@ @@ -365,7 +365,7 @@
365 ], 365 ],
366 "sizeAspectRatio": false, 366 "sizeAspectRatio": false,
367 "image": { 367 "image": {
368 - "filename": "{DALI_IMAGE_DIR}music-libray-star.png", 368 + "filename": "{DEMO_IMAGE_DIR}music-libray-star.png",
369 "width": 121, 369 "width": 121,
370 "height": 128, 370 "height": 128,
371 "loadPolicy": "IMMEDIATE", 371 "loadPolicy": "IMMEDIATE",
@@ -394,7 +394,7 @@ @@ -394,7 +394,7 @@
394 1 394 1
395 ], 395 ],
396 "image": { 396 "image": {
397 - "filename": "{DALI_IMAGE_DIR}music-libray-pause.png", 397 + "filename": "{DEMO_IMAGE_DIR}music-libray-pause.png",
398 "width": 128, 398 "width": 128,
399 "height": 128, 399 "height": 128,
400 "loadPolicy": "IMMEDIATE", 400 "loadPolicy": "IMMEDIATE",
@@ -418,7 +418,7 @@ @@ -418,7 +418,7 @@
418 ], 418 ],
419 "sizeAspectRatio": true, 419 "sizeAspectRatio": true,
420 "image": { 420 "image": {
421 - "filename": "{DALI_IMAGE_DIR}music-libray-menu.png", 421 + "filename": "{DEMO_IMAGE_DIR}music-libray-menu.png",
422 "width": 32, 422 "width": 32,
423 "height": 32, 423 "height": 32,
424 "loadPolicy": "IMMEDIATE", 424 "loadPolicy": "IMMEDIATE",
resources/scripts/shader-effect-ripple.json
  View file @d143329
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 "heightResizePolicy":"DIMENSION_DEPENDENCY", 13 "heightResizePolicy":"DIMENSION_DEPENDENCY",
14 "effect": "Ripple2D", 14 "effect": "Ripple2D",
15 "image": { 15 "image": {
16 - "filename": "{DALI_IMAGE_DIR}gallery-medium-25.jpg", 16 + "filename": "{DEMO_IMAGE_DIR}gallery-medium-25.jpg",
17 "width": 400, 17 "width": 400,
18 "height": 400, 18 "height": 400,
19 "loadPolicy": "IMMEDIATE", 19 "loadPolicy": "IMMEDIATE",
resources/scripts/slider.json
  View file @d143329
@@ -91,9 +91,9 @@ @@ -91,9 +91,9 @@
91 "hitRegion": [0, 48], 91 "hitRegion": [0, 48],
92 "backingRegion": [0, 30], 92 "backingRegion": [0, 30],
93 "handleRegion": [48, 48], 93 "handleRegion": [48, 48],
94 - "backingImageName": "{DALI_IMAGE_DIR}button-up-14.9.png",  
95 - "handleImageName": "{DALI_IMAGE_DIR}blocks-ball.png",  
96 - "progressImageName": "{DALI_IMAGE_DIR}button-down.9.png" 94 + "backingImageName": "{DEMO_IMAGE_DIR}button-up-14.9.png",
  95 + "handleImageName": "{DEMO_IMAGE_DIR}blocks-ball.png",
  96 + "progressImageName": "{DEMO_IMAGE_DIR}button-down.9.png"
97 }, { 97 }, {
98 "type": "Slider", 98 "type": "Slider",
99 "parentOrigin": "TOP_CENTER", 99 "parentOrigin": "TOP_CENTER",
resources/scripts/super-blur-view.json
  View file @d143329
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 "position": [0, 10, 0], 54 "position": [0, 10, 0],
55 "size": [460, 600, 0], 55 "size": [460, 600, 0],
56 "image": { 56 "image": {
57 - "filename": "{DALI_IMAGE_DIR}background-4.jpg" 57 + "filename": "{DEMO_IMAGE_DIR}background-4.jpg"
58 } 58 }
59 }, 59 },
60 60
@@ -70,8 +70,8 @@ @@ -70,8 +70,8 @@
70 "type": "TextLabel", 70 "type": "TextLabel",
71 "text": "Blur" 71 "text": "Blur"
72 }, 72 },
73 - "unselectedStateImage": "{DALI_IMAGE_DIR}button-background.png",  
74 - "selectedStateImage": "{DALI_IMAGE_DIR}button-background.png", 73 + "unselectedStateImage": "{DEMO_IMAGE_DIR}button-background.png",
  74 + "selectedStateImage": "{DEMO_IMAGE_DIR}button-background.png",
75 "signals": [{ 75 "signals": [{
76 "name": "pressed", 76 "name": "pressed",
77 "action": "play", 77 "action": "play",
resources/scripts/table-view.json
  View file @d143329
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 "type":"ImageActor", 65 "type":"ImageActor",
66 "heightResizePolicy":"FILL_TO_PARENT", 66 "heightResizePolicy":"FILL_TO_PARENT",
67 "image": { 67 "image": {
68 - "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg" 68 + "filename": "{DEMO_IMAGE_DIR}gallery-small-1.jpg"
69 }, 69 },
70 "customProperties": { // properties registered dynamically 70 "customProperties": { // properties registered dynamically
71 "cellIndex": [0,0], // property to specify the top-left cell this child occupies 71 "cellIndex": [0,0], // property to specify the top-left cell this child occupies
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 "type":"ImageActor", 77 "type":"ImageActor",
78 "heightResizePolicy":"FILL_TO_PARENT", 78 "heightResizePolicy":"FILL_TO_PARENT",
79 "image": { 79 "image": {
80 - "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg" 80 + "filename": "{DEMO_IMAGE_DIR}gallery-small-2.jpg"
81 }, 81 },
82 "customProperties": { // properties registered dynamically 82 "customProperties": { // properties registered dynamically
83 "cellIndex": [0,1], 83 "cellIndex": [0,1],
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 "name":"gallery3", 87 "name":"gallery3",
88 "type":"ImageActor", 88 "type":"ImageActor",
89 "image": { 89 "image": {
90 - "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg" 90 + "filename": "{DEMO_IMAGE_DIR}gallery-small-3.jpg"
91 }, 91 },
92 "customProperties": { 92 "customProperties": {
93 "cellIndex":[1,1], 93 "cellIndex":[1,1],
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 "type":"ImageActor", 100 "type":"ImageActor",
101 "widthResizePolicy":"FILL_TO_PARENT", 101 "widthResizePolicy":"FILL_TO_PARENT",
102 "image": { 102 "image": {
103 - "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg" 103 + "filename": "{DEMO_IMAGE_DIR}gallery-small-4.jpg"
104 }, 104 },
105 "customProperties": { 105 "customProperties": {
106 "cellIndex":[2,2] 106 "cellIndex":[2,2]
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 "widthResizePolicy":"FILL_TO_PARENT", 111 "widthResizePolicy":"FILL_TO_PARENT",
112 "heightResizePolicy":"FILL_TO_PARENT", 112 "heightResizePolicy":"FILL_TO_PARENT",
113 "image": { 113 "image": {
114 - "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg" 114 + "filename": "{DEMO_IMAGE_DIR}gallery-small-5.jpg"
115 }, 115 },
116 "customProperties": { 116 "customProperties": {
117 "cellIndex":[3,2], 117 "cellIndex":[3,2],
resources/style/demo-theme.json renamed to resources/style/demo-theme.json.in
  View file @d143329
1 /* 1 /*
2 -Copyright (c) 2000-2015 Samsung Electronics Co., Ltd All Rights Reserved  
3 -  
4 -This file is part of Dali Toolkit  
5 -  
6 -PROPRIETARY/CONFIDENTIAL  
7 -  
8 -This software is the confidential and proprietary information of  
9 -SAMSUNG ELECTRONICS ("Confidential Information"). You shall not  
10 -disclose such Confidential Information and shall use it only in  
11 -accordance with the terms of the license agreement you entered  
12 -into with SAMSUNG ELECTRONICS.  
13 -  
14 -SAMSUNG make no representations or warranties about the suitability  
15 -of the software, either express or implied, including but not limited  
16 -to the implied warranties of merchantability, fitness for a particular  
17 -purpose, or non-infringement. SAMSUNG shall not be liable for any  
18 -damages suffered by licensee as a result of using, modifying or  
19 -distributing this software or its derivatives.  
20 -*/ 2 + * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd
  3 + * Licensed under the Apache License, Version 2.0 (the "License");
  4 + * you may not use this file except in compliance with the License.
  5 + * You may obtain a copy of the License at
  6 + *
  7 + * http://www.apache.org/licenses/LICENSE-2.0
  8 + *
  9 + * Unless required by applicable law or agreed to in writing, software
  10 + * distributed under the License is distributed on an "AS IS" BASIS,
  11 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12 + * See the License for the specific language governing permissions and
  13 + * limitations under the License.
  14 + *
  15 + */
21 16
22 { 17 {
  18 + "constants":
  19 + {
  20 + "DEMO_IMAGE_DIR":"@DEMO_STYLE_IMAGE_DIR@"
  21 + },
  22 +
23 "styles": 23 "styles":
24 { 24 {
  25 + "confirmationpopup":{
  26 + "popupBackgroundImage":"{DEMO_IMAGE_DIR}00_popup_bg.9.png"
  27 + },
  28 +
25 "textlabel-Rosemary": 29 "textlabel-Rosemary":
26 { 30 {
27 "fontFamily":"Rosemary" 31 "fontFamily":"Rosemary"
resources/style/mobile/demo-theme.json renamed to resources/style/mobile/demo-theme.json.in
  View file @d143329
1 /* 1 /*
2 -Copyright (c) 2000-2015 Samsung Electronics Co., Ltd All Rights Reserved 2 + * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd
3 3
4 -This file is part of Dali Toolkit  
5 -  
6 -PROPRIETARY/CONFIDENTIAL  
7 -  
8 -This software is the confidential and proprietary information of  
9 -SAMSUNG ELECTRONICS ("Confidential Information"). You shall not  
10 -disclose such Confidential Information and shall use it only in  
11 -accordance with the terms of the license agreement you entered  
12 -into with SAMSUNG ELECTRONICS.  
13 -  
14 -SAMSUNG make no representations or warranties about the suitability  
15 -of the software, either express or implied, including but not limited  
16 -to the implied warranties of merchantability, fitness for a particular  
17 -purpose, or non-infringement. SAMSUNG shall not be liable for any  
18 -damages suffered by licensee as a result of using, modifying or  
19 -distributing this software or its derivatives.  
20 -*/ 4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
21 17
22 { 18 {
23 "styles": 19 "styles":
24 { 20 {
25 "textlabel-Rosemary": 21 "textlabel-Rosemary":
26 { 22 {
27 - "fontFamily":"Rosemary" 23 + "fontFamily":"Rosemary"
28 }, 24 },
29 "textlabel": 25 "textlabel":
30 { 26 {
shared/dali-demo-strings.h
  View file @d143329
@@ -98,6 +98,8 @@ extern &quot;C&quot; @@ -98,6 +98,8 @@ extern &quot;C&quot;
98 #define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line" 98 #define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line"
99 #define DALI_DEMO_STR_TITLE_COLOR_GRADIENT "Color Gradient" 99 #define DALI_DEMO_STR_TITLE_COLOR_GRADIENT "Color Gradient"
100 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View" 100 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View"
  101 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA "Image View Pixel Area"
  102 +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING "Image View Alpha Blending"
101 #define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM "Super Blur and Bloom" 103 #define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM "Super Blur and Bloom"
102 104
103 #endif 105 #endif