Peter M. Groen / dali-demo

Commit 46e6a0e92784c860b2b5425e34941c6574dd8062

Authored by David Steele
1 parent 6a71763a

Changed DALI_*_DIR to DEMO_*_DIR 

Scripts, examples and demo code should not use defines from other
parts of DALi. DALI_IMAGE_DIR is defined in Dali toolkit to specify
where the toolkit images are. This is used in the default toolkit
style file to specify the locations of the toolkit images.

It must not be overridden by applications.

Updated the demo style file to utilize a configured variable to point
at the installed demo style's images.

Added an example of a demo-specific image (confirmation popup background)

Updated dali-builder to load the demo theme (Scripting example within demo
already loads it)

Change-Id: Ie43a6611a8db3fc0afc6a1cd4d9d6e48afef75e7
Signed-off-by: David Steele <david.steele@samsung.com>
Inline Side-by-side
Showing 64 changed files with 828 additions and 1169 deletions
.gitignore
  View file @46e6a0e
... ... @@ -36,3 +36,4 @@ dali-builder
36 36 /build/desktop
37 37 /packaging/home*
38 38 *.mo
  39 +demo-theme.json
... ...
build/tizen/CMakeLists.txt
  View file @46e6a0e
... ... @@ -33,14 +33,14 @@ IF(NOT DEFINED LOCALE_DIR)
33 33 SET(LOCALE_DIR ${PREFIX}/share/locale)
34 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 45 FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
46 46 FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
... ... @@ -66,6 +66,9 @@ FOREACH(flag ${LOCAL_SCRIPTS_LIST})
66 66 INSTALL(FILES ${LOCAL_SCRIPTS_DIR}/${flag} DESTINATION ${SCRIPTS_DIR})
67 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 72 INSTALL(FILES ${LOCAL_STYLE_DIR}/demo-theme.json DESTINATION ${STYLE_DIR})
70 73  
71 74 SET(PKG_LIST dali-core
... ... @@ -79,7 +82,7 @@ FOREACH(flag ${REQUIRED_PKGS_CFLAGS})
79 82 SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
80 83 ENDFOREACH(flag)
81 84  
82   -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}")
83 86  
84 87 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall")
85 88 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
... ...
builder/dali-builder.cpp
  View file @46e6a0e
... ... @@ -199,9 +199,9 @@ private:
199 199 builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
200 200  
201 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 206 builder.AddConstants( defaultDirs );
207 207  
... ... @@ -297,15 +297,10 @@ private:
297 297 //------------------------------------------------------------------------------
298 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 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 304 if(argc > 1)
310 305 {
311 306 std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;
... ...
demo/dali-demo.cpp
  View file @46e6a0e
... ... @@ -27,11 +27,11 @@ using namespace Dali;
27 27 int main(int argc, char **argv)
28 28 {
29 29 // Configure gettext for internalization
30   - bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DALI_LOCALE_DIR);
  30 + bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DEMO_LOCALE_DIR);
31 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 36 // Create the demo launcher
37 37 DaliTableView demo(app);
... ...
demo/dali-table-view.cpp
  View file @46e6a0e
... ... @@ -37,10 +37,10 @@ using namespace Dali::Toolkit;
37 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 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 562 std::string name = mPressedActor.GetName();
563 563  
564 564 std::stringstream stream;
565   - stream << DALI_EXAMPLE_BIN << name.c_str();
  565 + stream << DEMO_EXAMPLE_BIN << name.c_str();
566 566 pid_t pid = fork();
567 567 if( pid == 0)
568 568 {
... ...
examples/atlas/atlas-example.cpp
  View file @46e6a0e
... ... @@ -28,10 +28,10 @@ class AtlasController;
28 28  
29 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 36 Application gApplication;
37 37 AtlasController* gAtlasController(NULL);
... ... @@ -79,28 +79,28 @@ public:
79 79  
80 80 mAtlas = Atlas::New( 400,700, Pixel::RGBA8888);
81 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 92 UploadBufferImages();
93 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 106 Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas );
... ... @@ -236,7 +236,7 @@ void RunTest( Application&amp; application )
236 236 //
237 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 241 RunTest( gApplication );
242 242  
... ...
examples/benchmark/benchmark.cpp
  View file @46e6a0e
... ... @@ -29,115 +29,115 @@ using namespace Dali::Toolkit;
29 29 namespace
30 30 {
31 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 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 143 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
... ...
examples/blocks/blocks-example.cpp
  View file @46e6a0e
... ... @@ -31,17 +31,17 @@ using namespace DemoHelper;
31 31  
32 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 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 46 const int TOTAL_BRICKS(4); ///< Total bricks in game.
47 47 const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f);
... ... @@ -838,7 +838,7 @@ void RunTest(Application&amp; app)
838 838  
839 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 843 RunTest(app);
844 844  
... ...
examples/bubble-effect/bubble-effect-example.cpp
  View file @46e6a0e
... ... @@ -24,29 +24,29 @@ using namespace Dali;
24 24  
25 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 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 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 42 const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) );
43 43  
44 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 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 322 int
323 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 327 RunTest(app);
328 328  
329 329 return 0;
330 330 }
331   -
332   -
333   -
... ...
examples/builder/examples.cpp
  View file @46e6a0e
... ... @@ -51,9 +51,9 @@ namespace
51 51 {
52 52  
53 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 58 std::string USER_DIRECTORY;
59 59  
... ... @@ -306,7 +306,7 @@ public:
306 306 }
307 307 else
308 308 {
309   - DirectoryFilesByType( DALI_SCRIPT_DIR, "json", files );
  309 + DirectoryFilesByType( DEMO_SCRIPT_DIR, "json", files );
310 310 }
311 311  
312 312 std::sort(files.begin(), files.end());
... ... @@ -414,9 +414,9 @@ public:
414 414 builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
415 415  
416 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 421 builder.AddConstants( defaultDirs );
422 422  
... ... @@ -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 623 ExampleApp dali_app(app);
624 624  
... ...
examples/buttons/buttons-example.cpp
  View file @46e6a0e
... ... @@ -29,21 +29,21 @@ using namespace Dali;
29 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 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 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 546 //
547 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 551 RunTest( application );
552 552  
... ...
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
  View file @46e6a0e
... ... @@ -20,9 +20,9 @@
20 20 using namespace Dali;
21 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 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 @46e6a0e
... ... @@ -37,44 +37,44 @@ using Dali::Toolkit::TextLabel;
37 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 41 const char * const APPLICATION_TITLE_WAVE( "Cube Transition: Wave" );
42 42 const char * const APPLICATION_TITLE_CROSS( "Cube Transition: Cross" );
43 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 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 79 const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) );
80 80  
... ... @@ -432,7 +432,7 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent&amp; event)
432 432 // Entry point for Linux & Tizen applications
433 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 436 CubeTransitionApp test( application );
437 437 application.MainLoop();
438 438  
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @46e6a0e
... ... @@ -33,41 +33,41 @@ using Dali::Toolkit::TextLabel;
33 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 37 const char * const APPLICATION_TITLE_HIGHP( "Dissolve Effect(highp)" );
38 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 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 73 const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) );
... ... @@ -443,7 +443,7 @@ bool DissolveEffectApp::OnTimerTick()
443 443 // Entry point for Linux & Tizen applications
444 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 447 DissolveEffectApp test( application );
448 448 application.MainLoop();
449 449  
... ...
examples/gradients/gradients-example.cpp
  View file @46e6a0e
... ... @@ -27,9 +27,9 @@ namespace
27 27 {
28 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 35 // This example shows how to render color gradients
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @46e6a0e
... ... @@ -27,18 +27,18 @@ using Toolkit::TextLabel;
27 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 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 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 37 const int MARGIN_SIZE = 10;
38 38  
39 39 const char* const NEXT_BUTTON_ID = "NEXT_BUTTON";
40 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 43 const char* const FITTING_BUTTON_ID = "FITTING_BUTTON";
44 44 const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON";
... ... @@ -52,29 +52,29 @@ const char* const STYLE_BUTTON_TEXT = &quot;buttonlabel&quot;;
52 52 const char* IMAGE_PATHS[] =
53 53 {
54 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 70 // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered
71 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 78 NULL
79 79 };
80 80 const int NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u;
... ... @@ -761,7 +761,7 @@ void RunTest( Application&amp; application )
761 761 // Entry point for Linux & Tizen applications
762 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 766 RunTest( application );
767 767  
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @46e6a0e
... ... @@ -61,11 +61,11 @@ namespace
61 61 /** Controls the output of application logging. */
62 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 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 70 /** The width of the grid in whole grid cells. */
71 71 const unsigned GRID_WIDTH = 9;
... ... @@ -104,64 +104,64 @@ const unsigned NUM_IMAGE_SIZES = sizeof(IMAGE_SIZES) / sizeof(IMAGE_SIZES[0]);
104 104 * show the scaling. */
105 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 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 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 165 NULL
166 166 };
167 167 const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u;
... ... @@ -616,7 +616,7 @@ void RunTest( Application&amp; application )
616 616 /** Entry point for Linux & Tizen applications */
617 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 621 RunTest( application );
622 622  
... ...
examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
  View file @46e6a0e
... ... @@ -47,7 +47,7 @@ private:
47 47 Vector4 green1 = Vector4( 0.f, 0.25f, 0.f, 0.25f );
48 48 BufferImage redGreen0 = CreateBufferImage( Color::RED, green0 );
49 49 BufferImage redGreen1 = CreateBufferImage( Color::RED, green1 );
50   - ResourceImage testImage = ResourceImage::New( DALI_IMAGE_DIR "gallery-large-20.jpg" );
  50 + ResourceImage testImage = ResourceImage::New( DEMO_IMAGE_DIR "gallery-large-20.jpg" );
51 51 float imageSize = 512.f;
52 52  
53 53 Toolkit::ImageView imageView0 = Toolkit::ImageView::New( testImage );
... ...
examples/image-view-pixel-area/image-view-pixel-area-example.cpp
  View file @46e6a0e
... ... @@ -21,9 +21,9 @@ using namespace Dali;
21 21  
22 22 namespace
23 23 {
24   -const char* IMAGE_PATH[] = { DALI_IMAGE_DIR "gallery-large-7.jpg",
25   - DALI_IMAGE_DIR "gallery-large-12.jpg",
26   - DALI_IMAGE_DIR "gallery-large-18.jpg" };
  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 27  
28 28 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
29 29 }
... ...
examples/image-view/image-view-example.cpp
  View file @46e6a0e
... ... @@ -25,22 +25,22 @@ using namespace Dali;
25 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 30 const char* APPLICATION_TITLE( "Image view" );
31 31  
32 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 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 46 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
... ... @@ -265,7 +265,7 @@ void RunTest( Application&amp; application )
265 265 //
266 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 270 RunTest( application );
271 271  
... ...
examples/item-view/item-view-example.cpp
  View file @46e6a0e
... ... @@ -37,80 +37,80 @@ enum AllImagesLayouts
37 37 };
38 38  
39 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 95 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATHS) / sizeof(char*);
96 96  
97 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 114 const char* APPLICATION_TITLE( "ItemView" );
115 115  
116 116 const char* SPIRAL_LABEL("Spiral");
... ... @@ -984,7 +984,7 @@ void RunTest(Application&amp; app)
984 984  
985 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 989 RunTest(app);
990 990  
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @46e6a0e
... ... @@ -26,8 +26,8 @@ using namespace Dali;
26 26  
27 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 32 #define MAKE_SHADER(A)#A
33 33  
... ...
examples/logging/logging-example.cpp
  View file @46e6a0e
... ... @@ -44,8 +44,8 @@ using namespace Dali;
44 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 50 const char* const TOOLBAR_TITLE = "Logging";
51 51 //const int TOOLBAR_HEIGHT = 62;
... ... @@ -712,7 +712,7 @@ void RunTest( Application&amp; application )
712 712 //
713 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 717 RunTest( application );
718 718  
... ...
examples/magnifier/magnifier-example.cpp
  View file @46e6a0e
... ... @@ -26,8 +26,8 @@ using namespace Dali;
26 26  
27 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 31 const char* APPLICATION_TITLE( "Magnifier Example" );
32 32 const Vector3 MAGNIFIER_SIZE(0.25f, 0.25f, 0.0f); ///< Magnifier sides should be 25% of the width of the stage
33 33 const float ANIMATION_DURATION(60.0f); ///< Run animation for a minute before repeating.
... ... @@ -413,7 +413,7 @@ void RunTest( Application&amp; application )
413 413 //
414 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 418 RunTest( application );
419 419  
... ...
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @46e6a0e
... ... @@ -32,12 +32,12 @@ namespace
32 32  
33 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 42 const unsigned int NUMBER_OF_SAMPLES(sizeof(MATERIAL_SAMPLES)/sizeof(const char*));
43 43  
... ...
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @46e6a0e
... ... @@ -31,8 +31,8 @@ using namespace Dali::Toolkit;
31 31  
32 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 37 const float GRAVITY_X(0);
38 38 const float GRAVITY_Y(-0.09);
... ... @@ -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 @46e6a0e
... ... @@ -27,8 +27,8 @@ using namespace Dali::Toolkit;
27 27  
28 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 33 const float GRAVITY_X(0);
34 34 const float GRAVITY_Y(-0.09);
... ... @@ -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 875  
876 876 return 0;
877 877 }
878   -
... ...
examples/model3d-view/model3d-view-example.cpp
  View file @46e6a0e
... ... @@ -25,20 +25,20 @@ namespace
25 25 const int MODEL_NUMBER(3);
26 26  
27 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 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 @46e6a0e
... ... @@ -54,11 +54,11 @@ const float MOTION_BLUR_ACTOR_HEIGHT = 112;
54 54 const unsigned int MOTION_BLUR_NUM_SAMPLES = 8;
55 55  
56 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 63 const char* MOTION_BLUR_ACTOR_IMAGES[] = {
64 64 MOTION_BLUR_ACTOR_IMAGE1,
... ... @@ -72,16 +72,16 @@ const int NUM_ACTOR_ANIMATIONS = 4;
72 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 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 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 560 //
561 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 565 RunTest(app);
566 566  
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @46e6a0e
... ... @@ -40,11 +40,11 @@ const float MOTION_STRETCH_ACTOR_WIDTH = 256;
40 40 const float MOTION_STRETCH_ACTOR_HEIGHT = 256; // ""
41 41  
42 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 49 const char* MOTION_STRETCH_ACTOR_IMAGES[] = {
50 50 MOTION_STRETCH_ACTOR_IMAGE1,
... ... @@ -58,16 +58,16 @@ const int NUM_ACTOR_ANIMATIONS = 4;
58 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 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 72 // These values depend on the button background image
73 73 const Vector4 BUTTON_IMAGE_BORDER( Vector4::ONE * 3.0f );
... ... @@ -443,7 +443,7 @@ void RunTest(Application&amp; app)
443 443 //
444 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 448 RunTest(app);
449 449  
... ...
examples/new-window/new-window-example.cpp
  View file @46e6a0e
... ... @@ -32,13 +32,13 @@ class NewWindowController;
32 32  
33 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 43 const float EXPLOSION_DURATION(1.2f);
44 44 const unsigned int EMIT_INTERVAL_IN_MS(40);
... ... @@ -241,7 +241,7 @@ void NewWindowController::Destroy( Application&amp; app )
241 241 void NewWindowController::AddBubbles( Actor& parentActor, const Vector2& stageSize)
242 242 {
243 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 245 200, Vector2( 5.0f, 5.0f ) );
246 246  
247 247 Image background = ResourceImage::New(BACKGROUND_IMAGE);
... ... @@ -563,7 +563,7 @@ void RunTest(Application&amp; app)
563 563 //
564 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 567 RunTest(gApplication);
568 568  
569 569 return 0;
... ...
examples/page-turn-view/page-turn-view-example.cpp
  View file @46e6a0e
... ... @@ -31,37 +31,37 @@ using namespace Dali::Toolkit;
31 31 // LOCAL STUFF
32 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 37 // The content amount of one page between portrait and landscape view are different
38 38 // set a ratio to modify the current page number when the rotation is changed
39 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 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 53 const unsigned int NUMBER_OF_PORTRAIT_IMAGE( sizeof(PAGE_IMAGES_PORTRAIT) / sizeof(PAGE_IMAGES_PORTRAIT[0]) );
54 54  
55 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 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 347 // Entry point for applications
348 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 351 PageTurnController test ( app );
352 352  
353 353 app.MainLoop();
354 354  
355 355 return 0;
356 356 }
357   -
... ...
examples/point-mesh/point-mesh-example.cpp
  View file @46e6a0e
... ... @@ -26,8 +26,8 @@ using namespace Dali;
26 26  
27 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 32 #define MAKE_SHADER(A)#A
33 33  
... ...
examples/popup/popup-example.cpp
  View file @46e6a0e
... ... @@ -34,15 +34,15 @@ struct ButtonItem
34 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 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 47 const char* const POPUP_BUTTON_TITLE_ID = "POPUP_BUTTON_TITLE";
48 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 61 const char* const POPUP_CONTROL_CANCEL_NAME = "controlCancel";
62 62  
63 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 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 70 const ButtonItem POPUP_BUTTON_ITEMS[] = {
71 71 { POPUP_BUTTON_COMPLEX_ID, "Complex" },
... ... @@ -733,7 +733,7 @@ void RunTest( Application&amp; application )
733 733 // Entry point for Linux & SLP applications
734 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 738 RunTest( application );
739 739  
... ...
examples/radial-menu/radial-menu-example.cpp
  View file @46e6a0e
... ... @@ -26,16 +26,16 @@ using namespace Dali::Toolkit;
26 26  
27 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 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 301 // Entry point for Linux & Tizen applications
302 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 306 RunTest(app);
307 307  
... ...
examples/refraction-effect/refraction-effect-example.cpp
  View file @46e6a0e
... ... @@ -32,25 +32,25 @@ using namespace Dali;
32 32 namespace
33 33 {
34 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 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 46 const unsigned int NUM_MESH_FILES( sizeof( MESH_FILES ) / sizeof( MESH_FILES[0] ) );
47 47  
48 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 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 599 int
600 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 604 RunTest(app);
605 605  
... ...
examples/scripting/launcher.cpp
  View file @46e6a0e
... ... @@ -79,9 +79,9 @@ void Launcher::Create( Dali::Application&amp; application )
79 79 mBuilder = Toolkit::Builder::New();
80 80  
81 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 85 mBuilder.AddConstants( defaultDirs );
86 86  
87 87 std::string json_data(GetFileContents( mJSONFileName ));
... ...
examples/scripting/scripting-example.cpp
  View file @46e6a0e
... ... @@ -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 91 daliApplication.MainLoop();
92 92  
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @46e6a0e
... ... @@ -28,11 +28,11 @@ using namespace Dali::Toolkit;
28 28  
29 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 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 37 const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f);
38 38  
... ... @@ -44,59 +44,59 @@ const char* EFFECT_MODE_NAME[] = {
44 44 };
45 45  
46 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 101 NULL
102 102 };
... ... @@ -581,7 +581,7 @@ private:
581 581  
582 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 585 ExampleController test(app);
586 586 app.MainLoop();
587 587 return 0;
... ...
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
  View file @46e6a0e
... ... @@ -31,21 +31,21 @@ using namespace DemoHelper;
31 31  
32 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 37 const char* APPLICATION_TITLE_PAN_LIGHT( "Lighting: Pan Light" );
38 38 const char* APPLICATION_TITLE_PAN_OBJECT( "Lighting: Rotate Object" );
39 39 const char* APPLICATION_TITLE_PAN_SCENE( "Lighting: Pan Scene" );
40 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 50 const float MIN_PINCH_SCALE( 0.3f );
51 51 const float MAX_PINCH_SCALE( 2.05f );
... ... @@ -199,7 +199,7 @@ public:
199 199 mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f);
200 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 203 mShadowPlaneBg.SetParentOrigin(ParentOrigin::CENTER);
204 204 mShadowPlaneBg.SetAnchorPoint(AnchorPoint::CENTER);
205 205 mShadowPlaneBg.SetName("Plane");
... ... @@ -503,7 +503,7 @@ RunTest(Application&amp; app)
503 503 int
504 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 508 RunTest(app);
509 509  
... ...
examples/size-negotiation/size-negotiation-example.cpp
  View file @46e6a0e
... ... @@ -33,9 +33,9 @@ struct ButtonItem
33 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 40 const char* const TOOLBAR_TITLE = "Negotiate Size";
41 41  
... ... @@ -815,7 +815,7 @@ void RunTest( Application&amp; application )
815 815 // Entry point for Linux & SLP applications
816 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 820 RunTest( application );
821 821  
... ...
examples/super-blur-bloom/super-blur-bloom-example.cpp
  View file @46e6a0e
... ... @@ -24,22 +24,22 @@ using namespace Dali;
24 24  
25 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 28 const char * const TITLE_SUPER_BLUR( "Super Blur" );
29 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 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 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 314 int
315 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 319 RunTest(app);
320 320  
... ...
examples/text-field/text-field-example.cpp
  View file @46e6a0e
... ... @@ -37,8 +37,8 @@ using namespace MultiLanguageStrings;
37 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 43 const float BORDER_WIDTH = 4.0f;
44 44  
... ...
examples/text-fonts/text-fonts-example.cpp
  View file @46e6a0e
... ... @@ -255,7 +255,7 @@ void RunTest( Application&amp; application )
255 255 /** Entry point for Linux & Tizen applications */
256 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 260 RunTest( application );
261 261  
... ...
examples/text-label-emojis/text-label-emojis.cpp
  View file @46e6a0e
... ... @@ -142,7 +142,7 @@ void RunTest( Application&amp; application )
142 142 //
143 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 147 RunTest( application );
148 148  
... ...
examples/text-label-multi-language/text-label-multi-language-example.cpp
  View file @46e6a0e
... ... @@ -144,7 +144,7 @@ void RunTest( Application&amp; application )
144 144 /** Entry point for Linux & Tizen applications */
145 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 149 RunTest( application );
150 150  
... ...
examples/text-label/text-label-example.cpp
  View file @46e6a0e
... ... @@ -34,7 +34,7 @@ using namespace MultiLanguageStrings;
34 34  
35 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 39 const unsigned int KEY_ZERO = 10;
40 40 const unsigned int KEY_ONE = 11;
... ... @@ -297,7 +297,7 @@ void RunTest( Application&amp; application )
297 297 /** Entry point for Linux & Tizen applications */
298 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 302 RunTest( application );
303 303  
... ...
examples/text-message-field/text-message-field-example.cpp
  View file @46e6a0e
... ... @@ -28,7 +28,7 @@ using namespace Dali::Toolkit;
28 28  
29 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 32 const Vector2 DESKTOP_SIZE( Vector2( 1440, 1600 ) );
33 33 const Vector2 PHOTOBOX_SIZE( Vector2(330.0f, 80.0f ) );
34 34 const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f;
... ... @@ -163,7 +163,7 @@ void RunTest( Application&amp; application )
163 163 /** Entry point for Linux & Tizen applications */
164 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 168 RunTest( application );
169 169  
... ...
examples/textured-mesh/textured-mesh-example.cpp
  View file @46e6a0e
... ... @@ -26,8 +26,8 @@ using namespace Dali;
26 26  
27 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 32 #define MAKE_SHADER(A)#A
33 33  
... ...
resources/images/00_popup_bg.9.png 0 → 100644
View file @46e6a0e

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